test-kitchen 1.2.1 → 1.3.0

data/support/chef_helpers.sh

@@ -0,0 +1,16 @@
+# @param $1 the omnibus root directory
+# @param $2 the requested version of omnibus package
+# @return 0 if omnibus needs to be installed, non-zero otherwise
+should_update_chef() {
+  if test ! -d "$1" ; then return 0
+  elif test "$2" = "true" ; then return 1
+  elif test "$2" = "latest" ; then return 0
+  fi
+
+  local version="`$1/bin/chef-solo -v | cut -d " " -f 2`"
+  if echo "$version" | grep "^$2" 2>&1 >/dev/null; then
+    return 1
+  else
+    return 0
+  fi
+}

data/support/download_helpers.sh

@@ -0,0 +1,109 @@
+# 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_perl 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_python 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=/opt/local/bin:/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
+}

data/test-kitchen.gemspec

@@ -1,43 +1,52 @@
 # -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'kitchen/version'
+require "kitchen/version"
+require "English"
 
 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.description   = %q{Test Kitchen is an integration tool for developing and testing infrastructure code and software on isolated target platforms.}
+  gem.license       = "Apache 2.0"
+  gem.authors       = ["Fletcher Nichol"]
+  gem.email         = ["fnichol@nichol.ca"]
+  gem.description   = "Test Kitchen is an integration tool for developing " \
+                      "and testing infrastructure code and software on " \
+                      "isolated target platforms."
   gem.summary       = gem.description
-  gem.homepage      = 'http://kitchen.ci'
+  gem.homepage      = "http://kitchen.ci"
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = %w(kitchen)
+  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  gem.executables   = %w[kitchen]
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ['lib']
-
-  gem.required_ruby_version = '>= 1.9.1'
-
-  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',       '~> 1.0'
-  gem.add_dependency 'thor',            '~> 0.18'
-
-  gem.add_development_dependency 'bundler',   '~> 1.3'
-  gem.add_development_dependency 'rake'
-
-  gem.add_development_dependency 'aruba',     '~> 0.5'
-  gem.add_development_dependency 'fakefs',    '~> 0.4'
-  gem.add_development_dependency 'minitest',  '~> 5.1.0'
-  gem.add_development_dependency 'mocha',     '~> 0.14'
-
-  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'
+  gem.require_paths = ["lib"]
+
+  gem.required_ruby_version = ">= 1.9.1"
+
+  gem.add_dependency "mixlib-shellout", ">= 1.2", "< 3.0"
+  gem.add_dependency "net-scp",         "~> 1.1"
+  gem.add_dependency "net-ssh",         "~> 2.7"
+  gem.add_dependency "safe_yaml",       "~> 1.0"
+  gem.add_dependency "thor",            "~> 0.18"
+
+  gem.add_development_dependency "pry"
+
+  gem.add_development_dependency "bundler",   "~> 1.3"
+  gem.add_development_dependency "rake"
+
+  gem.add_development_dependency "aruba",     "~> 0.5"
+  gem.add_development_dependency "fakefs",    "~> 0.4"
+  gem.add_development_dependency "minitest",  "~> 5.3"
+  gem.add_development_dependency "mocha",     "~> 1.1"
+
+  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 "yard",      "~> 0.8"
+
+  # style and complexity libraries are tightly version pinned as newer releases
+  # may introduce new and undesireable style choices which would be immediately
+  # enforced in CI
+  gem.add_development_dependency "finstyle",  "1.4.0"
+  gem.add_development_dependency "cane",      "2.6.2"
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +86,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -142,42 +162,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: cane
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
@@ -221,33 +227,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: tailor
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: finstyle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: cane
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.6.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.6.2
 description: Test Kitchen is an integration tool for developing and testing infrastructure
   code and software on isolated target platforms.
 email:
@@ -259,6 +279,7 @@ extra_rdoc_files: []
 files:
 - ".cane"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
@@ -268,17 +289,24 @@ files:
 - README.md
 - Rakefile
 - bin/kitchen
+- features/kitchen_action_commands.feature
 - features/kitchen_command.feature
+- features/kitchen_console_command.feature
+- features/kitchen_diagnose_command.feature
 - features/kitchen_driver_create_command.feature
 - features/kitchen_driver_discover_command.feature
 - features/kitchen_help_command.feature
 - features/kitchen_init_command.feature
 - features/kitchen_list_command.feature
-- features/sink_command.feature
+- features/kitchen_login_command.feature
+- features/kitchen_sink_command.feature
+- features/kitchen_test_command.feature
 - features/step_definitions/gem_steps.rb
 - features/step_definitions/git_steps.rb
+- features/step_definitions/output_steps.rb
 - features/support/env.rb
 - lib/kitchen.rb
+- lib/kitchen/base64_stream.rb
 - lib/kitchen/busser.rb
 - lib/kitchen/cli.rb
 - lib/kitchen/collection.rb
@@ -288,11 +316,13 @@ files:
 - lib/kitchen/command/console.rb
 - lib/kitchen/command/diagnose.rb
 - lib/kitchen/command/driver_discover.rb
+- lib/kitchen/command/exec.rb
 - lib/kitchen/command/list.rb
 - lib/kitchen/command/login.rb
 - lib/kitchen/command/sink.rb
 - lib/kitchen/command/test.rb
 - lib/kitchen/config.rb
+- lib/kitchen/configurable.rb
 - lib/kitchen/data_munger.rb
 - lib/kitchen/diagnostic.rb
 - lib/kitchen/driver.rb
@@ -329,24 +359,44 @@ files:
 - lib/kitchen/util.rb
 - lib/kitchen/version.rb
 - lib/vendor/hash_recursive_merge.rb
+- spec/kitchen/base64_stream_spec.rb
+- spec/kitchen/busser_spec.rb
 - spec/kitchen/collection_spec.rb
 - spec/kitchen/color_spec.rb
 - spec/kitchen/config_spec.rb
+- spec/kitchen/configurable_spec.rb
 - spec/kitchen/data_munger_spec.rb
+- spec/kitchen/diagnostic_spec.rb
 - spec/kitchen/driver/base_spec.rb
 - spec/kitchen/driver/dummy_spec.rb
+- spec/kitchen/driver/proxy_spec.rb
+- spec/kitchen/driver/ssh_base_spec.rb
 - spec/kitchen/driver_spec.rb
+- spec/kitchen/errors_spec.rb
 - spec/kitchen/instance_spec.rb
 - spec/kitchen/lazy_hash_spec.rb
 - spec/kitchen/loader/yaml_spec.rb
+- spec/kitchen/logger_spec.rb
+- spec/kitchen/logging_spec.rb
+- spec/kitchen/login_command_spec.rb
+- spec/kitchen/metadata_chopper_spec.rb
 - spec/kitchen/platform_spec.rb
 - spec/kitchen/provisioner/base_spec.rb
+- spec/kitchen/provisioner/chef_base_spec.rb
+- spec/kitchen/provisioner/chef_solo_spec.rb
+- spec/kitchen/provisioner/chef_zero_spec.rb
+- spec/kitchen/provisioner/shell_spec.rb
 - spec/kitchen/provisioner_spec.rb
+- spec/kitchen/shell_out_spec.rb
+- spec/kitchen/ssh_spec.rb
 - spec/kitchen/state_file_spec.rb
 - spec/kitchen/suite_spec.rb
 - spec/kitchen/util_spec.rb
+- spec/kitchen_spec.rb
 - spec/spec_helper.rb
 - support/chef-client-zero.rb
+- support/chef_helpers.sh
+- support/download_helpers.sh
 - support/dummy-validation.pem
 - templates/driver/CHANGELOG.md.erb
 - templates/driver/Gemfile.erb
@@ -384,37 +434,61 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Test Kitchen is an integration tool for developing and testing infrastructure
   code and software on isolated target platforms.
 test_files:
+- features/kitchen_action_commands.feature
 - features/kitchen_command.feature
+- features/kitchen_console_command.feature
+- features/kitchen_diagnose_command.feature
 - features/kitchen_driver_create_command.feature
 - features/kitchen_driver_discover_command.feature
 - features/kitchen_help_command.feature
 - features/kitchen_init_command.feature
 - features/kitchen_list_command.feature
-- features/sink_command.feature
+- features/kitchen_login_command.feature
+- features/kitchen_sink_command.feature
+- features/kitchen_test_command.feature
 - features/step_definitions/gem_steps.rb
 - features/step_definitions/git_steps.rb
+- features/step_definitions/output_steps.rb
 - features/support/env.rb
+- spec/kitchen/base64_stream_spec.rb
+- spec/kitchen/busser_spec.rb
 - spec/kitchen/collection_spec.rb
 - spec/kitchen/color_spec.rb
 - spec/kitchen/config_spec.rb
+- spec/kitchen/configurable_spec.rb
 - spec/kitchen/data_munger_spec.rb
+- spec/kitchen/diagnostic_spec.rb
 - spec/kitchen/driver/base_spec.rb
 - spec/kitchen/driver/dummy_spec.rb
+- spec/kitchen/driver/proxy_spec.rb
+- spec/kitchen/driver/ssh_base_spec.rb
 - spec/kitchen/driver_spec.rb
+- spec/kitchen/errors_spec.rb
 - spec/kitchen/instance_spec.rb
 - spec/kitchen/lazy_hash_spec.rb
 - spec/kitchen/loader/yaml_spec.rb
+- spec/kitchen/logger_spec.rb
+- spec/kitchen/logging_spec.rb
+- spec/kitchen/login_command_spec.rb
+- spec/kitchen/metadata_chopper_spec.rb
 - spec/kitchen/platform_spec.rb
 - spec/kitchen/provisioner/base_spec.rb
+- spec/kitchen/provisioner/chef_base_spec.rb
+- spec/kitchen/provisioner/chef_solo_spec.rb
+- spec/kitchen/provisioner/chef_zero_spec.rb
+- spec/kitchen/provisioner/shell_spec.rb
 - spec/kitchen/provisioner_spec.rb
+- spec/kitchen/shell_out_spec.rb
+- spec/kitchen/ssh_spec.rb
 - spec/kitchen/state_file_spec.rb
 - spec/kitchen/suite_spec.rb
 - spec/kitchen/util_spec.rb
+- spec/kitchen_spec.rb
 - spec/spec_helper.rb
 has_rdoc: