octopolo 0.3.5 → 0.3.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mzk1M2QwM2YzMDU2YjYzMDc4YjlhMTQyZTVlMWM4NTA5ZDcxZjZhMQ==
+    YjBkOWNlNGY5ZGYyYThmNjE4NjA5YzAyNDhmOGViOTVhMmI0ZTJkNw==
   data.tar.gz: !binary |-
-    NmQ5ZjZlNjNlM2QzZDIxOWI3ZTE0N2U2MzBjZTk5NWI0ZDQ2ZDM2NQ==
+    ZGUzMGFmZmM2ZGQxNDk5YjhhNjFlMWY3M2IxOWM3YmRiMWZjMTA2MA==
 SHA512:
   metadata.gz: !binary |-
-    ZGZhM2UyYTdhYzQ4MzNlYTE3MGFhMWFmZDRkNjg3ZTZiZjY3OTA3M2U1ODQy
-    ZTRlMWFiOWVkZGNmMWFlZGIwZWNkZGQ0MjBhNDBiZDhjNTA4Nzg0YWQ2Mjlh
-    YWI5ZjBiZDRhMTdkOWI5ZGM3NjBkNmI5YThiODkyNTQ2NTUwZWQ=
+    NDcwNjNkYTQ3OWI2OTRjNTE3YWRkMWEyOTRlMTJiZDg0OGRiYWJkMGFhZGZh
+    NGMxOTM0MjU5ZTAxZGE1NzllNmIyODQ2ODdlYmUwODQzNTU0OTYzZDQwY2Nm
+    YzQyYWJlNDg5OWM3OTllNjNkZTUwYzUzNjdlYWRiMzdkNjk5YmY=
   data.tar.gz: !binary |-
-    MGRjZjkxZWJhNzQ1MzlmZjQ0MTQ4MWYxOGQzMjI2Mzk3ZWMyMmFhNGViMDI3
-    M2FlOTk2YTEzYTE2NGE0YzAxNDI0ODVkY2U3MDVkNDM0NWIzZmJiOWM1ZDUz
-    NzYyZDU5ZWRjMjFhM2NlN2JhNjkxNGVmZjJmYzA5OWM2NzhkOGE=
+    OThiMTI3NjcyZmVjMDI5OWJlMTZlZTVkMTA1Njk1ODZiZmU4NTk0Zjc5YWRh
+    OGU2NmM4MmEzOGMzYzQ5Y2RhYThlN2U5Y2Q5Mjk1OGM3MTJmMjFjNzhiZGI3
+    OTAzYmE5YjVkMWY2MjJlZmU0MTU3MzE5MWE4MzY3MGEyYmU5Zjg=

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+#### v0.3.6
+* Some git commands are expected to return non-zero
+
+  > Brian Bergstrom: : https://github.com/sportngin/octopolo/pull/51
+
 #### v0.3.5
 * Dated branch delete flag patch
 

data/lib/octopolo/cli.rb

@@ -8,6 +8,7 @@ module Octopolo
     #
     # command - A String containing the command to perform.
     # say_command - A Boolean determining whether to display the performed command to the screen. (default: true)
+    # ignore_non_zero - Ignore exception for non-zero exit status of command.
     #
     # Examples
     #
@@ -20,13 +21,13 @@ module Octopolo
     #   # => "Already up-to-date."
     #
     # Returns the output of the command as a String.
-    def self.perform(command, say_command = true)
+    def self.perform(command, say_command = true, ignore_non_zero=false)
       # display the command
       say command if say_command
       # and then perform it
       if Open3.respond_to?(:capture3)
         output, error, status = Open3.capture3(command)
-        raise "command=#{command}; exit_status=#{status.exitstatus}; stderr=#{error}" unless status.success?
+        raise "command=#{command}; exit_status=#{status.exitstatus}; stderr=#{error}" unless status.success? || ignore_non_zero
       else
         # Only necessary as long as we use 1.8.7, which doesn't have Open3.capture3
         output = `#{command}`

data/lib/octopolo/git.rb

@@ -22,13 +22,16 @@ module Octopolo
     # Public: Perform the given Git subcommand
     #
     # subcommand - String containing the subcommand and its parameters
+    # options - Hash
+    #   ignore_non_zero - Ignore exception for non-zero exit status of command.
     #
     # Example:
     #
     #   > Git.perform "status"
     #   # => output of `git status`
-    def self.perform(subcommand)
-      cli.perform "git #{subcommand}"
+    def self.perform(subcommand, options={})
+      options[:ignore_non_zero] ||= false
+      cli.perform("git #{subcommand}", true, options[:ignore_non_zero])
     end
 
     # Public: Perform the given Git subcommand without displaying the output
@@ -125,7 +128,7 @@ module Octopolo
     def self.merge(branch_name)
       Git.if_clean do
         Git.fetch
-        perform "merge --no-ff origin/#{branch_name}"
+        perform "merge --no-ff origin/#{branch_name}", :ignore_non_zero => true
         raise MergeFailed unless Git.clean?
         Git.push
       end
@@ -233,7 +236,7 @@ module Octopolo
     # branch_name - The name of the branch to delete
     def self.delete_branch(branch_name)
       perform "push origin :#{branch_name}"
-      perform "branch -D #{branch_name}"
+      perform "branch -D #{branch_name}", :ignore_non_zero => true
     end
 
     # Public: Branches which have been merged into the given branch

data/lib/octopolo/version.rb

@@ -1,3 +1,3 @@
 module Octopolo
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/spec/octopolo/cli_spec.rb

@@ -41,6 +41,13 @@ module Octopolo
             .to raise_error(RuntimeError, "command=#{command}; exit_status=1; stderr=kaboom")
       end
 
+      it "should ignore non zero return from command" do
+        subject.should_receive(:say).with(command)
+        Open3.should_receive(:capture3).with(command).and_return([result, "kaboom", status_error])
+        subject.should_receive(:say).with(result)
+        expect { subject.perform(command, true, true) }.to_not raise_error
+      end
+
       it "should not speak the command if told not to" do
         subject.should_receive(:say).with(command).never
         subject.perform(command, false)

data/spec/octopolo/git_spec.rb

@@ -11,7 +11,7 @@ module Octopolo
       before { Git.cli = cli }
 
       it "performs the given subcommand" do
-        cli.should_receive(:perform).with("git #{command}")
+        cli.should_receive(:perform).with("git #{command}", true, false)
         Git.perform command
       end
     end
@@ -176,7 +176,7 @@ module Octopolo
       it "fetches the latest code and merges the given branch name" do
         Git.should_receive(:if_clean).and_yield
         Git.should_receive(:fetch)
-        Git.should_receive(:perform).with("merge --no-ff origin/#{branch_name}")
+        Git.should_receive(:perform).with("merge --no-ff origin/#{branch_name}", :ignore_non_zero => true)
         Git.should_receive(:clean?) { true }
         Git.should_receive(:push)
 
@@ -186,7 +186,7 @@ module Octopolo
       it "does not push and raises MergeFailed if the merge failed" do
         Git.should_receive(:if_clean).and_yield
         Git.should_receive(:fetch)
-        Git.should_receive(:perform).with("merge --no-ff origin/#{branch_name}")
+        Git.should_receive(:perform).with("merge --no-ff origin/#{branch_name}", :ignore_non_zero => true)
         Git.should_receive(:clean?) { false }
         Git.should_not_receive(:push)
 
@@ -434,7 +434,7 @@ module Octopolo
 
       it "leverages git-extra's delete-branch command" do
         Git.should_receive(:perform).with("push origin :#{branch_name}")
-        Git.should_receive(:perform).with("branch -D #{branch_name}")
+        Git.should_receive(:perform).with("branch -D #{branch_name}", :ignore_non_zero => true)
         Git.delete_branch branch_name
       end
     end

metadata

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