producer-core 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c2475905b4f530aaa6299d8ff7a85c05c588bb3
-  data.tar.gz: f2cfa1b86883199dee6760ae43dfbed5e8dcbe70
+  metadata.gz: 54159e4f77534537d3907df5c163f8625a10eee2
+  data.tar.gz: 4477e96cb8863e4a8b1f192cbbf72d134cc58a5b
 SHA512:
-  metadata.gz: 6b7b4f2e271d4731f99256bc3f44be758e821b1ec44c82ace19cf3c59b846ef1d77dc7bb433159ba2686fdd5acf7aad632b6269e520202725a790770cf373d7d
-  data.tar.gz: 7dda9db4a723a9d479ff4e589bb9d3dbb9295d8dc939320287021b35b42468e12e22d4f5a8a91da590bd28983e89fe37dcf54c105fe99c5749095b922af98511
+  metadata.gz: f5c973e21cba0028b335e65b7e15907196347065bb44a16fef4a5cdc765c0e0f49b9145c17b2aa1cdd753f7f9df746bc4b9a6e200020082631e93a4656e04eab
+  data.tar.gz: 9b21fd80402af11295d8f4b5087890e4d017d6ae75aa416b6cdc900b5d729bf58a4eb35d839b2d25f3ce1137abed8704e786e278cfc16c357d2a5eb63eece882

data/features/actions/sh.feature

@@ -19,11 +19,11 @@ Feature: `sh' task action
       target 'some_host.test'
 
       task :some_task do
-        sh '\echo from remote'
+        sh '\echo hello from remote'
       end
       """
     When I successfully execute the recipe
-    Then the output must contain "from remote"
+    Then the output must contain exactly "hello from remote\n"
 
   Scenario: aborts on failed command execution
     Given a recipe with:

data/features/tests/has_executable.feature

@@ -0,0 +1,30 @@
+@sshd
+Feature: `has_executable' condition keyword
+
+  Scenario: succeeds when remote executable is available
+    Given a recipe with:
+      """
+      target 'some_host.test'
+
+      task :testing_executable_availability do
+        condition { has_executable 'true' }
+
+        echo 'evaluated'
+      end
+      """
+    When I successfully execute the recipe
+    Then the output must contain "evaluated"
+
+  Scenario: succeeds when remote executable is available
+    Given a recipe with:
+      """
+      target 'some_host.test'
+
+      task :testing_executable_availability do
+        condition { has_executable 'some_non_existent_executable' }
+
+        echo 'evaluated'
+      end
+      """
+    When I successfully execute the recipe
+    Then the output must not contain "evaluated"

data/lib/producer/core/actions/shell_command.rb

@@ -4,7 +4,6 @@ module Producer
       class ShellCommand < Action
         def apply
           remote.execute(arguments.first, output)
-          output.puts
         end
       end
     end

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

@@ -13,10 +13,11 @@ module Producer
           end
         end
 
-        define_test :file_contains, Tests::FileContains
-        define_test :has_env,       Tests::HasEnv
-        define_test :has_dir,       Tests::HasDir
-        define_test :has_file,      Tests::HasFile
+        define_test :file_contains,   Tests::FileContains
+        define_test :has_env,         Tests::HasEnv
+        define_test :has_executable,  Tests::HasExecutable
+        define_test :has_dir,         Tests::HasDir
+        define_test :has_file,        Tests::HasFile
 
         attr_reader :block, :env, :tests
 

data/lib/producer/core/testing/mock_remote.rb

@@ -12,11 +12,18 @@ module Producer
 
           case program
           when 'echo'
-            output << tokens.join(' ')
+            output << tokens.join(' ') << "\n"
           when 'true'
             output << ''
           when 'false'
             raise RemoteCommandExecutionError
+          when 'type'
+            raise RemoteCommandExecutionError unless %w[
+              echo
+              true
+              false
+              type
+            ].include? tokens.first
           end
 
           output

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

@@ -0,0 +1,14 @@
+module Producer
+  module Core
+    module Tests
+      class HasExecutable < Test
+        def verify
+          remote.execute("type #{arguments.first}")
+          true
+        rescue RemoteCommandExecutionError
+          false
+        end
+      end
+    end
+  end
+end

data/lib/producer/core/version.rb

@@ -1,5 +1,5 @@
 module Producer
   module Core
-    VERSION = '0.1.14'
+    VERSION = '0.1.15'
   end
 end

data/lib/producer/core.rb

@@ -19,6 +19,7 @@ require 'producer/core/test'
 require 'producer/core/tests/file_contains'
 require 'producer/core/tests/has_dir'
 require 'producer/core/tests/has_env'
+require 'producer/core/tests/has_executable'
 require 'producer/core/tests/has_file'
 
 require 'producer/core/cli'

data/producer-core.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |s|
   s.executables = s.files.grep(/\Abin\//) { |f| File.basename(f) }
 
 
-  s.add_dependency 'net-ssh',   '~> 2.7.0'
-  s.add_dependency 'net-sftp',  '~> 2.1.2'
+  s.add_dependency 'net-ssh',   '~> 2.7'
+  s.add_dependency 'net-sftp',  '~> 2.1'
 
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'cucumber'
-  s.add_development_dependency 'aruba'
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec',     '~> 2.14'
+  s.add_development_dependency 'cucumber',  '~> 1.3'
+  s.add_development_dependency 'aruba',     '~> 0.5'
+  s.add_development_dependency 'rake',      '~> 10.1'
 end

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

@@ -15,7 +15,7 @@ module Producer::Core
           sh.apply
         end
 
-        it 'writes the returned output with a record separator' do
+        it 'writes the returned output' do
           sh.apply
           expect(output).to eq "#{command_args}\n"
         end

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

@@ -7,7 +7,13 @@ module Producer::Core
       let(:env)     { double 'env' }
       subject(:dsl) { DSL.new(env, &block) }
 
-      %w[file_contains has_dir has_env has_file].each do |test|
+      %w[
+        file_contains
+        has_dir
+        has_env
+        has_executable
+        has_file
+      ].each do |test|
         it "has `#{test}' test defined" do
           expect(dsl).to respond_to test.to_sym
         end

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

@@ -48,16 +48,11 @@ module Producer::Core
         end
       end
 
-      # FIXME: We rely a lot on mocking net-sftp heavily, while we already use a
-      # part of net-ssh story helpers, which are more close to integration tests.
-      describe '#file?', :ssh do
+      describe '#file?' do
         let(:file_path) { 'some_file_path' }
         let(:stat)      { double 'stat' }
 
-        before do
-          sftp_story
-          allow(fs.sftp).to receive(:stat!) { stat }
-        end
+        before { allow(sftp).to receive(:stat!) { stat } }
 
         context 'when path given as argument exists' do
           context 'when path is a file' do

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

@@ -20,8 +20,8 @@ module Producer::Core
         context 'dummy echo command' do
           let(:command) { 'echo some arguments' }
 
-          it 'returns command arguments' do
-            expect(remote.execute(command)).to eq 'some arguments'
+          it 'returns command arguments ended by a record separator' do
+            expect(remote.execute(command)).to eq "some arguments\n"
           end
         end
 
@@ -40,6 +40,25 @@ module Producer::Core
             expect { remote.execute(command) }.to raise_error(RemoteCommandExecutionError)
           end
         end
+
+        context 'dummy type command' do
+          context 'executable exists' do
+            let(:command) { 'type true' }
+
+            it 'returns an empty string' do
+              expect(remote.execute(command)).to eq ''
+            end
+          end
+
+          context 'executable does not exist' do
+            let(:command) { 'type some_non_existent_executable' }
+
+            it 'raises a RemoteCommandExecutionError' do
+              expect { remote.execute(command) }
+                .to raise_error(RemoteCommandExecutionError)
+            end
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+module Producer::Core
+  module Tests
+    describe HasExecutable, :env do
+      subject(:has_env) { HasExecutable.new(env, executable) }
+
+      it_behaves_like 'test'
+
+      describe '#verify' do
+        context 'executable exists' do
+          let(:executable) { 'true' }
+
+          it 'returns true' do
+            expect(has_env.verify).to be true
+          end
+        end
+
+        context 'executable does not exist' do
+          let(:executable) { 'some_non_existent_executable' }
+
+          it 'returns false' do
+            expect(has_env.verify).to be false
+          end
+        end
+      end
+    end
+  end
+end

data/spec/support/net_ssh_story_helpers.rb

@@ -1,24 +1,7 @@
 module NetSSHStoryHelpers
   require 'net/ssh/test'
-  include Net::SSH::Test
-
-  # FIXME: must be moved elsewhere or implemented another way/form.
-  class ::Net::SSH::Test::Channel
-    def gets_packet(type, *args)
-      gets_data(sftp_packet(type, *args))
-    end
 
-    def sends_packet(type, *args)
-      sends_data(sftp_packet(type, *args))
-    end
-
-    private
-
-    def sftp_packet(type, *args)
-      data = Net::SSH::Buffer.from(*args)
-      Net::SSH::Buffer.from(:long, data.length + 1, :byte, type, :raw, data).to_s
-    end
-  end
+  include Net::SSH::Test
 
   def story_with_new_channel
     story do |session|
@@ -29,22 +12,6 @@ module NetSSHStoryHelpers
     end
   end
 
-  def sftp_story
-    story do |session|
-      ch = session.opens_channel
-      ch.sends_subsystem 'sftp'
-      ch.sends_packet(
-        Net::SFTP::Constants::PacketTypes::FXP_INIT, :long,
-        Net::SFTP::Session::HIGHEST_PROTOCOL_VERSION_SUPPORTED
-      )
-      ch.gets_packet(
-        Net::SFTP::Constants::PacketTypes::FXP_VERSION, :long,
-        Net::SFTP::Session::HIGHEST_PROTOCOL_VERSION_SUPPORTED
-      )
-      yield ch if block_given?
-    end
-  end
-
   def expect_story_completed
     raise 'there is no story to expect' if socket.script.events.empty?
     yield

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: producer-core
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -16,84 +16,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 description: |
   Software provisioning tool, including a DSL to write "recipes".
 email: tj@a13.fr
@@ -135,6 +135,7 @@ files:
 - features/tests/file_contains.feature
 - features/tests/has_dir.feature
 - features/tests/has_env.feature
+- features/tests/has_executable.feature
 - features/tests/has_file.feature
 - features/tests/negated_test.feature
 - lib/producer/core.rb
@@ -164,6 +165,7 @@ files:
 - lib/producer/core/tests/file_contains.rb
 - lib/producer/core/tests/has_dir.rb
 - lib/producer/core/tests/has_env.rb
+- lib/producer/core/tests/has_executable.rb
 - lib/producer/core/tests/has_file.rb
 - lib/producer/core/version.rb
 - lib/producer/core/worker.rb
@@ -195,6 +197,7 @@ files:
 - spec/producer/core/tests/file_contains_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
 - spec/producer/core/tests/has_file_spec.rb
 - spec/producer/core/worker_spec.rb
 - spec/spec_helper.rb
@@ -223,7 +226,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
@@ -255,6 +258,7 @@ test_files:
 - features/tests/file_contains.feature
 - features/tests/has_dir.feature
 - features/tests/has_env.feature
+- features/tests/has_executable.feature
 - features/tests/has_file.feature
 - features/tests/negated_test.feature
 - spec/fixtures/recipes/empty.rb
@@ -284,6 +288,7 @@ test_files:
 - spec/producer/core/tests/file_contains_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
 - spec/producer/core/tests/has_file_spec.rb
 - spec/producer/core/worker_spec.rb
 - spec/spec_helper.rb
@@ -293,4 +298,3 @@ test_files:
 - spec/support/shared_action.rb
 - spec/support/shared_test.rb
 - spec/support/test_env_helpers.rb
-has_rdoc: