producer-core 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efce6312a8a297ea13fb953ca8f082610a4c629c
-  data.tar.gz: 87ed5ba505ff874af45ae009b4a69f9f0226a708
+  metadata.gz: b0948086dee94e6a1363c83af78cbc8fdec0c6d8
+  data.tar.gz: 6994469ae9fce4b8c7184545b453b3304555f648
 SHA512:
-  metadata.gz: 8fedb8c256e59d211b3b5dbd3af122d896c298e7b6bba7a7a0bab4467f06b54c2b2facaf5c6616d75ab43bbe7568b61e338b62e2feb30724f63653bcc53b2d2d
-  data.tar.gz: 4bdae0fd686786ea6f6e5b4d18d8a5449f0f127bb4e64d543500082c31351c0e990f31ddf95fc75c10ea25bc8168e30eeb78c1fb65504c8c23438d13d38cbb23
+  metadata.gz: e783aa0c29560a4c5f6f13c6ea5ab4367ca5031c2f5b766d351b8087bd64b0815deea04d355c0eb70a86a95db0b68076e2a9fb1aae405ca8e5a630635c547d90
+  data.tar.gz: c38e3b3445bbd59f58c0b8467fabf64c2a14c79b20aa9cbc6ca9586e1ba69d41bf84e3dc3e6bebb63d07e46ba5a8d301612318c7c93ae8443ee36d03e8793f22

data/features/ssh/config.feature

@@ -12,6 +12,7 @@ Feature: SSH settings
     When I successfully execute the recipe
     Then the output must contain my current login name
 
+  @fake_home
   Scenario: uses configured SSH user name for a given host
     Given an SSH config with:
       """

data/features/steps/etc_steps.rb

@@ -1,5 +1,3 @@
-# FIXME: our monkey patch currently prevent us from using `must' in step
-# definitions.
-Then(/^the output should contain my current login name$/) do
-  assert_partial_output(Etc.getlogin, all_output)
+Then /^the output must contain my current login name$/ do
+  assert_partial_output Etc.getlogin, all_output
 end

data/features/steps/execution_steps.rb

@@ -0,0 +1,3 @@
+Then /^the exit status must be (\d+)$/ do |exit_status|
+  assert_exit_status exit_status.to_i
+end

data/features/steps/output_steps.rb

@@ -0,0 +1,23 @@
+Then /^the output must match \/([^\/]+)\/$/ do |pattern|
+  assert_matching_output pattern, all_output
+end
+
+Then /^the output must contain "([^"]+)"$/ do |content|
+  assert_partial_output content, all_output
+end
+
+Then /^the output must contain:$/ do |content|
+  assert_partial_output content, all_output
+end
+
+Then /^the output must not contain "([^"]+)"$/ do |content|
+  assert_no_partial_output content, all_output
+end
+
+Then /^the output must contain exactly "([^"]+)"$/ do |content|
+  assert_exact_output content, all_output
+end
+
+Then /^the output must contain exactly:$/ do |content|
+  assert_exact_output content, all_output
+end

data/features/steps/recipe_steps.rb

@@ -1,16 +1,16 @@
-Given(/^a recipe with:$/) do |recipe_body|
+Given /^a recipe with:$/ do |recipe_body|
   write_file 'recipe.rb', recipe_body
 end
 
-When(/^I execute the recipe$/) do
-  run_simple('producer recipe.rb', false)
+When /^I execute the recipe$/ do
+  run_simple 'producer recipe.rb', false
 end
 
-When(/^I successfully execute the recipe$/) do
+When /^I successfully execute the recipe$/ do
   step 'I execute the recipe'
-  assert_exit_status(0)
+  assert_exit_status 0
 end
 
-When(/^I execute the recipe interactively$/) do
-  run_interactive('producer recipe.rb')
+When /^I execute the recipe interactively$/ do
+  run_interactive 'producer recipe.rb'
 end

data/features/steps/remote_steps.rb

@@ -10,14 +10,14 @@ Given /^a remote file named "([^"]+)" with "([^"]+)"$/ do |file_name, content|
   write_file file_name, content
 end
 
-Then /^the remote directory "([^"]+)" should exists$/ do |path|
-  check_directory_presence([path], true)
+Then /^the remote directory "([^"]+)" must exists$/ do |path|
+  check_directory_presence [path], true
 end
 
-Then /^the remote file "([^"]+)" should contain "([^"]+)"/ do |path, content|
+Then /^the remote file "([^"]+)" must contain "([^"]+)"$/ do |path, content|
   check_file_content path, content, true
 end
 
-Then /^the remote file "([^"]+)" should contain exactly "([^"]+)"/ do |path, content|
+Then /^the remote file "([^"]+)" must contain exactly "([^"]+)"$/ do |path, content|
   check_exact_file_content path, content
 end

data/features/steps/ssh_steps.rb

@@ -1,6 +1,3 @@
-# FIXME: current home directory shouldn't be changed here, maybe we should use
-# a tag for features needing a fake home directory.
-Given(/^an SSH config with:$/) do |config|
-  ENV['HOME'] = File.expand_path current_dir
+Given /^an SSH config with:$/ do |config|
   write_file '.ssh/config', config
 end

data/features/support/env.rb

@@ -1,18 +1,2 @@
-module Cucumber
-  class Runtime
-    alias :old_step_match :step_match
-
-    def step_match(step_name, name_to_report = nil)
-      if step_name.include? ' must '
-        name_to_report = step_name.dup
-        step_name.gsub! ' must ', ' should '
-      end
-
-      old_step_match(step_name, name_to_report)
-    end
-  end
-end
-
 require 'aruba/cucumber'
-
 require 'cucumber/sshd/cucumber'

data/features/support/env_fake_home.rb

@@ -0,0 +1,3 @@
+Before('@fake_home') do
+  ENV['HOME'] = File.expand_path(current_dir)
+end

data/features/tests/env.feature

@@ -21,7 +21,35 @@ Feature: `env?' condition keyword
       target 'some_host.test'
 
       task :testing_env_var_definition do
-        condition { env? :inexistent_var }
+        condition { env? :non_existent_var }
+
+        echo 'evaluated'
+      end
+      """
+    When I successfully execute the recipe
+    Then the output must not contain "evaluated"
+
+  Scenario: succeeds when remote environment variable value match
+    Given a recipe with:
+      """
+      target 'some_host.test'
+
+      task :testing_env_var_value do
+        condition { env? :shell, '/bin/sh' }
+
+        echo 'evaluated'
+      end
+      """
+    When I successfully execute the recipe
+    Then the output must contain "evaluated"
+
+  Scenario: fails when remote environment variable value does not match
+    Given a recipe with:
+      """
+      target 'some_host.test'
+
+      task :testing_env_var_value do
+        condition { env? :shell, 'non_existent_shell' }
 
         echo 'evaluated'
       end

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

@@ -3,7 +3,18 @@ module Producer
     module Tests
       class HasEnv < Test
         def verify
-          remote.environment.key? arguments.first.to_s.upcase
+          case arguments.size
+          when 1
+            remote.environment.key? key
+          when 2
+            remote.environment[key] == arguments.last
+          end
+        end
+
+        private
+
+        def key
+          arguments.first.to_s.upcase
         end
       end
     end

data/lib/producer/core/version.rb

@@ -1,5 +1,5 @@
 module Producer
   module Core
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

data/spec/producer/core/tests/has_env_spec.rb

@@ -3,37 +3,71 @@ require 'spec_helper'
 module Producer::Core
   module Tests
     describe HasEnv do
-      let(:env)           { Env.new }
-      let(:variable_name) { :some_variable_name }
-      subject(:has_env)   { HasEnv.new(env, variable_name) }
+      let(:env)         { Env.new }
+      let(:var_name)    { 'SOME_VAR' }
+      let(:var_value)   { 'SOME_VALUE' }
+      let(:remote_env)  { { 'SOME_VAR' => 'SOME_VALUE' } }
+      subject(:has_env) { HasEnv.new(env, var_name) }
 
       it_behaves_like 'test'
 
-      describe '#verify' do
-        let(:environment) { double 'environment' }
+      before do
+        allow(env.remote).to receive(:environment) { remote_env }
+      end
 
-        before do
-          allow(env.remote).to receive(:environment) { environment }
-        end
+      context 'when only var name is provided' do
+        describe '#verify' do
+          context 'when remote environment var is defined' do
+            it 'returns true' do
+              expect(has_env.verify).to be true
+            end
 
-        it 'stringifies the queried variable name' do
-          expect(environment).to receive(:key?).with(kind_of(String))
-          has_env.verify
-        end
+            context 'when var name is given as a lowercase symbol' do
+              let(:var_name) { :some_var }
 
-        it 'upcases the queried variable name' do
-          expect(environment).to receive(:key?).with('SOME_VARIABLE_NAME')
-          has_env.verify
-        end
+              it 'returns true' do
+                expect(has_env.verify).to be true
+              end
+            end
+          end
+
+          context 'when remote environment var is not defined' do
+            let(:var_name) { 'SOME_NON_EXISTENT_VAR' }
 
-        it 'returns true when remote environment var is defined' do
-          allow(environment).to receive(:key?) { true }
-          expect(has_env.verify).to be true
+            it 'returns false' do
+              expect(has_env.verify).to be false
+            end
+          end
         end
+      end
+
+      context 'when var name and value are provided' do
+        subject(:has_env) { HasEnv.new(env, var_name, var_value) }
+
+        describe '#verify' do
+          context 'when remote environment var is defined' do
+            context 'when value is the same' do
+              it 'returns true' do
+                expect(has_env.verify).to be true
+              end
+            end
+
+            context 'when value differs' do
+              let(:remote_env) { { 'SOME_VAR' => 'SOME_OTHER_VALUE' } }
+
+              it 'return false' do
+                expect(has_env.verify).to be false
+              end
+            end
+          end
+
+          context 'when remote environment var is not defined' do
+            let(:var_name) { 'SOME_NON_EXISTENT_VAR' }
 
-        it 'returns false when remote environment var is not defined' do
-          allow(environment).to receive(:key?) { false }
-          expect(has_env.verify).to be false
+            it 'return false' do
+              expect(has_env.verify).to be false
+            end
+          end
         end
       end
     end

data/spec/producer/core/tests/has_executable_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Producer::Core
   module Tests
     describe HasExecutable, :env do
-      subject(:has_env) { HasExecutable.new(env, executable) }
+      subject(:test) { HasExecutable.new(env, executable) }
 
       it_behaves_like 'test'
 
@@ -12,7 +12,7 @@ module Producer::Core
           let(:executable) { 'true' }
 
           it 'returns true' do
-            expect(has_env.verify).to be true
+            expect(test.verify).to be true
           end
         end
 
@@ -20,7 +20,7 @@ module Producer::Core
           let(:executable) { 'some_non_existent_executable' }
 
           it 'returns false' do
-            expect(has_env.verify).to be false
+            expect(test.verify).to be false
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: producer-core
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Thibault Jouan
@@ -137,11 +137,14 @@ files:
 - features/recipes/target.feature
 - features/ssh/config.feature
 - features/steps/etc_steps.rb
+- features/steps/execution_steps.rb
+- features/steps/output_steps.rb
 - features/steps/recipe_steps.rb
 - features/steps/remote_steps.rb
 - features/steps/ssh_steps.rb
 - features/support/env.rb
-- features/support/env_cucumber-doc_string.rb
+- features/support/env_cucumber_doc_string.rb
+- features/support/env_fake_home.rb
 - features/tasks/condition.feature
 - features/tasks/evaluation.feature
 - features/tasks/registry.feature
@@ -262,11 +265,14 @@ test_files:
 - features/recipes/target.feature
 - features/ssh/config.feature
 - features/steps/etc_steps.rb
+- features/steps/execution_steps.rb
+- features/steps/output_steps.rb
 - features/steps/recipe_steps.rb
 - features/steps/remote_steps.rb
 - features/steps/ssh_steps.rb
 - features/support/env.rb
-- features/support/env_cucumber-doc_string.rb
+- features/support/env_cucumber_doc_string.rb
+- features/support/env_fake_home.rb
 - features/tasks/condition.feature
 - features/tasks/evaluation.feature
 - features/tasks/registry.feature