git-process 0.9.1.pre3 → 0.9.2

data/spec/rebase_to_master_spec.rb

@@ -0,0 +1,314 @@
+require 'git-process/rebase_to_master'
+require 'GitRepoHelper'
+require 'webmock/rspec'
+require 'json'
+
+describe GitProc::RebaseToMaster do
+  include GitRepoHelper
+
+  before(:each) do
+    create_files(['.gitignore'])
+    gitprocess.commit('initial')
+  end
+
+
+  after(:each) do
+    rm_rf(tmpdir)
+  end
+
+
+  def create_process(dir, opts)
+    GitProc::RebaseToMaster.new(dir, opts)
+  end
+
+
+  describe "rebase to master" do
+
+    def log_level
+      Logger::ERROR
+    end
+
+
+    it "should work easily for a simple rebase" do
+      gitprocess.checkout('fb', :new_branch => 'master')
+      change_file_and_commit('a', '')
+
+      commit_count.should == 2
+
+      gitprocess.checkout('master')
+      change_file_and_commit('b', '')
+
+      gitprocess.checkout('fb')
+
+      gitprocess.run
+
+      commit_count.should == 3
+    end
+
+
+    it "should work for a rebase after a rerere merge" do
+      # Make sure rerere is enabled
+      gitprocess.rerere_enabled(true, false)
+      gitprocess.rerere_autoupdate(false, false)
+
+      # Create the file to conflict on
+      change_file_and_commit('a', '')
+
+      # In the new branch, give it a new value
+      gitprocess.checkout('fb', :new_branch => 'master') do
+        change_file_and_commit('a', 'hello')
+      end
+
+      # Change the value as well in the origional branch
+      gitprocess.checkout('master') do
+        change_file_and_commit('a', 'goodbye')
+      end
+
+      # Merge in the new branch; don't error-out because will auto-fix.
+      gitprocess.checkout('fb') do
+        gitprocess.merge('master') rescue
+        change_file_and_commit('a', 'merged')
+      end
+
+      # Make another change on master
+      gitprocess.checkout('master') do
+        change_file_and_commit('b', '')
+      end
+
+      # Go back to the branch and try to rebase
+      gitprocess.checkout('fb')
+
+      begin
+        gitprocess.runner
+        raise "Should have raised RebaseError"
+      rescue GitProc::RebaseError => exp
+        exp.resolved_files.should == ['a']
+        exp.unresolved_files.should == []
+
+        exp.commands.length.should == 3
+        exp.commands[0].should match /^# Verify/
+        exp.commands[1].should == 'git add a'
+        exp.commands[2].should == 'git rebase --continue'
+      end
+    end
+
+
+    describe "when used on _parking_" do
+      it 'should fail #rebase_to_master' do
+        gitprocess.checkout('_parking_', :new_branch => 'master')
+        change_file_and_commit('a', '')
+
+        expect {gitprocess.runner}.should raise_error GitProc::ParkedChangesError
+      end
+    end
+
+
+    describe "closing the pull request" do
+
+      def log_level
+        Logger::ERROR
+      end
+
+
+      it "should work for an existing pull request" do
+        gitprocess.branch('fb', :base_branch => 'master')
+        clone('fb') do |gp|
+          stub_request(:get, /test_repo\/pulls\?access_token=/).
+            to_return(:status => 200, :body => JSON([{:number => 987, :state => 'open', :html_url => 'test_url', :head => {:ref => 'fb'}, :base => {:ref => 'master'}}]))
+          stub_request(:patch, /test_repo\/pulls\/987\?access_token=/).
+            with(:body => JSON({:state => 'closed'})).
+            to_return(:status => 200, :body => JSON([{:number => 987, :state => 'closed', :html_url => 'test_url', :head => {:ref => 'fb'}, :base => {:ref => 'master'}}]))
+          gp.config('gitProcess.github.authToken', 'test-token')
+          gp.config('remote.origin.url', 'git@github.com:test_repo.git')
+          gp.config('github.user', 'test_user')
+          gp.stub(:fetch)
+          gp.stub(:push)
+
+          gp.runner
+        end
+      end
+
+
+      it "should not try when there is no auth token" do
+        gitprocess.branch('fb', :base_branch => 'master')
+        clone('fb') do |gp|
+          gp.config('gitProcess.github.authToken', '')
+          gp.config('remote.origin.url', 'git@github.com:test_repo.git')
+          gp.config('github.user', 'test_user')
+          gp.stub(:fetch)
+          gp.stub(:push)
+
+          gp.runner
+        end
+      end
+
+
+      it "should not try when there is a file:// origin url" do
+        gitprocess.branch('fb', :base_branch => 'master')
+        clone('fb') do |gp|
+          gp.config('gitProcess.github.authToken', 'test-token')
+          gp.config('github.user', 'test_user')
+          gp.stub(:fetch)
+          gp.stub(:push)
+
+          gp.runner
+        end
+      end
+
+    end
+
+  end
+
+
+  describe "custom integration branch" do
+
+    def log_level
+      Logger::ERROR
+    end
+
+
+    it "should use the 'gitProcess.integrationBranch' configuration" do
+      gitprocess.checkout('int-br', :new_branch => 'master') do
+        change_file_and_commit('a', '')
+      end
+      gitprocess.checkout('fb', :new_branch => 'master') do
+        change_file_and_commit('b', '')
+      end
+      gitprocess.branches['master'].delete
+
+      clone('int-br') do |gl|
+        gl.config('gitProcess.integrationBranch', 'int-br')
+
+        gl.checkout('ab', :new_branch => 'origin/int-br')
+
+        branches = gl.branches
+        branches.include?('origin/master').should be_false
+        branches['ab'].sha.should == branches['origin/int-br'].sha
+
+        gl.stub(:repo_name).and_return('test_repo')
+
+        change_file_and_commit('c', '', gl)
+
+        branches = gl.branches
+        branches['ab'].sha.should_not == branches['origin/int-br'].sha
+
+        gl.run
+
+        branches = gl.branches
+        branches['HEAD'].sha.should == branches['origin/int-br'].sha
+      end
+    end
+
+  end
+
+
+  describe "remove current feature branch" do
+
+    def log_level
+      Logger::ERROR
+    end
+
+
+    describe "when handling the parking branch" do
+
+      it "should create it based on origin/master" do
+        gitprocess.branch('fb', :base_branch => 'master')
+        clone('fb') do |gp|
+          gp.remove_feature_branch
+          gp.branches.current.name.should == '_parking_'
+        end
+      end
+
+
+      it "should move it to the new origin/master if it already exists and is clean" do
+        clone do |gp|
+          gp.branch('_parking_', :base_branch => 'origin/master')
+          change_file_and_commit('a', '', gp)
+
+          gp.checkout('fb', :new_branch => 'origin/master')
+
+          gp.remove_feature_branch
+
+          gp.branches.current.name.should == '_parking_'
+        end
+      end
+
+
+      it "should move it to the new origin/master if it already exists and changes are part of the current branch" do
+        gitprocess.checkout('afb', :new_branch => 'master')
+        clone do |gp|
+          gp.checkout('_parking_', :new_branch => 'origin/master') do
+            change_file_and_commit('a', '', gp)
+          end
+
+          gp.checkout('fb', :new_branch => '_parking_')
+          gp.push('origin', 'fb', 'master')
+
+          gp.remove_feature_branch
+          gp.branches.current.name.should == '_parking_'
+        end
+      end
+
+
+      it "should move it out of the way if it has unaccounted changes on it" do
+        clone do |gp|
+          gp.checkout('_parking_', :new_branch => 'origin/master')
+          change_file_and_commit('a', '', gp)
+          gp.checkout('fb', :new_branch => 'origin/master')
+
+          gp.branches.include?('_parking_OLD_').should be_false
+
+          gp.remove_feature_branch
+
+          gp.branches.include?('_parking_OLD_').should be_true
+          gp.branches.current.name.should == '_parking_'
+        end
+      end
+
+    end
+
+
+    it "should delete the old local branch when it has been merged into origin/master" do
+      clone do |gp|
+        change_file_and_commit('a', '', gp)
+
+        gp.checkout('fb', :new_branch => 'origin/master')
+        gp.branches.include?('fb').should be_true
+
+        gp.remove_feature_branch
+
+        gp.branches.include?('fb').should be_false
+        gp.branches.current.name.should == '_parking_'
+      end
+    end
+
+
+    it "should raise an error when the local branch has not been merged into origin/master" do
+      clone do |gp|
+        gp.checkout('fb', :new_branch => 'origin/master')
+        change_file_and_commit('a', '', gp)
+
+        gp.branches.include?('fb').should be_true
+
+        expect {gp.remove_feature_branch}.should raise_error GitProc::GitProcessError
+      end
+    end
+
+
+    it "should delete the old remote branch" do
+      change_file_and_commit('a', '')
+
+      gitprocess.branch('fb', :base_branch => 'master')
+
+      clone('fb') do |gp|
+        gp.branches.include?('origin/fb').should be_true
+        gp.remove_feature_branch
+        gp.branches.include?('origin/fb').should be_false
+        gitprocess.branches.include?('fb').should be_false
+        gp.branches.current.name.should == '_parking_'
+      end
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -1 +1 @@
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib/git-process')
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib')

data/spec/sync_spec.rb

@@ -0,0 +1,149 @@
+require 'git-process/sync'
+require 'GitRepoHelper'
+
+describe GitProc::Sync do
+  include GitRepoHelper
+
+  before(:each) do
+    create_files(['.gitignore'])
+    gitprocess.commit('initial')
+  end
+
+
+  after(:each) do
+    rm_rf(tmpdir)
+  end
+
+
+  def create_process(dir, opts)
+    opts[:rebase] = false
+    opts[:force] = false
+    GitProc::Sync.new(dir, opts)
+  end
+
+
+  describe "#run" do
+
+    def log_level
+      Logger::ERROR
+    end
+
+
+    it "should work when pushing with fast-forward" do
+      change_file_and_commit('a', '')
+
+      gitprocess.branch('fb', :base_branch => 'master')
+
+      clone('fb') do |gp|
+        change_file_and_commit('a', 'hello', gp)
+        gp.branches.include?('origin/fb').should be_true
+        gp.run
+        gp.branches.include?('origin/fb').should be_true
+        gitprocess.branches.include?('fb').should be_true
+      end
+    end
+
+
+    it "should work with a different remote server name" do
+      change_file_and_commit('a', '')
+
+      gitprocess.branch('fb', :base_branch => 'master')
+
+      clone('fb', 'a_remote') do |gp|
+        change_file_and_commit('a', 'hello', gp)
+        gp.branches.include?('a_remote/fb').should be_true
+        gp.run
+        gp.branches.include?('a_remote/fb').should be_true
+        gitprocess.branches.include?('fb').should be_true
+      end
+    end
+
+
+    it "should fail when pushing with non-fast-forward and no force" do
+      change_file_and_commit('a', '')
+
+      gitprocess.branch('fb', :base_branch => 'master')
+
+      clone('fb') do |gp|
+        gitprocess.checkout('fb') do
+          change_file_and_commit('a', 'hello', gitprocess)
+        end
+
+        expect {gp.run}.should raise_error GitProc::GitExecuteError
+      end
+    end
+
+  end
+
+
+  describe "when forcing the push" do
+
+    def create_process(dir, opts)
+      opts[:force] = false
+      opts[:force] = true
+      GitProc::Sync.new(dir, opts)
+    end
+
+
+    it "should work when pushing with non-fast-forward" do
+      change_file_and_commit('a', '')
+
+      gitprocess.branch('fb', :base_branch => 'master')
+
+      clone('fb') do |gp|
+        gitprocess.checkout('fb') do
+          change_file_and_commit('a', 'hello', gp)
+        end
+
+        expect {gp.run}.should_not raise_error GitProc::GitExecuteError
+      end
+    end
+
+  end
+
+
+  describe "sync_with_server with different remote name" do
+
+    def log_level
+      Logger::ERROR
+    end
+
+
+    def create_process(dir, opts)
+      opts[:force] = false
+      opts[:force] = true
+      gp = GitProc::Sync.new(dir, opts)
+      gp.instance_variable_set('@server_name', 'a_remote')
+      gp
+    end
+
+
+    it "should work with a different remote server name" do
+      change_file_and_commit('a', '')
+
+      gitprocess.branch('fb', :base_branch => 'master')
+
+      clone('fb', 'a_remote') do |gp|
+        change_file_and_commit('a', 'hello', gp)
+        gp.branches.include?('a_remote/fb').should be_true
+        gp.run
+        gp.branches.include?('a_remote/fb').should be_true
+        gitprocess.branches.include?('fb').should be_true
+      end
+    end
+
+  end
+
+
+  describe "remove current feature branch when used while on _parking_" do
+
+    it 'should fail #sync_with_server' do
+      gitprocess.checkout('_parking_', :new_branch => 'master')
+      change_file_and_commit('a', '')
+
+      expect {gitprocess.runner}.should raise_error GitProc::ParkedChangesError
+    end
+
+  end
+
+end

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: git-process
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 9
-  - 1
-  - pre
-  - 3
-  version: 0.9.1.pre3
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Jim Moore
@@ -16,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-02 00:00:00 -06:00
+date: 2012-07-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +45,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -57,36 +56,39 @@ files:
 - bin/git-sync
 - bin/git-to-master
 - git-process.gemspec
-- lib/git-process/abstract-error-builder.rb
-- lib/git-process/git-abstract-merge-error-builder.rb
-- lib/git-process/git-branch.rb
-- lib/git-process/git-branches.rb
-- lib/git-process/git-lib.rb
-- lib/git-process/git-merge-error.rb
-- lib/git-process/git-new-fb-options.rb
-- lib/git-process/git-process-error.rb
-- lib/git-process/git-process-options.rb
-- lib/git-process/git-process.rb
-- lib/git-process/git-pull-request-options.rb
-- lib/git-process/git-rebase-error.rb
-- lib/git-process/git-status.rb
-- lib/git-process/git-sync-options.rb
-- lib/git-process/git-to-master-options.rb
-- lib/git-process/github-client.rb
-- lib/git-process/github-service.rb
-- lib/git-process/parked-changes-error.rb
-- lib/git-process/pull-request.rb
-- lib/git-process/uncommitted-changes-error.rb
+- lib/git-process/abstract_error_builder.rb
+- lib/git-process/git_abstract_merge_error_builder.rb
+- lib/git-process/git_branch.rb
+- lib/git-process/git_branches.rb
+- lib/git-process/git_lib.rb
+- lib/git-process/git_merge_error.rb
+- lib/git-process/git_process.rb
+- lib/git-process/git_process_error.rb
+- lib/git-process/git_process_options.rb
+- lib/git-process/git_rebase_error.rb
+- lib/git-process/git_status.rb
+- lib/git-process/github_client.rb
+- lib/git-process/github_pull_request.rb
+- lib/git-process/github_service.rb
+- lib/git-process/new_fb.rb
+- lib/git-process/parked_changes_error.rb
+- lib/git-process/pull_request.rb
+- lib/git-process/rebase_to_master.rb
+- lib/git-process/sync.rb
+- lib/git-process/uncommitted_changes_error.rb
 - lib/git-process/version.rb
 - spec/FileHelpers.rb
 - spec/GitRepoHelper.rb
-- spec/git-abstract-merge-error-builder_spec.rb
-- spec/git-lib_spec.rb
-- spec/git-process_spec.rb
-- spec/git-status_spec.rb
-- spec/github-service_spec.rb
-- spec/pull-request_spec.rb
+- spec/git_abstract_merge_error_builder_spec.rb
+- spec/git_lib_spec.rb
+- spec/git_process_spec.rb
+- spec/git_status_spec.rb
+- spec/github_pull_request_spec.rb
+- spec/github_service_spec.rb
+- spec/new_fb_spec.rb
+- 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: []
@@ -107,13 +109,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -124,10 +124,13 @@ summary: A set of scripts for a good git process
 test_files: 
 - spec/FileHelpers.rb
 - spec/GitRepoHelper.rb
-- spec/git-abstract-merge-error-builder_spec.rb
-- spec/git-lib_spec.rb
-- spec/git-process_spec.rb
-- spec/git-status_spec.rb
-- spec/github-service_spec.rb
-- spec/pull-request_spec.rb
+- spec/git_abstract_merge_error_builder_spec.rb
+- spec/git_lib_spec.rb
+- spec/git_process_spec.rb
+- spec/git_status_spec.rb
+- spec/github_pull_request_spec.rb
+- spec/github_service_spec.rb
+- spec/new_fb_spec.rb
+- spec/rebase_to_master_spec.rb
 - spec/spec_helper.rb
+- spec/sync_spec.rb

data/lib/git-process/git-branches.rb

@@ -1,53 +0,0 @@
-require 'git-branch'
-
-module Git
-
-  class GitBranches
-    include Enumerable
-
-    def initialize(lib)
-      branch_lines = lib.branch(nil, :all => true, :no_color => true).split("\n")
-      @items = SortedSet.new
-      branch_lines.each do |bl|
-        @items << GitBranch.new(bl[2..-1], bl[0..0] == '*', lib)
-      end
-    end
-
-
-    def <<(item)
-      @items << item
-    end
-
-
-    def each(&block)
-      @items.each {|b| block.call(b)}
-    end
-
-
-    def names
-      @items.map {|b| b.name}
-    end
-
-
-    def current
-      @items.find {|b| b.current? }
-    end
-
-
-    def parking
-      @items.find {|b| b.name == '_parking_' }
-    end
-
-
-    def include?(branch_name)
-      @items.find {|b| b.name == branch_name} != nil
-    end
-
-
-    def [](branch_name)
-      @items.find {|b| b.name == branch_name}
-    end
-
-  end
-
-end

data/lib/git-process/git-merge-error.rb

@@ -1,31 +0,0 @@
-require 'git-process-error'
-require 'git-abstract-merge-error-builder'
-
-module Git
-
-  class Process
-
-    class MergeError < GitProcessError
-      include Git::AbstractMergeErrorBuilder
-
-      attr_reader :error_message, :lib
-
-      def initialize(merge_error_message, lib)
-        @lib = lib
-        @error_message = merge_error_message
-
-        msg = build_message
-
-        super(msg)
-      end
-
-
-      def continue_command
-        'git commit'
-      end
-
-    end
-
-  end
-
-end