octopolo 0.3.3 → 0.3.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDVhMDU0NWZiZDc1NmNkYTNjOWM3Y2I2MTM3ZmEzMjQwOGQ4YTUwZQ==
+    MDdlNGEyM2U2YzFhNWM3YzM3NDExN2M4MTQxNTJjNTVlODRmNjQ1OA==
   data.tar.gz: !binary |-
-    YmEzOGViMTQ2ZDA0YjljZTFjZDM0YzEwOTNhM2UwYjBiMDdhYWE2Zg==
+    ZDEzZmY5ZWQ5MmYwZTQ2ZDE2MzU3M2ZlYzdjODE3YTc3MTY4YTA1ZA==
 SHA512:
   metadata.gz: !binary |-
-    Nzc2OTI0NWEwYTIzYTBiOTRjZDk1MjI2MWUxNjY4OGJiNDI5NTg1MzFiMTI0
-    MjJiNDI1YWIxNDRkNDJmNjgwMzI2ZTczNWZiNDczYjZlM2JhNjE3YTZjZmZm
-    OTJjYzg2N2JkMzRmNWFmZDcwZTA2ZTRjOGJlMzQ5Y2MyOTVjZmY=
+    OTZiMjlkZGYyZjRlZWQ3YzVmZDcyNTZkMDhkM2YyZjRlMWFhZDEyNjY2MzUw
+    ZjhlMTliZGNkODJjZDkxMGVjZTlkNWMyZGRmMjEwYTg0YThmMDY4MTFiMzg2
+    MmVmMGVkNjc0NDRlNzM4NzAyYjNmYmEyN2MyMmNhZjFlMGQxMWI=
   data.tar.gz: !binary |-
-    OTcxMWIwNDFkOWMwZDBkNTk4YjVlOWY2MmE1MmVjNTNmOWRmMWUwYzEyYjI3
-    ODYxYmMyYjM5ZDdmMjkzOGZmOWJhNTYxZmZmMDVmNGIzNjYyODAyZDg2ODUy
-    OTdmMzMyOGQ5NzdjNTM4YWFhMWU5NGVlNzY5YjUxZjgyODc0YTc=
+    NTExNGU4YTI5Mjc2NzRmOWM1OTc5NmZiMjVhNWIzNWQzN2RmYjgzMjRlNzQw
+    OThmNjhhODdkNjk2YTFkZTZhY2FiNzI4YjI4NDkxYmE5NzZhMmJlZDU2MDM1
+    M2QwOWQxOTJkMTMyYjUzZWRhMjYzNmQ0ZjExZmQ2MjA5Y2VlN2U=

data/CHANGELOG.markdown

@@ -1,4 +1,17 @@
+#### v0.3.4
+* Adding delete flag to dated branch creation commands for non-interactive support
+
+  > Brian Bergstrom: Andy Fleener: https://github.com/sportngin/octopolo/pull/49
+
+* Command Errors Should Not Be Rescued
+
+  > Brian Bergstrom: Andy Fleener: https://github.com/sportngin/octopolo/pull/47
+
 #### v0.3.3
+* Errors from CLI commands should throw and exception
+
+  > Brian Bergstrom: Andy Fleener: https://github.com/sportngin/octopolo/pull/46
+  
 #### v0.3.2
 * Add new autocomplete_commands toggle; fixes #34
 

data/lib/octopolo/cli.rb

@@ -26,7 +26,7 @@ module Octopolo
       # and then perform it
       if Open3.respond_to?(:capture3)
         output, error, status = Open3.capture3(command)
-        raise "exit_status=#{status.exitstatus}; stderr=#{error}" unless status.success?
+        raise "command=#{command}; exit_status=#{status.exitstatus}; stderr=#{error}" unless status.success?
       else
         # Only necessary as long as we use 1.8.7, which doesn't have Open3.capture3
         output = `#{command}`
@@ -36,8 +36,6 @@ module Octopolo
       say output if say_command
       # return the output of the command
       output
-    rescue => e
-      say "Unable to perform '#{command}': #{e.message}"
     end
 
     # Public: Perform the command, but do not print out the command

data/lib/octopolo/commands/new_deployable.rb

@@ -3,6 +3,11 @@ long_desc "Create a new deployable branch with today's date and remove the other
 
 Useful when we have changes in the current deployable branch that we wish to remove."
 command 'new-deployable' do |c|
-  require_relative '../scripts/new_deployable'
-  c.action { Octopolo::Scripts::NewDeployable.new.execute }
+  c.switch :delete_old_branches, :default_value => false, :desc => "Should old deployable branches be deleted?", :negatable => false
+
+  c.action do |global_options, options, args|
+    require_relative '../scripts/new_deployable'
+    options = global_options.merge(options)
+    Octopolo::Scripts::NewDeployable.new.execute(options)
+  end
 end

data/lib/octopolo/commands/new_staging.rb

@@ -3,6 +3,11 @@ long_desc "Create a new staging branch with today's date and remove the others.
 
 Useful when we have changes in the current staging branch that we wish to remove."
 command 'new-staging' do |c|
-  require_relative '../scripts/new_staging'
-  c.action { Octopolo::Scripts::NewStaging.new.execute }
+  c.switch :delete_old_branches, :default_value => false, :desc => "Should old staging branches be deleted?", :negatable => false
+
+  c.action do |global_options, options, args|
+    require_relative '../scripts/new_staging'
+    options = global_options.merge(options)
+    Octopolo::Scripts::NewStaging.new.execute(options)
+  end
 end

data/lib/octopolo/dated_branch_creator.rb

@@ -9,20 +9,24 @@ module Octopolo
     include GitWrapper
 
     attr_accessor :branch_type
+    attr_accessor :should_delete_old_branches
 
     # Public: Initialize a new instance of DatedBranchCreator
     #
     # branch_type - Name of the type of branch (e.g., staging or deployable)
-    def initialize(branch_type)
+    # should_delete_old_branches - Flag to delete old branches of the given type.
+    def initialize(branch_type, should_delete_old_branches=false)
       self.branch_type = branch_type
+      self.should_delete_old_branches = should_delete_old_branches
     end
 
     # Public: Create a new branch of the given type for today's date
     #
     # branch_type - Name of the type of branch (e.g., staging or deployable)
+    # should_delete_old_branches - Flag to delete old branches of the given type.
     #
     # Returns a DatedBranchCreator
-    def self.perform(branch_type)
+    def self.perform(branch_type, should_delete_old_branches=false)
       new(branch_type).tap do |creator|
         creator.perform
       end
@@ -56,7 +60,10 @@ module Octopolo
 
     # Public: If necessary, and if user opts to, delete old branches of its type
     def delete_old_branches
-      if extra_branches.any? && cli.ask_boolean("Do you want to delete the old #{branch_type} branch(es)? (#{extra_branches.join(", ")})")
+      return unless extra_branches.any?
+      should_delete = should_delete_old_branches || cli.ask_boolean("Do you want to delete the old #{branch_type} branch(es)? (#{extra_branches.join(", ")})")
+
+      if should_delete
         extra_branches.each do |extra|
           Git.delete_branch(extra)
         end

data/lib/octopolo/git.rb

@@ -67,10 +67,11 @@ module Octopolo
     # Public: Check out the given branch name
     #
     # branch_name - The name of the branch to check out
-    def self.check_out branch_name
+    # do_after_pull - Should a pull be done after checkout?
+    def self.check_out(branch_name, do_after_pull=true)
       fetch
       perform "checkout #{branch_name}"
-      pull
+      pull if do_after_pull
       unless current_branch == branch_name
         raise CheckoutFailed, "Failed to check out '#{branch_name}'"
       end
@@ -87,7 +88,7 @@ module Octopolo
     def self.new_branch(new_branch_name, source_branch_name)
       fetch
       perform("branch --no-track #{new_branch_name} origin/#{source_branch_name}")
-      check_out new_branch_name
+      check_out(new_branch_name, false)
       perform("push --set-upstream origin #{new_branch_name}")
     end
 

data/lib/octopolo/scripts/new_deployable.rb

@@ -5,8 +5,8 @@ module Octopolo
   module Scripts
     class NewDeployable
 
-      def execute
-        DatedBranchCreator.perform Git::DEPLOYABLE_PREFIX
+      def execute(options={:delete_old_branches => false})
+        DatedBranchCreator.perform(Git::DEPLOYABLE_PREFIX, options[:delete_old_branches])
       end
     end
   end

data/lib/octopolo/scripts/new_staging.rb

@@ -6,8 +6,8 @@ module Octopolo
     class NewStaging
       include CLIWrapper
 
-      def execute
-        DatedBranchCreator.perform Git::STAGING_PREFIX
+      def execute(options={:delete_old_branches => false})
+        DatedBranchCreator.perform(Git::STAGING_PREFIX, options[:delete_old_branches])
       end
     end
   end

data/lib/octopolo/version.rb

@@ -1,3 +1,3 @@
 module Octopolo
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/octopolo/cli_spec.rb

@@ -28,18 +28,17 @@ module Octopolo
         subject.perform(command).should == result
       end
 
-      it "should handle exception gracefully" do
+      it "should raise exception" do
         subject.should_receive(:say).with(command)
         Open3.should_receive(:capture3).with(command).and_raise(exception_message)
-        subject.should_receive(:say).with("Unable to perform '#{command}': #{exception_message}")
-        subject.perform(command).should be_nil
+        expect { subject.perform(command) }.to raise_error(RuntimeError, exception_message)
       end
 
-      it "should handle errors gracefully" do
+      it "should raise errors 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("Unable to perform '#{command}': exit_status=1; stderr=kaboom")
-        subject.perform(command).should be_nil
+        expect { subject.perform(command) }
+            .to raise_error(RuntimeError, "command=#{command}; exit_status=1; stderr=kaboom")
       end
 
       it "should not speak the command if told not to" do

data/spec/octopolo/dated_branch_creator_spec.rb

@@ -112,6 +112,21 @@ module Octopolo
           cli.should_not_receive(:perform)
           subject.delete_old_branches
         end
+
+        context "delete flag" do
+          before do
+            subject.stub(extra_branches: extras)
+            subject.should_delete_old_branches = true
+          end
+
+          it "deletes these branches non-interactively" do
+            cli.should_not_receive(:ask_boolean).with(message)
+            extras.each do |extra|
+              Git.should_receive(:delete_branch).with(extra)
+            end
+            subject.delete_old_branches
+          end
+        end
       end
     end
 

data/spec/octopolo/git_spec.rb

@@ -79,6 +79,14 @@ module Octopolo
         Git.check_out name
       end
 
+      it "checks out the given branch name without after pull" do
+        Git.should_receive(:fetch)
+        Git.should_receive(:perform).with("checkout #{name}")
+        Git.should_not_receive(:pull)
+        Git.should_receive(:current_branch) { name }
+        Git.check_out(name, false)
+      end
+
       it "raises an exception if the current branch is not the requested branch afterward" do
         Git.should_receive(:fetch)
         Git.should_receive(:perform)
@@ -345,7 +353,7 @@ module Octopolo
       it "creates and pushes a new branch from the source branch" do
         Git.should_receive(:fetch)
         Git.should_receive(:perform).with("branch --no-track #{new_branch_name} origin/#{source_branch_name}")
-        Git.should_receive(:check_out).with(new_branch_name)
+        Git.should_receive(:check_out).with(new_branch_name, false)
         Git.should_receive(:perform).with("push --set-upstream origin #{new_branch_name}")
 
         Git.new_branch(new_branch_name, source_branch_name)

data/spec/octopolo/scripts/new_deployable_spec.rb

@@ -7,10 +7,14 @@ module Octopolo
       subject { NewDeployable.new }
 
       context "#execute" do
-        it "delegates the work to DatedBranchCreator" do
-          DatedBranchCreator.should_receive(:perform).with(Git::DEPLOYABLE_PREFIX)
+        it "delegates the work to DatedBranchCreator with default delete flag" do
+          DatedBranchCreator.should_receive(:perform).with(Git::DEPLOYABLE_PREFIX, false)
           subject.execute
         end
+        it "delegates the work to DatedBranchCreator with delete flag" do
+          DatedBranchCreator.should_receive(:perform).with(Git::DEPLOYABLE_PREFIX, true)
+          subject.execute(:delete_old_branches => true)
+        end
       end
     end
   end

data/spec/octopolo/scripts/new_staging_spec.rb

@@ -7,10 +7,14 @@ module Octopolo
       subject { NewStaging.new }
 
       context "#execute" do
-        it "delegates to DatedBranchCreator to create the branch" do
-          DatedBranchCreator.should_receive(:perform).with(Git::STAGING_PREFIX)
+        it "delegates to DatedBranchCreator to create the branch with default delete flag" do
+          DatedBranchCreator.should_receive(:perform).with(Git::STAGING_PREFIX, false)
           subject.execute
         end
+        it "delegates to DatedBranchCreator to create the branch with delete flag" do
+          DatedBranchCreator.should_receive(:perform).with(Git::STAGING_PREFIX, true)
+          subject.execute(:delete_old_branches => true)
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopolo
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Patrick Byrne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake