lib/itamae/recipe.rb in itamae-1.0.0.beta1 vs lib/itamae/recipe.rb in itamae-1.0.0.beta2

@@ -2,43 +2,43 @@
 
 module Itamae
   class Recipe
     attr_reader :path
     attr_reader :runner
+    attr_reader :resources
+    attr_reader :delayed_actions
 
     def initialize(runner, path)
       @runner = runner
       @path = path
-      @resources = []
+      @resources = ResourceCollection.new
+      @delayed_actions = []
+
       load_resources
     end
 
     def node
       @runner.node
     end
 
     def run
       @resources.each do |resource|
-        Logger.info ">>> Executing #{resource.class.name} (#{resource.options})..."
-        begin
-          resource.run
-        rescue Resources::CommandExecutionError
-          Logger.error "<<< Failed."
-          exit 2
-        else
-          Logger.info "<<< Succeeded."
-        end
+        resource.run
       end
+
+      @delayed_actions.uniq.each do |action, resource|
+        resource.run(action)
+      end
     end
 
     private
 
     def load_resources
       instance_eval(File.read(@path), @path, 1)
     end
 
     def method_missing(method, name, &block)
-      klass = Resources.get_resource_class(method)
+      klass = Resource.get_resource_class(method)
       resource = klass.new(self, name, &block)
       @resources << resource
     end
   end
 end