Merge Recipe::DSL into Recipe

lib/producer/core.rb

@@ -33,7 +33,7 @@ require 'producer/core/errors'
 require 'producer/core/logger_formatter'
 require 'producer/core/prompter'
 require 'producer/core/recipe'
-require 'producer/core/recipe/dsl'
+require 'producer/core/recipe/file_evaluator'
 require 'producer/core/remote'
 require 'producer/core/remote/environment'
 require 'producer/core/remote/fs'

lib/producer/core/cli.rb

@@ -58,7 +58,7 @@ module Producer
       end
 
       def recipe
-        @recipe ||= Recipe.evaluate_from_file(@arguments.first, env)
+        @recipe ||= Recipe::FileEvaluator.evaluate(@arguments.first, env)
       end
     end
   end

lib/producer/core/recipe.rb

@@ -2,16 +2,46 @@ module Producer
   module Core
     class Recipe
       class << self
-        def evaluate_from_file(filepath, env)
-          dsl = DSL.new(env, File.read(filepath)).evaluate
-          Recipe.new(dsl.tasks)
+        def define_macro(name, block)
+          define_method(name) { |*args| task name, *args, &block }
         end
       end
 
-      attr_accessor :tasks
+      attr_reader :env, :tasks
 
-      def initialize(tasks = [])
-        @tasks = tasks
+      def initialize(env)
+        @env    = env
+        @tasks  = []
+      end
+
+      def source(filepath)
+        instance_eval File.read("./#{filepath}.rb"), "#{filepath}.rb"
+      end
+
+      def target(hostname)
+        env.target ||= hostname
+      end
+
+      def task(name, *args, &block)
+        @tasks << Task.evaluate(name, env, *args, &block)
+      end
+
+      def macro(name, &block)
+        define_singleton_method(name) do |*args|
+          task("#{name}", *args, &block)
+        end
+      end
+
+      def test_macro(name, dsl: Condition::DSL, &block)
+        dsl.define_test(name, block)
+      end
+
+      def set(key, value)
+        env[key] = value
+      end
+
+      def get(key)
+        env[key]
       end
     end
   end

lib/producer/core/recipe/dsl.rb

@@ -1,61 +0,0 @@
-module Producer
-  module Core
-    class Recipe
-      class DSL
-        class << self
-          def define_macro(name, block)
-            define_method(name) { |*args| task name, *args, &block }
-          end
-        end
-
-        attr_reader :env, :code, :block, :tasks
-
-        def initialize(env, code = nil, &block)
-          @env    = env
-          @code   = code
-          @block  = block
-          @tasks  = []
-        end
-
-        def evaluate
-          if @code
-            instance_eval @code
-          else
-            instance_eval &@block
-          end
-          self
-        end
-
-        def source(filepath)
-          instance_eval File.read("./#{filepath}.rb"), "#{filepath}.rb"
-        end
-
-        def target(hostname)
-          env.target ||= hostname
-        end
-
-        def task(name, *args, &block)
-          @tasks << Task.evaluate(name, env, *args, &block)
-        end
-
-        def macro(name, &block)
-          define_singleton_method(name) do |*args|
-            task("#{name}", *args, &block)
-          end
-        end
-
-        def test_macro(name, dsl: Condition::DSL, &block)
-          dsl.define_test(name, block)
-        end
-
-        def set(key, value)
-          env[key] = value
-        end
-
-        def get(key)
-          env[key]
-        end
-      end
-    end
-  end
-end

lib/producer/core/recipe/file_evaluator.rb

@@ -0,0 +1,14 @@
+module Producer
+  module Core
+    class Recipe
+      class FileEvaluator
+        class << self
+          def evaluate(file_path, env)
+            content = File.read(file_path)
+            Recipe.new(env).tap { |o| o.instance_eval content, file_path }
+          end
+        end
+      end
+    end
+  end
+end