carry_out 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16830ee088c7b7c1b7dc3fb7de84d5df9f521dea
-  data.tar.gz: 44e1f37324820a73e7e4a68e9c0da07cc89723ed
+  metadata.gz: 93f80c00a226b8751663d149943b30aeb5c2dd35
+  data.tar.gz: 4561dba1b6110b7dbc1a4712ba4fde4204910608
 SHA512:
-  metadata.gz: 80581596bd631638de21ab30b4401464237303e4932f37d9f33546318bc31c38603c095da3e1fe78da855d4449042f9708ee139b175d088f175370aed26481ac
-  data.tar.gz: bd634f1d8d8a24cbf91a54c4014e26a477865adb38c80f0bf3b1df5c81ec9dfd5732fc689c895a46592b1eed2577dba9147b73c67e6131d5cf6c473460aa40a2
+  metadata.gz: 3f5521e863a205ae3345357df363613e5ef14c29974a31e08f67367aab963c0c7303caa2a43fa78db1dab3d8b8890fe18825dbf4273e1a7f7f27b538ca4f84bc
+  data.tar.gz: a390316064acff75e07c46dbb9124278bdcc27baa9584a1f75de23cf4be38a894dd27adb7a27759c6edbafe9c3353222d5c0d85832199f16b88426104dbc46ea

data/lib/carry_out.rb

@@ -18,6 +18,14 @@ module CarryOut
     def plan(options = {}, &block)
       CarryOut.plan(Hash.new.merge(@options).merge(options), &block) 
     end
+
+    def call_unit(*args, &block)
+      CarryOut.call_unit(*args)
+    end
+  end
+
+  def self.call_unit(*args, &block)
+    PlanRunner.call_unit(*args, &block)
   end
 
   def self.configure(&block)
@@ -29,7 +37,7 @@ module CarryOut
     plan = PlanBuilder.build(merged_options, &block)
 
     Proc.new do |context = nil, &block| 
-      PlanRunner.run(plan, context).tap do |result|
+      PlanRunner.call(plan, context).tap do |result|
         block.call(result) unless block.nil?
       end
     end

data/lib/carry_out/plan_runner.rb

@@ -1,10 +1,6 @@
 module CarryOut
   class PlanRunner
-    def self.run(plan, context = {})
-      PlanRunner.new.run(plan, context)
-    end
-
-    def run(plan, context = {})
+    def self.call(plan, context = {})
       Result.new(context).tap do |plan_result|
         node = plan
 
@@ -27,5 +23,12 @@ module CarryOut
         end
       end
     end
+
+    def self.call_unit(unit, context = {}, &block)
+      node = Plan::Node.new(unit)
+      Plan::NodeContext.new(node).instance_eval(&block) unless block.nil?
+
+      call(node, context)
+    end
   end
 end

data/lib/carry_out/result.rb

@@ -9,11 +9,16 @@ module CarryOut
 
     def add(group, object)
       if object.kind_of?(CarryOut::Error)
-        errors << ResultError.new(
-          group: group,
+        object = ResultError.new(
           message: object.message,
           details: object.details
         )
+      end
+
+      if object.kind_of?(CarryOut::ResultError)
+        group = group || :_unlabeled
+        errors[group] ||= []
+        errors[group] << object
       elsif object.kind_of?(Enumerable) && object.all? { |o| o.kind_of?(CarryOut::Error) }
         object.each { |o| add(group, o) }
       else
@@ -22,10 +27,12 @@ module CarryOut
             artifacts[group] ||= {}
             object.each { |k,v| artifacts[group][k] = v }
           elsif object.kind_of?(Result)
-            add(group, object.to_hash)
-            
-            object.errors.each do |error|
-              add([group, error.group].flatten(1), e)
+            add(group, object.artifacts)
+
+            object.errors.each do |g, errors|
+              error_group = [ group, g ]
+
+              errors.each { |e| add(error_group, e) }
             end
           else
             artifacts[group] = object
@@ -39,25 +46,11 @@ module CarryOut
     end
 
     def errors
-      @errors ||= []
-    end
-
-    def errors_hash
-      Hash.new.tap do |h|
-        errors.each do |e|
-          if e.details.kind_of?(Hash)
-            h.merge!(e.details)
-          end
-        end
-      end
+      @errors ||= {}
     end
 
     def success?
       @errors.nil? || @errors.empty?
     end
-
-    def to_hash
-      artifacts
-    end
   end
 end

data/lib/carry_out/result_error.rb

@@ -1,12 +1,10 @@
 module CarryOut
   class ResultError
     attr_reader :details
-    attr_reader :group
     attr_reader :message
 
     def initialize(options = {})
       @details = options[:details]
-      @group = options[:group]
       @message = options[:message]
     end
   end

data/lib/carry_out/version.rb

@@ -1,3 +1,3 @@
 module CarryOut
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carry_out
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ryan Fields
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler