octopolo 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWJiMDZmMWJkMWE1YjhkOWY2YzY3MDY4YWI3M2E0MDRmZDUxNDg3Mg==
+    ODRlOGY4MDgyY2EwZDQ0NDQ3NmZkNjgxMjNlNmRmOWMzYjg1YTNmYg==
   data.tar.gz: !binary |-
-    YjFhNGU3NzdkODFiYmM4YjBlYjIzNjc2ZWI5Y2E2YzVmOWM0OGViMQ==
+    ZGU2ZGQ4ZWYxZTIzNGY0MTA2NDk2YTY2ZTliMDllYTg0MzUwNWM0Mw==
 SHA512:
   metadata.gz: !binary |-
-    Njk1YjE0Mjk0ZjRhZThhZGE4OGU2YTE0ZmI3MjM3ZjEzYTEzOGI0NmZiN2E5
-    NjcxZWMxYzQ5ZTg3Y2VlMDMzMzA2NDFjZTQ5NDUzMTdkNGNmNjcyZmEwZTBj
-    YTY3YzNiNTE2OTEyOGFlZTQ4OTIwYjgzNDdkMmZiN2VlNDQxODY=
+    MmQwZmFjY2ZjMzZmNzBmMzllMTY5OTc0YjZmMTk3NzEzYWFjNDRkZjUwZmQz
+    OTY3NWRlMzNkYTBlM2UwMzgzMDg2MmJjNTBmMjYxMTE3M2Q5OTc4YzNkMDdi
+    NDlhMDNkYWY4ODVmMDIyYmFhMDZlZjNmYjFiYzllOGNlNDljMjM=
   data.tar.gz: !binary |-
-    NDA2OTA3ODIyNTk5NWQxOTU1ZTdkZDBhNWE0ODkxNGUzNjgwMDJhYWQwNDkw
-    MGJmYzgxZjFhZDgxZDYxMDQwMzQ3NmNlOTliNTM1ZGQzODg2OGJmNDI4NzFl
-    OTk5ODQyZjliMTNjYjE3YmIzYjQ4ZWYyNjZlZDM3YjBkZTA1NmY=
+    MmY5ZmM5ZTVmZmM0YjBiOWE0NzA1ZjdhNjk1MTNmODgyMmMyMTM3ZmJiYTA0
+    MTUwM2NhY2JmNzc0YjFlYzJkYzA5NWZjYWY1N2FlYmY0NDY3YTJiMTc0ZTVk
+    MDI3YTQ4ZDg5YmQ2ZDBhNWVmNTE3Y2E1Y2M2M2I5MGVlZjZiMzg=

data/CHANGELOG.markdown

@@ -1,3 +1,4 @@
+#### v0.3.1
 #### v0.3.0
 #### v0.2.1
 #### v0.1.4

data/lib/octopolo/github.rb

@@ -35,7 +35,7 @@ module Octopolo
     def self.client(options = {})
       Octokit::Client.new(options.merge(login: user_config.github_user, access_token: user_config.github_token))
     rescue UserConfig::MissingGitHubAuth
-      raise TryAgain, "No GitHub API token stored. Please run `bundle exec github-auth` to generate your token."
+      raise TryAgain, "No GitHub API token stored. Please run `op github-auth` to generate your token."
     end
 
     # Public: A GitHub client configured to crawl through pages
@@ -48,7 +48,7 @@ module Octopolo
       # we don't care about the output, just try to hit the API
       client.user && nil
     rescue Octokit::Unauthorized
-      raise BadCredentials, "Your stored credentials were rejected by GitHub. Run `bundle exec github-auth` to generate a new token."
+      raise BadCredentials, "Your stored credentials were rejected by GitHub. Run `op github-auth` to generate a new token."
     end
 
     def self.pull_request *args

data/lib/octopolo/pull_request_merger.rb

@@ -53,7 +53,7 @@ module Octopolo
       when GitHub::PullRequest::CommentFailed
         cli.say "Unable to write comment. Please navigate to #{pull_request.url} and add the comment, '#{comment_body}'"
       else
-        cli.say "An uknown error occured:  #{e.class.to_s}"
+        cli.say "An unknown error occurred:  #{e.class.to_s}"
       end
       false
     end

data/lib/octopolo/scripts/deployable.rb

@@ -25,30 +25,30 @@ module Octopolo
       # Public: Perform the script
       def execute
         self.pull_request_id ||= cli.prompt("Pull Request ID: ")
-        merge_and_label
+        GitHub.connect do
+          if config.deployable_label
+            with_labelling do
+              merge
+            end
+          else
+            merge
+          end
+        end
       end
 
-      def merge_and_label
-        if config.deployable_label
-          ensure_label_was_created
-        else
-          PullRequestMerger.perform Git::DEPLOYABLE_PREFIX, Integer(@pull_request_id), :user_notifications => config.user_notifications
-        end
+      def merge
+        PullRequestMerger.perform Git::DEPLOYABLE_PREFIX, Integer(@pull_request_id), :user_notifications => config.user_notifications
       end
+      private :merge
 
-      def ensure_label_was_created
+      def with_labelling(&block)
         pull_request = Octopolo::GitHub::PullRequest.new(config.github_repo, @pull_request_id)
-        begin
-          pull_request.add_labels(Deployable.deployable_label)
-          unless PullRequestMerger.perform Git::DEPLOYABLE_PREFIX, Integer(@pull_request_id), :user_notifications => config.user_notifications
-             pull_request.remove_labels(Deployable.deployable_label)
-          end
-        rescue Octokit::Error
-
-          cli.say("Unable to mark as deployable, please try command again")
+        pull_request.add_labels(Deployable.deployable_label)
+        unless yield
+          pull_request.remove_labels(Deployable.deployable_label)
         end
       end
-
+      private :with_labelling
     end
   end
 end

data/lib/octopolo/version.rb

@@ -1,3 +1,3 @@
 module Octopolo
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/octopolo/github_spec.rb

@@ -24,7 +24,7 @@ module Octopolo
       it "properly handles if the github authentication isn't configured" do
         user_config.should_receive(:github_user).and_raise(UserConfig::MissingGitHubAuth)
         Scripts::GithubAuth.should_not_receive(:invoke)
-        expect { GitHub.client }.to raise_error(GitHub::TryAgain, "No GitHub API token stored. Please run `bundle exec github-auth` to generate your token.")
+        expect { GitHub.client }.to raise_error(GitHub::TryAgain, "No GitHub API token stored. Please run `op github-auth` to generate your token.")
       end
     end
 

data/spec/octopolo/scripts/deployable_spec.rb

@@ -4,92 +4,84 @@ require "octopolo/scripts/deployable"
 module Octopolo
   module Scripts
     describe Deployable do
-      let(:cli) { stub(:Cli) }
-      let(:config) { stub(:user_notifications => ['NickLaMuro'], :github_repo => 'foo', :deployable_label => true) }
-      before { Deployable.any_instance.stub(:cli => cli, :config => config) }
+      subject { described_class.new 42 }
+
+      let(:cli) { stub(prompt: 42) }
+      let(:config) { stub(user_notifications: ['NickLaMuro'],
+                          github_repo: 'grumpy_cat',
+                          deployable_label: true) }
+      let(:pull_request) { stub(add_labels: true, remove_labels: true) }
+      before do
+        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(Octopolo::GitHub).to receive(:check_connection) { true }
+      end
 
       context "#execute" do
-        subject { Deployable.new 42}
-        it "calls merge_and_label" do
-          expect(subject).to receive(:merge_and_label)
+        after do
           subject.execute
         end
 
-        context "#merge_and_label" do
-          before do
-            allow(PullRequestMerger).to receive(:perform)
-          end
-
-          context "deployable_label is set to true" do
-            it "calls ensure_label_was_created" do
-              expect(subject).to receive(:ensure_label_was_created)
-              subject.execute
-            end
-          end
-
-          context "deployable_label is set to false " do 
-            let(:config) { stub(:user_notifications => ['NickLaMuro'], :github_repo => 'foo', :deployable_label => false) }
-            it "skips add_to_pull when deployable_label is false" do
-              expect(subject).to_not receive(:ensure_label_was_created)
-              subject.execute
-            end
+        context "with a PR ID passed in with the command" do
+          it "doesn't prompt for a PR ID" do
+            cli.should_not_receive(:prompt)
           end
         end
-      end
 
-      context "#ensure_label_was_created" do
-        subject { Deployable.new 42}
-        let(:pull_request) {Octopolo::GitHub::PullRequest.new('foo', subject.pull_request_id, nil)}
-        before do
-          allow_any_instance_of(Octopolo::GitHub::PullRequest).to receive(:add_labels)
-        end
+        context "without a PR ID passed in with the command" do
+          subject { described_class.new }
 
-        context "with a PR passed in via the command args" do
-          it "delegates the work to PullRequestMerger" do
-            expect(PullRequestMerger).to receive(:perform).with(Git::DEPLOYABLE_PREFIX, 42, :user_notifications => ["NickLaMuro"]) {true}
-            subject.ensure_label_was_created
+          it "prompts for a PR ID" do
+            cli.should_receive(:prompt)
+              .with("Pull Request ID: ")
+              .and_return("42")
           end
         end
 
-        context "with no PR passed in from the command args" do
-          subject { Deployable.new }
+        context "with labelling enabled" do
+          it "adds the deployable label" do
+            pull_request.should_receive(:add_labels)
+          end
 
-          context "with a PR passed in through the cli" do
+          context "when merge to deployable fails" do
             before do
-              cli.should_receive(:prompt)
-                 .with("Pull Request ID: ")
-                 .and_return("42")
+              allow(PullRequestMerger).to receive(:perform) { false }
             end
 
-            it "delegates the work to PullRequestMerger" do
-              expect(PullRequestMerger).to receive(:perform).with(Git::DEPLOYABLE_PREFIX, 42, :user_notifications => ["NickLaMuro"]) {true}
-              subject.execute
+            it "removes the deployable label" do
+              pull_request.should_receive(:remove_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)
             end
           end
 
-          context "with no PR passed in from the cli" do
+          context "with an invalid auth token" do
             before do
-              cli.should_receive(:prompt)
-                 .with("Pull Request ID: ")
-                 .and_return("foo")
+              Octopolo::GitHub.stub(:check_connection) { raise GitHub::BadCredentials, "Your stored credentials were rejected by GitHub. Run `op github-auth` to generate a new token." }
             end
 
-            it "delegates the work to PullRequestMerger" do
-              expect{ subject.execute }.to raise_error(ArgumentError)
+            it "should give a helpful error message saying your token is invalid" do
+              expect(CLI).to receive(:say).with("Your stored credentials were rejected by GitHub. Run `op github-auth` to generate a new token.")
             end
           end
         end
 
-        context "when it creates a label successfully" do
+        context "with labelling disabled" do
+          let(:config) { stub(user_notifications: ['NickLaMuro'],
+                              github_repo: 'grumpy_cat',
+                              deployable_label: false) }
 
-          it "calls remove_label when pull_request_merge fails" do
-            allow(PullRequestMerger).to receive(:perform) {nil}
-            expect_any_instance_of(Octopolo::GitHub::PullRequest).to receive(:remove_labels)
-            subject.ensure_label_was_created
+          it "doesn't add the deployable label" do
+            pull_request.should_not_receive(:add_labels)
           end
         end
       end
-      
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopolo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Patrick Byrne