git-process 1.0.4 → 1.0.5

data/spec/git_lib_spec.rb

@@ -6,12 +6,13 @@ describe GitProc::GitLib do
   class GLStub
     include GitProc::GitLib
 
+
     def initialize(workdir, log_level)
       @logger = Logger.new(STDOUT)
       @logger.level = log_level || Logger::WARN
       @logger.datetime_format = "%Y-%m-%d %H:%M:%S"
       f = Logger::Formatter.new
-      @logger.formatter = proc do |severity, datetime, progname, msg|
+      @logger.formatter = proc do |_, _, _, msg|
         "#{msg}\n"
       end
 
@@ -31,6 +32,7 @@ describe GitProc::GitLib do
       @workdir
     end
 
+
     def logger
       @logger
     end
@@ -46,14 +48,14 @@ describe GitProc::GitLib do
     include GitRepoHelper
 
     it "list all the branches" do
-      create_files(['.gitignore'])
+      create_files(%w(.gitignore))
       gitlib.commit('initial')
 
       gitlib.branch('ba', :base_branch => 'master')
       gitlib.branch('bb', :base_branch => 'master')
       gitlib.branch('origin/master', :base_branch => 'master')
 
-      gitlib.branches.names.should == ['ba', 'bb', 'master', 'origin/master']
+      gitlib.branches.names.should == %w(ba bb master origin/master)
     end
 
   end
@@ -68,25 +70,25 @@ describe GitProc::GitLib do
 
 
     it "should create a branch with default base" do
-      lib.stub(:command).with(:branch, ['test_branch', 'master'])
+      lib.stub(:command).with(:branch, %w(test_branch master))
       lib.branch('test_branch')
     end
 
 
     it "should create a branch with explicit base" do
-      lib.stub(:command).with(:branch, ['test_branch', 'other_branch'])
+      lib.stub(:command).with(:branch, %w(test_branch other_branch))
       lib.branch('test_branch', :base_branch => 'other_branch')
     end
 
 
     it "should delete a branch without force" do
-      lib.stub(:command).with(:branch, ['-d', 'test_branch'])
+      lib.stub(:command).with(:branch, %w(-d test_branch))
       lib.branch('test_branch', :delete => true)
     end
 
 
     it "should delete a branch with force" do
-      lib.stub(:command).with(:branch, ['-D', 'test_branch'])
+      lib.stub(:command).with(:branch, %w(-D test_branch))
       lib.branch('test_branch', :delete => true, :force => true)
     end
 
@@ -107,15 +109,15 @@ describe GitProc::GitLib do
 
 
     it "should push local branch to remote" do
-      lib.should_receive(:command).with(:push, ['remote', 'local_branch:test_branch'])
+      lib.should_receive(:command).with(:push, %w(remote local_branch:test_branch))
 
       lib.push('remote', 'local_branch', 'test_branch')
     end
 
 
     it "should push current branch to remote" do
-      lib.stub(:command).with(:branch, ['-a', '--no-color']).and_return("* my_branch\n")
-      lib.should_receive(:command).with(:push, ['remote', 'my_branch:my_branch'])
+      lib.stub(:command).with(:branch, %w(-a --no-color)).and_return("* my_branch\n")
+      lib.should_receive(:command).with(:push, %w(remote my_branch:my_branch))
 
       lib.push('remote', 'my_branch', nil)
     end
@@ -124,7 +126,7 @@ describe GitProc::GitLib do
     it "should remove named branch on remote" do
       lib.stub(:remote_name).and_return('remote')
       lib.stub(:config).and_return('master')
-      lib.should_receive(:command).with(:push, ['remote', '--delete', 'my_branch'])
+      lib.should_receive(:command).with(:push, %w(remote --delete my_branch))
 
       lib.push('remote', 'my_branch', nil, :delete => true)
     end
@@ -133,7 +135,7 @@ describe GitProc::GitLib do
     it "should remove current branch on remote" do
       lib.stub(:remote_name).and_return('remote')
       lib.stub(:config).and_return('master')
-      lib.should_receive(:command).with(:push, ['remote', '--delete', 'my_branch'])
+      lib.should_receive(:command).with(:push, %w(remote --delete my_branch))
 
       lib.push('remote', nil, nil, :delete => 'my_branch')
     end
@@ -143,7 +145,7 @@ describe GitProc::GitLib do
       lib.stub(:remote_name).and_return('remote')
       lib.stub(:config).and_return('master')
 
-      expect {lib.push('remote', nil, nil, :delete => 'master')}.should raise_error GitProc::GitProcessError
+      expect { lib.push('remote', nil, nil, :delete => 'master') }.should raise_error GitProc::GitProcessError
     end
 
   end
@@ -152,6 +154,7 @@ describe GitProc::GitLib do
   describe "#remote_name" do
     include GitRepoHelper
 
+
     def log_level
       Logger::ERROR
     end

data/spec/git_process_spec.rb

@@ -5,13 +5,14 @@ require 'fileutils'
 describe GitProc::Process do
   include GitRepoHelper
 
+
   def log_level
     Logger::ERROR
   end
 
 
   before(:each) do
-    create_files(['.gitignore'])
+    create_files(%w(.gitignore))
     gitprocess.commit('initial')
   end
 

data/spec/git_status_spec.rb

@@ -5,6 +5,7 @@ require 'fileutils'
 describe GitProc::GitStatus do
   include GitRepoHelper
 
+
   def log_level
     Logger::ERROR
   end
@@ -39,7 +40,7 @@ describe GitProc::GitStatus do
 
     gitprocess.merge('fb') rescue
 
-    status = gitprocess.status
+        status = gitprocess.status
     status.unmerged.should == ['a']
     status.modified.should == ['a']
   end
@@ -54,7 +55,7 @@ describe GitProc::GitStatus do
 
     gitprocess.merge('fb') rescue
 
-    status = gitprocess.status
+        status = gitprocess.status
     status.unmerged.should == ['a']
     status.added.should == ['a']
   end
@@ -72,7 +73,7 @@ describe GitProc::GitStatus do
 
     gitprocess.merge('fb') rescue
 
-    status = gitprocess.status
+        status = gitprocess.status
     status.unmerged.should == ['a']
     status.deleted.should == ['a']
   end
@@ -90,7 +91,7 @@ describe GitProc::GitStatus do
 
     gitprocess.merge('fb') rescue
 
-    status = gitprocess.status
+        status = gitprocess.status
     status.unmerged.should == ['a']
     status.deleted.should == ['a']
   end

data/spec/github_pull_request_spec.rb

@@ -9,6 +9,7 @@ require 'tempfile'
 describe GitHub::PullRequest do
   include GitRepoHelper
 
+
   def lib
     unless @lib
       @lib = double('lib')
@@ -38,7 +39,7 @@ describe GitHub::PullRequest do
 
     it "should return a pull request for a good request" do
       stub_request(:post, "https://api.github.com/repos/test_repo/pulls?access_token=#{test_token}").
-        to_return(:status => 200, :body => JSON({:number => 1, :state => 'open'}))
+          to_return(:status => 200, :body => JSON({:number => 1, :state => 'open'}))
 
       pull_request.create('test_base', 'test_head', 'test title', 'test body')[:state].should == 'open'
     end
@@ -47,11 +48,11 @@ describe GitHub::PullRequest do
     it "should handle asking for a duplicate pull request" do
       # trying to create the request should return "HTTP 422: Unprocessable Entity" because it already exists
       stub_request(:post, "https://api.github.com/repos/test_repo/pulls?access_token=#{test_token}").
-        to_return(:status => 422)
+          to_return(:status => 422)
 
       # listing all existing pull requests should contain the current branch
       stub_request(:get, /test_repo\/pulls\?access_token=/).
-        to_return(:status => 200, :body => JSON([{:html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}]))
+          to_return(:status => 200, :body => JSON([{:html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}]))
 
       pull_request.create('test_base', 'test_head', 'test title', 'test body')[:html_url].should == 'test_url'
     end
@@ -63,9 +64,9 @@ describe GitHub::PullRequest do
 
     it "should close a good current pull request" do
       stub_request(:get, /test_repo\/pulls\?access_token=/).
-        to_return(:status => 200, :body => JSON([{:number => 1, :state => 'open', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}]))
+          to_return(:status => 200, :body => JSON([{:number => 1, :state => 'open', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}]))
       stub_request(:patch, /test_repo\/pulls\/1\?access_token=/).with(:body => JSON({:state => 'closed'})).
-        to_return(:status => 200, :body => JSON({:number => 1, :state => 'closed', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}))
+          to_return(:status => 200, :body => JSON({:number => 1, :state => 'closed', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}))
 
       pull_request.close('test_base', 'test_head')[:state].should == 'closed'
     end
@@ -73,7 +74,7 @@ describe GitHub::PullRequest do
 
     it "should close a good current pull request using the pull request number" do
       stub_request(:patch, /test_repo\/pulls\/1\?access_token=/).with(:body => JSON({:state => 'closed'})).
-        to_return(:status => 200, :body => JSON({:number => 1, :state => 'closed', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}))
+          to_return(:status => 200, :body => JSON({:number => 1, :state => 'closed', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}))
 
       pull_request.close(1)[:state].should == 'closed'
     end
