producer-core 0.1.17 → 0.2.0

data/Guardfile

@@ -1,10 +1,10 @@
-guard :cucumber, cli: '--format pretty --quiet' do
+guard :cucumber, cli: '--format pretty --quiet', all_on_start: false do
   watch(%r{\Afeatures/.+\.feature\z})
   watch(%r{\Afeatures/support/.+\.rb\z})                { 'features' }
   watch(%r{\Afeatures/step_definitions/.+_steps\.rb\z}) { 'features' }
 end
 
-guard :rspec, cmd: 'rspec -f doc' do
+guard :rspec, cmd: 'bundle exec rspec -f doc' do
   watch(%r{\Aspec/.+_spec\.rb\z})
   watch(%r{\Alib/(.+)\.rb\z})         { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')        { 'spec' }

data/features/support/{env_aruba.rb → env.rb}

@@ -14,3 +14,5 @@ module Cucumber
 end
 
 require 'aruba/cucumber'
+
+require 'cucumber/sshd/cucumber'

data/features/tests/{has_dir.feature → dir.feature}

@@ -1,5 +1,5 @@
 @sshd
-Feature: `has_dir' condition keyword
+Feature: `dir?' condition keyword
 
   Background:
     Given a recipe with:
@@ -7,7 +7,7 @@ Feature: `has_dir' condition keyword
       target 'some_host.test'
 
       task :testing_directory_existence do
-        condition { has_dir 'some_directory' }
+        condition { dir? 'some_directory' }
 
         echo 'evaluated'
       end

data/features/tests/{has_env.feature → env.feature}

@@ -1,5 +1,5 @@
 @sshd
-Feature: `has_env' condition keyword
+Feature: `env?' condition keyword
 
   Scenario: succeeds when remote environment variable is defined
     Given a recipe with:
@@ -7,7 +7,7 @@ Feature: `has_env' condition keyword
       target 'some_host.test'
 
       task :testing_env_var_definition do
-        condition { has_env :shell }
+        condition { env? :shell }
 
         echo 'evaluated'
       end
@@ -21,7 +21,7 @@ Feature: `has_env' condition keyword
       target 'some_host.test'
 
       task :testing_env_var_definition do
-        condition { has_env :inexistent_var }
+        condition { env? :inexistent_var }
 
         echo 'evaluated'
       end

data/features/tests/{has_executable.feature → executable.feature}

@@ -1,5 +1,5 @@
 @sshd
-Feature: `has_executable' condition keyword
+Feature: `executable?' condition keyword
 
   Scenario: succeeds when remote executable is available
     Given a recipe with:
@@ -7,7 +7,7 @@ Feature: `has_executable' condition keyword
       target 'some_host.test'
 
       task :testing_executable_availability do
-        condition { has_executable 'true' }
+        condition { executable? 'true' }
 
         echo 'evaluated'
       end
@@ -21,7 +21,7 @@ Feature: `has_executable' condition keyword
       target 'some_host.test'
 
       task :testing_executable_availability do
-        condition { has_executable 'some_non_existent_executable' }
+        condition { executable? 'some_non_existent_executable' }
 
         echo 'evaluated'
       end

data/features/tests/{has_file.feature → file.feature}

@@ -1,5 +1,5 @@
 @sshd
-Feature: `has_file' condition keyword
+Feature: `file?' condition keyword
 
   Background:
     Given a recipe with:
@@ -7,7 +7,7 @@ Feature: `has_file' condition keyword
       target 'some_host.test'
 
       task :testing_file_existence do
-        condition { has_file 'some_file' }
+        condition { file? 'some_file' }
 
         echo 'evaluated'
       end

data/features/tests/negated_test.feature

@@ -7,13 +7,13 @@ Feature: negated test prefix (no_)
       target 'some_host.test'
 
       task :successful_test do
-        condition { has_env :shell }
+        condition { env? :shell }
 
         echo 'successful_test'
       end
 
       task :negated_test do
-        condition { no_has_env :shell }
+        condition { no_env? :shell }
 
         echo 'negated_test'
       end
@@ -28,13 +28,13 @@ Feature: negated test prefix (no_)
       target 'some_host.test'
 
       task :failing_test do
-        condition { has_env :inexistent_var }
+        condition { env? :inexistent_var }
 
         echo 'failing_test'
       end
 
       task :negated_test do
-        condition { no_has_env :inexistent_var }
+        condition { no_env? :inexistent_var }
 
         echo 'negated_test'
       end

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

@@ -16,10 +16,10 @@ module Producer
         define_test :`,               Tests::ShellCommandStatus
         define_test :sh,              Tests::ShellCommandStatus
         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
+        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
 

data/lib/producer/core/version.rb

@@ -1,5 +1,5 @@
 module Producer
   module Core
-    VERSION = '0.1.17'
+    VERSION = '0.2.0'
   end
 end

data/producer-core.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'net-ssh',   '~> 2.7'
   s.add_dependency 'net-sftp',  '~> 2.1'
 
-  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'
+  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 'cucumber-sshd', '~> 0.1'
+  s.add_development_dependency 'rake',          '~> 10.1'
 end

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

@@ -11,10 +11,10 @@ module Producer::Core
         `
         sh
         file_contains
-        has_dir
-        has_env
-        has_executable
-        has_file
+        dir?
+        env?
+        executable?
+        file?
       ].each do |test|
         it "has `#{test}' test defined" do
           expect(dsl).to respond_to test.to_sym

data/spec/support/net_ssh_story_helpers.rb

@@ -1,6 +1,21 @@
-module NetSSHStoryHelpers
-  require 'net/ssh/test'
+require 'net/ssh/test'
+
+if Net::SSH::Version::CURRENT >= Net::SSH::Version[2, 8, 0]
+  module Net
+    module SSH
+      module Test
+        class Socket
+          def open(host, port, connections_options = nil)
+            @host, @port = host, port
+            self
+          end
+        end
+      end
+    end
+  end
+end
 
+module NetSSHStoryHelpers
   include Net::SSH::Test
 
   def story_with_new_channel

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: producer-core
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Thibault Jouan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: net-sftp
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -76,13 +86,31 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: cucumber-sshd
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -90,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -126,17 +155,16 @@ files:
 - features/steps/recipe_steps.rb
 - features/steps/remote_steps.rb
 - features/steps/ssh_steps.rb
-- features/support/env_aruba.rb
+- features/support/env.rb
 - features/support/env_cucumber-doc_string.rb
-- features/support/ssh.rb
 - features/tasks/condition.feature
 - features/tasks/evaluation.feature
 - features/tasks/registry.feature
+- features/tests/dir.feature
+- features/tests/env.feature
+- features/tests/executable.feature
+- features/tests/file.feature
 - 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
 - features/tests/shell_command_status.feature
 - lib/producer/core.rb
@@ -212,26 +240,27 @@ files:
 - spec/support/test_env_helpers.rb
 homepage: https://rubygems.org/gems/producer-core
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.29
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Provisioning tool
 test_files:
 - features/actions/echo.feature
@@ -252,17 +281,16 @@ test_files:
 - features/steps/recipe_steps.rb
 - features/steps/remote_steps.rb
 - features/steps/ssh_steps.rb
-- features/support/env_aruba.rb
+- features/support/env.rb
 - features/support/env_cucumber-doc_string.rb
-- features/support/ssh.rb
 - features/tasks/condition.feature
 - features/tasks/evaluation.feature
 - features/tasks/registry.feature
+- features/tests/dir.feature
+- features/tests/env.feature
+- features/tests/executable.feature
+- features/tests/file.feature
 - 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
 - features/tests/shell_command_status.feature
 - spec/fixtures/recipes/empty.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 30fb89006ff65ccf133c3ba8169115217d1331f3
