test-kitchen 1.0.0.beta.3 → 1.0.0.beta.4

data/lib/kitchen/ssh.rb

@@ -93,6 +93,7 @@ module Kitchen
       args  = %W{ -o UserKnownHostsFile=/dev/null }
       args += %W{ -o StrictHostKeyChecking=no }
       args += %W{ -o LogLevel=#{logger.debug? ? "VERBOSE" : "ERROR"} }
+      args += %W{ -o ForwardAgent=#{options[:forward_agent] ? "yes" : "no"} } if options.key? :forward_agent
       Array(options[:keys]).each { |ssh_key| args += %W{ -i #{ssh_key}} }
       args += %W{ -p #{port}}
       args += %W{ #{username}@#{hostname}}

data/lib/kitchen/suite.rb

@@ -30,6 +30,9 @@ module Kitchen
     # @return [Array] Array of names of excluded platforms
     attr_reader :excludes
 
+    # @return [Hash] suite specific driver_config hash
+    attr_reader :driver_config
+
     # Constructs a new suite.
     #
     # @param [Hash] options configuration for a new suite
@@ -41,6 +44,7 @@ module Kitchen
 
       @name = options.delete(:name)
       @excludes = Array(options[:excludes])
+      @driver_config = options.delete(:driver_config) || {}
       @data = options
     end
 
@@ -81,6 +85,19 @@ module Kitchen
       def nodes_path
         data[:nodes_path]
       end
+
+      # @return [String] local path to the suite's environments, or nil if one does
+      #   not exist
+      def environments_path
+        data[:environments_path]
+      end
+
+      # @return [String] the suite's environment, or nil if one does
+      #   not exist
+      def environment
+        data[:environment]
+      end
+
     end
 
     # Extra suite methods used for accessing Puppet data such as a manifest.

data/lib/kitchen/thor_tasks.rb

@@ -35,7 +35,6 @@ module Kitchen
     def initialize(*args)
       super
       @config = Kitchen::Config.new
-      @config.supervised = false
       Kitchen.logger = Kitchen.default_file_logger
       yield self if block_given?
       define

data/lib/kitchen/util.rb

@@ -98,5 +98,125 @@ module Kitchen
       seconds = (total - (minutes * 60))
       "(%dm%.2fs)" % [minutes, seconds]
     end
+
+    # Returns a set of Bourne Shell (AKA /bin/sh) compatible helper
+    # functions. This function is usually called inline in a string that
+    # will be executed remotely on a test instance.
+    #
+    # @return [String] a string representation of useful helper functions
+    def self.shell_helpers
+      # use Bourne (/bin/sh) as Bash does not exist on all Unix flavors
+      <<-HELPERS
+        # Check whether a command exists - returns 0 if it does, 1 if it does not
+        exists() {
+          if command -v $1 >/dev/null 2>&1
+          then
+            return 0
+          else
+            return 1
+          fi
+        }
+
+        # do_wget URL FILENAME
+        do_wget() {
+          echo "trying wget..."
+          wget -O "$2" "$1" 2>/tmp/stderr
+          # check for bad return status
+          test $? -ne 0 && return 1
+          # check for 404 or empty file
+          grep "ERROR 404" /tmp/stderr 2>&1 >/dev/null
+          if test $? -eq 0 || test ! -s "$2"; then
+            return 1
+          fi
+          return 0
+        }
+
+        # do_curl URL FILENAME
+        do_curl() {
+          echo "trying curl..."
+          curl -L "$1" > "$2"
+          # check for bad return status
+          [ $? -ne 0 ] && return 1
+          # check for bad output or empty file
+          grep "The specified key does not exist." "$2" 2>&1 >/dev/null
+          if test $? -eq 0 || test ! -s "$2"; then
+            return 1
+          fi
+          return 0
+        }
+
+        # do_fetch URL FILENAME
+        do_fetch() {
+          echo "trying fetch..."
+          fetch -o "$2" "$1" 2>/tmp/stderr
+          # check for bad return status
+          test $? -ne 0 && return 1
+          return 0
+        }
+
+        # do_curl URL FILENAME
+        do_perl() {
+          echo "trying perl..."
+          perl -e "use LWP::Simple; getprint($ARGV[0]);" "$1" > "$2"
+          # check for bad return status
+          test $? -ne 0 && return 1
+          # check for bad output or empty file
+          # grep "The specified key does not exist." "$2" 2>&1 >/dev/null
+          # if test $? -eq 0 || test ! -s "$2"; then
+          #   unable_to_retrieve_package
+          # fi
+          return 0
+        }
+
+        # do_curl URL FILENAME
+        do_python() {
+          echo "trying python..."
+          python -c "import sys,urllib2 ; sys.stdout.write(urllib2.urlopen(sys.argv[1]).read())" "$1" > "$2"
+          # check for bad return status
+          test $? -ne 0 && return 1
+          # check for bad output or empty file
+          #grep "The specified key does not exist." "$2" 2>&1 >/dev/null
+          #if test $? -eq 0 || test ! -s "$2"; then
+          #  unable_to_retrieve_package
+          #fi
+          return 0
+        }
+
+        # do_download URL FILENAME
+        do_download() {
+          PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+          export PATH
+
+          echo "downloading $1"
+          echo "  to file $2"
+
+          # we try all of these until we get success.
+          # perl, in particular may be present but LWP::Simple may not be installed
+
+          if exists wget; then
+            do_wget $1 $2 && return 0
+          fi
+
+          if exists curl; then
+            do_curl $1 $2 && return 0
+          fi
+
+          if exists fetch; then
+            do_fetch $1 $2 && return 0
+          fi
+
+          if exists perl; then
+            do_perl $1 $2 && return 0
+          fi
+
+          if exists python; then
+            do_python $1 $2 && return 0
+          fi
+
+          echo ">>>>>> wget, curl, fetch, perl or python not found on this instance."
+          return 16
+        }
+      HELPERS
+    end
   end
 end

data/lib/kitchen/version.rb

@@ -18,5 +18,5 @@
 
 module Kitchen
 
-  VERSION = "1.0.0.beta.3"
+  VERSION = "1.0.0.beta.4"
 end

data/spec/kitchen/instance_spec.rb

@@ -47,10 +47,6 @@ describe Kitchen::Instance do
 
   let(:instance) { Kitchen::Instance.new(opts) }
 
-  before do
-    Celluloid.logger = Logger.new(StringIO.new)
-  end
-
   it "raises an ArgumentError if suite is missing" do
     opts.delete(:suite)
     proc { Kitchen::Instance.new(opts) }.must_raise Kitchen::ClientError

data/test-kitchen.gemspec

@@ -7,41 +7,38 @@ Gem::Specification.new do |gem|
   gem.name          = "test-kitchen"
   gem.version       = Kitchen::VERSION
   gem.license       = 'Apache 2.0'
-  gem.authors       = ["Fletcher Nichol"]
-  gem.email         = ["fnichol@nichol.ca"]
+  gem.authors       = ['Fletcher Nichol']
+  gem.email         = ['fnichol@nichol.ca']
   gem.description   = %q{A Chef convergence integration test harness}
   gem.summary       = gem.description
-  gem.homepage      = "https://github.com/opscode/test-kitchen"
+  gem.homepage      = 'https://github.com/opscode/test-kitchen'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = %w(kitchen)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
-  gem.required_ruby_version = ">= 1.9.1"
+  gem.required_ruby_version = '>= 1.9.1'
 
-  gem.add_dependency 'celluloid'
-  gem.add_dependency 'thor'
-  gem.add_dependency 'pry'
-  gem.add_dependency 'net-ssh'
-  gem.add_dependency 'net-scp'
-  gem.add_dependency 'mixlib-shellout'
-  gem.add_dependency 'safe_yaml', '~> 0.9.5'
+  gem.add_dependency 'mixlib-shellout', '~> 1.2'
+  gem.add_dependency 'net-scp',         '~> 1.1'
+  gem.add_dependency 'net-ssh',         '~> 2.7'
+  gem.add_dependency 'safe_yaml',       '~> 0.9'
+  gem.add_dependency 'thor',            '~> 0.18'
+  gem.add_dependency 'buff-ignore',     '~> 1.1'
 
-  gem.add_development_dependency 'bundler', '~> 1.3'
+  gem.add_development_dependency 'bundler',   '~> 1.3'
   gem.add_development_dependency 'rake'
 
-  gem.add_development_dependency 'minitest', '~> 4.7'
-  gem.add_development_dependency 'mocha'
-  gem.add_development_dependency 'fakefs'
-  gem.add_development_dependency 'guard-minitest'
-  gem.add_development_dependency 'aruba', '~> 0.5'
-  gem.add_development_dependency 'guard-cucumber'
+  gem.add_development_dependency 'aruba',     '~> 0.5'
+  gem.add_development_dependency 'fakefs',    '~> 0.4'
+  gem.add_development_dependency 'minitest',  '~> 4.7'
+  gem.add_development_dependency 'mocha',     '~> 0.14'
 
-  gem.add_development_dependency 'yard'
-  gem.add_development_dependency 'maruku'
-  gem.add_development_dependency 'cane'
-  gem.add_development_dependency 'tailor'
-  gem.add_development_dependency 'simplecov'
-  gem.add_development_dependency 'countloc'
+  gem.add_development_dependency 'cane',      '~> 2.6'
+  gem.add_development_dependency 'countloc',  '~> 0.4'
+  gem.add_development_dependency 'maruku',    '~> 0.6'
+  gem.add_development_dependency 'simplecov', '~> 0.7'
+  gem.add_development_dependency 'tailor',    '~> 1.2'
+  gem.add_development_dependency 'yard',      '~> 0.8'
 end

metadata

@@ -1,113 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.3
+  version: 1.0.0.beta.4
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: celluloid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thor
+  name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: net-scp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
-  name: net-scp
+  name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: mixlib-shellout
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
-  name: safe_yaml
+  name: buff-ignore
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -137,173 +123,145 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  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: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: guard-minitest
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
-  name: guard-cucumber
+  name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: countloc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: tailor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: countloc
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 description: A Chef convergence integration test harness
 email:
 - fnichol@nichol.ca
@@ -338,17 +296,16 @@ files:
 - lib/kitchen/driver.rb
 - lib/kitchen/driver/base.rb
 - lib/kitchen/driver/dummy.rb
+- lib/kitchen/driver/proxy.rb
 - lib/kitchen/driver/ssh_base.rb
 - lib/kitchen/errors.rb
 - lib/kitchen/generator/driver_create.rb
 - lib/kitchen/generator/init.rb
 - lib/kitchen/instance.rb
-- lib/kitchen/instance_actor.rb
 - lib/kitchen/loader/yaml.rb
 - lib/kitchen/logger.rb
 - lib/kitchen/logging.rb
 - lib/kitchen/login_command.rb
-- lib/kitchen/manager.rb
 - lib/kitchen/metadata_chopper.rb
 - lib/kitchen/platform.rb
 - lib/kitchen/provisioner.rb