Andrei Simion andreiashu

Git DMZ Flow

I've been asked a few times over the last few months to put together a full write-up of the Git workflow we use at RichRelevance (and at Precog before), since I have referenced it in passing quite a few times in tweets and in person. The workflow is appreciably different from GitFlow and its derivatives, and thus it brings with it a different set of tradeoffs and optimizations. To that end, it would probably be helpful to go over exactly what workflow benefits I find to be beneficial or even necessary.

Two developers working on independent features must never be blocked by each other
- No code freeze! Ever! For any reason!
A developer must be able to base derivative work on another developer's work, without waiting for any third party
Two developers working on inter-dependent features (or even the same feature) must be able to do so without interference from (or interfering with) any other parties
Developers must be able to work on multiple features simultaneously, or at lea

	# -- mode: ruby --
	# vi: set ft=ruby :

	BOX_NAME = ENV['BOX_NAME'] \|\| "Centos6.4"
	BOX_URI = ENV['BOX_URI'] \|\| "http://shonky.info/centos64.box"

	# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
	VAGRANTFILE_API_VERSION = "2"

	Vagrant.configure(VAGRANTFILE_API_VERSION) do \|config\|

	const Promise = require('bluebird');

	// bluebird unhandledRejection event
	process.on('unhandledRejection', function (reason, promise) {
	console.log(`unhandledRejection, reason ${reason}`, promise);
	// don't continue in this state you plonker!
	process.exit(1);
	});

	CREATE TABLE `datapoints` (
	`id` int(11) unsigned NOT NULL AUTO_INCREMENT,
	`lineid` varchar(255) DEFAULT NULL,
	`geolocation` point DEFAULT NULL,
	`price` float NOT NULL,
	`currency` varchar(20) NOT NULL DEFAULT '',
	`locname` text DEFAULT NULL,
	`time` datetime DEFAULT NULL,
	PRIMARY KEY (`id`)
	) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;

	# PWN that sucker!
	# Warning: completely obliterates Docker: removes all containers, images and volumes
	# add this function to your ~/.bash_profile or ~/.zshrc (or equivalent)
	pwndocker() {
	echo -n "You sure you want to pwn Docker (y/n)? "
	read answer
	if echo "$answer" \| grep -iq "^y$" ;then
	[[ -n $(docker ps -qa) ]] && docker kill $(docker ps -qa)
	[[ -n $(docker ps -qa) ]] && docker rm -v $(docker ps -qa)
	[[ -n $(docker images -q) ]] && docker rmi -f $(docker images -q)

	describe("Understand Jest framework", () => {
	test("async works with Promise.resolve", async () => Promise.resolve(true))
	test("async works with return", async () => true)
	test("async works with expect met", async () => expect(true).toBe(true))
	test("expect throws", async () => {
	try {
	expect(true).toBe(false)
	console.log('This should not be printed')
	} catch (err) {
	// silence the error

	cd /var/lib

	tar czf ${WORKSPACE}/ecm_jenkins.tar.gz --exclude='.log' --exclude='jenkins/jobs//builds/' --exclude='jenkins/jobs//workspace/*' jenkins

	s3cmd put ${WORKSPACE}/ecm_jenkins.tar.gz s3://[bucket-name]/ecm_jenkins.tar.gz

	// paste this in your browser's console
	(function() {
	_loadScript = function(path){ var script= document.createElement('script'); script.type= 'text/javascript'; script.src= path; document.head.appendChild(script); }

	_loadScript('https://cdnjs.cloudflare.com/ajax/libs/web3/1.6.1-rc.0/web3.min.js');

	// @TODO: this can fail on slow connections; should have a retry mechanism
	setTimeout(() => {
	console.log(`Loaded Web3 version: ${Web3.version}`);
	}, 1500);