git-process-lib 2.0.4 → 3.0.0

data/spec/pull_request_helper.rb

@@ -3,8 +3,8 @@ module PullRequestHelper
   def create_pull_request(opts = {})
     v = {
         :head_remote => 'testrepo',
-        :head_repo => 'test_repo',
-        :base_repo => 'test_repo',
+        :head_repo => 'tester/test_repo',
+        :base_repo => 'tester/test_repo',
         :head_branch => 'test_branch',
         :base_branch => 'source_branch',
         :api_url => 'https://api.github.com',

data/spec/pull_request_spec.rb

@@ -1,9 +1,9 @@
 require 'git-process/pull_request'
-#require 'git-process/github_configuration'
 require 'github_test_helper'
 require 'pull_request_helper'
 require 'GitRepoHelper'
-require 'hashie'
+require 'sawyer'
+require 'octokit'
 
 
 describe GitProc::PullRequest do
@@ -41,13 +41,15 @@ describe GitProc::PullRequest do
       GitProc::PullRequest.stub(:create_pull_request_client).and_return(pr_client)
       #PullRequest.stub(:create_pull_request_client).with(anything, 'origin', 'jdigger/git-process').and_return(pr_client)
       gitlib.should_receive(:push)
-      pr_client.should_receive(:create).with('develop', 'master', 'master', '').and_return(Hashie::Mash.new({:html_url => 'http://test'}))
+      agent = Sawyer::Agent.new(Octokit::Default::API_ENDPOINT, {})
+      sawyer_resource = Sawyer::Resource.new(agent, {:html_url => 'http://test'})
+      pr_client.should_receive(:create).with('develop', 'master', 'master', '').and_return(sawyer_resource)
 
       gitprocess.runner
     end
 
 
-    it "should fail if the base and head branch are the same" do
+    it 'should fail if the base and head branch are the same' do
       gitlib.remote.add('origin', 'git@github.com:jdigger/git-process.git')
 
       expect {
@@ -79,7 +81,7 @@ describe GitProc::PullRequest do
       end
 
 
-      it "should checkout the branch for the pull request" do
+      it 'should checkout the branch for the pull request' do
         add_remote(:head)
         stub_fetch(:head)
 
@@ -88,9 +90,9 @@ describe GitProc::PullRequest do
         expect_checkout_pr_head()
         expect_upstream_set()
 
-        gitlib.stub(:branch).with(nil, :no_color => true, :all => true).and_return("")
-        gitlib.stub(:branch).with(nil, :no_color => true, :remote => true).and_return("")
-        gitlib.should_receive(:rebase).with('test_repo/master', {})
+        gitlib.stub(:branch).with(nil, :no_color => true, :all => true).and_return('')
+        gitlib.stub(:branch).with(nil, :no_color => true, :remote => true).and_return('')
+        gitlib.should_receive(:rebase).with('tester/test_repo/master', {})
 
         gitprocess.runner
       end
@@ -98,7 +100,7 @@ describe GitProc::PullRequest do
     end
 
 
-    describe "with repo name and PR #" do
+    describe 'with repo name and PR #' do
 
       def pull_request
         @pr ||= create_pull_request(:base_remote => 'sourcerepo', :base_repo => 'source_repo')
@@ -111,7 +113,7 @@ describe GitProc::PullRequest do
       end
 
 
-      it "should checkout the branch for the pull request" do
+      it 'should checkout the branch for the pull request' do
         add_remote(:head)
         add_remote(:base)
         stub_fetch(:head)
@@ -125,7 +127,7 @@ describe GitProc::PullRequest do
 
         gitlib.stub(:branch).with(nil, :no_color => true, :all => true).and_return('')
         gitlib.stub(:branch).with(nil, :no_color => true, :remote => true).and_return('')
-        gitlib.should_receive(:rebase).with('test_repo/master', {})
+        gitlib.should_receive(:rebase).with('tester/test_repo/master', {})
 
         gitprocess.runner
       end

data/spec/rebase_to_master_spec.rb

@@ -106,7 +106,7 @@ describe RebaseToMaster do
         gl.checkout('ab', :new_branch => 'origin/int-br')
 
         my_branches = gl.branches
-        my_branches.include?('origin/master').should be_false
+        my_branches.include?('origin/master').should be false
         my_branches['ab'].sha.should == my_branches['origin/int-br'].sha
 
         gl.stub(:repo_name).and_return('test_repo')
@@ -175,11 +175,11 @@ describe RebaseToMaster do
           change_file_and_commit('a', '', gl)
           gl.checkout('fb', :new_branch => 'origin/master')
 
-          gl.branches.include?('_parking_OLD_').should be_false
+          gl.branches.include?('_parking_OLD_').should be false
 
           create_process(gl).remove_feature_branch
 
-          gl.branches.include?('_parking_OLD_').should be_true
+          gl.branches.include?('_parking_OLD_').should be true
           gl.branches.current.name.should == '_parking_'
         end
       end
@@ -192,11 +192,11 @@ describe RebaseToMaster do
         change_file_and_commit('a', '', gl)
 
         gl.checkout('fb', :new_branch => 'origin/master')
-        gl.branches.include?('fb').should be_true
+        gl.branches.include?('fb').should be true
 
         create_process(gl).remove_feature_branch
 
-        gl.branches.include?('fb').should be_false
+        gl.branches.include?('fb').should be false
         gl.branches.current.name.should == '_parking_'
       end
     end
@@ -207,7 +207,7 @@ describe RebaseToMaster do
         gl.checkout('fb', :new_branch => 'origin/master')
         change_file_and_commit('a', '', gl)
 
-        gl.branches.include?('fb').should be_true
+        gl.branches.include?('fb').should be true
 
         expect { create_process(gl).remove_feature_branch }.to raise_error GitProcessError
       end
@@ -220,10 +220,10 @@ describe RebaseToMaster do
       gitlib.branch('fb', :base_branch => 'master')
 
       clone_repo('fb') do |gl|
-        gl.branches.include?('origin/fb').should be_true
+        gl.branches.include?('origin/fb').should be true
         create_process(gl).remove_feature_branch
-        gl.branches.include?('origin/fb').should be_false
-        gitlib.branches.include?('fb').should be_false
+        gl.branches.include?('origin/fb').should be false
+        gitlib.branches.include?('fb').should be false
         gl.branches.current.name.should == '_parking_'
       end
     end
@@ -292,7 +292,7 @@ describe RebaseToMaster do
       stub_fetch(:base, gl)
 
       stub_get("https://api.github.com/repos/#{head_repo_name}/pulls/#{pull_request_number}", :body => pull_request)
-      stub_patch("https://api.github.com/repos/#{head_repo_name}/pulls/#{pull_request_number}")
+      stub_patch("https://api.github.com/repos/#{head_repo_name}/pulls/#{pull_request_number}", :body => pull_request)
     end
 
 

data/spec/sync_spec.rb

@@ -65,6 +65,23 @@ describe Sync do
     end
   end
 
+  it 'should work when the branch name contains a slash' do
+    Given do
+      origin 'user/fb', :new_branch => 'master'
+      create_commit :b
+      local 'user/fb', :new_branch => 'origin/user/fb'
+      create_commit :c
+    end
+
+    @local.checkout('user/fb')
+    create_process(@local).runner
+
+    Then do
+      branch_tip(local_repo, 'user/fb').should == branch_tip(origin_repo, 'user/fb')
+      branch_tip(local_repo, 'user/fb').should == @local.sha('origin/user/fb')
+    end
+  end
+
 
   describe 'when forcing the push with a merge' do
 
@@ -1256,12 +1273,12 @@ describe Sync do
 
     clone_repo('fb', 'a_remote') do |gl|
       change_file_and_commit('a', 'hello', gl)
-      gl.branches.include?('a_remote/fb').should be_true
+      gl.branches.include?('a_remote/fb').should be true
 
       GitProc::Sync.new(gl, :rebase => false, :force => false, :log_level => log_level).runner
 
-      gl.branches.include?('a_remote/fb').should be_true
-      gitlib.branches.include?('fb').should be_true
+      gl.branches.include?('a_remote/fb').should be true
+      gitlib.branches.include?('fb').should be true
     end
   end
 

metadata

@@ -1,161 +1,131 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: git-process-lib
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
-  segments: 
-  - 2
-  - 0
-  - 4
-  version: 2.0.4
+version: !ruby/object:Gem::Version
+  version: 3.0.0
 platform: ruby
-authors: 
+authors:
 - Jim Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-01-29 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-03-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: octokit
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 119
-        segments: 
-        - 1
-        - 24
-        - 0
-        version: 1.24.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 8
-        version: "1.8"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: netrc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 8
-        version: "1.8"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: trollop
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 1
-        - 16
-        version: "1.16"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 6
-        - 13
-        version: 1.6.13
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: addressable
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.4'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: gem-man
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
-        version: "0.3"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: gem-man
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: faraday
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 45
-        segments: 
-        - 0
-        - 8
-        - 9
-        version: 0.8.9
-  type: :runtime
-  version_requirements: *id008
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 description: The libraries for the git-process suite of tools
-email: 
+email:
 - moore.jim@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README.md
+- README.adoc
 - Rakefile
 - bin/git-new-fb
 - bin/git-pull-req
@@ -219,43 +189,31 @@ 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
+licenses:
+- Apache-2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 57
-      segments: 
-      - 1
-      - 8
-      - 7
-      version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '2.0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The libraries for the git-process suite of tools
-test_files: 
+test_files:
 - spec/FileHelpers.rb
 - spec/GitRepoHelper.rb
 - spec/changed_file_helper_spec.rb
@@ -276,3 +234,4 @@ test_files:
 - spec/rebase_to_master_spec.rb
 - spec/spec_helper.rb
 - spec/sync_spec.rb
+has_rdoc: