thegarage-gitx 2.13.1 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c76b9142f428f3c146f42e9ebb4cae36f5aa3e4
-  data.tar.gz: c1beddf110f6ef5d34179bfec65fbcf79e9bd48c
+  metadata.gz: 1dbfd6ee46fe1a237617f9d3b49870be833ceb3a
+  data.tar.gz: 70a854edc6ab9e7f53826fb499ad08226f4fa318
 SHA512:
-  metadata.gz: 5eb433fa613fe8740d57436d16707cd6cd21929ee003916619e8edf060447fb70b7eb410927b9f2f09f791f8decc0da728da91597059f02979120ad1b7491805
-  data.tar.gz: 689de10ba6d60de808582ab64144a573c4c760ee38614483e097f76be766f7fdb8ca9031a53d9ed157e5d1c8c43c4343e66697ccdcb6b313bd8a30503acdd49e
+  metadata.gz: 838035ded4221ebe0e430c31b44bef2d77798aa0ddebf7effb8ef7a45df1aa211daa35e0394a35bb0054b607b8956e033680d2e74c142bddb635159737af73bb
+  data.tar.gz: 2ee82330158b17347e098d3d303aa456ce8c4770707746b005cd94ab88807ccf628a4aa9660eb040cb32b0b9cc82e32003a40e3830a68bc4b540a7f12dfb1fa2

data/README.md

@@ -26,6 +26,10 @@ update the local feature branch with latest remote changes plus upstream release
 
 integrate the current feature branch into an aggregate branch (ex: prototype, staging)
 
+options:
+* `--comment` or `-c` = Add a comment about the integration to an existing PR for the working branch. Create a new PR for that branch if one does not exist.
+* `--resume` or `-r` = Resume integration after resolving a merge conflict on the aggregate branch.
+
 ## git review <feature_branch_name (optional, default: current_branch)>
 
 create a pull request on github for peer review of the current branch.  This command is re-runnable

data/lib/thegarage/gitx/cli/integrate_command.rb

@@ -11,6 +11,7 @@ module Thegarage
         include Thegarage::Gitx::Github
         desc 'integrate', 'integrate the current branch into one of the aggregate development branches (default = staging)'
         method_option :resume, :type => :string, :aliases => '-r', :desc => 'resume merging of feature-branch'
+        method_option :comment, :type => :boolean, :aliases => '-c', :desc => 'add a comment to the pull request for this branch. Creates a new PR if none exists.'
         def integrate(integration_branch = 'staging')
           assert_aggregate_branch!(integration_branch)
 
@@ -26,7 +27,7 @@ module Thegarage
           integrate_branch(branch, integration_branch) unless options[:resume]
           checkout_branch branch
 
-          create_integrate_comment(branch) unless config.reserved_branch?(branch)
+          create_integrate_comment(branch) if options[:comment] && !config.reserved_branch?(branch)
         end
 
         private

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '2.13.1'
+    VERSION = '2.14.0'
   end
 end

data/spec/thegarage/gitx/cli/integrate_command_spec.rb

@@ -47,9 +47,8 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
       it 'defaults to staging branch' do
         should meet_expectations
       end
-      it 'posts comment to pull request' do
-        expect(WebMock).to have_requested(:post, "https://api.github.com/repos/thegarage/thegarage-gitx/issues/10/comments").
-          with(body: {body: '[gitx] integrated into staging :twisted_rightwards_arrows:'})
+      it 'does not post comment to pull request' do
+        expect(WebMock).to_not have_requested(:post, "https://api.github.com/repos/thegarage/thegarage-gitx/issues/10/comments")
       end
     end
     context 'when current_branch == master' do
@@ -74,51 +73,6 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
         expect(WebMock).to_not have_requested(:post, "https://api.github.com/repos/thegarage/thegarage-gitx/pulls")
       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
-        {
-          html_url: "https://path/to/html/pull/request",
-          issue_url: "https://api/path/to/issue/url",
-          number: 10,
-          head: {
-            ref: "branch_name"
-          }
-        }
-      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(Thegarage::Gitx::Cli::UpdateCommand, :update).twice
-
-        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 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:'* %s%n%b'").and_return("2013-01-01 did some stuff").ordered
-
-        stub_request(:post, 'https://api.github.com/repos/thegarage/thegarage-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/thegarage/thegarage-gitx/issues/10/comments').to_return(:status => 201)
-
-        VCR.use_cassette('pull_request_does_not_exist') do
-          cli.integrate
-        end
-      end
-      it 'creates github pull request' do
-        should meet_expectations
-      end
-      it 'creates github comment for integration' do
-        expect(WebMock).to have_requested(:post, "https://api.github.com/repos/thegarage/thegarage-gitx/issues/10/comments").
-          with(body: {body: '[gitx] integrated into staging :twisted_rightwards_arrows:'})
-      end
-      it 'runs expected commands' do
-        should meet_expectations
-      end
-    end
     context 'when staging branch does not exist remotely' do
       let(:authorization_token) { '123123' }
       let(:remote_branch_names) { [] }
@@ -146,9 +100,6 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
       it 'creates remote aggregate branch' do
         should meet_expectations
       end
-      it 'posts comment to pull request' do
-        expect(WebMock).to have_requested(:post, "https://api.github.com/repos/thegarage/thegarage-gitx/issues/10/comments")
-      end
     end
     context 'when integration branch == prototype and remote branch exists' do
       let(:authorization_token) { '123123' }
@@ -173,9 +124,6 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
       it 'runs expected commands' do
         should meet_expectations
       end
-      it 'posts comment to pull request' do
-        expect(WebMock).to have_requested(:post, "https://api.github.com/repos/thegarage/thegarage-gitx/issues/10/comments")
-      end
     end
     context 'when integration branch is not an aggregate branch' do
       it 'raises an error' do
@@ -235,9 +183,6 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
       it 'does not delete local staging branch' do
         should meet_expectations
       end
-      it 'posts comment to pull request' do
-        expect(WebMock).to have_requested(:post, "https://api.github.com/repos/thegarage/thegarage-gitx/issues/10/comments")
-      end
     end
     context 'with --resume "feature-branch" flag when feature-branch does not exist' do
       let(:options) do
@@ -264,8 +209,81 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
       it 'asks user for feature-branch name' do
         should meet_expectations
       end
+    end
+    context 'for default integration (to staging) with --comment flag' do
+      let(:options) do
+        { comment: true }
+      end
+      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(Thegarage::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 push origin HEAD").ordered
+        expect(cli).to receive(:run_cmd).with("git checkout feature-branch").ordered
+
+        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+
+        VCR.use_cassette('pull_request_does_exist_with_success_status') do
+          cli.integrate
+        end
+      end
+      it 'defaults to staging branch' do
+        should meet_expectations
+      end
       it 'posts comment to pull request' do
-        expect(WebMock).to have_requested(:post, "https://api.github.com/repos/thegarage/thegarage-gitx/issues/10/comments")
+        expect(WebMock).to have_requested(:post, "https://api.github.com/repos/thegarage/thegarage-gitx/issues/10/comments").
+          with(body: {body: '[gitx] integrated into staging :twisted_rightwards_arrows:'})
+      end
+    end
+    context 'with --comment flag when a pull request doesn\'t exist for the feature-branch' do
+      let(:options) do
+        { comment: true }
+      end
+      let(:authorization_token) { '123123' }
+      let(:changelog) { '* made some fixes' }
+      let(:new_pull_request) do
+        {
+          html_url: "https://path/to/html/pull/request",
+          issue_url: "https://api/path/to/issue/url",
+          number: 10,
+          head: {
+            ref: "branch_name"
+          }
+        }
+      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(Thegarage::Gitx::Cli::UpdateCommand, :update).twice
+
+        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 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:'* %s%n%b'").and_return("2013-01-01 did some stuff").ordered
+
+        stub_request(:post, 'https://api.github.com/repos/thegarage/thegarage-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/thegarage/thegarage-gitx/issues/10/comments').to_return(:status => 201)
+
+        VCR.use_cassette('pull_request_does_not_exist') do
+          cli.integrate
+        end
+      end
+      it 'creates github pull request' do
+        should meet_expectations
+      end
+      it 'creates github comment for integration' do
+        expect(WebMock).to have_requested(:post, "https://api.github.com/repos/thegarage/thegarage-gitx/issues/10/comments").
+          with(body: {body: '[gitx] integrated into staging :twisted_rightwards_arrows:'})
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 2.13.1
+  version: 2.14.0
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged