octopolo 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9347171f8e40371369adff2ff3182e3f5feae9c
-  data.tar.gz: 5b8cc4f765258a60c3402c55d7fd98e8c31802c1
+  metadata.gz: ce85f0e7584c097f6057eb0f0290419beadbb7c0
+  data.tar.gz: 2aa223c174ba9b35fb2a2c91fc3bb9c951d9d29e
 SHA512:
-  metadata.gz: 4bad6818445d9e8bae0f600cbc7ae136eb997de6b2848e76bc122039d458cdb4df347dec16c66235a0265298a4b91922f7181de146cd5e27eabdba1ca1d644df
-  data.tar.gz: 0514539626222b2effd7efa5a61c2672f0a4f02c9bde6a67ff9c1384e338911263ba7a829194bb46c16fb6802be632f591c29afa7130b3fd1e6da52247da7d4a
+  metadata.gz: 685c5bc181c5cf915e86b8359ea8edd1224c84a03da2847cd5f3c17d594186d602ae34bb9d52bee20ac49fb5aae528acbd75390b1ec8fa9858d4c885f9b27a30
+  data.tar.gz: 88a1262406cae5fb72644cbbc1354820fa7f0a1b7917c6593cab6618a2221f6ee5ed3e4053d353d9ae5ef701e14d66eb2e64bf0e430d0df2ac10044e6a2bc3ad

data/CHANGELOG.markdown

@@ -1,3 +1,12 @@
+#### v1.1.0
+* Auto pull request
+
+  > Scott Trenda, Brian Bergstrom: Chris Arcand: https://github.com/sportngin/octopolo/pull/70
+
+* issue64 - improve git if_clean check
+
+  > newzac: Scott Trenda, Brian Bergstrom: https://github.com/sportngin/octopolo/pull/69
+
 #### v1.0.2
 * Fix Rake Depenency Issues
 

data/lib/octopolo/git.rb

@@ -5,6 +5,7 @@ module Octopolo
   class Git
     NO_BRANCH = "(no branch)"
     DEFAULT_DIRTY_MESSAGE = "Your Git index is not clean. Commit, stash, or otherwise clean up the index before continuing."
+    DIRTY_CONFIRM_MESSAGE = "Your Git index is not clean. Do you want to continue?"
     # we use date-based tags, so look for anything starting with a 4-digit year
     RELEASE_TAG_FILTER = /^\d{4}.*/
     RECENT_TAG_LIMIT = 9
@@ -109,7 +110,7 @@ module Octopolo
 
     # Public: Perform the block if the Git index is clean
     def self.if_clean(message=DEFAULT_DIRTY_MESSAGE)
-      if clean?
+      if clean? || cli.ask_boolean(DIRTY_CONFIRM_MESSAGE)
         yield
       else
         alert_dirty_index message
@@ -122,6 +123,7 @@ module Octopolo
       cli.say message
       cli.say " "
       perform "status"
+      raise DirtyIndex
     end
 
     # Public: Merge the given remote branch into the current branch
@@ -276,5 +278,6 @@ module Octopolo
     CheckoutFailed = Class.new(StandardError)
     MergeFailed = Class.new(StandardError)
     NoBranchOfType = Class.new(StandardError)
+    DirtyIndex = Class.new(StandardError)
   end
 end

data/lib/octopolo/github/pull_request.rb

@@ -6,6 +6,10 @@ module Octopolo
   module GitHub
     class PullRequest < Issue
 
+      extend CLIWrapper
+      extend ConfigWrapper
+      extend UserConfigWrapper
+
       # Public: All closed pull requests for a given repo
       #
       # repo_name - Full name ("account/repo") of the repo in question
@@ -65,6 +69,24 @@ module Octopolo
         @commits ||= Commit.for_pull_request self
       end
 
+      def self.current
+        current_branch = Git.current_branch
+        query = "repo:#{config.github_repo} type:pr is:open head:#{current_branch}"
+        pulls = GitHub.search_issues(query)
+        if pulls.total_count!= 1
+          cli.say "Multiple pull requests found for branch #{current_branch}" if pulls.total_count > 1
+          cli.say "No pull request found for branch #{current_branch}" if pulls.total_count < 1
+          return nil
+        else
+          cli.say "Pull request for current branch is number #{pulls.items.first.number}"
+          pulls.items.first
+
+        end
+      rescue => e
+        cli.say "An error occurred while getting the current branch: #{e.message}"
+        return nil
+      end
+
     end
   end
 end

data/lib/octopolo/github.rb

@@ -113,6 +113,10 @@ module Octopolo
       client.add_labels_to_an_issue *args
     end
 
+    def self.search_issues *args
+      client.search_issues *args
+    end
+
 
     # now that you've set up your credentials, try again
     TryAgain = Class.new(StandardError)

data/lib/octopolo/scripts/deployable.rb

@@ -24,6 +24,10 @@ module Octopolo
 
       # Public: Perform the script
       def execute
+        if (!self.pull_request_id)
+          current = GitHub::PullRequest.current
+          self.pull_request_id = current.number if current
+        end
         self.pull_request_id ||= cli.prompt("Pull Request ID: ")
         GitHub.connect do
           if config.deployable_label

data/lib/octopolo/scripts/stage_up.rb

@@ -18,6 +18,10 @@ module Octopolo
 
       # Public: Perform the script
       def execute
+        if (!self.pull_request_id)
+          current = GitHub::PullRequest.current
+          self.pull_request_id = current.number if current
+        end
         self.pull_request_id ||= cli.prompt("Pull Request ID: ")
         PullRequestMerger.perform Git::STAGING_PREFIX, Integer(pull_request_id)
       end

data/lib/octopolo/version.rb

@@ -1,3 +1,3 @@
 module Octopolo
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/spec/octopolo/git_spec.rb

@@ -125,6 +125,8 @@ module Octopolo
     context ".if_clean" do
       let(:custom_message) { "Some other message" }
 
+      before { Git.cli = cli }
+
       it "performs the block if the git index is clean" do
         Git.should_receive(:clean?) { true }
         Math.should_receive(:log).with(1)
@@ -134,18 +136,31 @@ module Octopolo
         end
       end
 
-      it "does not perform the block if the git index is not clean" do
+      it "performs the block if the git index is not clean and user responds yes" do
         Git.should_receive(:clean?) { false }
+        cli.should_receive(:ask_boolean).with(Git::DIRTY_CONFIRM_MESSAGE) { true }
+        Math.should_receive(:log).with(1)
+
+        Git.if_clean do
+          Math.log 1
+        end
+      end
+
+      it "does not perform the block if the git index is not clean and user responds no" do
+        Git.should_receive(:clean?) { false }
+        cli.should_receive(:ask_boolean).with(Git::DIRTY_CONFIRM_MESSAGE) { false}
         Math.should_not_receive(:log)
         Git.should_receive(:alert_dirty_index).with(Git::DEFAULT_DIRTY_MESSAGE)
 
+
         Git.if_clean do
           Math.log 1
         end
       end
 
-      it "prints a custom message if git index is not clean" do
+      it "prints a custom message if git index is not clean and user responds no" do
         Git.should_receive(:clean?) { false }
+        cli.should_receive(:ask_boolean).with(Git::DIRTY_CONFIRM_MESSAGE) { false }
         Math.should_not_receive(:log)
         Git.should_receive(:alert_dirty_index).with(custom_message)
 
@@ -166,7 +181,7 @@ module Octopolo
         cli.should_receive(:say).with(" ")
         Git.should_receive(:perform).with("status")
 
-        Git.alert_dirty_index message
+        expect{Git.alert_dirty_index message}.to raise_error
       end
     end
 

data/spec/octopolo/github/pull_request_spec.rb

@@ -287,6 +287,50 @@ module Octopolo
         end
       end
 
+      context ".current" do
+        let(:branch_name) { "branch-name" }
+        let(:error_message) { "some error message" }
+        let(:pull) { PullRequest.new repo_name, pr_number }
+
+        before do
+          Octopolo.config.stub(:github_repo) { repo_name }
+        end
+
+        it "calls GitHub.pull_requests with the current repo/branch and return a single pull request" do
+          Git.should_receive(:current_branch) { branch_name }
+          GitHub.should_receive(:search_issues) { double(total_count: 1, items: [pull]) }
+          PullRequest.current.should == pull
+        end
+
+        it "returns nil when Git.current_branch fails" do
+          Git.should_receive(:current_branch) { raise error_message }
+          CLI.should_receive(:say).with("An error occurred while getting the current branch: #{error_message}")
+          PullRequest.current.should == nil
+        end
+
+        it "returns nil when GitHub.pull_requests fails" do
+          Git.should_receive(:current_branch) { branch_name }
+          GitHub.should_receive(:search_issues) { raise error_message }
+          CLI.should_receive(:say).with("An error occurred while getting the current branch: #{error_message}")
+          PullRequest.current.should == nil
+        end
+
+        it "returns nil when more than one PR exists" do
+          Git.should_receive(:current_branch) { branch_name }
+          GitHub.should_receive(:search_issues) { double(total_count: 2, items: [pull, pull]) }
+          CLI.should_receive(:say).with("Multiple pull requests found for branch #{branch_name}")
+          PullRequest.current.should == nil
+        end
+
+        it "returns nil when no PR exists" do
+          Git.should_receive(:current_branch) { branch_name }
+          GitHub.should_receive(:search_issues) { double(total_count: 0, items: []) }
+          CLI.should_receive(:say).with("No pull request found for branch #{branch_name}")
+          PullRequest.current.should == nil
+        end
+
+      end
+
       context "labeling" do
         let(:label1) { Label.new(name: "low-risk", color: "343434") }
         let(:label2) { Label.new(name: "high-risk", color: '565656') }

data/spec/octopolo/scripts/deployable_spec.rb

@@ -10,7 +10,7 @@ module Octopolo
       let(:config) { stub(user_notifications: ['NickLaMuro'],
                           github_repo: 'grumpy_cat',
                           deployable_label: true) }
-      let(:pull_request) { stub(add_labels: true, remove_labels: true) }
+      let(:pull_request) { stub(add_labels: true, remove_labels: true, number: 7) }
       before do
         allow(subject).to receive(:cli) { cli }
         allow(subject).to receive(:config) { config }
@@ -33,10 +33,26 @@ module Octopolo
         context "without a PR ID passed in with the command" do
           subject { described_class.new }
 
-          it "prompts for a PR ID" do
-            cli.should_receive(:prompt)
-              .with("Pull Request ID: ")
-              .and_return("42")
+          context "with an existing PR for the current branch" do
+            before do
+              GitHub::PullRequest.should_receive(:current) { pull_request }
+            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)
+            end
+          end
+
+          context "without an existing PR for the current branch" do
+            before do
+              GitHub::PullRequest.should_receive(:current) { nil }
+            end
+
+            it "prompts for a PR ID" do
+              cli.should_receive(:prompt)
+                .with("Pull Request ID: ")
+                .and_return("42")
+            end
           end
         end
 

data/spec/octopolo/scripts/stage_up_spec.rb

@@ -20,28 +20,45 @@ module Octopolo
         context "with no PR passed in from the command args" do
           subject { StageUp.new }
 
-          context "with a PR passed in through the cli" do
+          context "with an existing PR for the current branch" do
             before do
-              cli.should_receive(:prompt)
-                 .with("Pull Request ID: ")
-                 .and_return("42")
+              GitHub::PullRequest.should_receive(:current) { GitHub::PullRequest.new("account/repo", 7) }
             end
 
-            it "delegates the work to PullRequestMerger" do
-              PullRequestMerger.should_receive(:perform).with(Git::STAGING_PREFIX, 42)
+            it "takes the pull requests ID from the current branch" do
+              PullRequestMerger.should_receive(:perform).with(Git::STAGING_PREFIX, 7)
               subject.execute
             end
           end
 
-          context "with no PR passed in from the cli" do
+          context "without an existing PR for the current branch" do
             before do
-              cli.should_receive(:prompt)
-                 .with("Pull Request ID: ")
-                 .and_return("foo")
+              GitHub::PullRequest.should_receive(:current) { nil }
             end
 
-            it "delegates the work to PullRequestMerger" do
-              expect{ subject.execute }.to raise_error(ArgumentError)
+            context "with a PR passed in through the cli" do
+              before do
+                cli.should_receive(:prompt)
+                   .with("Pull Request ID: ")
+                   .and_return("42")
+              end
+
+              it "delegates the work to PullRequestMerger" do
+                PullRequestMerger.should_receive(:perform).with(Git::STAGING_PREFIX, 42)
+                subject.execute
+              end
+            end
+
+            context "with no PR passed in from the cli" do
+              before do
+                cli.should_receive(:prompt)
+                   .with("Pull Request ID: ")
+                   .and_return("foo")
+              end
+
+              it "delegates the work to PullRequestMerger" do
+                expect{ subject.execute }.to raise_error(ArgumentError)
+              end
             end
           end
         end

metadata

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