producer-core 0.4.2 → 0.4.3

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.1.4

data/config/cucumber.yaml

@@ -0,0 +1 @@
+default: --require features/support --require features/steps

data/features/{registry.feature → recipe/registry.feature}

@@ -46,3 +46,26 @@ Feature: key/value registry
     When I execute the recipe
     Then the output must not contain "after_fail"
     And the output must match /\A\w+Error:\s+:no_key/
+
+  Scenario: `get' keyword accepts a default value
+    Given a recipe with:
+      """
+      task :registry_testing do
+        echo get(:some_key, 'some_value')
+      end
+      """
+    When I successfully execute the recipe
+    Then the output must contain "some_value"
+
+  Scenario: `set?' keyword tests wether given key is defined
+    Given a recipe with:
+      """
+      set :some_key, 'some_value'
+      task :registry_testing do
+        echo 'some_value_set' if set? :some_key
+        echo 'other_value' if set? :other_key
+      end
+      """
+    When I execute the recipe
+    Then the output must contain "some_value_set"
+    And the output must not contain "other_value"

data/features/steps/remote_steps.rb

@@ -19,7 +19,7 @@ Then /^the remote file "([^"]+)" must contain "([^"]+)"$/ do |path, content|
 end
 
 Then /^the remote file "([^"]+)" must contain exactly "([^"]+)"$/ do |path, content|
-  check_exact_file_content path, content
+  check_file_content path, content
 end
 
 Then /^the remote file "([^"]+)" must match \/([^\/]+)\/$/ do |path, pattern|

data/lib/producer/core/cli.rb

@@ -17,7 +17,7 @@ module Producer
           rescue ArgumentError => e
             stderr.puts e.message
             exit EX_USAGE
