gitx 2.16.0 → 2.17.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8f7eaff73daa4f118fef0f3e96d7b592780a93f
-  data.tar.gz: ae5ab0f84785a11bd5151c4d594dcffdcff8ea4b
+  metadata.gz: 1c47e50026d785901a8fd24360b213bae36d404c
+  data.tar.gz: cb4bf8d747cc834bf2c18f63f75c690d752cb10d
 SHA512:
-  metadata.gz: a320ac06ff05b0f300e0b8cfbae18ac8cc09eab9150f690d267c67c8f8ce3f4e6baea507d31d95055a53658bfab938201bec4741a9bd8ee8d07332f6f2536fb5
-  data.tar.gz: 2bd4a7cd98d152cba9f35cfd02f648f831771918cc346ea06c4ab4bb1b839a21650d2dfff2597761e95ebd594b05e7a837d5a9b1691412bb571e1951baa1e4a5
+  metadata.gz: cc56fa8b8f1d187dd16a02a4bc67e11a62d429eb49bbc8a9d4efad2934c7f8cdab195d34efc59a3d66e746529031a62c35b067789ef580ffe9723ef1ce868860
+  data.tar.gz: 104685ea15c4046c486a4ca5d8426b5ec5edefa54bceba35f1356574e9fb26ed7508ffff549d866611f85815242c594f3412a2224238f087445fe1cb74142d61

data/lib/gitx/cli/integrate_command.rb

@@ -22,10 +22,10 @@ module Gitx
           raise MergeError, 'Merge conflict occurred.  Please fix merge conflict and rerun the integrate command'
         end
 
-        integrate_branch(branch, integration_branch) unless options[:resume]
+        pull_request = pull_request_for_branch(branch)
+        integrate_branch(branch, integration_branch, pull_request) unless options[:resume]
         checkout_branch branch
-
-        create_integrate_comment(branch) unless config.reserved_branch?(branch)
+        create_integrate_comment(pull_request) if pull_request
       end
 
       private
@@ -38,10 +38,17 @@ module Gitx
         say integration_branch, :green
       end
 
-      def integrate_branch(branch, integration_branch)
+      def pull_request_for_branch(branch)
+        return nil if config.reserved_branch?(branch)
+        find_or_create_pull_request(branch)
+      end
+
+      def integrate_branch(branch, integration_branch, pull_request)
         fetch_remote_branch(integration_branch)
+        commit_message = "[gitx] Integrating #{branch} into #{integration_branch}"
+        commit_message += " (Pull request ##{pull_request.number})" if pull_request
         begin
-          run_cmd "git merge #{branch}"
+          run_cmd %Q(git merge --no-ff -m "#{commit_message}" #{branch})
         rescue
           raise MergeError, "Merge conflict occurred.  Please fix merge conflict and rerun command with --resume #{branch} flag"
         end
@@ -83,8 +90,7 @@ module Gitx
         run_cmd "git push origin #{target_branch}:#{target_branch}"
       end
 
-      def create_integrate_comment(branch)
-        pull_request = find_or_create_pull_request(branch)
+      def create_integrate_comment(pull_request)
         comment = '[gitx] integrated into staging :twisted_rightwards_arrows:'
         github_client.add_comment(github_slug, pull_request.number, comment)
       end

data/lib/gitx/cli/release_command.rb

@@ -2,7 +2,6 @@ require 'thor'
 require 'gitx'
 require 'gitx/cli/base_command'
 require 'gitx/cli/update_command'
-require 'gitx/cli/cleanup_command'
 require 'gitx/github'
 
 module Gitx

data/lib/gitx/version.rb

@@ -1,3 +1,3 @@
 module Gitx
-  VERSION = '2.16.0'
+  VERSION = '2.17.0.pre'
 end

data/spec/gitx/cli/integrate_command_spec.rb

@@ -14,6 +14,7 @@ describe Gitx::Cli::IntegrateCommand do
   let(:repo) { cli.send(:repo) }
   let(:remote_branch_names) { ['origin/staging', 'origin/prototype'] }
   let(:local_branch_names) { ['feature-branch'] }
+  let(:authorization_token) { '123123' }
 
   before do
     allow(cli).to receive(:current_branch).and_return(current_branch)
@@ -21,20 +22,19 @@ describe Gitx::Cli::IntegrateCommand do
     allow(branches).to receive(:each_name).with(:local).and_return(local_branch_names)
     allow(branches).to receive(:each_name).with(:remote).and_return(remote_branch_names)
     allow(repo).to receive(:branches).and_return(branches)
+    allow(cli).to receive(:authorization_token).and_return(authorization_token)
   end
 
   describe '#integrate' do
     context 'when integration branch is ommitted and remote branch exists' do
-      let(:authorization_token) { '123123' }
       let(:remote_branch_names) { ['origin/staging'] }
       before do
-        allow(cli).to receive(:authorization_token).and_return(authorization_token)
         expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
 
         expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
         expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
         expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
-        expect(cli).to receive(:run_cmd).with('git merge feature-branch').ordered
+        expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Integrating feature-branch into staging (Pull request #10)" feature-branch').ordered
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
 
@@ -55,16 +55,14 @@ describe Gitx::Cli::IntegrateCommand do
     context 'when current_branch == master' do
       let(:current_branch) { double('fake branch', name: 'master', head?: true) }
       let(:local_branch_names) { ['master'] }
-      let(:authorization_token) { '123123' }
       let(:remote_branch_names) { ['origin/staging'] }
       before do
-        allow(cli).to receive(:authorization_token).and_return(authorization_token)
         expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
 
         expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
         expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
         expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
-        expect(cli).to receive(:run_cmd).with('git merge master').ordered
+        expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Integrating master into staging" master').ordered
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
         expect(cli).to receive(:run_cmd).with('git checkout master').ordered
 
@@ -78,7 +76,6 @@ describe Gitx::Cli::IntegrateCommand do
       end
     end
     context 'when a pull request doesnt exist for the feature-branch' do
-      let(:authorization_token) { '123123' }
       let(:changelog) { '* made some fixes' }
       let(:new_pull_request) do
         {
@@ -92,17 +89,16 @@ describe Gitx::Cli::IntegrateCommand do
       end
       before do
         allow(cli).to receive(:ask_editor).and_return('description')
-        allow(cli).to receive(:authorization_token).and_return(authorization_token)
         expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update).twice
 
+        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
+        expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %B'").and_return('2013-01-01 did some stuff').ordered
         expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
         expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
         expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
-        expect(cli).to receive(:run_cmd).with('git merge feature-branch').ordered
+        expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Integrating feature-branch into staging (Pull request #10)" feature-branch').ordered
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %B'").and_return('2013-01-01 did some stuff').ordered
 
         stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/pulls').to_return(status: 201, body: new_pull_request.to_json, headers: { 'Content-Type' => 'application/json' })
         stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments').to_return(status: 201)
@@ -123,10 +119,8 @@ describe Gitx::Cli::IntegrateCommand do
       end
     end
     context 'when staging branch does not exist remotely' do
-      let(:authorization_token) { '123123' }
       let(:remote_branch_names) { [] }
       before do
-        allow(cli).to receive(:authorization_token).and_return(authorization_token)
         expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
 
         expect(repo).to receive(:create_branch).with('staging', 'master')
@@ -136,7 +130,7 @@ describe Gitx::Cli::IntegrateCommand do
         expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
         expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
         expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
-        expect(cli).to receive(:run_cmd).with('git merge feature-branch').ordered
+        expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Integrating feature-branch into staging (Pull request #10)" feature-branch').ordered
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
 
@@ -151,16 +145,14 @@ describe Gitx::Cli::IntegrateCommand do
       end
     end
     context 'when integration branch == prototype and remote branch exists' do
-      let(:authorization_token) { '123123' }
       let(:remote_branch_names) { ['origin/prototype'] }
       before do
-        allow(cli).to receive(:authorization_token).and_return(authorization_token)
         expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
 
         expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
         expect(cli).to receive(:run_cmd).with('git branch -D prototype', allow_failure: true).ordered
         expect(cli).to receive(:run_cmd).with('git checkout prototype').ordered
-        expect(cli).to receive(:run_cmd).with('git merge feature-branch').ordered
+        expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Integrating feature-branch into prototype (Pull request #10)" feature-branch').ordered
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
 
@@ -198,9 +190,11 @@ describe Gitx::Cli::IntegrateCommand do
         expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
         expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
         expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
-        expect(cli).to receive(:run_cmd).with('git merge feature-branch').and_raise('git merge feature-branch failed').ordered
+        expect(cli).to receive(:run_cmd).with('git merge --no-ff -m "[gitx] Integrating feature-branch into staging (Pull request #10)" feature-branch').and_raise('git merge feature-branch failed').ordered
 
-        expect { cli.integrate }.to raise_error(/Merge conflict occurred.  Please fix merge conflict and rerun command with --resume feature-branch flag/)
+        VCR.use_cassette('pull_request_does_exist_with_success_status') do
+          expect { cli.integrate }.to raise_error(/Merge conflict occurred.  Please fix merge conflict and rerun command with --resume feature-branch flag/)
+        end
       end
       it 'raises a helpful error' do
         should meet_expectations
@@ -213,10 +207,7 @@ describe Gitx::Cli::IntegrateCommand do
         }
       end
       let(:repo) { cli.send(:repo) }
-      let(:authorization_token) { '123123' }
       before do
-        allow(cli).to receive(:authorization_token).and_return(authorization_token)
-
         expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
 
         expect(cli).not_to receive(:run_cmd).with('git branch -D staging')
@@ -240,9 +231,7 @@ describe Gitx::Cli::IntegrateCommand do
         }
       end
       let(:local_branch_names) { ['feature-branch'] }
-      let(:authorization_token) { '123123' }
       before do
-        allow(cli).to receive(:authorization_token).and_return(authorization_token)
         expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
         expect(cli).to receive(:ask).and_return('feature-branch')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitx
 version: !ruby/object:Gem::Version
-  version: 2.16.0
+  version: 2.17.0.pre
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-28 00:00:00.000000000 Z
+date: 2015-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -331,9 +331,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8