octopolo 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9cda31d965fb45d75ae197ea4343da56736f69f9
-  data.tar.gz: 6e3dbbe248ff7c975bdbad6ee696fe30843da062
+SHA256:
+  metadata.gz: c7127cc1021b5d826c88d16784375a445515b0e0ec602df9a2a91755f7a22aa5
+  data.tar.gz: 1ab2947b7ff4ce2bcbbf04aa24ef5e4189f1c7abaabc1bad951cc1fc2f6e1b18
 SHA512:
-  metadata.gz: 3edb4de1696405e53dde4d3abe2fc387856cd42ddac0c847d6ad4ec1e23f65f7fa3ea13d2ab2b33acdd412269c0099bbd9a61760830172dc41f20afa941fe6dd
-  data.tar.gz: 206579ef9b311236170a6813707351b2288dc5efe82df1a7cc6377b9f1ab585b1447968baf7a0dff353f31e4b28f30258e8c24fdc3964d24ca39596db58f871d
+  metadata.gz: 3621dfa1a3d7606569d85029b94a54a21ba34a93395cb5ac1fd062d2489898413e5b80f770f4c91e5c60b395a32d86a934979e3ee438fa27511dd3009e07f235
+  data.tar.gz: d46d8cf93716d4a0799c6f928d0664a40ac30fc6f9dcce15b0c42e9475941f1adad9c5581e2f26deb22a1988021f879bbfb6b68fc494735cc4fcccc219584534

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+#### v1.8.0
+* Fail on PR merge errors
+
+  > Scott Trenda: production-status-check[bot]: https://github.com/sportngin/octopolo/pull/131
+
 #### v1.7.2
 * Fix pagination issue
 

data/lib/octopolo/pull_request_merger.rb

@@ -55,7 +55,7 @@ module Octopolo
       else
         cli.say "An unknown error occurred: #{e.inspect}"
       end
-      false
+      raise
     end
 
    # Public: Check out the branch

data/lib/octopolo/version.rb

@@ -1,3 +1,3 @@
 module Octopolo
-  VERSION = "1.7.1"
+  VERSION = "1.8.0"
 end

data/spec/octopolo/pull_request_merger_spec.rb

@@ -65,14 +65,14 @@ module Octopolo
           git.should_receive(:if_clean).and_raise(GitHub::PullRequest::NotFound)
           cli.should_receive(:say).with("Unable to find pull request #{pull_request_id}. Please retry with a valid ID.")
 
-          subject.perform
+          expect { subject.perform }.to raise_error
         end
 
         it "properly handles a failed merge" do
           git.should_receive(:if_clean).and_raise(Git::MergeFailed)
           cli.should_receive(:say).with("Merge failed. Please identify the source of this merge conflict resolve this conflict in your pull request's branch. NOTE: Merge conflicts resolved in the deployable branch are NOT used when deploying.")
 
-          subject.perform
+          expect { subject.perform }.to raise_error
         end
 
         it "properly handles a failed checkout of branch" do
@@ -80,14 +80,15 @@ module Octopolo
           git.should_receive(:latest_branch_for).with("deployable").and_return("deployable")
           cli.should_receive(:say).with("Checkout of #{git.deployable_branch} failed. Please contact Infrastructure to determine the cause.")
 
-          subject.perform
+          expect { subject.perform }.to raise_error
         end
 
         it "properly handles a failed comment" do
           git.should_receive(:if_clean).and_raise(GitHub::PullRequest::CommentFailed)
           git.should_receive(:latest_branch_for).with("deployable").and_return("deployable")
           cli.should_receive(:say).with("Unable to write comment. Please navigate to #{pull_request.url} and add the comment, '#{subject.comment_body}'")
-          subject.perform
+
+          expect { subject.perform }.to raise_error
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopolo
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Patrick Byrne
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2018-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -375,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: A set of GitHub workflow scripts to provide a smooth development process