-          rescue Exception => e
+          rescue StandardError => e
             ef = ErrorFormatter.new(
               debug:        cli.env.debug?,
               force_cause:  [RecipeEvaluationError]
@@ -45,6 +45,7 @@ module Producer
 
       def run(worker: Worker.new(@env))
         evaluate_recipes.each { |recipe| worker.process recipe.tasks }
+      ensure
         @env.cleanup
       end
 

data/lib/producer/core/env.rb

@@ -1,6 +1,9 @@
 module Producer
   module Core
     class Env
+      extend Forwardable
+      def_delegators :@registry, :[]=, :key?
+
       attr_reader   :input, :output, :error_output, :registry, :logger
       attr_accessor :target, :verbose, :debug, :dry_run
 
@@ -17,17 +20,13 @@ module Producer
         @remote ||= Remote.new(target)
       end
 
-      def [](key)
-        @registry.fetch key
+      def [](*args)
+        @registry.fetch *args
       rescue KeyError
-        fail RegistryKeyError, key.inspect
+        fail RegistryKeyError, args.first.inspect
       end
       alias get []
 
-      def []=(key, value)
-        @registry[key] = value
-      end
-
       def logger
         @logger ||= begin
           logger = Logger.new(output)

data/lib/producer/core/error_formatter.rb

@@ -1,6 +1,12 @@
 module Producer
   module Core
     class ErrorFormatter
+      FILTERS = [
+        /\/producer-\w+\/(?:bin|lib)\//,
+        /\/net\/ssh\//,
+        /\/net\/sftp\//
+      ].freeze
+
       def initialize(debug: false, force_cause: [])
         @debug        = debug
         @force_cause  = force_cause
@@ -22,6 +28,7 @@ module Producer
         lines.join("\n")
       end
 
+
       private
 
       def format_exception(exception, filter: true)
@@ -42,7 +49,9 @@ module Producer
       end
 
       def filter_backtrace(backtrace)
-        backtrace.reject { |l| l =~ /\/producer-\w+\/(?:bin|lib)\// }
+        backtrace.reject do |line|
+          FILTERS.any? { |filter| line =~ filter }
+        end
       end
 
       def indent_backtrace(backtrace)

data/lib/producer/core/recipe.rb

@@ -19,6 +19,9 @@ module Producer
         end
       end
 
+      extend Forwardable
+      def_delegator :@env, :[]=,  :set
+      def_delegator :@env, :[],   :get
       attr_reader :env, :tasks
 
       def initialize(env)
@@ -49,14 +52,6 @@ module Producer
       def test_macro(name, &block)
         Condition.define_test(name, block)
       end
-
-      def set(key, value)
-        env[key] = value
-      end
-
-      def get(key)
-        env[key]
-      end
     end
   end
 end

data/lib/producer/core/task.rb

@@ -14,7 +14,10 @@ module Producer
       end
 
       extend Forwardable
-      def_delegators :@env, :target
+      def_delegators  :@name, :to_s
+      def_delegators  :@env,  :target
+      def_delegator   :@env,  :[], :get
+      def_delegator   :@env,  :key?, :set?
 
       define_action :echo,                  Actions::Echo
       define_action :sh,                    Actions::ShellCommand
@@ -34,10 +37,6 @@ module Producer
         @condition  = condition
       end
 
-      def to_s
-        @name.to_s
-      end
-
       def condition_met?
         !!@condition
       end
@@ -55,10 +54,6 @@ module Producer
         prompter.prompt(question, choices)
       end
 
-      def get(key)
-        @env[key]
-      end
-
       def template(path, variables = {})
         Template.new(path).render variables
       end

data/lib/producer/core/tests/condition_test.rb

@@ -2,9 +2,9 @@ module Producer
   module Core
     module Tests
       class ConditionTest < Test
-        def verify
-          condition.met?
-        end
+        extend Forwardable
+        def_delegator :@arguments,  :first,  :condition_block
+        def_delegator :condition,   :met?,   :verify
 
         def condition
           Condition.evaluate(env, *condition_args, &condition_block)
@@ -13,10 +13,6 @@ module Producer
         def condition_args
           arguments.drop 1
         end
-
-        def condition_block
-          arguments.first
-        end
       end
     end
   end

data/lib/producer/core/tests/shell_command_status.rb

@@ -2,16 +2,15 @@ module Producer
   module Core
     module Tests
       class ShellCommandStatus < Test
+        extend Forwardable
+        def_delegator :@arguments, :first, :command
+
         def verify
           remote.execute(command)
           true
         rescue RemoteCommandExecutionError
           false
         end
-
-        def command
-          arguments.first
-        end
       end
     end
   end

data/lib/producer/core/version.rb

@@ -1,5 +1,5 @@
 module Producer
   module Core
-    VERSION = '0.4.2'.freeze
+    VERSION = '0.4.3'.freeze
   end
 end

data/spec/producer/core/cli_spec.rb

@@ -152,6 +152,15 @@ module Producer::Core
         expect(cli.env).to receive :cleanup
         cli.run
       end
+
+      context 'on error' do
+        let(:recipe_file) { fixture_path_for 'recipes/raise.rb' }
+
+        it 'cleans up the env' do
+          expect(cli.env).to receive :cleanup
+          cli.run rescue nil
+        end
+      end
     end
 
     describe '#evaluate_recipes' do

data/spec/producer/core/task_spec.rb

@@ -160,6 +160,18 @@ module Producer::Core
       end
     end
 
+    describe '#set?' do
+      before { env[:some_key] = :some_value }
+
+      it 'returns true when given key exists' do
+        expect(task.set? :some_key).to be true
+      end
+
+      it 'returns false when given key does not exist' do
+        expect(task.set? :other_key).to be false
+      end
+    end
+
     describe '#target' do
       before { env.target = :some_target }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: producer-core
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -132,33 +132,35 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE
 - Rakefile
 - bin/producer
-- features/action_echo.feature
-- features/action_file_append.feature
-- features/action_file_replace_content.feature
-- features/action_file_write.feature
-- features/action_mkdir.feature
-- features/action_sh.feature
-- features/action_yaml_write.feature
-- features/cli_debug.feature
-- features/cli_dry_run.feature
-- features/cli_error_reporting.feature
-- features/cli_target.feature
-- features/cli_usage.feature
-- features/cli_verbose.feature
-- features/condition_negated_test.feature
-- features/condition_target.feature
-- features/recipe_compose_macro.feature
-- features/recipe_macro.feature
-- features/recipe_source.feature
-- features/recipe_target.feature
-- features/recipe_test_macro.feature
-- features/registry.feature
-- features/ssh_config.feature
+- config/cucumber.yaml
+- features/actions/echo.feature
+- features/actions/file_append.feature
+- features/actions/file_replace_content.feature
+- features/actions/file_write.feature
+- features/actions/mkdir.feature
+- features/actions/sh.feature
+- features/actions/yaml_write.feature
+- features/cli/debug.feature
+- features/cli/dry_run.feature
+- features/cli/error_reporting.feature
+- features/cli/target.feature
+- features/cli/usage.feature
+- features/cli/verbose.feature
+- features/condition/negated_test.feature
+- features/condition/target.feature
+- features/recipe/compose_macro.feature
+- features/recipe/macro.feature
+- features/recipe/registry.feature
+- features/recipe/source.feature
+- features/recipe/target.feature
+- features/recipe/test_macro.feature
+- features/ssh/config.feature
 - features/steps/etc_steps.rb
 - features/steps/execution_steps.rb
 - features/steps/output_steps.rb
@@ -169,20 +171,20 @@ 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/task_nested_tasks.feature
-- features/task_target.feature
-- features/task_template.feature
-- features/test_dir.feature
-- features/test_env.feature
-- features/test_executable.feature
-- features/test_file.feature
-- features/test_file_contains.feature
-- features/test_file_eq.feature
-- features/test_file_match.feature
-- features/test_shell_command_status.feature
-- features/test_yaml_eq.feature
+- features/task/ask.feature
+- features/task/condition.feature
+- features/task/nested_tasks.feature
+- features/task/target.feature
+- features/task/template.feature
+- features/tests/dir.feature
+- features/tests/env.feature
+- features/tests/executable.feature
+- features/tests/file.feature
+- features/tests/file_contains.feature
+- features/tests/file_eq.feature
+- features/tests/file_match.feature
+- features/tests/shell_command_status.feature
+- features/tests/yaml_eq.feature
 - lib/producer/core.rb
 - lib/producer/core/action.rb
 - lib/producer/core/actions/echo.rb
@@ -290,33 +292,33 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 1.8.30
 signing_key: 
 specification_version: 3
 summary: Provisioning tool
 test_files:
-- features/action_echo.feature
-- features/action_file_append.feature
-- features/action_file_replace_content.feature
-- features/action_file_write.feature
-- features/action_mkdir.feature
-- features/action_sh.feature
-- features/action_yaml_write.feature
-- features/cli_debug.feature
-- features/cli_dry_run.feature
-- features/cli_error_reporting.feature
-- features/cli_target.feature
-- features/cli_usage.feature
-- features/cli_verbose.feature
-- features/condition_negated_test.feature
-- features/condition_target.feature
-- features/recipe_compose_macro.feature
-- features/recipe_macro.feature
-- features/recipe_source.feature
-- features/recipe_target.feature
-- features/recipe_test_macro.feature
-- features/registry.feature
-- features/ssh_config.feature
+- features/actions/echo.feature
+- features/actions/file_append.feature
+- features/actions/file_replace_content.feature
+- features/actions/file_write.feature
+- features/actions/mkdir.feature
+- features/actions/sh.feature
+- features/actions/yaml_write.feature
+- features/cli/debug.feature
+- features/cli/dry_run.feature
+- features/cli/error_reporting.feature
+- features/cli/target.feature
+- features/cli/usage.feature
+- features/cli/verbose.feature
+- features/condition/negated_test.feature
+- features/condition/target.feature
+- features/recipe/compose_macro.feature
+- features/recipe/macro.feature
+- features/recipe/registry.feature
+- features/recipe/source.feature
+- features/recipe/target.feature
+- features/recipe/test_macro.feature
+- features/ssh/config.feature
 - features/steps/etc_steps.rb
 - features/steps/execution_steps.rb
 - features/steps/output_steps.rb
@@ -327,20 +329,20 @@ 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/task_nested_tasks.feature
-- features/task_target.feature
-- features/task_template.feature
-- features/test_dir.feature
-- features/test_env.feature
-- features/test_executable.feature
-- features/test_file.feature
-- features/test_file_contains.feature
-- features/test_file_eq.feature
-- features/test_file_match.feature
-- features/test_shell_command_status.feature
-- features/test_yaml_eq.feature
+- features/task/ask.feature
+- features/task/condition.feature
+- features/task/nested_tasks.feature
+- features/task/target.feature
+- features/task/template.feature
+- features/tests/dir.feature
+- features/tests/env.feature
+- features/tests/executable.feature
+- features/tests/file.feature
+- features/tests/file_contains.feature
+- features/tests/file_eq.feature
+- features/tests/file_match.feature
+- features/tests/shell_command_status.feature
+- features/tests/yaml_eq.feature
 - spec/fixtures/recipes/empty.rb
 - spec/fixtures/recipes/raise.rb
 - spec/fixtures/recipes/some_recipe.rb