producer-core 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a595e50ec520bdedf5e94b927b4dd8080a1acef
-  data.tar.gz: 1c7c1f218276ed668d62c2d31f482e12a2f3ca40
+  metadata.gz: fba0f36e7a80a2897a17831da23ae1e9a7510ab3
+  data.tar.gz: 53ec1accae1569022521804498ea3eb379e6d6d8
 SHA512:
-  metadata.gz: 727921d665f949d90cb092b3c653c698a7f1c82d2d48e1dd8f73adbb9905fd60c3b0348a6bfdc3c1e01b77c35f7843507768c3f18102d3e5e9ae8d16b748b9a6
-  data.tar.gz: b2ece9b39a0be51041fd89f1b526c2d8042a252c3e4961be6cb9c621420c1f5bbccfab531df0885b3fa8f29473c07c32de8f30d46b2a6f7332bdccff2b2f9d73
+  metadata.gz: 024a23110ed45ca7ed46d78a4ca77e403de5283482aedc549b34f63b3aa14ab38d70f9defbab90e8b8ed935e28e1a116a0307cfc35d4b577dee77934a2364a3a
+  data.tar.gz: 8a5c854adfa2ae0d8bec10abe38995d9aaf7ce312013081a7b4b226c0a58519419457f33be3cd52142864e0be0317fc1e0527f09881a73308cd843a81b5fbd89

data/features/task_template.feature

@@ -0,0 +1,27 @@
+Feature: `template' task keyword
+
+  Background:
+    Given a file named "basic.erb" with:
+      """
+      basic template
+      """
+    Given a file named "variables.erb" with:
+      """
+      <%= @foo %>
+      """
+
+  Scenario: renders an ERB template file
+    Given a recipe with:
+      """
+      task(:echo_template) { echo template 'basic' }
+      """
+    When I execute the recipe
+    Then the output must contain "basic template"
+
+  Scenario: renders ERB with given attributes as member data
+    Given a recipe with:
+      """
+      task(:echo_template) { echo template('variables', foo: 'bar') }
+      """
+    When I execute the recipe
+    Then the output must contain "bar"

data/features/test_file_match.feature

@@ -0,0 +1,26 @@
+@sshd
+Feature: `file_match' condition keyword
+
+  Background:
+    Given a recipe with:
+      """
+      task :file_match_test do
+        condition { file_match 'some_file', /\Asome_content\z/ }
+
+        echo 'evaluated'
+      end
+      """
+
+  Scenario: succeeds when file match pattern
+    Given a remote file named "some_file" with "some_content"
+    When I successfully execute the recipe on remote target
+    Then the output must contain "evaluated"
+
+  Scenario: fails when file does not match pattern
+    Given a remote file named "some_file" with "some_other_content"
+    When I successfully execute the recipe on remote target
+    Then the output must not contain "evaluated"
+
+  Scenario: fails when file does not exist
+    When I successfully execute the recipe on remote target
+    Then the output must not contain "evaluated"

data/lib/producer/core/condition.rb

@@ -36,6 +36,7 @@ module Producer
       define_test :sh,              Tests::ShellCommandStatus
       define_test :file_contains,   Tests::FileContains
       define_test :file_eq,         Tests::FileEq
+      define_test :file_match,      Tests::FileMatch
       define_test :env?,            Tests::HasEnv
       define_test :executable?,     Tests::HasExecutable
       define_test :dir?,            Tests::HasDir

data/lib/producer/core/remote.rb

@@ -25,7 +25,7 @@ module Producer
       end
 
       def execute(command, output = '', error_output = '')
-        channel = session.open_channel do |channel|
+        session.open_channel do |channel|
           channel.exec command do |ch, success|
             ch.on_data do |c, data|
               output << data
@@ -40,8 +40,7 @@ module Producer
               fail RemoteCommandExecutionError, command if exit_status != 0
             end
           end
-        end
-        channel.wait
+        end.wait
         output
       end
 

data/lib/producer/core/task.rb

@@ -57,6 +57,25 @@ module Producer
       def get(key)
         @env[key]
       end
