steppy 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2969c8372d3a0376c291cc217e47c45c9cea6fabafd28ccc13556546aaab279
-  data.tar.gz: 8c9338e9ebce22988467f05e4a2f28b14452fc68adecca428890411f3f3cd48b
+  metadata.gz: 8a3e69bd0bf6da2bc6ad68601777f7aaf6c350afabf6f899db8dcb244ea9ebcf
+  data.tar.gz: c2e3b695f6f791c3c90c523c357915071fe0a5cff19151d10ca4bed3b795e3b0
 SHA512:
-  metadata.gz: 80899b0790ae1222e0cad723139f8ea684bc19eee4968d82e1a1a72c9a80a0d81aef9473722e2cc07932bec1da9bf4c4514e35dbbacfaeecd760efee88377960
-  data.tar.gz: 2596206005472684f1797fab86859a00267f97b097064a25396683c48801ed2053c40ebdc8ef0368ab3c64d05c77b9529a90c986bd559f5ac6daf17bfdd8a678
+  metadata.gz: c694feb7e483edbee03a84d936f5d64295911c318232ec31ea6f7ba9b58068d199cec2df97e1f9f14284387dd01c0e0c56b20f18e7c61d63ddfcac668110dbb0
+  data.tar.gz: 4865f642107ed0cfd33d1c5ac2200cdeef40adc71407e73f9cd349f33994c556fcc65f44556faa66b7000a7c3a199496bfed05297087b05bb305fa97692854e3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    steppy (0.5.4)
+    steppy (0.6.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/steppy.rb

@@ -16,7 +16,12 @@ module Steppy
     if !defined? step
       def step(method, **args, &block)
         args[:prefix] ||= :step
-        steppy_add step_method: method, step_args: args, step_block: block
+
+        steppy_add(
+          step_method: method,
+          step_args: args,
+          step_block: block,
+        )
       end
     end
 
@@ -26,6 +31,15 @@ module Steppy
       end
     end
 
+    if !defined? step_unless
+      def step_unless(condition, &block)
+        steppy_add(
+          step_if: -> { !steppy_run_block(condition) },
+          step_block: block,
+        )
+      end
+    end
+
     if !defined? step_set
       def step_set(*sets)
         steppy_cache[:sets] = *sets
@@ -91,16 +105,24 @@ module Steppy
       end
     end
 
-    def steppy_run_steps(steps)
-      if !steps
-        return
-      end
+    def steppy_run_step(step)
+      step_method = step[:step_method]
 
-      steps.each do |step|
-        @steppy[:result] = step.key?(:step_if) ? steppy_if_block(step) : steppy_step(step)
+      if step.key?(:step_if)
+        steppy_if_block(step)
+      elsif step_method.is_a? Proc
+        steppy_run_block(step_method)
+      else
+        steppy_step(step)
       end
     end
 
+    def steppy_run_steps(steps)
+      return if !steps
+
+      steps.each { |step| @steppy[:result] = steppy_run_step(step) }
+    end
+
     def steppy_step(step_method:, step_args:, step_block:)
       if steppy_if(step_args[:if]) || @steppy_prefix != step_args[:prefix]
         return
@@ -109,15 +131,15 @@ module Steppy
       method_name = "#{@steppy_prefix}_#{step_method}"
 
       result = if step_block
-                 steppy_run_block(step_block, steppy_attributes)
+                 steppy_run_block(step_block)
                else
-                 steppy_run_method(method_name, steppy_attributes)
+                 steppy_run_method(method_name)
                end
 
       steppy_set(step_args[:set], result)
     end
 
-    def steppy_run_method(method_name, steppy_attributes)
+    def steppy_run_method(method_name)
       if method(method_name).arity > 0
         public_send(method_name, steppy_attributes)
       else
@@ -125,10 +147,11 @@ module Steppy
       end
     end
 
-    def steppy_run_block(step_block, steppy_attributes)
+    def steppy_run_block(step_block)
       if step_block.arity > 0
         instance_exec(steppy_attributes, &step_block)
-      else instance_exec(&step_block)
+      else
+        instance_exec(&step_block)
       end
     end
 

data/lib/steppy/error.rb

@@ -9,8 +9,6 @@ class SteppyError < StandardError
     if step
       @step = step
       message = step.to_json
-    else
-      message = 'Steppy Failed!'
     end
 
     super(message)

data/lib/steppy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Steppy
-  VERSION = '0.5.4'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steppy
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler