Fix merging into deployable

.travis.yml

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

lib/octopolo/scripts/deployable.rb

@@ -35,28 +35,21 @@ def execute
             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?

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'

spec/octopolo/scripts/deployable_spec.rb

@@ -19,7 +19,7 @@ module Scripts
         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 Scripts
             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 Scripts
 
           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 Scripts
             pull_request.should_receive(:add_labels)
           end
         end
-
       end
     end
   end