+
+      def template(path, variables = {})
+        path = "#{path}.erb"
+        tpl = ERB.new(File.read(path), nil, '-')
+        tpl.filename = path
+        tpl.result build_erb_binding variables
+      end
+
+
+      private
+
+      def build_erb_binding(variables)
+        Object.new.instance_eval do |o|
+          variables.each do |k, v|
+            o.instance_variable_set "@#{k}", v
+          end
+          binding
+        end
+      end
     end
   end
 end

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

@@ -7,6 +7,7 @@ module Producer
           content ? content.include?(arguments[1]) : false
         end
 
+
         private
 
         def file_content

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

@@ -0,0 +1,18 @@
+module Producer
+  module Core
+    module Tests
+      class FileMatch < Test
+        def verify
+          !!(file_content =~ arguments[1])
+        end
+
+
+        private
+
+        def file_content
+          fs.file_read(arguments[0]) or ''
+        end
+      end
+    end
+  end
+end

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

@@ -11,6 +11,7 @@ module Producer
           end
         end
 
+
         private
 
         def key

data/lib/producer/core/version.rb

@@ -1,5 +1,5 @@
 module Producer
   module Core
-    VERSION = '0.3.8'.freeze
+    VERSION = '0.3.9'.freeze
   end
 end

data/lib/producer/core.rb

@@ -1,3 +1,4 @@
+require 'erb'
 require 'etc'
 require 'forwardable'
 require 'optparse'
@@ -21,6 +22,7 @@ require 'producer/core/test'
 require 'producer/core/tests/condition_test'
 require 'producer/core/tests/file_contains'
 require 'producer/core/tests/file_eq'
+require 'producer/core/tests/file_match'
 require 'producer/core/tests/has_dir'
 require 'producer/core/tests/has_env'
 require 'producer/core/tests/has_executable'

data/spec/producer/core/actions/echo_spec.rb

@@ -4,7 +4,7 @@ module Producer::Core
   module Actions
     describe Echo, :env do
       let(:text)      { 'hello' }
-      subject(:echo)  { Echo.new(env, text) }
+      subject(:echo)  { described_class.new(env, text) }
 
       it_behaves_like 'action'
 

data/spec/producer/core/actions/file_append_spec.rb

@@ -6,7 +6,7 @@ module Producer::Core
       let(:path)          { 'some_path' }
       let(:content)       { 'some content' }
       let(:added_content) { ' added' }
-      subject(:action)    { FileAppend.new(env, path, added_content) }
+      subject(:action)    { described_class.new(env, path, added_content) }
 
       it_behaves_like 'action'
 

data/spec/producer/core/actions/file_replace_content_spec.rb

@@ -7,7 +7,7 @@ module Producer::Core
       let(:pattern)     { 'content' }
       let(:replacement) { 'other content' }
       let(:content)     { 'some content' }
-      subject(:action)  { FileReplaceContent.new(env, path, pattern, replacement) }
+      subject(:action)  { described_class.new(env, path, pattern, replacement) }
 
       it_behaves_like 'action'
 

data/spec/producer/core/actions/file_writer_spec.rb

@@ -5,7 +5,7 @@ module Producer::Core
     describe FileWriter, :env do
       let(:path)        { 'some_path' }
       let(:content)     { 'some_content' }
-      subject(:writer)  { FileWriter.new(env, path, content) }
+      subject(:writer)  { described_class.new(env, path, content) }
 
       it_behaves_like 'action'
 
@@ -16,7 +16,7 @@ module Producer::Core
         end
 
         context 'when a mode was given' do
-          subject(:writer) { FileWriter.new(env, path, content, 0600) }
+          subject(:writer) { described_class.new(env, path, content, 0600) }
 
           it 'specifies the given mode' do
             expect(remote_fs)
@@ -44,7 +44,7 @@ module Producer::Core
         end
 
         context 'when a mode was given' do
-          subject(:writer) { FileWriter.new(env, path, content, 0600) }
+          subject(:writer) { described_class.new(env, path, content, 0600) }
 
           it 'returns the mode' do
             expect(writer.mode).to eq 0600

data/spec/producer/core/actions/mkdir_spec.rb

@@ -4,7 +4,7 @@ module Producer::Core
   module Actions
     describe Mkdir, :env do
       let(:path)      { 'some_path' }
-      subject(:mkdir) { Mkdir.new(env, path) }
+      subject(:mkdir) { described_class.new(env, path) }
 
       it_behaves_like 'action'
 
@@ -17,7 +17,7 @@ module Producer::Core
         end
 
         context 'when a mode was given' do
-          subject(:mkdir) { Mkdir.new(env, path, 0700) }
+          subject(:mkdir) { described_class.new(env, path, 0700) }
 
           it 'changes the directory with given mode' do
             expect(remote_fs).to receive(:chmod).with(path, 0700)

data/spec/producer/core/actions/shell_command_spec.rb

@@ -5,7 +5,7 @@ module Producer::Core
     describe ShellCommand, :env do
       let(:command_args)  { 'hello from remote host' }
       let(:command)       { "echo #{command_args}" }
-      subject(:sh)        { ShellCommand.new(env, command) }
+      subject(:sh)        { described_class.new(env, command) }
 
       it_behaves_like 'action'
 

data/spec/producer/core/condition_spec.rb

@@ -9,6 +9,7 @@ module Producer::Core
       sh
       file_contains
       file_eq
+      file_match
       dir?
       env?
       executable?
@@ -87,7 +88,7 @@ module Producer::Core
       before { described_class.define_test(:some_test, some_test) }
 
       it 'returns an evaluated condition' do
-        expect(condition).to be_a Condition
+        expect(condition).to be_a described_class
       end
 
       it 'evaluates the condition tests' do

data/spec/producer/core/prompter_spec.rb

@@ -4,7 +4,7 @@ module Producer::Core
   describe Prompter do
     let(:input)         { StringIO.new }
     let(:output)        { StringIO.new }
-    subject(:prompter)  { Prompter.new(input, output) }
+    subject(:prompter)  { described_class.new(input, output) }
 
     describe '#initialize' do
       it 'assigns the given input' do

data/spec/producer/core/remote/fs_spec.rb

@@ -5,7 +5,7 @@ module Producer::Core
     describe FS do
       let(:sftp_file) { double 'sftp_file' }
       let(:sftp)      { double('sftp', file: sftp_file) }
-      subject(:fs)    { FS.new(sftp) }
+      subject(:fs)    { described_class.new(sftp) }
 
       describe '#initialize' do
         it 'assigns the sftp session' do

data/spec/producer/core/remote_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 module Producer::Core
   describe Remote do
     let(:hostname)    { 'some_host.example' }
-    subject(:remote)  { Remote.new(hostname) }
+    subject(:remote)  { described_class.new(hostname) }
 
     describe '#initialize' do
       it 'assigns the given hostname' do

data/spec/producer/core/testing/mock_remote_spec.rb

@@ -4,7 +4,7 @@ require 'producer/core/testing'
 module Producer::Core
   module Testing
     describe MockRemote do
-      subject(:remote) { MockRemote.new('some_host.example') }
+      subject(:remote) { described_class.new('some_host.example') }
 
       it 'is a remote' do
         expect(remote).to be_a Remote

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

@@ -5,7 +5,7 @@ module Producer::Core
     describe FileContains, :env do
       let(:filepath)  { 'some_file' }
       let(:content)   { 'some_content' }
-      subject(:test)  { FileContains.new(env, filepath, content) }
+      subject(:test)  { described_class.new(env, filepath, content) }
 
       it_behaves_like 'test'
 

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

@@ -5,7 +5,7 @@ module Producer::Core
     describe FileEq, :env do
       let(:filepath)  { 'some_file' }
       let(:content)   { 'some content' }
-      subject(:test)  { FileEq.new(env, filepath, content) }
+      subject(:test)  { described_class.new(env, filepath, content) }
 
       it_behaves_like 'test'
 

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

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+module Producer::Core
+  module Tests
+    describe FileMatch, :env do
+      let(:filepath)  { 'some_file' }
+      let(:pattern)   { /\Asome_content\z/ }
+      subject(:test)  { described_class.new(env, filepath, pattern) }
+
+      it_behaves_like 'test'
+
+      describe '#verify' do
+        context 'when file matches the pattern' do
+          before do
+            allow(remote_fs)
+              .to receive(:file_read).with(filepath) { 'some_content' }
+          end
+
+          it 'returns true' do
+            expect(test.verify).to be true
+          end
+        end
+
+        context 'when file does not match the pattern' do
+          before do
+            allow(remote_fs).to receive(:file_read).with(filepath) { 'foo bar' }
+          end
+
+          it 'returns false' do
+            expect(test.verify).to be false
+          end
+        end
+
+        context 'when file does not exist' do
+          before do
+            allow(remote_fs).to receive(:file_read).with(filepath) { nil }
+          end
+
+          it 'returns false' do
+            expect(test.verify).to be false
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module Producer::Core
   module Tests
     describe HasDir, :env do
       let(:path)        { 'some_directory' }
-      subject(:has_dir) { HasDir.new(env, path) }
+      subject(:has_dir) { described_class.new(env, path) }
 
       it_behaves_like 'test'
 

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

@@ -7,7 +7,7 @@ module Producer::Core
       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) }
+      subject(:has_env) { described_class.new(env, var_name) }
 
       it_behaves_like 'test'
 
@@ -42,7 +42,7 @@ module Producer::Core
       end
 
       context 'when var name and value are provided' do
-        subject(:has_env) { HasEnv.new(env, var_name, var_value) }
+        subject(:has_env) { described_class.new(env, var_name, var_value) }
 
         describe '#verify' do
           context 'when remote environment var is defined' do

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(:test) { HasExecutable.new(env, executable) }
+      subject(:test) { described_class.new(env, executable) }
 
       it_behaves_like 'test'
 

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

@@ -4,7 +4,7 @@ module Producer::Core
   module Tests
     describe HasFile, :env do
       let(:filepath)      { 'some_file' }
-      subject(:has_file)  { HasFile.new(env, filepath) }
+      subject(:has_file)  { described_class.new(env, filepath) }
 
       it_behaves_like 'test'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: producer-core
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-26 00:00:00.000000000 Z
+date: 2014-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -155,12 +155,14 @@ files:
 - 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
 - lib/producer/core.rb
 - lib/producer/core/action.rb
@@ -188,6 +190,7 @@ files:
 - lib/producer/core/tests/condition_test.rb
 - lib/producer/core/tests/file_contains.rb
 - lib/producer/core/tests/file_eq.rb
+- lib/producer/core/tests/file_match.rb
 - lib/producer/core/tests/has_dir.rb
 - lib/producer/core/tests/has_env.rb
 - lib/producer/core/tests/has_executable.rb
@@ -223,6 +226,7 @@ files:
 - spec/producer/core/tests/condition_test_spec.rb
 - spec/producer/core/tests/file_contains_spec.rb
 - spec/producer/core/tests/file_eq_spec.rb
+- spec/producer/core/tests/file_match_spec.rb
 - spec/producer/core/tests/has_dir_spec.rb
 - spec/producer/core/tests/has_env_spec.rb
 - spec/producer/core/tests/has_executable_spec.rb
@@ -293,12 +297,14 @@ test_files:
 - 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
 - spec/fixtures/recipes/empty.rb
 - spec/fixtures/recipes/raise.rb
@@ -327,6 +333,7 @@ test_files:
 - spec/producer/core/tests/condition_test_spec.rb
 - spec/producer/core/tests/file_contains_spec.rb
 - spec/producer/core/tests/file_eq_spec.rb
+- spec/producer/core/tests/file_match_spec.rb
 - spec/producer/core/tests/has_dir_spec.rb
 - spec/producer/core/tests/has_env_spec.rb
 - spec/producer/core/tests/has_executable_spec.rb