git-process 1.0.5 → 1.0.6

data/CHANGELOG.md

@@ -1,4 +1,12 @@
-# CHANGELOG - 1.0.5 #
+# CHANGELOG - 1.0.6 #
+
+### Since 1.0.5 ###
+
+* Adds option to make rebase the default for git-sync. (GH-82)
+* git-sync is now "safer" when working with other people on the same branch. (GH-80)
+* Interactive rebase is now option an option for git-to-master. (GH-13)
+* Simplified/improved arguments for git-pull-request (GH-86)
+* Adds some more known statuses. (GH-84, GH-88)
 
 ### Since 1.0.4 ###
 

data/README.md

@@ -98,6 +98,7 @@ $ git to-master              # 6
 * `gitProcess.integrationBranch` : The name of the integration branch. Defaults to `master`, but can be set to `develop` or other.
 * `gitProcess.keepLocalIntegrationBranch` : Controls asking about removing the local integration branch. Defaults to 'false' (i.e., do not assume the branch should be there).
 * `gitProcess.remoteName` : Explicitly sets the remote server name to use.
+* `gitProcess.defaultRebaseSync`: Should `git sync` default to using rebase instead of merge?
 
 
 # Assumptions #

data/bin/git-pull-request

@@ -6,6 +6,7 @@ require 'git-process/git_process_options'
 class PullRequestOptions
   include GitProc::GitProcessOptions
 
+
   def summary
     "Creates a Pull Request for the current branch."
   end
@@ -56,25 +57,20 @@ DESC
   end
 
 
-  def empty_argv_ok?
-    false
-  end
-
-
   def extend_opts(parser)
-    parser.opt :base_branch,  "The branch on the server that you want this \"pulled\" into. "+
-                              "Defaults to the integration branch."
-    parser.opt :head_branch,  "The branch that you want reviewed before being \"pulled\" "+
-                              "into the base branch. Defaults to the current branch."
-    parser.opt :repo_name,    "The name of the repository to \"pull\" into. Defaults to "+
-                              "the current repository."
-    parser.opt :description,  "The description of the Pull Request. Usually includes a "+
-                              "nice description of what was changed to make things easier "+
-                              "for the reviewer.", :short => :d
-    parser.opt :user,         "Your GitHub username. Only needed the first time you connect, "+
-                              "and you will be prompted for it if needed."
-    parser.opt :password,     "Your GitHub password. Only needed the first time you connect, "+
-                              "and you will be prompted for it if needed."
+    parser.opt :base_branch, "The branch on the server that you want this \"pulled\" into. "+
+        "Defaults to the integration branch.", :type => :string
+    parser.opt :head_branch, "The branch that you want reviewed before being \"pulled\" "+
+        "into the base branch. Defaults to the current branch.", :type => :string
+    parser.opt :repo_name, "The name of the repository to \"pull\" into. Defaults to "+
+        "the current repository.", :type => :string
+    parser.opt :description, "The description of the Pull Request. Usually includes a "+
+        "nice description of what was changed to make things easier "+
+        "for the reviewer.", :short => :d, :type => :string
+    parser.opt :user, "Your GitHub username. Only needed the first time you connect, "+
+        "and you will be prompted for it if needed.", :type => :string
+    parser.opt :password, "Your GitHub password. Only needed the first time you connect, "+
+        "and you will be prompted for it if needed.", :type => :string
   end
 
 

data/bin/git-sync

@@ -11,6 +11,7 @@ require 'git-process/sync'
 class SyncOptions
   include GitProc::GitProcessOptions
 
+
   def summary
     "Gets the latest changes that have happened on the integration branch, then pushes your changes to a \"private\" branch on the server."
   end
@@ -33,6 +34,8 @@ Since most projects only have a single remote (i.e., "origin") this works most o
 But if you have multiple remotes and want to explicitly set it, use the \
 'gitProcess.remoteName' configuration option.
 
+Setting `gitProcess.defaultRebaseSync` to "true" causes this to default to using rebase instead of merge.
+
 EXAMPLE
 
 Assuming that the current branch is called "interesting_changes" and the integration \

data/bin/git-to-master

@@ -6,6 +6,7 @@ require 'git-process/rebase_to_master'
 class ToMasterOptions
   include GitProc::GitProcessOptions
 
+
   def summary
     "Rebase against the integration branch, then pushes to it."
   end
@@ -56,6 +57,8 @@ for you:
   $ git branch -d interesting_changes
   $ git push origin :interesting_changes
 
+If you use the --interactive option, then it does an interactive rebase before the first "push".
+
 If you use the --keep option, then the process stops after the first "push".
 
 NOTES
@@ -69,9 +72,10 @@ DESC
 
 
   def extend_opts(parser)
-    parser.opt :keep,  "Don't do any \"cleanup.\" It keeps the current local "+
-                       "and remote branches, and does not close any "+
-                       "outstanding pull requests.", :short => :k, :default => false
+    parser.opt :keep, "Don't do any \"cleanup.\" It keeps the current local "+
+        "and remote branches, and does not close any "+
+        "outstanding pull requests.", :short => :k, :default => false
+    parser.opt :interactive, "Do an interactive rebase before pushing to the server.", :short => :i, :default => false
   end
 
 end

data/lib/git-process/git_branch.rb

@@ -67,7 +67,8 @@ module GitProc
 
 
     def is_ahead_of(base_branch_name)
-      @lib.rev_list(base_branch_name, @name, :oneline => true, :num_revs => 1) != ''
+      contains_all_of(base_branch_name) and
+          (@lib.rev_list(base_branch_name, @name, :oneline => true, :num_revs => 1) != '')
     end
 
 

data/lib/git-process/git_lib.rb

@@ -94,9 +94,16 @@ module GitProc
     end
 
 
-    def rebase(base)
-      logger.info { "Rebasing #{branches.current.name} against #{base}" }
-      command('rebase', base)
+    def rebase(base, opts = {})
+      args = []
+      if opts[:interactive]
+        logger.info { "Interactively rebasing #{branches.current.name} against #{base}" }
+        args << '-i'
+      else
+        logger.info { "Rebasing #{branches.current.name} against #{base}" }
+      end
+      args << base
+      command('rebase', args)
     end
 
 

data/lib/git-process/git_process.rb

@@ -174,9 +174,9 @@ module GitProc
     end
 
 
-    def proc_rebase(base)
+    def proc_rebase(base, opts = {})
       begin
-        rebase(base)
+        rebase(base, opts)
       rescue GitExecuteError => rebase_error
         raise RebaseError.new(rebase_error.message, self)
       end

data/lib/git-process/git_status.rb

@@ -54,7 +54,7 @@ module GitProc
           when 'MD'
             modified << f
             deleted << f
-          when 'D ', ' D'
+          when 'D ', ' D', 'DD'
             deleted << f
           when 'DU', 'UD'
             deleted << f
@@ -64,10 +64,13 @@ module GitProc
           when 'AD'
             added << f
             deleted << f
-          when 'AA'
+          when 'AA', 'AU', 'UA'
             added << f
             unmerged << f
-          when '??'
+          when 'AM', 'MA'
+            added << f
+            merged << f
+          when '??', '!!'
             unknown << f
           when 'R '
             old_file, new_file = file.split(' -> ')

data/lib/git-process/pull_request.rb

@@ -23,12 +23,13 @@ module GitProc
 
     def initialize(dir, opts)
       super
+      current_branch = branches.current.name
       @title = opts[:title]
       @base_branch = opts[:base_branch] || master_branch
-      @head_branch = opts[:head_branch] || branches.current
+      @head_branch = opts[:head_branch] || current_branch
       @repo_name = opts[:repo_name] || repo_name()
-      @title = opts[:title] || ask_for_pull_title()
-      @description = opts[:description] || ask_for_pull_description()
+      @title = opts[:title] || current_branch
+      @description = opts[:description] || ''
       @user = opts[:user]
       @password = opts[:password]
     end
@@ -41,21 +42,6 @@ module GitProc
       pr.create(@base_branch, @head_branch, @title, @description)
     end
 
-
-    private
-
-
-    def ask_for_pull_title
-      ask("What <%= color('title', [:bold]) %> do you want to give the pull request? ") do |q|
-        q.validate = /^\w+.*/
-      end
-    end
-
-
-    def ask_for_pull_description
-      ask("What <%= color('description', [:bold]) %> do you want to give the pull request? ")
-    end
-
   end
 
 end

data/lib/git-process/rebase_to_master.rb

@@ -24,6 +24,7 @@ module GitProc
 
     def initialize(dir, opts)
       @keep = opts[:keep]
+      @interactive = opts[:interactive]
       super
     end
 
@@ -36,14 +37,14 @@ module GitProc
     end
 
 
-    #noinspection RubyControlFlowConversionInspection
     def runner
       if has_a_remote?
         fetch(server_name)
         proc_rebase(integration_branch)
+        proc_rebase(integration_branch, :interactive => true) if @interactive
         push(server_name, branches.current, master_branch)
 
-        if not @keep
+        unless @keep
           close_pull_request
           remove_feature_branch
         end

data/lib/git-process/sync.rb

@@ -24,8 +24,6 @@ module GitProc
 
 
     def initialize(dir, opts)
-      opts[:force] = true if opts[:rebase]
-
       if !opts[:merge].nil? and opts[:merge] == opts[:rebase]
         raise ArgumentError.new(":merge = #{opts[:merge]} and :rebase = #{opts[:rebase]}")
       end
@@ -56,26 +54,42 @@ module GitProc
     end
 
 
+    def remote_has_changed
+      old_sha = rev_parse(@remote_branch) rescue ''
+      fetch(server_name) if has_a_remote?
+      new_sha = rev_parse(@remote_branch) rescue ''
+
+      old_sha != new_sha
+    end
+
+
     def runner
       @current_branch ||= branches.current
       @remote_branch ||= "#{server_name}/#@current_branch"
 
       # if the remote branch has changed, merge those changes in before
       #   doing anything with the integration branch
-      old_sha = rev_parse(@remote_branch) rescue ''
-      fetch(server_name) if has_a_remote?
-      new_sha = rev_parse(@remote_branch) rescue ''
-      unless old_sha == new_sha
+      if remote_has_changed
         logger.info('There have been changes on this remote branch, so will merge them in.')
         proc_merge(@remote_branch)
       end
 
+      @do_rebase ||= config('gitProcess.defaultRebaseSync').to_boolean
+
       if @do_rebase
+        @force = true
         proc_rebase(integration_branch)
       else
         proc_merge(integration_branch)
       end
 
+      push_to_server
+    end
+
+
+    private
+
+    def push_to_server
       if @local
         logger.debug("Not pushing to the server because the user selected local-only.")
       elsif not has_a_remote?
@@ -92,9 +106,6 @@ module GitProc
     end
 
 
-    private
-
-
     def handle_remote_changed(old_sha)
       fetch(server_name)
       new_sha = rev_parse(@remote_branch) rescue ''

data/lib/git-process/version.rb

@@ -14,7 +14,7 @@ module GitProc
   module Version
     MAJOR = 1
     MINOR = 0
-    PATCH = 5
+    PATCH = 6
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/spec/git_branch_spec.rb

@@ -0,0 +1,123 @@
+require 'git-process/git_lib'
+require 'GitRepoHelper'
+
+describe GitProc::GitBranch do
+  include GitRepoHelper
+
+
+  def log_level
+    Logger::ERROR
+  end
+
+
+  before(:each) do
+    create_files(%w(.gitignore))
+    gitprocess.commit('initial')
+  end
+
+
+  after(:each) do
+    rm_rf(@tmpdir)
+  end
+
+
+  describe "contains_all_of" do
+
+    it "should handle the trivial case" do
+      current = gitprocess.branches.current
+      current.contains_all_of(current.name).should == true
+    end
+
+
+    it "should handle new branch containing base branch that did not change" do
+      base_branch = gitprocess.branches.current
+
+      gitprocess.checkout('fb', :new_branch => base_branch.name)
+      current = gitprocess.branches.current
+
+      change_file_and_commit('a', 'hello')
+
+      current.contains_all_of(base_branch.name).should == true
+    end
+
+
+    it "should handle new branch containing base branch that did change" do
+      base_branch = gitprocess.branches.current
+
+      gitprocess.checkout('fb', :new_branch => base_branch.name)
+      current = gitprocess.branches.current
+
+      gitprocess.checkout(base_branch.name)
+      change_file_and_commit('a', 'goodbye')
+
+      current.contains_all_of(base_branch.name).should == false
+    end
+
+
+    it "should handle containing in both branches" do
+      base_branch = gitprocess.branches.current
+
+      gitprocess.checkout('fb', :new_branch => base_branch.name)
+      current = gitprocess.branches.current
+
+      change_file_and_commit('a', 'hello')
+
+      gitprocess.checkout(base_branch.name)
+      change_file_and_commit('a', 'goodbye')
+
+      current.contains_all_of(base_branch.name).should == false
+    end
+
+  end
+
+
+  describe "is_ahead_of" do
+
+    it "should handle the trivial case" do
+      current = gitprocess.branches.current
+      current.is_ahead_of(current.name).should == false # same is not "ahead of"
+    end
+
+
+    it "should handle new branch containing base branch that did not change" do
+      base_branch = gitprocess.branches.current
+
+      gitprocess.checkout('fb', :new_branch => base_branch.name)
+      current = gitprocess.branches.current
+
+      change_file_and_commit('a', 'hello')
+
+      current.is_ahead_of(base_branch.name).should == true
+    end
+
+
+    it "should handle new branch containing base branch that did change" do
+      base_branch = gitprocess.branches.current
+
+      gitprocess.checkout('fb', :new_branch => base_branch.name)
+      current = gitprocess.branches.current
+
+      gitprocess.checkout(base_branch.name)
+      change_file_and_commit('a', 'goodbye')
+
+      current.is_ahead_of(base_branch.name).should == false
+    end
+
+
+    it "should handle containing in both branches" do
+      base_branch = gitprocess.branches.current
+
+      gitprocess.checkout('fb', :new_branch => base_branch.name)
+      current = gitprocess.branches.current
+
+      change_file_and_commit('a', 'hello')
+
+      gitprocess.checkout(base_branch.name)
+      change_file_and_commit('a', 'goodbye')
+
+      current.is_ahead_of(base_branch.name).should == false
+    end
+
+  end
+
+end

data/spec/git_status_spec.rb

@@ -12,7 +12,7 @@ describe GitProc::GitStatus do
 
 
   before(:each) do
-    create_files(['.gitignore'])
+    create_files(%w(.gitignore))
     gitprocess.commit('initial')
   end
 
@@ -38,11 +38,11 @@ describe GitProc::GitStatus do
     gitprocess.checkout('master')
     change_file_and_commit('a', 'goodbye')
 
-    gitprocess.merge('fb') rescue
+    gitprocess.merge('fb') rescue ''
 
-        status = gitprocess.status
-    status.unmerged.should == ['a']
-    status.modified.should == ['a']
+    status = gitprocess.status
+    status.unmerged.should == %w(a)
+    status.modified.should == %w(a)
   end
 
 
@@ -53,11 +53,11 @@ describe GitProc::GitStatus do
     gitprocess.checkout('master')
     change_file_and_commit('a', 'goodbye')
 
-    gitprocess.merge('fb') rescue
+    gitprocess.merge('fb') rescue ''
 
-        status = gitprocess.status
-    status.unmerged.should == ['a']
-    status.added.should == ['a']
+    status = gitprocess.status
+    status.unmerged.should == %w(a)
+    status.added.should == %w(a)
   end
 
 
@@ -71,11 +71,11 @@ describe GitProc::GitStatus do
     gitprocess.checkout('master')
     change_file_and_commit('a', 'goodbye')
 
-    gitprocess.merge('fb') rescue
+    gitprocess.merge('fb') rescue ''
 
-        status = gitprocess.status
-    status.unmerged.should == ['a']
-    status.deleted.should == ['a']
+    status = gitprocess.status
+    status.unmerged.should == %w(a)
+    status.deleted.should == %w(a)
   end
 
 
@@ -89,11 +89,11 @@ describe GitProc::GitStatus do
     gitprocess.remove('a', :force => true)
     gitprocess.commit('removed a')
 
-    gitprocess.merge('fb') rescue
+    gitprocess.merge('fb') rescue ''
 
-        status = gitprocess.status
-    status.unmerged.should == ['a']
-    status.deleted.should == ['a']
+    status = gitprocess.status
+    status.unmerged.should == %w(a)
+    status.deleted.should == %w(a)
   end
 
 

data/spec/rebase_to_master_spec.rb

@@ -13,7 +13,7 @@ describe GitProc::RebaseToMaster do
 
 
   before(:each) do
-    create_files(['.gitignore'])
+    create_files(%w(.gitignore))
     gitprocess.commit('initial')
   end
 
@@ -83,7 +83,7 @@ describe GitProc::RebaseToMaster do
         gitprocess.runner
         raise "Should have raised RebaseError"
       rescue GitProc::RebaseError => exp
-        exp.resolved_files.should == ['a']
+        exp.resolved_files.should == %w(a)
         exp.unresolved_files.should == []
 
         exp.commands.length.should == 3
@@ -313,4 +313,21 @@ describe GitProc::RebaseToMaster do
 
   end
 
+
+  describe ":interactive option" do
+
+    it "should try to do an interactive rebase" do
+      gitprocess.branch('fb', :base_branch => 'master')
+
+      rtm = GitProc::RebaseToMaster.new(clone('fb').workdir, {:log_level => log_level, :interactive => true})
+      rtm.should_receive(:fetch)
+      rtm.should_receive(:rebase).with('origin/master', {})
+      rtm.should_receive(:rebase).with('origin/master', :interactive => true)
+      rtm.should_receive(:push).with('origin', rtm.branches.current, 'master')
+      rtm.should_receive(:push).with('origin', nil, nil, :delete => 'fb')
+      rtm.runner
+    end
+
+  end
+
 end

data/spec/sync_spec.rb

@@ -116,15 +116,32 @@ describe GitProc::Sync do
     it "should work when pushing (non-fast-forward)" do
       change_file_and_commit('a', '')
 
-      gitprocess.branch('fb', :base_branch => 'master')
+      gp = clone
+      gp.checkout('fb', :new_branch => 'master')
 
-      clone('fb') do |gp|
-        gitprocess.checkout('fb') do
-          change_file_and_commit('a', 'hello', gitprocess)
-        end
+      expect { gp.runner }.to_not raise_error GitProc::GitExecuteError
 
-        expect { gp.runner }.to_not raise_error GitProc::GitExecuteError
-      end
+      change_file_and_commit('a', 'hello', gitprocess)
+
+      expect { gp.runner }.to_not raise_error GitProc::GitExecuteError
+    end
+
+
+    it "should merge and then rebase if remote feature branch changed" do
+      change_file_and_commit('a', '')
+
+      gitprocess.checkout('fb', :new_branch => 'master')
+
+      gp = clone
+      gp.checkout('fb', :new_branch => 'origin/master')
+
+      change_file_and_commit('b', 'hello', gp)
+      change_file_and_commit('a', 'hello', gitprocess)
+      change_file_and_commit('b', 'goodbye', gp)
+      change_file_and_commit('a', 'goodbye', gitprocess)
+      gitprocess.checkout('master')
+
+      expect { gp.runner }.to_not raise_error GitProc::GitExecuteError
     end
 
   end
@@ -179,6 +196,84 @@ describe GitProc::Sync do
   end
 
 
+  describe "when default rebase flag is used" do
+
+    def create_process(dir, opts)
+      GitProc::Sync.new(dir, opts.merge({:rebase => false, :force => false, :local => false}))
+    end
+
+
+    it "should try to rebase by flag" do
+      change_file_and_commit('a', '', gitprocess)
+
+      gitprocess.branch('fb', :base_branch => 'master')
+
+      sp = GitProc::Sync.new(gitprocess.workdir, {:rebase => true, :force => false, :local => true, :log_level => log_level})
+      sp.should_receive(:rebase)
+      sp.should_not_receive(:merge)
+
+      sp.runner
+    end
+
+
+    it "should try to rebase by config" do
+      change_file_and_commit('a', '', gitprocess)
+
+      gitprocess.branch('fb', :base_branch => 'master')
+      gitprocess.config('gitProcess.defaultRebaseSync', 'true')
+
+      sp = GitProc::Sync.new(gitprocess.workdir, {:rebase => false, :force => false, :local => true, :log_level => log_level})
+      sp.should_receive(:rebase)
+      sp.should_not_receive(:merge)
+
+      sp.runner
+    end
+
+
+    it "should not try to rebase by false config" do
+      change_file_and_commit('a', '', gitprocess)
+
+      gitprocess.branch('fb', :base_branch => 'master')
+      gitprocess.config('gitProcess.defaultRebaseSync', 'false')
+
+      sp = GitProc::Sync.new(gitprocess.workdir, {:rebase => false, :force => false, :local => true, :log_level => log_level})
+      sp.should_not_receive(:rebase)
+      sp.should_receive(:merge)
+
+      sp.runner
+    end
+
+
+    it "should not try to rebase by false config" do
+      change_file_and_commit('a', '', gitprocess)
+
+      gitprocess.branch('fb', :base_branch => 'master')
+      gitprocess.config('gitProcess.defaultRebaseSync', 'false')
+
+      sp = GitProc::Sync.new(gitprocess.workdir, {:rebase => false, :force => false, :local => true, :log_level => log_level})
+      sp.should_not_receive(:rebase)
+      sp.should_receive(:merge)
+
+      sp.runner
+    end
+
+
+    it "should try to rebase by true config" do
+      change_file_and_commit('a', '', gitprocess)
+
+      gitprocess.branch('fb', :base_branch => 'master')
+      gitprocess.config('gitProcess.defaultRebaseSync', 'true')
+
+      sp = GitProc::Sync.new(gitprocess.workdir, {:rebase => false, :force => false, :local => true, :log_level => log_level})
+      sp.should_receive(:rebase)
+      sp.should_not_receive(:merge)
+
+      sp.runner
+    end
+
+  end
+
+
   it "should work with a different remote server name than 'origin'" do
     change_file_and_commit('a', '')
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: git-process
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Jim Moore
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-23 00:00:00 -06:00
-default_executable: 
+date: 2012-11-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -30,10 +29,10 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
-  version_requirements: *id001
-  name: octokit
   prerelease: false
   type: :runtime
+  name: octokit
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,10 +45,10 @@ dependencies:
         - 7
         - 3
         version: 1.7.3
-  version_requirements: *id002
-  name: json
   prerelease: false
   type: :runtime
+  name: json
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -62,10 +61,10 @@ dependencies:
         - 16
         - 2
         version: 1.16.2
-  version_requirements: *id003
-  name: trollop
   prerelease: false
   type: :runtime
+  name: trollop
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -78,10 +77,10 @@ dependencies:
         - 6
         - 13
         version: 1.6.13
-  version_requirements: *id004
-  name: highline
   prerelease: false
   type: :runtime
+  name: highline
+  version_requirements: *id004
 description: A set of scripts to make working with git easier and more consistent
 email: 
 - moore.jim@gmail.com
@@ -132,6 +131,7 @@ files:
 - spec/GitRepoHelper.rb
 - spec/changed_file_helper_spec.rb
 - spec/git_abstract_merge_error_builder_spec.rb
+- spec/git_branch_spec.rb
 - spec/git_lib_spec.rb
 - spec/git_process_spec.rb
 - spec/git_status_spec.rb
@@ -141,7 +141,6 @@ files:
 - spec/rebase_to_master_spec.rb
 - spec/spec_helper.rb
 - spec/sync_spec.rb
-has_rdoc: true
 homepage: http://jdigger.github.com/git-process/
 licenses: 
 - ASL2
@@ -173,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A set of scripts for a good git process
@@ -182,6 +181,7 @@ test_files:
 - spec/GitRepoHelper.rb
 - spec/changed_file_helper_spec.rb
 - spec/git_abstract_merge_error_builder_spec.rb
+- spec/git_branch_spec.rb
 - spec/git_lib_spec.rb
 - spec/git_process_spec.rb
 - spec/git_status_spec.rb
@@ -191,3 +191,4 @@ test_files:
 - spec/rebase_to_master_spec.rb
 - spec/spec_helper.rb
 - spec/sync_spec.rb
+has_rdoc: