octopolo 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18c5e296ce0914de673bfd17051d93126fc58b7e
-  data.tar.gz: 02624f57907de6b1426fa605c425c8618e398ee0
+  metadata.gz: 4330e2b0cb3d14e82b15bb69dcd74828dd7461c5
+  data.tar.gz: f4952a0a8428fda3a22e66ffad602233bfb4028c
 SHA512:
-  metadata.gz: 23d921698f4295a74cb98e07b6ccc77b202e64ee1449e10a41c2442411b41bae2d4c245862f7258655f6b3b2382922e7a26fc3d83280b0873f30c53e22973a20
-  data.tar.gz: 8ee7ecf80105318f96db7f86bd525dc48d865838962a7b3e2572643d574725994ffb8dbad8a1c2bc76dac58fa08173a1cd2d430f7d8570c44c27b0225a6276e8
+  metadata.gz: bb55714ef20937deb3fd455762d3b9aa6a2b9bc5f8d6145a326589b1d2929d6ee7c61b66b859652209fb1be0feaa0b5c4bcfe5e75044764be6af49b62f1229d5
+  data.tar.gz: a04932843c942b34aa80f361bbdbdc410380131d91684a3ecdaf2c8304b4a38ec58e271d0021df02d3065530fb0abbaed52d5c7a5e7ebaad8d717a4d1c5b3b6c

data/.travis.yml

@@ -9,4 +9,4 @@ rvm:
   - 2.2
 script: bundle exec rspec
 before_install:
-- gem uninstall bundler && gem install bundler
+- gem install bundler

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+#### v1.5.3
+#### v1.5.2
+* Fix merging into deployable
+
+  > Emma Sax: Unknown User: https://github.com/sportngin/octopolo/pull/120
+
 #### v1.5.1
 * Fix Ruby 2.0 compatiblity
 

data/lib/octopolo/scripts/deployable.rb

@@ -35,28 +35,21 @@ module Octopolo
             CLI.say 'Pull request status checks have not passed. Cannot be marked deployable.'
             exit!
           end
-          if config.deployable_label
-            with_labelling do
-              merge
-            end
-          else
-            merge
-          end
+
+          merge_result = merge
+          add_deployable_label if config.deployable_label && merge_result
         end
       end
 
       def merge
-        PullRequestMerger.perform Git::DEPLOYABLE_PREFIX, Integer(@pull_request_id), :user_notifications => config.user_notifications
+        PullRequestMerger.new(Git::DEPLOYABLE_PREFIX, Integer(@pull_request_id), :user_notifications => config.user_notifications).perform
       end
       private :merge
 
-      def with_labelling(&block)
+      def add_deployable_label
         pull_request.add_labels(Deployable.deployable_label)
-        unless yield
-          pull_request.remove_labels(Deployable.deployable_label)
-        end
       end
-      private :with_labelling
+      private :add_deployable_label
 
       def deployable?
         pull_request.mergeable? && pull_request.status_checks_passed?

data/lib/octopolo/version.rb

@@ -1,3 +1,3 @@
 module Octopolo
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

data/octopolo.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'semantic', '~> 1.3'
 
   gem.add_development_dependency 'rake', '~> 10.1'
+  gem.add_development_dependency 'bundler', '~> 1.16'
   gem.add_development_dependency 'rspec', '~> 2.99'
   gem.add_development_dependency 'guard', '~> 2.6'
   gem.add_development_dependency 'guard-rspec', '~> 4.3'

data/spec/octopolo/scripts/deployable_spec.rb

@@ -19,7 +19,7 @@ module Octopolo
         allow(subject).to receive(:cli) { cli }
         allow(subject).to receive(:config) { config }
         allow(Octopolo::GitHub::PullRequest).to receive(:new) { pull_request }
-        allow(PullRequestMerger).to receive(:perform) { true }
+        allow_any_instance_of(PullRequestMerger).to receive(:perform) { true }
         allow(Octopolo::GitHub).to receive(:check_connection) { true }
       end
 
@@ -43,7 +43,7 @@ module Octopolo
             end
 
             it "takes the pull requests ID from the current branch" do
-              PullRequestMerger.should_receive(:perform).with(Git::DEPLOYABLE_PREFIX, pull_request.number, :user_notifications => config.user_notifications)
+              expect_any_instance_of(PullRequestMerger).to receive(:perform)
             end
           end
 
@@ -67,17 +67,17 @@ module Octopolo
 
           context "when merge to deployable fails" do
             before do
-              allow(PullRequestMerger).to receive(:perform) { false }
+              allow_any_instance_of(PullRequestMerger).to receive(:perform) { false }
             end
 
-            it "removes the deployable label" do
-              pull_request.should_receive(:remove_labels)
+            it "does not add any labels" do
+              pull_request.should_not_receive(:add_labels)
             end
           end
 
           context "when the merge to deployable succeeds" do
-            it "doesn't remove the deployable label" do
-              pull_request.should_not_receive(:remove_labels)
+            it "adds a label" do
+              pull_request.should_receive(:add_labels)
             end
           end
 
@@ -134,7 +134,6 @@ module Octopolo
             pull_request.should_receive(:add_labels)
           end
         end
-
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopolo
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Patrick Byrne
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -138,6 +138,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.16'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +220,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".octopolo.yml"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".soyuz.yml"