@@ -81,9 +82,9 @@ describe GitHub::PullRequest do
 
     it "should complain about a missing pull request" do
       stub_request(:get, /test_repo\/pulls\?access_token=/).
-        to_return(:status => 200, :body => JSON([{:number => 1, :state => 'open', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}]))
+          to_return(:status => 200, :body => JSON([{:number => 1, :state => 'open', :html_url => 'test_url', :head => {:ref => 'test_head'}, :base => {:ref => 'test_base'}}]))
 
-      expect {pull_request.close('test_base', 'missing_head')}.should raise_error GitHub::PullRequest::NotFoundError
+      expect { pull_request.close('test_base', 'missing_head') }.should raise_error GitHub::PullRequest::NotFoundError
     end
 
   end

data/spec/github_service_spec.rb

@@ -11,6 +11,7 @@ require 'rspec/mocks/mock'
 class GHS
   include GitHubService
 
+
   def initialize(user = nil, password = nil, site = nil)
     @user = user
     @password = password
@@ -24,6 +25,7 @@ class GHS
     @lib.stub(:logger).and_return(logger)
   end
 
+
   def lib
     @lib
   end
@@ -52,7 +54,7 @@ describe GitHubService do
       ghs.lib.should_receive(:config).with('gitProcess.github.authToken', anything).once
 
       stub_request(:post, /api.github.com\/authorizations/).
-        to_return(:status => 200, :body => JSON({:token => test_token}))
+          to_return(:status => 200, :body => JSON({:token => test_token}))
 
       ghs.create_authorization().should == test_token
     end
@@ -60,7 +62,7 @@ describe GitHubService do
 
     it "should 401 for bad password" do
       stub_request(:post, /api.github.com\/authorizations/).
-        to_return(:status => 401)
+          to_return(:status => 401)
 
       lambda { ghs.create_authorization() }.should raise_error Octokit::Unauthorized
     end
@@ -88,7 +90,7 @@ describe GitHubService do
       ghs.lib.should_receive(:config).with('gitProcess.github.authToken', anything).once
 
       stub_request(:post, /api.github.com\/authorizations/).
-        to_return(:status => 200, :body => JSON({:token => test_token}))
+          to_return(:status => 200, :body => JSON({:token => test_token}))
 
       ghs.auth_token.should == test_token
     end
@@ -130,7 +132,7 @@ describe GitHubService do
       ghs.lib.should_receive(:config).with('gitProcess.github.authToken', anything).once
 
       stub_request(:post, /myco.com\/api\/v3\/authorizations/).
-        to_return(:status => 200, :body => JSON({:token => test_token}))
+          to_return(:status => 200, :body => JSON({:token => test_token}))
 
       ghs.create_authorization().should == test_token
     end
@@ -167,14 +169,14 @@ describe GitHubService do
     it "site should raise an error if remote.origin.url not set" do
       ghs.lib.stub(:config).with('remote.origin.url').and_return('')
 
-      lambda {ghs.site}.should raise_error GitHubService::NoRemoteRepository
+      lambda { ghs.site }.should raise_error GitHubService::NoRemoteRepository
     end
 
 
     it "site should not work for a garbase url address" do
       ghs.lib.stub(:config).with('remote.origin.url').and_return('garbage')
 
-      lambda {ghs.site}.should raise_error URI::InvalidURIError
+      lambda { ghs.site }.should raise_error URI::InvalidURIError
     end
 
 
@@ -196,8 +198,8 @@ describe GitHubService do
       ghs.lib.stub(:config).with('remote.origin.url').and_return('mygithub:jdigger/git-process.git')
 
       content = "\nHost mygithub\n"+
-        "  User git\n"+
-        "  HostName github.myco.com\n"
+          "  User git\n"+
+          "  HostName github.myco.com\n"
 
       in_tempfile(content) do |file|
         ghs.site(:ssh_config_file => file.path).should == 'http://github.myco.com'

data/spec/rebase_to_master_spec.rb

@@ -6,6 +6,7 @@ require 'json'
 describe GitProc::RebaseToMaster do
   include GitRepoHelper
 
+
   def log_level
     Logger::ERROR
   end
@@ -67,7 +68,7 @@ describe GitProc::RebaseToMaster do
       # 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')
+            change_file_and_commit('a', 'merged')
       end
 
       # Make another change on master
@@ -98,7 +99,7 @@ describe GitProc::RebaseToMaster do
         gitprocess.checkout('_parking_', :new_branch => 'master')
         change_file_and_commit('a', '')
 
-        expect {gitprocess.verify_preconditions}.should raise_error GitProc::ParkedChangesError
+        expect { gitprocess.verify_preconditions }.should raise_error GitProc::ParkedChangesError
       end
     end
 
@@ -107,10 +108,10 @@ describe GitProc::RebaseToMaster do
 
       it "should work for an existing pull request" do
         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'}}]))
+            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'}}]))
+            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'}}]))
 
         gitprocess.branch('fb', :base_branch => 'master')
 
@@ -276,7 +277,7 @@ describe GitProc::RebaseToMaster do
 
         gp.branches.include?('fb').should be_true
 
-        expect {gp.remove_feature_branch}.should raise_error GitProc::GitProcessError
+        expect { gp.remove_feature_branch }.should raise_error GitProc::GitProcessError
       end
     end
 

data/spec/sync_spec.rb

@@ -5,7 +5,7 @@ describe GitProc::Sync do
   include GitRepoHelper
 
   before(:each) do
-    create_files(['.gitignore'])
+    create_files(%w(.gitignore))
     gitprocess.commit('initial')
   end
 
@@ -53,42 +53,54 @@ describe GitProc::Sync do
   end
 
 
-  it "should fail when pushing with non-fast-forward and no force" do
-    change_file_and_commit('a', '')
+  describe "when forcing the push" do
 
-    gitprocess.branch('fb', :base_branch => 'master')
+    def create_process(dir, opts)
+      GitProc::Sync.new(dir, opts.merge({:rebase => false, :force => true}))
+    end
 
-    gp = clone('fb')
-    gitprocess.checkout('fb') do
-      change_file_and_commit('a', 'hello', gitprocess)
+
+    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', gitprocess)
+        end
+
+        expect {
+          GitProc::Sync.new(gp.workdir, {:rebase => false, :force => true, :log_level => log_level}).runner
+        }.to_not raise_error GitProc::GitExecuteError
+      end
     end
 
-    expect {
-      GitProc::Sync.new(gp.workdir, {:rebase => false, :force => false, :log_level => log_level}).runner
-    }.should raise_error GitProc::GitExecuteError
   end
 
 
-  describe "when forcing the push" do
+  describe "when changes are made upstream" do
 
     def create_process(dir, opts)
-      GitProc::Sync.new(dir, opts.merge({:rebase => false, :force => true}))
+      GitProc::Sync.new(dir, opts.merge({:rebase => false, :force => false}))
     end
 
 
-    it "should work when pushing with non-fast-forward" do
+    it "should work when pushing with non-fast-forward by merging" do
       change_file_and_commit('a', '')
 
       gitprocess.branch('fb', :base_branch => 'master')
 
-      gp = clone('fb')
-      gitprocess.checkout('fb') do
-        change_file_and_commit('a', 'hello', gitprocess)
-      end
+      clone('fb') do |gp|
+
+        gitprocess.checkout('fb') do
+          change_file_and_commit('a', 'hello', gitprocess)
+        end
 
-      expect {
-        GitProc::Sync.new(dir, opts.merge({:rebase => false, :force => true, :log_level => log_level})).runner
-      }.should_not raise_error GitProc::GitExecuteError
+        expect {
+          gp.runner
+        }.to_not raise_error GitProc::GitExecuteError
+      end
     end
 
   end
@@ -111,7 +123,7 @@ describe GitProc::Sync do
           change_file_and_commit('a', 'hello', gitprocess)
         end
 
-        expect {gp.runner}.should_not raise_error GitProc::GitExecuteError
+        expect { gp.runner }.to_not raise_error GitProc::GitExecuteError
       end
     end
 
@@ -145,6 +157,28 @@ describe GitProc::Sync do
   end
 
 
+  describe "when there is no remote" do
+
+    def create_process(dir, opts)
+      GitProc::Sync.new(dir, opts.merge({:rebase => true, :force => false, :local => false}))
+    end
+
+
+    it "should not try to fetch or push" do
+      change_file_and_commit('a', '')
+
+      gitprocess.branch('fb', :base_branch => 'master')
+
+      sp = GitProc::Sync.new(gitprocess.workdir, {:rebase => true, :force => false, :local => true, :log_level => log_level})
+      sp.should_not_receive(:fetch)
+      sp.should_not_receive(:push)
+
+      sp.runner
+    end
+
+  end
+
+
   it "should work with a different remote server name than 'origin'" do
     change_file_and_commit('a', '')
 
@@ -163,7 +197,7 @@ describe GitProc::Sync do
     gitprocess.checkout('_parking_', :new_branch => 'master')
     change_file_and_commit('a', '')
 
-    expect {gitprocess.verify_preconditions}.should raise_error GitProc::ParkedChangesError
+    expect { gitprocess.verify_preconditions }.to raise_error GitProc::ParkedChangesError
   end
 
 end