carry_out 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85928342e0fda93fadd48a0609af90372244b406
-  data.tar.gz: 50a55f7b851ae3363d1f8ff3a9bccae4720c0963
+  metadata.gz: 61806a31006a015a414678cc29c2dfec3102e821
+  data.tar.gz: c9119841ad6a1dc4556b8093cc2241b9c8d928fe
 SHA512:
-  metadata.gz: bb251b2ce082f94ede7d254a57a6973a1f609c775951e1390dc8105fa14d007bb17a54c7849f51f8f540e9cf293e556137a167d6c9f0dc656f20f9d545d6c122
-  data.tar.gz: 84f8722a4a273fd1b9ad0e5ce15fb608ba1f66a99681cc2aad81be3c2dee41c5657a313639d3f80fad1ede719c8825219303ce89d3a465453e58987d274a52c5
+  metadata.gz: ceae682a4aa09f8d815fa9ac960d451ff9009c2be4ed4c03ca89c020767c8c61854305cd61f2f776dd89468155d572923eed3d317550762c1d141c420e2e32b2
+  data.tar.gz: 48ae6d41753a17cb56f3e9515865e9d86c996973542928c88c90abaa7baa81598513f15e4a22beb4a50f954db5afbff0924df3abd39850ebde100d3940ec9330

data/lib/carry_out/plan_runner.rb

@@ -14,19 +14,16 @@ module CarryOut
           begin
             node_result = node.call(plan_result.artifacts)
 
-            if node_result.kind_of?(Plan::NodeResult) && node.returns_as
+            if node_result.kind_of?(Plan::NodeResult)
               plan_result.add(node.returns_as, node_result.value)
-
-              if node_result.value.kind_of?(CarryOut::Result) && !node_result.value.success?
-                break
-              end
             end
-
-            node = node.connects_to
           rescue StandardError => error
-            plan_result.add (node.returns_as || :base), CarryOut::Error.new(error.message, error)
-            break
+            error = CarryOut::Error.new(error.message, error) unless error.kind_of?(CarryOut::Error)
+            plan_result.add node.returns_as, error 
           end
+
+          break unless plan_result.success?
+          node = node.connects_to
         end
       end
     end

data/lib/carry_out/result.rb

@@ -1,3 +1,5 @@
+require 'carry_out/result_error'
+
 module CarryOut
   class Result
 
@@ -7,20 +9,28 @@ module CarryOut
 
     def add(group, object)
       if object.kind_of?(CarryOut::Error)
-        add_error(group, object)
-      elsif object.kind_of?(Result)
-        add(group, object.to_hash)
-        
-        object.errors.each do |g, errors|
-          errors.each { |e| add(g,e) }
-        end
-      elsif object.kind_of?(Hash)
-        artifacts[group] ||= {}
-        object.each { |k,v| artifacts[group][k] = v }
-      elsif !artifacts[group].nil?
-        artifacts[group] = [ artifacts[group], object ].flatten(1)
+        errors << ResultError.new(
+          group: group,
+          message: object.message,
+          details: object.details
+        )
+      elsif object.kind_of?(Enumerable) && !object.kind_of?(Hash)
+        object.each { |o| add(group, o) }
       else
-        artifacts[group] = object
+        unless group.nil?
+          if object.kind_of?(Hash)
+            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)
+            end
+          else
+            artifacts[group] = object
+          end
+        end
       end
     end
 
@@ -29,7 +39,7 @@ module CarryOut
     end
 
     def errors
-      @errors ||= {}
+      @errors ||= []
     end
 
     def success?
@@ -39,11 +49,5 @@ module CarryOut
     def to_hash
       artifacts
     end
-
-    private
-      def add_error(group, error)
-        group = errors[group] ||= []
-        group << error
-      end
   end
 end

data/lib/carry_out/result_error.rb

@@ -0,0 +1,13 @@
+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
+end

data/lib/carry_out/version.rb

@@ -1,3 +1,3 @@
 module CarryOut
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/carry_out.rb

@@ -27,7 +27,12 @@ module CarryOut
   def self.plan(options = {}, &block)
     merged_options = Hash.new.merge(configuration).merge(options)
     plan = PlanBuilder.build(merged_options, &block)
-    -> (context = nil) { PlanRunner.run(plan, context) }
+
+    Proc.new do |context = nil, &block| 
+      PlanRunner.run(plan, context).tap do |result|
+        block.call(result) unless block.nil?
+      end
+    end
   end
 
   def self.configuration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carry_out
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan Fields
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,6 +112,7 @@ files:
 - lib/carry_out/plan_builder.rb
 - lib/carry_out/plan_runner.rb
 - lib/carry_out/result.rb
+- lib/carry_out/result_error.rb
 - lib/carry_out/unit.rb
 - lib/carry_out/version.rb
 homepage: https://github.com/ryanfields/carry_out