git-prepare-merge 1.0.1

data/History.txt

@@ -0,0 +1,4 @@
+== 1.0.0 / 2011-07-05
+
+* 1 major enhancement
+  * Birthday!

data/README.md

@@ -0,0 +1,63 @@
+prepare_merge
+===========
+
+Git Scripts to ease the merging of review branches into develop.
+
+Features
+--------
+
+
+
+Examples
+--------
+
+Requirements
+------------
+
+Ruby 1.9.1
+git 1.7.6
+
+Install
+-------
+
+the gem file is located in the pkg subfolder
+
+just run
+
+gem install Rebase_review_flow_git_scripts-0.0.1.gem
+
+
+Author
+------
+
+Original author: Simone Vicentini
+
+Contributors:
+
+
+
+License
+-------
+
+(The MIT License)
+
+Copyright (c) 2011 - HuzuTech
+
+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/Rakefile

@@ -0,0 +1,18 @@
+
+begin
+  require 'bones'
+rescue LoadError
+  abort '### Please install the "bones" gem ###'
+end
+
+
+Bones {
+  name     'git-prepare-merge'
+  authors  'Simone Vicentini - HuzuTech ltd'
+  email    'simone.vicentini@huzutech.com'
+  url      'http://www.huzutech.com'
+  depend_on 'git'
+  depend_on 'highline'
+  depend_on 'OptionParser'
+}
+

data/bin/git-compare-branches

@@ -0,0 +1,132 @@
+#!/usr/bin/env ruby
+require "highline/import"
+require 'git'
+include Git
+
+#
+# Git Compare Branches
+#
+# Script to find out what is in a branch that is not in a second branch.
+# The two branches need to have a common ancestor.
+# git command:
+# git log --cherry-pick --format="%h %s" --no-merges --right-only branch1...branch2 
+#
+#
+# The script can also find out the latest Release Candidate branch to then compare it
+# with the current branch.
+# Release Candidate branches should following this naming convention:
+# RC-YYYYMMDD-name
+# 
+# e.g.
+# RC-20110112-AntoninePlague
+# RC-20111129-MoscowPlagueAndRiot
+#
+
+def checkIfCommandRunInGITrootFolder
+    begin
+        repo = Base.new :working_directory => "."
+        return repo
+    rescue ArgumentError
+      puts 'You should run this script from the root folder of your git repo'
+      puts 'Aborting...'
+      exit 1
+    end
+end
+
+numberOfArgs = ARGV.length
+
+compareWithLastRC = false
+
+branch1 = ""
+branch2 = ""
+
+optparse = OptionParser.new do|opts|
+   # Set a banner, displayed at the top
+   # of the help screen.
+   opts.banner = "Usage: git compare-branches -b <branchName> [-c <branchName>] | -l"
+
+   opts.on( '-l', '--lastRC', 'Will try to find out the latest Release Candidate and compare the current branch with it' ) do|b|
+     compareWithLastRC = true
+   end
+
+   opts.on( '-b','--base BRANCH', 'Find out what is in the current branch which is not already in BRANCH') do|b|
+     branch1 = b
+   end
+
+   opts.on( '-c','--current BRANCH', 'Use BRANCH instead of the current branch.' ) do|b|
+     branch2 = b
+   end
+
+
+   # This displays the help screen, all programs are
+   # assumed to have this option.
+   opts.on( '-h', 'Display this screen' ) do
+     puts opts
+     exit
+   end
+ end
+
+optparse.parse!
+
+if (branch1.empty? && branch2.empty? || branch1.empty? && !branch2.empty?)&& !compareWithLastRC then
+  puts optparse.help
+  exit 0
+end
+
+repo = checkIfCommandRunInGITrootFolder
+
+
+#Fetch latest stuff from the remote repo
+puts "Fetching latest stuff..."
+repo.fetch()
+puts "Fetching finished."
+
+#saving current branch
+currentBranch = repo.current_branch()
+
+if branch2.empty? then
+  branch2 = currentBranch
+end
+
+if compareWithLastRC then
+  
+  remoteBranches = `git branch -r | grep -E "RC-20[0-9][0-9](0[1-9]|1[012])(0[1-9]|[12][0-9]|3[01])"`
+  remoteBranches.strip!
+  if remoteBranches.length == 0 then
+    puts "No Release Candidate branches found!"
+    exit 0
+  end
+
+  remoteBranches = remoteBranches.split($/)
+
+  remoteBranches.each { |w| w.strip! }
+  remoteBranches.sort!
+  rc = remoteBranches.last
+  puts "Looks like \n#{rc}\nis the most recent Release Candidate"
+  correctRC = agree "Is this correct?\n(Y = continue, N = show me all the other available Release Candidate branches)"
+  if correctRC then
+    branch1 = rc
+  else
+    puts "Then select a RC from the available ones:"
+    CHOICES = remoteBranches
+    branch1 = choose(*CHOICES)
+  end
+end
+
+puts "going to find out what is in #{branch2} which is not already in #{branch1}"
+diffs = `git log --cherry-pick --format="%h %s" --no-merges --right-only #{branch1}...#{branch2}`
+result = $?.success?
+puts "...done!"
+
+if ! result then
+    puts "Something went wrong while comparing the branches"
+    exit 1
+end
+if diffs.empty? then
+    puts "No differences between #{branch1} and #{branch2}"
+    exit 0 
+end
+puts " "
+puts "Here is what is in #{branch2} but not in #{branch1}:"
+puts " "
+puts diffs

data/bin/git-prepare-merge

@@ -0,0 +1,485 @@
+#!/usr/bin/env ruby
+require 'git'
+require 'fileutils'
+include FileUtils
+include Git
+require "highline/import"
+
+######################################################################
+#
+# Git Prepare Merge
+#
+# Script to automatically squash and rebase a branch with a standard commit message.
+#
+# N.B. The reason why we are not using the rebase command with the --autosquash option
+# is that the autosquash is not completely automatic and it can be only used with the -i (interactive)
+# option which defeats the point of this script. Why? because the interactive option will show 
+# a list of the commits which are about to be rebased and then is up to the user editing that 
+# list before rebasing, while the prepare merge script will automate this process.
+#
+#
+# Steps executed by the script:
+# 1 - find out the fork-point commit between the current branch and the destination branch.
+# 2 - soft reset current branch to the fork point commit.
+# 3 - stage all the changes
+# 4 - ask for commit message details
+# 5 - commit
+#
+# ====================================================================
+#  o = commit
+# 
+#  find fork point
+#
+#               destination branch
+#                       /
+#  o---o---o---o---o---o
+#              |\
+#              | o---o---o---o---o---o---o
+#              |                          \
+#              |                      your branch
+#              |
+#          fork-point
+#
+# ==================================================================== 
+# reset and create only one commit (simulating rebasing)
+#
+#
+#               destination branch
+#                       /
+#  o---o---o---o---o---o
+#              |\
+#              | o
+#              |  \
+#              |  your branch
+#              |
+#          fork-point
+#
+# ====================================================================
+# rebase on top of the destination branch
+#
+#               destination branch
+#                       /
+#  o---o---o---o---o---o---o
+#                           \
+#                       your branch
+#              
+#          
+######################################################################
+
+
+#constants
+TEMP_DIR = ".git#{File::SEPARATOR}prepare_merge"
+HEAD_SHA_FILE = "HEAD"
+TODO_FILE = "TODO"
+
+
+destination_branch = "develop"
+
+is_windows = (RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/)
+
+# Windows terminals don't support pretty colours
+if is_windows
+  HighLine.use_color=false
+end
+
+# Abort if ctrl-c on input
+if is_windows
+  trap('INT') { say("\n\n\nAborting...\n\n\n"); exit }
+else
+  stty_save = `stty -g`.chomp
+  trap('INT') { say("\n\n\n<%=color('Aborting...'.ljust(76), WHITE, ON_RED, BOLD)%>\n\n\n"); system('stty', stty_save); exit }
+end
+
+
+#class override
+def commit(title, message, ref, opts = {})
+    arr_opts = Array.new
+    arr_opts.push 'commit'
+
+    arr_opts.push '-m'
+    arr_opts.push title
+    
+    if !message.empty? then
+      arr_opts.push '-m'
+      arr_opts.push message
+    end
+    
+    if !ref.empty? then
+      arr_opts.push '-m'
+      arr_opts.push ref
+    end
+    
+    arr_opts.push  '-a' if opts[:add_all]
+
+    arr_opts.push  '--amend' if opts[:amend]    
+    
+    commitParams = "#{arr_opts.join(" ")}"
+    puts "commit message:"
+    puts "@"*60
+    system("git", *arr_opts); result = $?.success?
+    puts "@"*60
+    return result
+end
+
+#methods
+
+ft = HighLine::ColorScheme.new do |cs|
+         cs[:headline] = [ :bold, :yellow, :on_black ]
+         cs[:message]  = [:yellow, :on_black ]
+         cs[:even_row] = [ :green ]
+         cs[:error]    = [ :bold, :black, :on_red ]
+         cs[:command]  = [:black, :on_white ]
+       end
+
+
+HighLine.color_scheme = ft
+
+def drawHeadline
+	say("<%= color('*'*60, :headline)%>\n")
+end
+
+def drawErrorLine
+	say("<%= color('-'*60, :error)%>\n")
+end
+	
+def sayMessage(msg)
+        msg = msg.gsub(34.chr, '\"')
+	msg = msg.center(60)
+	say("<%= color(\"#{msg}\", :message)%>\n")
+end
+
+def sayError(error)
+        error = error.gsub(34.chr, '\"')
+	error = error.center(60)
+	say("<%= color(\"#{error}\", :error)%>\n")
+end
+
+def sayCommand(cmd)
+        cmd = cmd.gsub(34.chr, '\"')
+	cmd = cmd.center(60)
+	say("<%= color(\"#{cmd}\", :command)%>\n")
+end
+
+def checkIfCommandRunInGITrootFolder
+    begin
+        repo = Base.new :working_directory => "."
+        return repo
+    rescue ArgumentError
+      drawErrorLine
+      sayError('You should run this script from the root folder of your git repo')
+      sayError('Aborting...')
+      drawErrorLine
+      exit 1
+    end
+end
+
+def rebaseOn(repo, target)
+    drawHeadline
+    sayMessage("Now rebasing on top of #{target}")
+    sayMessage("Fetching latest stuff from origin\n")
+    repo.fetch()
+    output = `git rebase #{target}`; result = $?.success? 
+    drawHeadline
+    return result
+end
+
+def getSavedHEADsha
+    #read saved SHA for the current branch
+    if ! File.exist?(TEMP_DIR+File::SEPARATOR+HEAD_SHA_FILE) then
+    	sayMessage "The saved HEAD file does not exists!"
+        return ""
+    end
+    headShaFile = File.new(TEMP_DIR+File::SEPARATOR+HEAD_SHA_FILE , "r")
+    sha = headShaFile.gets.chomp
+		headShaFile.close
+    return sha
+end
+
+def removeTempFiles
+  FileUtils.rm_rf TEMP_DIR
+end
+
+
+doClean = false
+doContinue = false
+doAbort = false
+
+optparse = OptionParser.new do|opts|
+   # Set a banner, displayed at the top
+   # of the help screen.
+   opts.banner = "Usage: git prepare-merge [options]"
+ 
+   
+   opts.on( '-b', '--branch BRANCH', "Specify the destination BRANCH.",
+                                     "The actual branch comparison is done against the relative remote branch.",
+                                     "If nothing is passed the default branch used is develop." ) do|b|
+     destination_branch = b
+   end
+
+   
+   opts.on( '--clean', "To stop the execution of prepare-merge without",
+                       "trying to set the repo back as it was before." ) do
+     doClean = true
+   end
+
+   
+   opts.on( '--continue', "If, for any reason, the script was interrupted",
+                          "you can use this to try to resume it." ) do
+     doContinue = true
+   end
+
+   
+   opts.on( '--abort', 'Abort the current prepare merge and reset branch to original HEAD' ) do
+     doAbort = true
+   end
+ 
+
+
+   # This displays the help screen, all programs are
+   # assumed to have this option.
+   opts.on( '-h', 'Display this screen' ) do
+     puts opts
+     exit
+   end
+ end
+
+optparse.parse!
+
+
+repo = checkIfCommandRunInGITrootFolder
+
+
+
+currentBranch = repo.current_branch()
+if ["#{destination_branch}", "master", "origin/#{destination_branch}", "origin/master"].include?(currentBranch) then
+    drawErrorLine
+    sayError "You cannot run this command on this branch. It\'s too risky."
+    drawErrorLine
+    exit 1
+end
+
+
+
+if doContinue || doClean then
+    if ! File.exist?(TEMP_DIR) then
+      sayError "Not currently in the middle of a prepare-merge"
+      sayError "Nothing to do."
+      exit 0
+    end
+end
+
+
+if doClean then
+  sayMessage "prepare-merge stopped and temp files removed."
+  sayMessage "Check that this branch is set to the commit expected before doing anything else."
+  continueClean = agree "Are you sure you want to continue?"
+  if continueClean then
+    removeTempFiles
+  end
+  exit 0
+end
+
+if doAbort then
+    #the temp directory doesn't exist
+    if ! File.exist?(TEMP_DIR) then
+        sayMessage "nothing to abort"
+        exit 0
+    end
+    sha = getSavedHEADsha
+    if ! sha.empty? then 
+        commit = Git::Object::Commit.new(repo, sha)
+        sayMessage "THIS OPERATION WILL RESET YOUR BRANCH TO THE FOLLOWING REVIEW:"
+        sayMessage "SHA: #{sha}"
+        sayMessage "Commit Message: "+commit.message.to_s
+        sayMessage "Commit Date: "+commit.committer_date.to_s
+        sayMessage "Commit Author: "+commit.committer.to_s
+
+        continueAborting = agree "ARE YOU REALLY SURE YOU WANT TO CONTINUE? (Y/N)"
+        if continueAborting then
+          #reset current branch to saved SHA
+          repo.reset_hard(sha)
+          removeTempFiles
+          sayMessage "prepare merge aborted successfully"
+        else
+          sayMessage "Abort operation cancelled. Check your repo carefully and if you want to end the prepare-merge process"
+          sayMessage "without any alteration to the current repo , use it with the --clean parameter."
+        end
+    end
+    exit 0
+end
+
+
+############################################################################
+#ok we are not aborting or cleaning so we need to check if
+#the repo is ready.
+statusMessage = `git status --porcelain`
+
+if ! statusMessage.empty? then
+  drawErrorLine
+  sayError  "There are either untracked files or changes that have not been committed yet on this branch. Please solve those problems so to have a clean working directory before running the prepare merge script."
+  drawErrorLine
+  puts "This is what GIT has to say:"
+  puts statusMessage
+  exit 1
+end
+############################################################################
+
+if !doContinue then
+
+    begin
+        Dir.mkdir(TEMP_DIR)
+    rescue
+        sayError "Looks like you are in the middle of preparing a merge"
+        sayError "To abort the current submission run the script with the --abort option"
+        sayError "To try to continue the submission run the script with the --continue option"
+        sayError "To stop the execution of prepare-merge without trying to set the repo back as it was before running the command run the script with --clean"
+        exit 1
+    end
+end
+
+drawHeadline
+
+puts "Is this a feature or a bugfix ?"
+CHOICES = ["FEATURE", "BUG FIX"]
+choice = choose(*CHOICES)
+choice = CHOICES.index(choice) 
+
+type = "[BUG FIX]"
+if choice == 0 then
+    feature = ask "Input a label for the feature"
+    while feature.empty? do
+        puts "you need to bloody specify a feature"
+        feature = gets.chomp
+    end
+    type = "[#{feature}]"
+end
+
+title = ""
+while title.empty? do
+	title = ask "Input a title for the commit"
+end
+
+details = ask "Input some details"
+
+
+
+drawHeadline
+sayMessage "You are on branch: " + currentBranch
+
+sayMessage "Fetching latest stuff from origin"
+repo.fetch()
+
+#save current branch HEAD to be able to reset it back if needed
+currentBranchHEAD = repo.revparse("HEAD")
+sayMessage "The current HEAD for "+currentBranch+ " is :"
+sayMessage currentBranchHEAD
+
+
+Dir.new(TEMP_DIR)
+headSHAfilePath = TEMP_DIR+File::SEPARATOR+HEAD_SHA_FILE 
+headSHAfile = File.new(headSHAfilePath, "w+")
+headSHAfile.write(currentBranchHEAD)
+headSHAfile.close
+
+
+if !doContinue then
+    #get differences between current branch and origin/#{destination_branch}
+    diffs = `git log --cherry-pick --format="%H" --no-merges --right-only origin/#{destination_branch}...`
+    result = $?.success?
+    if ! result then
+        drawErrorLine
+        sayError "Something went wrong while comparing the branches."
+        drawErrorLine
+        exit 1
+    end
+    if diffs.empty? then
+        sayMessage "No differences between #{currentBranch} and origin/#{destination_branch}"
+        sayMessage "Maybe your branch has already been merged to #{destination_branch}."
+        exit 0 
+    end
+    diffs = diffs.split($/)
+    #reversing the array so that the oldest commit is at the start
+    diffs.reverse!
+    sayMessage "Resetting to first commit"
+    sha = diffs.shift
+    sayMessage "SHA: #{sha}"
+    repo.reset_hard(sha)
+    #save the rest of the commits that we need to apply in a file
+    todofilePath = TEMP_DIR+File::SEPARATOR+TODO_FILE
+    todofile = File.new(todofilePath, "w+")
+    todofile.write(diffs.join($/))
+    todofile.close    
+end
+
+
+diffs = IO.readlines(TEMP_DIR+File::SEPARATOR+TODO_FILE, $/)
+
+while (diffs.length > 0)
+    sha = diffs.shift.chomp
+    commit = Git::Object::Commit.new(repo, sha)
+    sayMessage "Applying commit ..."
+    sayMessage "SHA: "+sha
+    sayMessage "Message: #{commit.message}"
+    system("git cherry-pick --no-commit "+sha); result = $?.success?
+    
+    if ! result then
+        todofilePath = TEMP_DIR+File::SEPARATOR+TODO_FILE
+        todofile = File.new(todofilePath, "w")
+        diffs.each {|sha| todofile.puts(sha)}
+        todofile.close
+        sayError "Crap! You've got some conflicts! You need to solve them and then run the command with --continue"         
+        exit 1
+    end
+end
+
+#ok now we commit everything
+system("git add --all")
+
+savedHEADSha = getSavedHEADsha
+
+result = commit(type+" "+title, details, "Original branch HEAD: #{savedHEADSha}", :amend => 0)
+if ! result then
+  drawErrorLine
+	sayError "something went wrong while trying to squash your commits."
+  sayError "check the status of your branch adn if needed abort or clean the prepare merge."
+  drawErrorLine
+  exit 1
+end
+      
+removeTempFiles
+sayMessage "\nYEAH! all done!\n"
+
+rebaseNow = agree "Do you want to rebase on top of origin/#{destination_branch}?"
+
+if rebaseNow then 
+  result = rebaseOn(repo, "origin/#{destination_branch}")
+  if !result then
+    sayError "Rebasing has raised some conflicts and you are now in the middle of a rebase. You need to solve them manually. Unfortunately this script cannot continue automatically, so once you've solved your conflicts you need to manually run these commands:\n "
+  puts "git checkout #{destination_branch} && git pull origin #{destination_branch} && git merge --ff-only #{currentBranch}\n"
+    exit 1
+  end
+  sayMessage "Rebased successfully!\n"
+  drawHeadline
+  puts "now switch to #{destination_branch} and merge (Fast Forward) this review and then push\n\n"
+  puts "copy and paste the following command"
+  puts " "
+  puts "git checkout #{destination_branch} && git pull origin #{destination_branch} && git merge --ff-only #{currentBranch}"
+  puts " "
+  puts "if the commands above are run successfully you should push your #{destination_branch} to origin\n\n"
+  puts "git push origin #{destination_branch}"
+else
+  drawHeadline
+  puts "You now need to rebase on top of origin #{destination_branch} manually."
+  puts " "
+  puts "use: git rebase origin/#{destination_branch}"
+  puts " "
+  puts "After that switch to #{destination_branch} and merge (Fast Forward) this review and then push"
+  puts "copy and paste the following command"
+  puts " "
+  puts "git checkout #{destination_branch} && git pull origin #{destination_branch} && git merge --ff-only #{currentBranch}"
+  puts " "
+  puts "if the commands above are run successfully you should push your #{destination_branch} to origin"
+  puts " "
+  puts "git push origin #{destination_branch}"
+end
+drawHeadline

data/lib/prepare_merge.rb

@@ -0,0 +1,60 @@
+
+module PrepareMerge
+
+  # :stopdoc:
+  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
+  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
+  VERSION = ::File.read(PATH + 'version.txt').strip
+  # :startdoc:
+
+  # Returns the library path for the module. If any arguments are given,
+  # they will be joined to the end of the libray path using
+  # <tt>File.join</tt>.
+  #
+  def self.libpath( *args )
+    rv =  args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
+    if block_given?
+      begin
+        $LOAD_PATH.unshift LIBPATH
+        rv = yield
+      ensure
+        $LOAD_PATH.shift
+      end
+    end
+    return rv
+  end
+
+  # Returns the lpath for the module. If any arguments are given,
+  # they will be joined to the end of the path using
+  # <tt>File.join</tt>.
+  #
+  def self.path( *args )
+    rv = args.empty? ? PATH : ::File.join(PATH, args.flatten)
+    if block_given?
+      begin
+        $LOAD_PATH.unshift PATH
+        rv = yield
+      ensure
+        $LOAD_PATH.shift
+      end
+    end
+    return rv
+  end
+
+  # Utility method used to require all files ending in .rb that lie in the
+  # directory below this file that has the same name as the filename passed
+  # in. Optionally, a specific _directory_ name can be passed in such that
+  # the _filename_ does not have to be equivalent to the directory.
+  #
+  def self.require_all_libs_relative_to( fname, dir = nil )
+    dir ||= ::File.basename(fname, '.*')
+    search_me = ::File.expand_path(
+        ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
+
+    Dir.glob(search_me).sort.each {|rb| require rb}
+  end
+
+end  # module PrepareMerge
+
+PrepareMerge.require_all_libs_relative_to(__FILE__)
+

data/spec/prepare_merge_spec.rb

@@ -0,0 +1,6 @@
+
+require File.join(File.dirname(__FILE__), %w[spec_helper])
+
+describe PrepareMerge do
+end
+

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+
+require File.expand_path(
+    File.join(File.dirname(__FILE__), %w[.. lib prepare_merge]))
+
+Spec::Runner.configure do |config|
+  # == Mock Framework
+  #
+  # RSpec uses it's own mocking framework by default. If you prefer to
+  # use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+end
+

data/version.txt

@@ -0,0 +1 @@
+1.0.1

metadata

@@ -0,0 +1,108 @@
+--- !ruby/object:Gem::Specification
+name: git-prepare-merge
+version: !ruby/object:Gem::Version
+  version: 1.0.1
+  prerelease: 
+platform: ruby
+authors:
+- Simone Vicentini - HuzuTech ltd
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2012-01-18 00:00:00.000000000 +00:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: &27820392 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *27820392
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: &27820020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *27820020
+- !ruby/object:Gem::Dependency
+  name: OptionParser
+  requirement: &27819660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *27819660
+- !ruby/object:Gem::Dependency
+  name: bones
+  requirement: &27819240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.7.0
+  type: :development
+  prerelease: false
+  version_requirements: *27819240
+description: Git Scripts to ease the merging of review branches into develop.
+email: simone.vicentini@huzutech.com
+executables:
+- git-compare-branches
+- git-prepare-merge
+extensions: []
+extra_rdoc_files:
+- History.txt
+- bin/git-compare-branches
+- bin/git-prepare-merge
+files:
+- History.txt
+- README.md
+- Rakefile
+- bin/git-compare-branches
+- bin/git-prepare-merge
+- lib/prepare_merge.rb
+- spec/prepare_merge_spec.rb
+- spec/spec_helper.rb
+- test/test_prepare_merge.rb
+- version.txt
+has_rdoc: true
+homepage: http://www.huzutech.com
+licenses: []
+post_install_message: 
+rdoc_options:
+- --main
+- README.md
+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: git-prepare-merge
+rubygems_version: 1.5.2
+signing_key: 
+specification_version: 3
+summary: Git Scripts to ease the merging of review branches into develop.
+test_files:
+- test/test_prepare_merge.rb