-  data.tar.gz: 5ca30ada198418333e91f5d7b5eabf7c13d95e9f
-SHA512:
-  metadata.gz: 494eedfa740e3628b1b7d145dd7bfbfa96fb3f055661d243f0069b36e0b53bdb19282f1c93284dcd5fd3244af5e686fbac9b82592b45d81541a1970793e3adae
-  data.tar.gz: 1639982191a5860d744055dabb87192e800ad93fc450cb392492d355a9be1781da3e41e43040ba279aa3a689f53323a8c59c3b3c6291897064c4fc888b822c5d

data/features/support/ssh.rb

@@ -1,107 +0,0 @@
-# FIXME: should be extracted as a separate gem `cucumber-sshd?'.
-class SSHServer
-  include Aruba::Api
-
-  DEFAULT_LISTEN_PORT = 2222
-  KEY_PATH            = 'etc/ssh_host_rsa_key'
-  KEY_PUB_PATH        = KEY_PATH.dup << '.pub'
-  SSHD_CONFIG_PATH    = 'etc/sshd_config'
-  SSH_CONFIG_PATH     = '.ssh/config'
-
-  attr_accessor :listen_port
-
-  def initialize(base_path)
-    @base_path    = base_path
-    @listen_port  = ENV['PRODUCER_TEST_SSHD_PORT'] ?
-      ENV['PRODUCER_TEST_SSHD_PORT'] :
-      DEFAULT_LISTEN_PORT
-  end
-
-  def start
-    in_current_dir do
-      @pid = fork do
-        $stderr.reopen '/dev/null'
-        exec "/usr/sbin/sshd -f etc/sshd_config -Deq"
-      end
-    end
-  end
-
-  def stop
-    Process.kill('TERM', @pid)
-    Process.wait(@pid)
-  end
-
-  def make_env
-    %w[etc .ssh].map { |e| create_dir e }
-
-    write_file KEY_PATH, <<-eoh
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA7EVDKeM7NYCGGVJw0wWLGCoptMFSR7DobhbEx2bAQbWDLFBF
-7S9bXpW/ddebFA4GBkHVriNPwu/IGjIgO3tivVcy6iguNKdYRABlSfpeAs+OdCzK
-hyEWhmKnFMZs2MhPiJg/KUep2gFZLoEcs9vkk37+cLcuUVkXVOSPXlYCuHjgkwaN
-9ij/KvCcLP4tw83H3Pyh1Wn/Y4k1+3nWN2S3RgRHF9RjEx7nm2FmXcZq1wygPe5G
-2bQNvZKykL+wlKIHwKiM4AWpVClczOiljNv9KROhGWanIZNNBIDTnikxFvY0FyoP
-1qvRrE8BlqxNeyG/vYNmXsv8xpO0MOF65z3d2QIDAQABAoIBAHL8dmZxX0R3i0vR
-knUwsnQNOQTuPPQFBelmDViaCiEwjGlJm+6F6KrMqERarO+Cr63l5m98YfoWJkWR
-dZxdPT22rWHGMk6PzuYxZxoszgoCJ2skzWAcW1EFvBjhROHwAr0Qk1Ssut4NX/DB
-B04FS2X5HS2QCOuwNymqnpejtmk+A2hv9bGVzj0X614gX3h5+0dImGrYE0Lu+Abf
-5fvWhN5nxgK5CVlU7WM09WxyHj9lBXI+W2dgTl6w3QJfBBQTkarLmDpwIeErq9xc
-al2qHj60nYC+RdFopuLfJWKiObdKRFpuPFYKbTA9nJz9T61zAF+LaDZ1mvdTuQmz
-jJEJ0nECgYEA+o2uJcDOCD2LBp2LqeQcGk1PrFLpSQ5921B10SxDWhygs2+UlBCW
-7t/qurqjEUZ91l3TAlUM7ViB/EkXk/xWJRJCzlmWRXfht9LPQTWlnDox/w8uSV2g
-3VwPx1xpju2PHO7Vsk6dsQsyoro14qNhYa9m1lBHA1TtJ/RLWauvnmUCgYEA8WgZ
-MthPXi/clDg2DlROGOEWd7WgaErEz578HWnegcMrHb8RV/XW21CO2UegHykzUlxz
-vJxAqhQeKJbP7T8uzuCZnkZqBqPh5PJT1XqxZibTeQvqYLzbIiKqmDrZWuRJvbLL
-kPxwYEG8R8nl9Dk1tLHuTQWWa5Q49he1cDss4GUCgYEA7WMBRZnIW3xb1Xe9VMjg
-a3cmbqHbj7FgQ0OXbQigA6euBnRIdITHTCnxDtw4Fe0Q2uLoQoRsjA/YkDx8T2S8
-BcGodDPjMYxk2rKsVR9L+poUtpEejLpd6H0KIhwHkzi26HXNGHRt6ckvP4hn94RO
-hqwWJiXHMnvrenh2T85fxRUCgYEA7m06NhWejhAHc/zwpsZtO/VUE3e3rknqiIUl
-zIc71D3G3+JOZunQA1xVOhSb+SrgHYBibu6Ej3a/MqeBRXkZ6gm6r7AsF9LU0SLl
-2fsMKzA9vVgfbNwaMmS6yQ+WjUbb7hghJlmtQ+So6N5n2AaJHKaADmJuZmJGwAg6
-k1ZexGECgYAFc+GjjFOPxC+Qg6z8261PnDffBK0o+0/EIq3cGA7Cp5pEo/hhMjDl
-W7CLjAGkok9W+rr9XwwXWCBuJmPh2jYeNaQljrHt9hIAOAxoYdbweb9oSo5SkcHv
-iDjcFK8S1e5vnlZAh9xH1WMCEsaz1WNqWm7CZOayN2LFn6Ed9seYYg==
------END RSA PRIVATE KEY-----
-    eoh
-
-    write_file KEY_PUB_PATH, <<-eoh
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsRUMp4zs1gIYZUnDTBYsYKim0wVJHsOhuFsTHZsBBtYMsUEXtL1telb9115sUDgYGQdWuI0/C78gaMiA7e2K9VzLqKC40p1hEAGVJ+l4Cz450LMqHIRaGYqcUxmzYyE+ImD8pR6naAVkugRyz2+STfv5wty5RWRdU5I9eVgK4eOCTBo32KP8q8Jws/i3Dzcfc/KHVaf9jiTX7edY3ZLdGBEcX1GMTHuebYWZdxmrXDKA97kbZtA29krKQv7CUogfAqIzgBalUKVzM6KWM2/0pE6EZZqchk00EgNOeKTEW9jQXKg/Wq9GsTwGWrE17Ib+9g2Zey/zGk7Qw4XrnPd3Z
-    eoh
-
-    write_file SSHD_CONFIG_PATH, <<-eoh
-Port #{listen_port}
-ListenAddress ::1
-
-Protocol 2
-HostKey #{File.expand_path @base_path}/#{KEY_PATH}
-PidFile /dev/null
-UsePrivilegeSeparation no
-Subsystem sftp /usr/lib/openssh/sftp-server
-ForceCommand HOME=#{File.expand_path @base_path} sh -c "cd ~; $SSH_ORIGINAL_COMMAND"
-    eoh
-
-    write_file SSH_CONFIG_PATH, <<-eoh
-Host          some_host.test
-  HostName    localhost
-  Port        #{listen_port}
-    eoh
-  end
-end
-
-
-Before('@sshd') do
-  @_sshd = SSHServer.new(current_dir)
-  @_sshd.make_env
-  @_sshd.start
-
-  ENV['HOME'] = File.expand_path current_dir
-
-  # FIXME: we might need to wait until sshd accepts connections, polling isn't
-  # really acceptable, another workaround might be to execute sshd with
-  # LD_PRELOAD and a hook, so we could block here until the hook release the
-  # blocking call.
-end
-
-After('@sshd') do
-  @_sshd.stop
-end