mergeq 0.0.1

data/.gitignore

@@ -0,0 +1,17 @@
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in mergeq.gemspec
+gemspec

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2012 Aaron Jensen
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,29 @@
+# Mergeq
+
+TODO: Write a gem description
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'mergeq'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install mergeq
+
+## Usage
+
+TODO: Write usage instructions here
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -0,0 +1,2 @@
+#!/usr/bin/env rake
+require "bundler/gem_tasks"

data/bin/mergeq

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+exec File.dirname(__FILE__) + '/mergeq.sh'

data/bin/mergeq.sh

@@ -0,0 +1,127 @@
+#!/bin/bash
+target_branch=${1:-"integration"}
+merge_branch=${2:-"merge/$target_branch"}
+
+function status {
+  echo "// $1"
+}
+
+function exit_if_local_mods {
+  if [ ! -z "$(git status --porcelain)" ] ; then
+    status "Local modifications detected. Cannot push."
+    git status -s
+    exit 1
+  fi
+
+  return 0
+}
+
+function merge_failed {
+  status "Doh. Your merge has conflicts, but don\'t worry:"
+  echo
+  echo 1. Fix your merge conflicts
+  echo 2. Commit them
+  echo 3. Run mergeq again
+
+  exit 1
+}
+
+function checkout_target_branch {
+  status "Checking out $target_branch..."
+
+  git fetch origin $target_branch
+  git checkout -q FETCH_HEAD
+  git reset --hard
+  git clean -f
+}
+
+function cleanup {
+  echo "
+Returning to $branch..."
+  git checkout -q $branch
+  rm .merging
+}
+
+function try_to_merge {
+  status "Merging $branch into $target_branch"
+
+  git merge --no-ff $branch -m "Merge $branch into $target_branch" || merge_failed
+}
+
+function write_temp_file {
+  status "Writing temp file..."
+  echo "$branch;$merge_branch;$target_branch" > .merging
+}
+
+function start_merge {
+  status "Starting merge..."
+  set -e
+
+  exit_if_local_mods
+
+  branch=`git rev-parse --abbrev-ref HEAD`
+
+  checkout_target_branch
+  write_temp_file
+  try_to_merge
+
+  continue_merge
+}
+
+function push_failed {
+  status "Your push failed, someone may have beat you. Try again?"
+}
+
+function exit_if_we_have_already_been_merged {
+  set +e
+  git fetch origin $target_branch
+  git diff --quiet FETCH_HEAD
+  if [ $? -eq 0 ]
+  then
+    echo "
+**********************************************************
+
+ This branch has already been merged into $target_branch
+
+**********************************************************"
+    cleanup
+    exit 1
+  fi
+  set -e
+}
+
+function push_to_merge_branch {
+  current=`git rev-parse HEAD`
+
+  status "Merging into $merge_branch"
+  git fetch origin $merge_branch
+  git checkout -q FETCH_HEAD
+  git merge --no-ff -s ours --no-commit $current
+  echo $current > .merge
+  git add .merge
+  git commit -m "Queuing merge: $branch into $target_branch"
+  status "Queuing merge by pushing $merge_branch"
+  git push origin HEAD:refs/heads/$merge_branch || push_failed
+}
+
+function continue_merge {
+  exit_if_local_mods
+  exit_if_we_have_already_been_merged
+  push_to_merge_branch
+
+  status "Done!"
+  cleanup
+}
+
+if [ -f .merging ]
+then
+  IFS=';' read -ra branches < .merging
+  branch=${branches[0]}
+  merge_branch=${branches[1]}
+  target_branch=${branches[2]}
+
+  status "Continuing merge..."
+  continue_merge
+else
+  start_merge
+fi

data/bin/mergeq_ci

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+exec File.dirname(__FILE__) + '/mergeq_ci.sh'

data/bin/mergeq_ci.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+set -e
+action=$1
+
+function print_usage_and_exit {
+  echo "Usage: mergeq_ci <merge|push> [target-branch]"
+  exit 1
+}
+
+
+function checkout_target_branch {
+  git fetch origin $target_branch
+  git checkout -q FETCH_HEAD
+  git reset --hard
+  git clean -df
+}
+
+function merge_branch_into_target_branch {
+  # This ends up looking like a new merge regardless
+  # of whether or not we can fast forward merge.
+  # and it copies over any merge conflict resolutions.
+  # It's clearly black magic.
+  git merge --no-ff --no-commit $head
+  echo `git rev-parse $head^2` > .git/MERGE_HEAD
+}
+
+function commit_merge {
+  message=`git log -1 --pretty=%s $head`
+  git commit -m "$message"
+}
+
+function merge {
+  head=`git rev-parse HEAD^2`
+
+  checkout_target_branch
+  merge_branch_into_target_branch
+  commit_merge
+}
+
+function push {
+  git push origin HEAD:$target_branch
+}
+
+target_branch=${2:-"integration"}
+
+if [ "$action" = "merge" ] ; then
+  merge
+elif [ "$action" = "push" ] ; then
+  push
+else
+  print_usage_and_exit
+fi

data/lib/mergeq.rb

@@ -0,0 +1,5 @@
+require "mergeq/version"
+
+module Mergeq
+  # Your code goes here...
+end

data/lib/mergeq/version.rb

@@ -0,0 +1,3 @@
+module Mergeq
+  VERSION = "0.0.1"
+end

data/mergeq.gemspec

@@ -0,0 +1,17 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/mergeq/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["Aaron Jensen"]
+  gem.email         = ["aaronjensen@gmail.com"]
+  gem.description   = %q{A set of scripts that enable merging after build. Useful if you'd rather run your tests on TeamCity.}
+  gem.summary       = %q{Get your CI (like TeamCity) to merge after builds pass with a queue of gated merges.}
+  gem.homepage      = ""
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "mergeq"
+  gem.require_paths = ["lib"]
+  gem.version       = Mergeq::VERSION
+end

metadata

@@ -0,0 +1,63 @@
+--- !ruby/object:Gem::Specification
+name: mergeq
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+  prerelease: 
+platform: ruby
+authors:
+- Aaron Jensen
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2012-07-13 00:00:00.000000000 Z
+dependencies: []
+description: A set of scripts that enable merging after build. Useful if you'd rather
+  run your tests on TeamCity.
+email:
+- aaronjensen@gmail.com
+executables:
+- mergeq
+- mergeq.sh
+- mergeq_ci
+- mergeq_ci.sh
+extensions: []
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
+- LICENSE
+- README.md
+- Rakefile
+- bin/mergeq
+- bin/mergeq.sh
+- bin/mergeq_ci
+- bin/mergeq_ci.sh
+- lib/mergeq.rb
+- lib/mergeq/version.rb
+- mergeq.gemspec
+homepage: ''
+licenses: []
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 1.8.23
+signing_key: 
+specification_version: 3
+summary: Get your CI (like TeamCity) to merge after builds pass with a queue of gated
+  merges.
+test_files: []