thegarage-gitx 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c816348d551adad9dafcf7efb19f3430707347d
-  data.tar.gz: e99bc201fb96d47977ab8f105a234e0c47549f93
+  metadata.gz: 09fedfaebdd521708a24d8888081fc9fd069e6ff
+  data.tar.gz: 4f292966ed0b548879f59eb5462046920585a2cc
 SHA512:
-  metadata.gz: 0c412f5989ed6aba0ffb0485d655af476967c0631c35ffa39ff874f24b6826cdff9db8a94bbc7676f33339583334032e72f33341ac8fb94d485b7ed32b9e3504
-  data.tar.gz: 74f411acf2307fa4470478400f244db2ef27afbbe22dccc8055350b5e5791494b866bd3ccb98cf86c673c61f4410312a47441c88066781e17a5642e509f1ba4a
+  metadata.gz: bc46244d36565c05ca6032ab4c8c47de3879d3972991c20b34346d1914534cb3ff4bb46526cadb672d5fa115dcbc85454548b24b8d817c9067464e8e8309cef5
+  data.tar.gz: 8fce08cfbe03c7dd3eeefc9a10302fe82ab0557df6840942149fa4079cae2ef41329bf30c6de4651bf726222c4ea2c887fa39a8e9d7254631704e7f73f6b067e

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

@@ -26,8 +26,7 @@ module Thegarage
           integrate_branch(branch, integration_branch) unless options[:resume]
           checkout_branch branch
 
-          pull_request = find_or_create_pull_request(branch)
-          create_integrate_comment(pull_request)
+          create_integrate_comment(branch) unless RESERVED_BRANCHES.include?(branch)
         end
 
         private
@@ -89,7 +88,8 @@ module Thegarage
           run_cmd "git push origin #{target_branch}:#{target_branch}"
         end
 
-        def create_integrate_comment(pull_request)
+        def create_integrate_comment(branch)
+          pull_request = find_or_create_pull_request(branch)
           comment = '[gitx] integrated into staging :twisted_rightwards_arrows:'
           github_client.add_comment(github_slug, pull_request.number, comment)
         end

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '2.7.0'
+    VERSION = '2.7.1'
   end
 end

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

@@ -56,6 +56,28 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
           with(body: {body: '[gitx] integrated into staging :twisted_rightwards_arrows:'})
       end
     end
+    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(fake_update_command).to receive(: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 push origin HEAD").ordered
+        expect(cli).to receive(:run_cmd).with("git checkout master").ordered
+
+        cli.integrate
+      end
+      it 'does not create pull request' 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' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged