test-kitchen 1.14.1 → 1.14.2

data/spec/kitchen/verifier/dummy_spec.rb

@@ -24,24 +24,23 @@ require "stringio"
 require "kitchen/verifier/dummy"
 
 describe Kitchen::Verifier::Dummy do
-
   let(:logged_output) { StringIO.new }
   let(:logger)        { Logger.new(logged_output) }
-  let(:platform)      { stub(:os_type => nil, :shell_type => nil) }
-  let(:suite)         { stub(:name => "fries") }
+  let(:platform)      { stub(os_type: nil, shell_type: nil) }
+  let(:suite)         { stub(name: "fries") }
   let(:state)         { Hash.new }
 
   let(:config) do
-    { :test_base_path => "/basist", :kitchen_root => "/rooty" }
+    { test_base_path: "/basist", kitchen_root: "/rooty" }
   end
 
   let(:instance) do
     stub(
-      :name => "coolbeans",
-      :to_str => "instance",
-      :logger => logger,
-      :suite => suite,
-      :platform => platform
+      name: "coolbeans",
+      to_str: "instance",
+      logger: logger,
+      suite: suite,
+      platform: platform
     )
   end
 
@@ -58,7 +57,6 @@ describe Kitchen::Verifier::Dummy do
   end
 
   describe "configuration" do
-
     it "sets :sleep to 0 by default" do
       verifier[:sleep].must_equal 0
     end
@@ -69,7 +67,6 @@ describe Kitchen::Verifier::Dummy do
   end
 
   describe "#call" do
-
     it "calls sleep if :sleep value is greater than 0" do
       config[:sleep] = 12.5
       verifier.expects(:sleep).with(12.5).returns(true)

data/spec/kitchen/verifier/shell_spec.rb

@@ -25,24 +25,23 @@ require "kitchen/verifier/shell"
 require "kitchen/transport/ssh"
 
 describe Kitchen::Verifier::Shell do
-
   let(:logged_output) { StringIO.new }
   let(:logger)        { Logger.new(logged_output) }
-  let(:platform)      { stub(:os_type => nil, :shell_type => nil, :name => "coolbeans") }
-  let(:suite)         { stub(:name => "fries") }
+  let(:platform)      { stub(os_type: nil, shell_type: nil, name: "coolbeans") }
+  let(:suite)         { stub(name: "fries") }
   let(:state)         { Hash.new }
 
   let(:config) do
-    { :test_base_path => "/basist", :kitchen_root => "/rooty" }
+    { test_base_path: "/basist", kitchen_root: "/rooty" }
   end
 
   let(:instance) do
     stub(
-      :name => [platform.name, suite.name].join("-"),
-      :to_str => "instance",
-      :logger => logger,
-      :suite => suite,
-      :platform => platform
+      name: [platform.name, suite.name].join("-"),
+      to_str: "instance",
+      logger: logger,
+      suite: suite,
+      platform: platform
     )
   end
 
@@ -59,7 +58,6 @@ describe Kitchen::Verifier::Shell do
   end
 
   describe "configuration" do
-
     it "sets :sleep to 0 by default" do
       verifier[:sleep].must_equal 0
     end
@@ -74,7 +72,6 @@ describe Kitchen::Verifier::Shell do
   end
 
   describe "#call" do
-
     describe "#shell_out" do
       it "calls sleep if :sleep value is greater than 0" do
         config[:sleep] = 3
@@ -124,12 +121,12 @@ describe Kitchen::Verifier::Shell do
 
       let(:instance) do
         stub(
-          :name => "coolbeans",
-          :to_str => "instance",
-          :logger => logger,
-          :platform => platform,
-          :suite => suite,
-          :transport => transport
+          name: "coolbeans",
+          to_str: "instance",
+          logger: logger,
+          platform: platform,
+          suite: suite,
+          transport: transport
         )
       end
 

data/spec/kitchen/verifier_spec.rb

@@ -33,14 +33,11 @@ module Kitchen
 end
 
 module Kitchen
-
   module Verifier
-
     class Coolbeans < Kitchen::Verifier::Base
     end
 
     class ItDepends < Kitchen::Verifier::Base
-
       attr_reader :verify_call_count
 
       def initialize(config = {})
@@ -54,7 +51,6 @@ module Kitchen
     end
 
     class UnstableDepends < Kitchen::Verifier::Base
-
       def verify_dependencies
         raise UserError, "Oh noes, you don't have software!"
       end
@@ -63,9 +59,7 @@ module Kitchen
 end
 
 describe Kitchen::Verifier do
-
   describe ".for_plugin" do
-
     before do
       Kitchen::Verifier.stubs(:require).returns(true)
     end
@@ -77,7 +71,7 @@ describe Kitchen::Verifier do
     end
 
     it "returns a verifier initialized with its config" do
-      verifier = Kitchen::Verifier.for_plugin("coolbeans", :foo => "bar")
+      verifier = Kitchen::Verifier.for_plugin("coolbeans", foo: "bar")
 
       verifier[:foo].must_equal "bar"
     end
@@ -100,21 +94,21 @@ describe Kitchen::Verifier do
     it "raises ClientError if the verifier could not be required" do
       Kitchen::Verifier.stubs(:require).raises(LoadError)
 
-      proc { Kitchen::Verifier.for_plugin("coolbeans", {}) }.
-        must_raise Kitchen::ClientError
+      proc { Kitchen::Verifier.for_plugin("coolbeans", {}) }
+        .must_raise Kitchen::ClientError
     end
 
     it "raises ClientError if the verifier's class constant was not found" do
       # pretend require worked
       Kitchen::Verifier.stubs(:require).returns(true)
 
-      proc { Kitchen::Verifier.for_plugin("nope", {}) }.
-        must_raise Kitchen::ClientError
+      proc { Kitchen::Verifier.for_plugin("nope", {}) }
+        .must_raise Kitchen::ClientError
     end
 
     it "raises UserError if #verify_dependencies failes" do
-      proc { Kitchen::Verifier.for_plugin("unstable_depends", {}) }.
-        must_raise Kitchen::UserError
+      proc { Kitchen::Verifier.for_plugin("unstable_depends", {}) }
+        .must_raise Kitchen::UserError
     end
   end
 end

data/spec/kitchen_spec.rb

@@ -21,7 +21,6 @@ require_relative "spec_helper"
 require "kitchen"
 
 describe "Kitchen" do
-
   let(:stdout) { StringIO.new }
 
   before do
@@ -39,7 +38,6 @@ describe "Kitchen" do
   end
 
   describe "defaults" do
-
     it "sets DEFAULT_LOG_LEVEL to :info" do
       Kitchen::DEFAULT_LOG_LEVEL.must_equal :info
     end
@@ -66,8 +64,8 @@ describe "Kitchen" do
   end
 
   it ".source_root returns the root path of the gem" do
-    Kitchen.source_root.
-      must_equal Pathname.new(File.expand_path("../..", __FILE__))
+    Kitchen.source_root
+      .must_equal Pathname.new(File.expand_path("../..", __FILE__))
   end
 
   it ".default_logger is a Kitchen::Logger" do
@@ -93,8 +91,8 @@ describe "Kitchen" do
   it ".default_file_logger returns a logger that uses a file" do
     Kitchen.default_file_logger.warn("uhoh")
 
-    IO.read(File.join(%w[.kitchen logs kitchen.log])).
-      must_match %r{ -- Kitchen: uhoh$}
+    IO.read(File.join(%w{.kitchen logs kitchen.log}))
+      .must_match %r{ -- Kitchen: uhoh$}
   end
 
   it ".default_file_logger accepts a level and log_overwrite" do

data/spec/spec_helper.rb

@@ -71,7 +71,7 @@ end
 
 def os_safe_root_path(root_path)
   if running_tests_on_windows?
-    "#{File.join(ENV["SystemDrive"], root_path)}"
+    File.join(ENV["SystemDrive"], root_path).to_s
   else
     root_path
   end

data/spec/support/powershell_max_size_spec.rb

@@ -27,10 +27,9 @@ require_relative "../spec_helper"
 # in terms of PowerShell invocations).
 
 describe "PowerShell script max size" do
-
   MAX_POWERSHELL_SIZE = 3010
 
-  Dir.glob(File.join(File.dirname(__FILE__), "../../support/*.ps1*")).each do|script|
+  Dir.glob(File.join(File.dirname(__FILE__), "../../support/*.ps1*")).each do |script|
     base = File.basename(script)
 
     it "support/#{base} size must be less than #{MAX_POWERSHELL_SIZE} bytes" do

data/support/chef-client-zero.rb

@@ -33,7 +33,6 @@ require "fileutils"
 ENV["GEM_HOME"] = ENV["GEM_PATH"] = ENV["GEM_CACHE"] = nil
 
 class ChefClientZero
-
   def self.start
     new.run
   end
@@ -52,8 +51,8 @@ class ChefClientZero
     chef_fs.write_pretty_json = true
 
     @server = ChefZero::Server.new(
-      :generate_real_keys => false,
-      :data_store => Chef::ChefFS::ChefFSDataStore.new(chef_fs)
+      generate_real_keys: false,
+      data_store: Chef::ChefFS::ChefFSDataStore.new(chef_fs)
     )
     puts "-----> Starting Chef Zero server in #{chef_fs.fs_description}"
     @server.start_background
@@ -70,7 +69,7 @@ class ChefClientZero
 
   def run_chef_client
     system("chef-client", *ARGV)
-    fail if $CHILD_STATUS != 0
+    raise if $CHILD_STATUS != 0
   end
 end
 

data/test-kitchen.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "http://kitchen.ci"
 
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  gem.executables   = %w[kitchen]
+  gem.executables   = %w{kitchen}
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
@@ -41,7 +41,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "winrm-fs", "~> 1.0"
 
   gem.add_development_dependency "bundler",   "~> 1.3"
-  gem.add_development_dependency "rake", "~> 10.0"
+  gem.add_development_dependency "rake",      "~> 12.0"
   gem.add_development_dependency "github_changelog_generator", "1.11.3"
 
   gem.add_development_dependency "aruba",     "~> 0.11"
@@ -56,8 +56,6 @@ Gem::Specification.new do |gem|
   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.5.0"
+  # Replacing finstyle in favor of chefstyle
+  gem.add_development_dependency "chefstyle"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.14.2
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -258,14 +258,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: github_changelog_generator
   requirement: !ruby/object:Gem::Requirement
@@ -407,19 +407,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: finstyle
+  name: chefstyle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
 description: Test Kitchen is an integration tool for developing and testing infrastructure
   code and software on isolated target platforms.
 email: