producer-core 0.3.0 → 0.3.1

data/spec/producer/core/task_spec.rb

@@ -2,62 +2,90 @@ require 'spec_helper'
 
 module Producer::Core
   describe Task do
-    let(:name)      { :some_task }
-    let(:action)    { double 'action' }
-    let(:condition) { double 'condition' }
-    subject(:task)  { Task.new(name, [action], condition) }
+    class SomeAction < Action; end
 
-    describe '.evaluate' do
-      let(:name)              { :some_task }
-      let(:env)               { double 'env' }
-      let(:block)             { proc { condition { :condition }; some_action } }
-      let(:some_action_class) { Class.new(Action) }
-      subject(:task)          { Task.evaluate(name, env, :some, :args, &block) }
+    let(:env)       { Env.new }
+    let(:name)      { :some_task }
+    let(:condition) { :some_condition }
+    subject(:task)  { described_class.new(env, name, [], condition) }
+
+    %w[
+      echo
+      sh
+      mkdir
+      file_append
+      file_replace_content
+      file_write
+    ].each do |action|
+      it "has `#{action}' action defined" do
+        expect(task).to respond_to action.to_sym
+      end
+    end
 
-      before { Task::DSL.define_action(:some_action, some_action_class) }
+    describe '.define_action' do
+      before { described_class.define_action(:some_action, SomeAction) }
 
-      it 'returns an evaluated task' do
-        expect(task).to be_kind_of Task
+      it 'defines a new action keyword' do
+        expect(task).to respond_to :some_action
       end
 
-      context 'evaluated task' do
-        it 'has the requested name' do
-          expect(task.name).to eq name
+      context 'when an action keyword is called' do
+        it 'registers the action' do
+          expect { task.some_action }.to change { task.actions.count }.by 1
         end
 
-        it 'has the requested actions' do
-          expect(task.actions.first).to be_kind_of some_action_class
+        it 'registers the action with current env' do
+          task.some_action
+          expect(task.actions.first.env).to be env
         end
 
-        it 'has the requested condition' do
-          expect(task.condition.return_value).to be :condition
+        it 'registers the action with given arguments' do
+          task.some_action :foo, :bar
+          expect(task.actions.first.arguments).to eq %i[foo bar]
         end
       end
     end
 
-    describe '#initialize' do
-      it 'assigns the name' do
-        expect(task.name).to eq name
+    describe '.evaluate' do
+      let(:code)      { proc { condition { :condition }; some_action } }
+      let(:arguments) { [] }
+      subject(:task)  { described_class.evaluate(env, name, *arguments, &code) }
+
+      before { described_class.define_action(:some_action, SomeAction) }
+
+      it 'returns an evaluated task' do
+        expect(task).to be_a Task
       end
 
-      it 'assigns the actions' do
-        expect(task.actions).to eq [action]
+      it 'evaluates the task condition' do
+        expect(task.condition).to be_a Condition
       end
 
-      it 'assigns the condition' do
-        expect(task.condition).to eq condition
+      it 'evaluates the task actions' do
+        expect(task.actions).to match [
+          an_instance_of(SomeAction)
+        ]
       end
 
-      context 'when only the name is given as argument' do
-        subject(:task) { described_class.new(name) }
+      context 'when task arguments are given' do
+        let(:code)      { proc { |a, b| throw a } }
+        let(:arguments) { %i[foo bar] }
 
-        it 'assigns no action' do
-          expect(task.actions).to be_empty
+        it 'passes arguments as block parameters during evaluation' do
+          expect { task }.to throw_symbol :foo
         end
+      end
+    end
 
-        it 'assigns a true condition' do
-          expect(task.condition).to be true
-        end
+    describe '#initialize' do
+      subject(:task) { described_class.new(env, name) }
+
+      it 'assigns no action' do
+        expect(task.actions).to be_empty
+      end
+
+      it 'assigns a truthy condition' do
+        expect(task.condition).to be_truthy
       end
     end
 
@@ -69,7 +97,7 @@ module Producer::Core
 
     describe '#condition_met?' do
       context 'when condition is truthy' do
-        let(:condition) { Condition.new([], true) }
+        let(:condition) { true }
 
         it 'returns true' do
           expect(task.condition_met?).to be true
@@ -77,12 +105,50 @@ module Producer::Core
       end
 
       context 'when condition is falsy' do
-        let(:condition) { Condition.new([], false) }
+        let(:condition) { false }
 
         it 'returns false' do
           expect(task.condition_met?).to be false
         end
       end
     end
+
+    describe '#condition' do
+      it 'returns current condition' do
+        expect(task.condition).to eq :some_condition
+      end
+
+      context 'when a block is given' do
+        it 'assigns a new evaluated condition' do
+          task.condition { :some_new_condition }
+          expect(task.condition.return_value).to eq :some_new_condition
+        end
+      end
+    end
+
+    describe '#ask' do
+      let(:question)  { 'Which letter?' }
+      let(:choices)   { [[:a, ?A], [:b, ?B]] }
+      let(:prompter)  { instance_spy Prompter }
+      subject(:ask)   { task.ask question, choices, prompter: prompter }
+
+      it 'prompts for choices' do
+        ask
+        expect(prompter).to have_received(:prompt).with(question, choices)
+      end
+
+      it 'returns selected choice' do
+        allow(prompter).to receive(:prompt) { :choice }
+        expect(ask).to eq :choice
+      end
+    end
+
+    describe '#get' do
+      before { env[:some_key] = :some_value }
+
+      it 'fetches a value from the registry at given index' do
+        expect(task.get :some_key).to eq :some_value
+      end
+    end
   end
 end

data/spec/producer/core/worker_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Producer::Core
   describe Worker do
-    let(:env)         { double 'env', log: nil, dry_run?: false }
+    let(:env)         { Env.new }
     subject(:worker)  { described_class.new(env) }
 
     describe '#process' do
@@ -12,7 +12,7 @@ module Producer::Core
       end
 
       context 'when dry run is enabled' do
-        before { allow(env).to receive(:dry_run?) { true } }
+        before { env.dry_run = true }
 
         it 'warns dry run is enabled' do
           expect(env).to receive(:log).with(
@@ -25,12 +25,12 @@ module Producer::Core
     end
 
     describe '#process_task' do
+      let(:env)       { instance_spy Env, dry_run?: false }
       let(:action)    { double('action', to_s: 'echo').as_null_object }
-      let(:task_name) { 'some_task' }
-      let(:task)      { Task.new(task_name, [action]) }
+      let(:task)      { Task.new(env, :some_task, [action]) }
 
       it 'logs task info' do
-        expect(env).to receive(:log).with /\ATask: `#{task_name}'/
+        expect(env).to receive(:log).with /\ATask: `some_task'/
         worker.process_task task
       end
 
@@ -41,7 +41,7 @@ module Producer::Core
         end
 
         it 'logs the task as beeing applied' do
-          expect(env).to receive(:log).with /#{task_name}.+applying\.\.\.\z/
+          expect(env).to receive(:log).with /some_task.+applying\.\.\.\z/
           worker.process_task task
         end
 
@@ -61,7 +61,7 @@ module Producer::Core
       end
 
       context 'when task condition is not met' do
-        let(:task) { Task.new(task_name, [action], false) }
+        before { task.condition { false } }
 
         it 'does not apply the actions' do
           expect(action).not_to receive :apply
@@ -69,16 +69,10 @@ module Producer::Core
         end
 
         it 'logs the task as beeing skipped' do
-          expect(env).to receive(:log).with /#{task_name}.+skipped\z/
+          expect(env).to receive(:log).with /some_task.+skipped\z/
           worker.process_task task
         end
       end
     end
-
-    describe '#env' do
-      it 'returns the assigned env' do
-        expect(worker.env).to be env
-      end
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: producer-core
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2014-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -132,7 +132,7 @@ files:
 - features/cli_target.feature
 - features/cli_usage.feature
 - features/cli_verbose.feature
-- features/recipe_ask.feature
+- features/condition_negated_test.feature
 - features/recipe_macro.feature
 - features/recipe_source.feature
 - features/recipe_target.feature
@@ -149,6 +149,7 @@ files:
 - features/support/env_aruba_timeout.rb
 - features/support/env_cucumber_doc_string.rb
 - features/support/env_fake_home.rb
+- features/task_ask.feature
 - features/task_condition.feature
 - features/test_dir.feature
 - features/test_env.feature
@@ -156,7 +157,6 @@ files:
 - features/test_file.feature
 - features/test_file_contains.feature
 - features/test_file_eq.feature
-- features/test_negated_test.feature
 - features/test_shell_command_status.feature
 - lib/producer/core.rb
 - lib/producer/core/action.rb
@@ -168,18 +168,16 @@ files:
 - lib/producer/core/actions/shell_command.rb
 - lib/producer/core/cli.rb
 - lib/producer/core/condition.rb
-- lib/producer/core/condition/dsl.rb
 - lib/producer/core/env.rb
 - lib/producer/core/errors.rb
 - lib/producer/core/logger_formatter.rb
 - lib/producer/core/prompter.rb
 - lib/producer/core/recipe.rb
-- lib/producer/core/recipe/dsl.rb
+- lib/producer/core/recipe/file_evaluator.rb
 - lib/producer/core/remote.rb
 - lib/producer/core/remote/environment.rb
 - lib/producer/core/remote/fs.rb
 - lib/producer/core/task.rb
-- lib/producer/core/task/dsl.rb
 - lib/producer/core/test.rb
 - lib/producer/core/testing.rb
 - lib/producer/core/testing/mock_remote.rb
@@ -206,17 +204,15 @@ files:
 - spec/producer/core/actions/mkdir_spec.rb
 - spec/producer/core/actions/shell_command_spec.rb
 - spec/producer/core/cli_spec.rb
-- spec/producer/core/condition/dsl_spec.rb
 - spec/producer/core/condition_spec.rb
 - spec/producer/core/env_spec.rb
 - spec/producer/core/logger_formatter_spec.rb
 - spec/producer/core/prompter_spec.rb
-- spec/producer/core/recipe/dsl_spec.rb
+- spec/producer/core/recipe/file_evaluator_spec.rb
 - spec/producer/core/recipe_spec.rb
 - spec/producer/core/remote/environment_spec.rb
 - spec/producer/core/remote/fs_spec.rb
 - spec/producer/core/remote_spec.rb
-- spec/producer/core/task/dsl_spec.rb
 - spec/producer/core/task_spec.rb
 - spec/producer/core/test_spec.rb
 - spec/producer/core/testing/mock_remote_spec.rb
@@ -255,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provisioning tool
@@ -270,7 +266,7 @@ test_files:
 - features/cli_target.feature
 - features/cli_usage.feature
 - features/cli_verbose.feature
-- features/recipe_ask.feature
+- features/condition_negated_test.feature
 - features/recipe_macro.feature
 - features/recipe_source.feature
 - features/recipe_target.feature
@@ -287,6 +283,7 @@ test_files:
 - features/support/env_aruba_timeout.rb
 - features/support/env_cucumber_doc_string.rb
 - features/support/env_fake_home.rb
+- features/task_ask.feature
 - features/task_condition.feature
 - features/test_dir.feature
 - features/test_env.feature
@@ -294,7 +291,6 @@ test_files:
 - features/test_file.feature
 - features/test_file_contains.feature
 - features/test_file_eq.feature
-- features/test_negated_test.feature
 - features/test_shell_command_status.feature
 - spec/fixtures/recipes/empty.rb
 - spec/fixtures/recipes/raise.rb
@@ -308,17 +304,15 @@ test_files:
 - spec/producer/core/actions/mkdir_spec.rb
 - spec/producer/core/actions/shell_command_spec.rb
 - spec/producer/core/cli_spec.rb
-- spec/producer/core/condition/dsl_spec.rb
 - spec/producer/core/condition_spec.rb
 - spec/producer/core/env_spec.rb
 - spec/producer/core/logger_formatter_spec.rb
 - spec/producer/core/prompter_spec.rb
-- spec/producer/core/recipe/dsl_spec.rb
+- spec/producer/core/recipe/file_evaluator_spec.rb
 - spec/producer/core/recipe_spec.rb
 - spec/producer/core/remote/environment_spec.rb
 - spec/producer/core/remote/fs_spec.rb
 - spec/producer/core/remote_spec.rb
-- spec/producer/core/task/dsl_spec.rb
 - spec/producer/core/task_spec.rb
 - spec/producer/core/test_spec.rb
 - spec/producer/core/testing/mock_remote_spec.rb

data/lib/producer/core/condition/dsl.rb

@@ -1,48 +0,0 @@
-module Producer
-  module Core
-    class Condition
-      class DSL
-        class << self
-          def define_test(keyword, test)
-            {
-              keyword         => false,
-              "no_#{keyword}" => true
-            }.each do |kw, negated|
-              define_method(kw) do |*args|
-                if test.respond_to? :call
-                  args  = [test, *args]
-                  klass = Tests::ConditionTest
-                else
-                  klass = test
-                end
-                t = klass.new(@env, *args, negated: negated)
-                @tests << t
-              end
-            end
-          end
-        end
-
-        define_test :`,               Tests::ShellCommandStatus
-        define_test :sh,              Tests::ShellCommandStatus
-        define_test :file_contains,   Tests::FileContains
-        define_test :file_eq,         Tests::FileEq
-        define_test :env?,            Tests::HasEnv
-        define_test :executable?,     Tests::HasExecutable
-        define_test :dir?,            Tests::HasDir
-        define_test :file?,           Tests::HasFile
-
-        attr_reader :block, :env, :tests
-
-        def initialize(env, &block)
-          @env    = env
-          @block  = block
-          @tests  = []
-        end
-
-        def evaluate(*args)
-          instance_exec *args, &@block
-        end
-      end
-    end
-  end
-end

data/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

data/lib/producer/core/task/dsl.rb

@@ -1,50 +0,0 @@
-module Producer
-  module Core
-    class Task
-      class DSL
-        class << self
-          def define_action(keyword, klass)
-            define_method(keyword) do |*args|
-              @actions << klass.new(@env, *args)
-            end
-          end
-        end
-
-        define_action :echo,  Actions::Echo
-        define_action :sh,    Actions::ShellCommand
-
-        define_action :mkdir, Actions::Mkdir
-
-        define_action :file_append,           Actions::FileAppend
-        define_action :file_replace_content,  Actions::FileReplaceContent
-        define_action :file_write,            Actions::FileWriter
-
-        attr_reader :env, :block, :actions
-
-        def initialize(env, &block)
-          @env        = env
-          @block      = block
-          @actions    = []
-          @condition  = true
-        end
-
-        def evaluate(*args)
-          instance_exec *args, &@block
-        end
-
-        def condition(&block)
-          @condition = Condition.evaluate(@env, &block) if block
-          @condition
-        end
-
-        def ask(question, choices, prompter: Prompter)
-          prompter.new(env.input, env.output).prompt(question, choices)
-        end
-
-        def get(key)
-          env[key]
-        end
-      end
-    end
-  end
-end

data/spec/producer/core/condition/dsl_spec.rb

@@ -1,116 +0,0 @@
-require 'spec_helper'
-
-module Producer::Core
-  class Condition
-    describe DSL do
-      let(:block)   { proc { :some_condition_code } }
-      let(:env)     { double 'env' }
-      subject(:dsl) { DSL.new(env, &block) }
-
-      %w[
-        `
-        sh
-        file_contains
-        file_eq
-        dir?
-        env?
-        executable?
-        file?
-      ].each do |test|
-        it "has `#{test}' test defined" do
-          expect(dsl).to respond_to test.to_sym
-        end
-      end
-
-      describe '.define_test' do
-        let(:some_test) { Test }
-
-        before { described_class.define_test(:some_test, some_test) }
-
-        it 'defines a new test keyword' do
-          expect(dsl).to respond_to :some_test
-        end
-
-        it 'defines the negated test' do
-          expect(dsl).to respond_to :no_some_test
-        end
-
-        context 'when a test keyword is called' do
-          it 'registers the test' do
-            expect { dsl.some_test }.to change { dsl.tests.count }.by 1
-          end
-
-          it 'registers the test with current env' do
-            dsl.some_test
-            expect(dsl.tests.last.env).to be env
-          end
-
-          it 'registers the test with given arguments' do
-            dsl.some_test :some, :args
-            expect(dsl.tests.last.arguments).to eq [:some, :args]
-          end
-
-          context 'when given test is callable' do
-            let(:some_test) { proc {} }
-
-            before { dsl.some_test }
-
-            it 'registers a condition test' do
-              expect(dsl.tests.last).to be_a Tests::ConditionTest
-            end
-
-            it 'registers the test with given block' do
-              expect(dsl.tests.last.condition_block).to be some_test
-            end
-
-            it 'registers the test with given arguments' do
-              dsl.some_test :some, :args
-              expect(dsl.tests.last.condition_args).to eq [:some, :args]
-            end
-          end
-        end
-
-        context 'when a negated test keyword is called' do
-          it 'registers a negated test' do
-            dsl.no_some_test
-            expect(dsl.tests.last).to be_negated
-          end
-        end
-      end
-
-      describe '#initialize' do
-        it 'assigns the env' do
-          expect(dsl.env).to be env
-        end
-
-        it 'assigns the code' do
-          expect(dsl.block).to be block
-        end
-
-        it 'assigns no test' do
-          expect(dsl.tests).to be_empty
-        end
-      end
-
-      describe '#evaluate' do
-        it 'evaluates its code' do
-          dsl = described_class.new(env) { throw :condition_code }
-          expect { dsl.evaluate }.to throw_symbol :condition_code
-        end
-
-        it 'returns the value returned by the assigned block' do
-          expect(dsl.evaluate).to eq block.call
-        end
-
-        context 'when arguments are given' do
-          let(:block) { proc { |e| throw e } }
-
-          it 'passes arguments as block parameters' do
-            expect { dsl.evaluate :some_argument }
-              .to throw_symbol :some_argument
-          end
-        end
-      end
-    end
-  end
-end