git_reflow 0.8.6 → 0.8.7

data/lib/git_reflow/rspec/command_line_helpers.rb

@@ -34,7 +34,7 @@ module GitReflow
 
       def stub_run_for(module_to_stub)
         allow(module_to_stub).to receive(:run) do |command, options|
-          options ||= {}
+          options = { loud: true, blocking: true }.merge(options || {})
           $commands_ran << Hashie::Mash.new(command: command, options: options)
           ret_value = $stubbed_commands[command] || ""
           command = "" # we need this due to a bug in rspec that will keep this assignment on subsequent runs of the stub
@@ -69,32 +69,36 @@ module GitReflow
   end
 end
 
-RSpec::Matchers.define :have_run_command do |command|
+RSpec::Matchers.define :have_run_command do |command, options|
+  options = { blocking: true, loud: true }.merge(options || {})
+
   match do |block|
     block.call
     (
-      $commands_ran.include? Hashie::Mash.new(command: command, options: {}) or
-      $commands_ran.include? Hashie::Mash.new(command: command, options: {with_system: true})
+      $commands_ran.include? Hashie::Mash.new(command: command, options: options) or
+      $commands_ran.include? Hashie::Mash.new(command: command, options: options.merge({with_system: true}))
     )
   end
 
   supports_block_expectations
 
   failure_message do |block|
-    "expected to have run the command \`#{command}\` but instead ran:\n\t#{$commands_ran.inspect}"
+    "expected to have run the command \`#{command}\` with options \`#{options}\` but instead ran:\n\t#{$commands_ran.inspect}"
   end
 end
 
-RSpec::Matchers.define :have_run_command_silently do |command|
+RSpec::Matchers.define :have_run_command_silently do |command, options|
+  options = { blocking: true, loud: false }.merge(options || {})
+
   match do |block|
     block.call
-    $commands_ran.include? Hashie::Mash.new(command: command, options: { loud: false })
+    $commands_ran.include? Hashie::Mash.new(command: command, options: options)
   end
 
   supports_block_expectations
 
   failure_message do |block|
-    "expected to have run the command \`#{command}\` silently but instead ran:\n\t#{$commands_ran.inspect}"
+    "expected to have run the command \`#{command}\` silently with options \`#{options}\` but instead ran:\n\t#{$commands_ran.inspect}"
   end
 end
 

data/lib/git_reflow/rspec/stub_helpers.rb

@@ -1,13 +1,13 @@
-module GitReflow
-  module RSpec
-    module StubHelpers
-
-      def stub_with_fallback(obj, method)
-        original_method = obj.method(method)
-        allow(obj).to receive(method).with(anything()) { |*args| original_method.call(*args) }
-        return allow(obj).to receive(method)
-      end
-
-    end
-  end
-end
+module GitReflow
+  module RSpec
+    module StubHelpers
+
+      def stub_with_fallback(obj, method)
+        original_method = obj.method(method)
+        allow(obj).to receive(method).with(anything()) { |*args| original_method.call(*args) }
+        return allow(obj).to receive(method)
+      end
+
+    end
+  end
+end

data/lib/git_reflow/rspec.rb

@@ -1,2 +1,2 @@
-require_relative 'rspec/command_line_helpers'
-require_relative 'rspec/stub_helpers'
+require_relative 'rspec/command_line_helpers'
+require_relative 'rspec/stub_helpers'

data/lib/git_reflow/sandbox.rb

@@ -12,16 +12,21 @@ module GitReflow
     }
 
     def run(command, options = {})
-      options = { loud: true }.merge(options)
+      options = { loud: true, blocking: true }.merge(options)
+
+      GitReflow.logger.debug "Running... #{command}"
 
       if options[:with_system] == true
         system(command)
-      elsif options[:loud] == true
-        output = %x{#{command}}
-        puts output
-        output
       else
-        %x{#{command}}
+        output = %x{#{command}}
+
+        if options[:blocking] == true && !$?.success?
+          abort "\`#{command}\` failed to run."
+        else
+          puts output if options[:loud] == true
+          output
+        end
       end
     end
 

data/lib/git_reflow/version.rb

@@ -1,3 +1,3 @@
 module GitReflow
-  VERSION = "0.8.6"
+  VERSION = "0.8.7"
 end

data/lib/git_reflow/workflow.rb

@@ -1,59 +1,59 @@
-require 'git_reflow/sandbox'
-require 'git_reflow/git_helpers'
-
-module GitReflow
-  module Workflow
-    def self.included base
-      base.extend ClassMethods
-    end
-
-    # @nodoc
-    def self.current
-      workflow_file = GitReflow::Config.get('reflow.workflow')
-      if workflow_file.length > 0 and File.exists?(workflow_file)
-        eval(File.read(workflow_file))
-      else
-        GitReflow::Workflows::Core
-      end
-    end
-
-    module ClassMethods
-      include GitReflow::Sandbox
-      include GitReflow::GitHelpers
-
-      # Creates a singleton method on the inlcuded class
-      #
-      # This method will take any number of keyword parameters. If @defaults keyword is provided, and the given
-      # key(s) in the defaults are not provided as keyword parameters, then it will use the value given in the
-      # defaults for that parameter.
-      #
-      # @param name [Symbol] the name of the method to create
-      # @param defaults [Hash] keyword arguments to provide fallbacks for
-      #
-      # @yield [a:, b:, c:, ...] Invokes the block with an arbitrary number of keyword arguments
-      def command(name, **params, &block)
-        defaults = params[:defaults] || {}
-        self.define_singleton_method(name) do |**args|
-          args_with_defaults = {}
-          args.each do |name, value|
-            if "#{value}".length <= 0
-              args_with_defaults[name] = defaults[name]
-            else
-              args_with_defaults[name] = value
-            end
-          end
-
-          defaults.each do |name, value|
-            if "#{args_with_defaults[name]}".length <= 0
-              args_with_defaults[name] = value
-            end
-          end
-
-          block.call(**args_with_defaults)
-        end
-      end
-    end
-  end
-end
-
-extend GitReflow::Workflow
+require 'git_reflow/sandbox'
+require 'git_reflow/git_helpers'
+
+module GitReflow
+  module Workflow
+    def self.included base
+      base.extend ClassMethods
+    end
+
+    # @nodoc
+    def self.current
+      workflow_file = GitReflow::Config.get('reflow.workflow')
+      if workflow_file.length > 0 and File.exists?(workflow_file)
+        eval(File.read(workflow_file))
+      else
+        GitReflow::Workflows::Core
+      end
+    end
+
+    module ClassMethods
+      include GitReflow::Sandbox
+      include GitReflow::GitHelpers
+
+      # Creates a singleton method on the inlcuded class
+      #
+      # This method will take any number of keyword parameters. If @defaults keyword is provided, and the given
+      # key(s) in the defaults are not provided as keyword parameters, then it will use the value given in the
+      # defaults for that parameter.
+      #
+      # @param name [Symbol] the name of the method to create
+      # @param defaults [Hash] keyword arguments to provide fallbacks for
+      #
+      # @yield [a:, b:, c:, ...] Invokes the block with an arbitrary number of keyword arguments
+      def command(name, **params, &block)
+        defaults = params[:defaults] || {}
+        self.define_singleton_method(name) do |**args|
+          args_with_defaults = {}
+          args.each do |name, value|
+            if "#{value}".length <= 0
+              args_with_defaults[name] = defaults[name]
+            else
+              args_with_defaults[name] = value
+            end
+          end
+
+          defaults.each do |name, value|
+            if "#{args_with_defaults[name]}".length <= 0
+              args_with_defaults[name] = value
+            end
+          end
+
+          block.call(**args_with_defaults)
+        end
+      end
+    end
+  end
+end
+
+extend GitReflow::Workflow