test-kitchen 1.14.1 → 1.14.2

data/spec/kitchen/logger_spec.rb

@@ -21,7 +21,6 @@ require_relative "../spec_helper"
 require "kitchen"
 
 describe Kitchen::Logger do
-
   before do
     @orig_stdout = $stdout
     $stdout = StringIO.new
@@ -36,7 +35,7 @@ describe Kitchen::Logger do
   end
 
   let(:opts) do
-    { :color => :red, :colorize => true }
+    { color: :red, colorize: true }
   end
 
   let(:logger) do
@@ -96,7 +95,6 @@ describe Kitchen::Logger do
   end
 
   describe "stdout-based logger" do
-
     let(:stdout) { StringIO.new }
 
     before { opts[:stdout] = stdout }
@@ -130,7 +128,6 @@ describe Kitchen::Logger do
     end
 
     describe "for severity" do
-
       before { opts[:level] = Kitchen::Util.to_logger_level(:debug) }
 
       it "logs to banner" do
@@ -226,7 +223,6 @@ describe Kitchen::Logger do
     end
 
     describe "#<<" do
-
       it "message with a newline are logged on info" do
         logger << "yo\n"
 
@@ -247,7 +243,7 @@ describe Kitchen::Logger do
           "-----> banner",
           "       info",
           ">>>>>> error",
-          "vanilla"
+          "vanilla",
         ].join("\n").concat("\n")
 
         stdout.string.must_equal(
@@ -262,7 +258,7 @@ describe Kitchen::Logger do
         logger << [
           "-----> banner",
           "       info",
-          "partial"
+          "partial",
         ].join("\n")
 
         stdout.string.must_equal(
@@ -294,7 +290,7 @@ describe Kitchen::Logger do
       it "logger chomps carriage return characters" do
         logger << [
           "-----> banner\r",
-          "vanilla\r"
+          "vanilla\r",
         ].join("\n").concat("\n")
 
         stdout.string.must_equal(
@@ -306,16 +302,14 @@ describe Kitchen::Logger do
   end
 
   describe "opened IO logdev-based logger" do
-
     let(:logdev) { StringIO.new }
 
     before { opts[:logdev] = logdev }
 
     describe "for severity" do
-
       before { opts[:level] = Kitchen::Util.to_logger_level(:debug) }
 
-      let(:ts) { "\\[[^\\]]+\\]" }
+      let(:ts) { '\\[[^\\]]+\\]' }
 
       it "logs to banner" do
         logger.banner("yo")
@@ -362,8 +356,7 @@ describe Kitchen::Logger do
   end
 
   describe "file IO logdev-based logger" do
-
-    let(:logfile) { Dir::Tmpname.make_tmpname(%w[kitchen .log], nil) }
+    let(:logfile) { Dir::Tmpname.make_tmpname(%w{kitchen .log}, nil) }
 
     before do
       opts[:logdev] = logfile
@@ -377,10 +370,9 @@ describe Kitchen::Logger do
     end
 
     describe "for severity" do
-
       before { opts[:level] = Kitchen::Util.to_logger_level(:debug) }
 
-      let(:ts) { "\\[[^\\]]+\\]" }
+      let(:ts) { '\\[[^\\]]+\\]' }
 
       it "logs to banner" do
         logger.banner("yo")

data/spec/kitchen/logging_spec.rb

@@ -21,7 +21,6 @@ require_relative "../spec_helper"
 require "kitchen/logging"
 
 class LoggingDummy
-
   include Kitchen::Logging
 
   attr_reader :logger
@@ -31,8 +30,7 @@ class LoggingDummy
   end
 
   class Logger
-
-    METHODS = [:banner, :debug, :info, :warn, :error, :fatal]
+    METHODS = [:banner, :debug, :info, :warn, :error, :fatal].freeze
 
     attr_reader(*(METHODS.map { |m| "#{m}_msg".to_sym }))
 
@@ -45,7 +43,6 @@ class LoggingDummy
 end
 
 describe Kitchen::Logging do
-
   let(:logger)  { LoggingDummy::Logger.new }
   let(:subject) { LoggingDummy.new(logger) }
 

data/spec/kitchen/login_command_spec.rb

@@ -21,9 +21,8 @@ require_relative "../spec_helper"
 require "kitchen/login_command"
 
 describe Kitchen::LoginCommand do
-
   let(:cmd)   { "" }
-  let(:argv)  { Array.new }
+  let(:argv)  { [] }
   let(:opts)  { Hash.new }
 
   let(:login_command) { Kitchen::LoginCommand.new(cmd, argv, opts) }
@@ -51,7 +50,7 @@ describe Kitchen::LoginCommand do
   it "#options returns the options hash from the constructor" do
     opts[:cake] = "yummy"
 
-    login_command.options.must_equal(:cake => "yummy")
+    login_command.options.must_equal(cake: "yummy")
   end
 
   it "#exec_args returns an array of arguments for Kernel.exec" do
@@ -63,6 +62,6 @@ describe Kitchen::LoginCommand do
 
     opts[:charlie] = "delta"
     login_command.exec_args.must_equal [
-      "alpha", "-o", "beta", { :charlie => "delta" }]
+      "alpha", "-o", "beta", { charlie: "delta" }]
   end
 end

data/spec/kitchen/metadata_chopper_spec.rb

@@ -21,7 +21,6 @@ require_relative "../spec_helper"
 require "kitchen/metadata_chopper"
 
 describe Kitchen::MetadataChopper do
-
   before do
     FakeFS.activate!
     FileUtils.mkdir_p("/tmp")
@@ -35,7 +34,6 @@ describe Kitchen::MetadataChopper do
   let(:described_class) { Kitchen::MetadataChopper }
 
   describe ".new" do
-
     it "contains a :name attribute" do
       stub_metadata!("banzai")
 
@@ -50,7 +48,6 @@ describe Kitchen::MetadataChopper do
   end
 
   describe ".extract" do
-
     it "returns a tuple" do
       stub_metadata!("foo", "1.2.3")
 

data/spec/kitchen/platform_spec.rb

@@ -22,8 +22,7 @@ require "kitchen/errors"
 require "kitchen/platform"
 
 describe Kitchen::Platform do
-
-  let(:opts) do; { :name => "plata" }; end
+  let(:opts) { ; { name: "plata" }; }
   let(:klass) { Kitchen::Platform }
 
   it "raises an ArgumentError if name is missing" do
@@ -32,49 +31,49 @@ describe Kitchen::Platform do
   end
 
   it "#os_type returns value passed into constructor with :os_type" do
-    klass.new(:name => "p", :os_type => "unix").os_type.must_equal "unix"
-    klass.new(:name => "p", :os_type => "windows").os_type.must_equal "windows"
-    klass.new(:name => "p", :os_type => "unicorn").os_type.must_equal "unicorn"
-    klass.new(:name => "p", :os_type => nil).os_type.must_equal nil
+    klass.new(name: "p", os_type: "unix").os_type.must_equal "unix"
+    klass.new(name: "p", os_type: "windows").os_type.must_equal "windows"
+    klass.new(name: "p", os_type: "unicorn").os_type.must_equal "unicorn"
+    klass.new(name: "p", os_type: nil).os_type.must_equal nil
   end
 
   it "#os_type defaults to `unix` when not provided" do
-    klass.new(:name => "p").os_type.must_equal "unix"
+    klass.new(name: "p").os_type.must_equal "unix"
   end
 
   it "#os_type defaults to `windows` if the name starts with 'win'" do
-    klass.new(:name => "win").os_type.must_equal "windows"
-    klass.new(:name => "Win").os_type.must_equal "windows"
-    klass.new(:name => "win7").os_type.must_equal "windows"
-    klass.new(:name => "windows").os_type.must_equal "windows"
-    klass.new(:name => "Windows").os_type.must_equal "windows"
-    klass.new(:name => "windows81").os_type.must_equal "windows"
-    klass.new(:name => "windows-2012").os_type.must_equal "windows"
+    klass.new(name: "win").os_type.must_equal "windows"
+    klass.new(name: "Win").os_type.must_equal "windows"
+    klass.new(name: "win7").os_type.must_equal "windows"
+    klass.new(name: "windows").os_type.must_equal "windows"
+    klass.new(name: "Windows").os_type.must_equal "windows"
+    klass.new(name: "windows81").os_type.must_equal "windows"
+    klass.new(name: "windows-2012").os_type.must_equal "windows"
   end
 
   it "#shell_type returns value passed into constructor with :shell_type" do
-    klass.new(:name => "p", :shell_type => "bourne").
-      shell_type.must_equal "bourne"
-    klass.new(:name => "p", :shell_type => "powershell").
-      shell_type.must_equal "powershell"
-    klass.new(:name => "p", :shell_type => "unicorn").
-      shell_type.must_equal "unicorn"
-    klass.new(:name => "p", :shell_type => nil).
-      shell_type.must_equal nil
+    klass.new(name: "p", shell_type: "bourne")
+         .shell_type.must_equal "bourne"
+    klass.new(name: "p", shell_type: "powershell")
+         .shell_type.must_equal "powershell"
+    klass.new(name: "p", shell_type: "unicorn")
+         .shell_type.must_equal "unicorn"
+    klass.new(name: "p", shell_type: nil)
+         .shell_type.must_equal nil
   end
 
   it "#shell_type defaults to `bourne` when not provided" do
-    klass.new(:name => "p").shell_type.must_equal "bourne"
+    klass.new(name: "p").shell_type.must_equal "bourne"
   end
 
   it "#shell_type defaults to `powershell` if the name starts with 'windows'" do
-    klass.new(:name => "win").shell_type.must_equal "powershell"
-    klass.new(:name => "Win").shell_type.must_equal "powershell"
-    klass.new(:name => "win7").shell_type.must_equal "powershell"
-    klass.new(:name => "windows").shell_type.must_equal "powershell"
-    klass.new(:name => "Windows").shell_type.must_equal "powershell"
-    klass.new(:name => "windows81").shell_type.must_equal "powershell"
-    klass.new(:name => "windows-2012").shell_type.must_equal "powershell"
+    klass.new(name: "win").shell_type.must_equal "powershell"
+    klass.new(name: "Win").shell_type.must_equal "powershell"
+    klass.new(name: "win7").shell_type.must_equal "powershell"
+    klass.new(name: "windows").shell_type.must_equal "powershell"
+    klass.new(name: "Windows").shell_type.must_equal "powershell"
+    klass.new(name: "windows81").shell_type.must_equal "powershell"
+    klass.new(name: "windows-2012").shell_type.must_equal "powershell"
   end
 
   it "#diagnose returns a hash with sorted keys" do
@@ -82,8 +81,8 @@ describe Kitchen::Platform do
     opts[:shell_type] = "wundershell"
 
     klass.new(opts).diagnose.must_equal(
-      :os_type => "unikitty",
-      :shell_type => "wundershell"
+      os_type: "unikitty",
+      shell_type: "wundershell"
     )
   end
 end

data/spec/kitchen/provisioner/base_spec.rb

@@ -23,11 +23,8 @@ require "stringio"
 require "kitchen"
 
 module Kitchen
-
   module Provisioner
-
     class TestingDummy < Kitchen::Provisioner::Base
-
       attr_reader :called_create_sandbox, :called_cleanup_sandbox
 
       def install_command
@@ -62,10 +59,9 @@ module Kitchen
 end
 
 describe Kitchen::Provisioner::Base do
-
   let(:logged_output)   { StringIO.new }
   let(:logger)          { Logger.new(logged_output) }
-  let(:platform)        { stub(:os_type => nil, :shell_type => nil) }
+  let(:platform)        { stub(os_type: nil, shell_type: nil) }
   let(:config)          { Hash.new }
 
   let(:transport) do
@@ -76,11 +72,11 @@ describe Kitchen::Provisioner::Base do
 
   let(:instance) do
     stub(
-      :name => "coolbeans",
-      :to_str => "instance",
-      :logger => logger,
-      :platform => platform,
-      :transport => transport
+      name: "coolbeans",
+      to_str: "instance",
+      logger: logger,
+      platform: platform,
+      transport: transport
     )
   end
 
@@ -89,9 +85,7 @@ describe Kitchen::Provisioner::Base do
   end
 
   describe "configuration" do
-
     describe "for unix operating systems" do
-
       before { platform.stubs(:os_type).returns("unix") }
 
       it ":root_path defaults to /tmp/kitchen" do
@@ -108,11 +102,10 @@ describe Kitchen::Provisioner::Base do
     end
 
     describe "for windows operating systems" do
-
       before { platform.stubs(:os_type).returns("windows") }
 
-      it ":root_path defaults to $env:TEMP\\kitchen" do
-        provisioner[:root_path].must_equal "$env:TEMP\\kitchen"
+      it ':root_path defaults to $env:TEMP\\kitchen' do
+        provisioner[:root_path].must_equal '$env:TEMP\\kitchen'
       end
 
       it ":sudo defaults to nil" do
@@ -138,7 +131,6 @@ describe Kitchen::Provisioner::Base do
   end
 
   describe "#call" do
-
     let(:state) { Hash.new }
     let(:cmd)   { provisioner.call(state) }
 
@@ -202,8 +194,8 @@ describe Kitchen::Provisioner::Base do
     it "logs to info" do
       cmd
 
-      logged_output.string.
-        must_match(/INFO -- : Transferring files to instance$/)
+      logged_output.string
+                   .must_match(/INFO -- : Transferring files to instance$/)
     end
 
     it "uploads sandbox files" do
@@ -219,29 +211,27 @@ describe Kitchen::Provisioner::Base do
     end
 
     it "raises an ActionFailed on transfer when TransportFailed is raised" do
-      connection.stubs(:upload).
-        raises(Kitchen::Transport::TransportFailed.new("dang"))
+      connection.stubs(:upload)
+                .raises(Kitchen::Transport::TransportFailed.new("dang"))
 
       proc { cmd }.must_raise Kitchen::ActionFailed
     end
 
     it "raises an ActionFailed on execute when TransportFailed is raised" do
-      connection.stubs(:execute).
-        raises(Kitchen::Transport::TransportFailed.new("dang"))
+      connection.stubs(:execute)
+                .raises(Kitchen::Transport::TransportFailed.new("dang"))
 
       proc { cmd }.must_raise Kitchen::ActionFailed
     end
   end
 
   [:init_command, :install_command, :prepare_command, :run_command].each do |cmd|
-
     it "has a #{cmd} method" do
       provisioner.public_send(cmd).must_be_nil
     end
   end
 
   describe "sandbox" do
-
     after do
       begin
         provisioner.cleanup_sandbox
@@ -257,8 +247,8 @@ describe Kitchen::Provisioner::Base do
       provisioner.create_sandbox
 
       File.directory?(provisioner.sandbox_path).must_equal true
-      format("%o", File.stat(provisioner.sandbox_path).mode)[1, 4].
-        must_equal "0755"
+      format("%o", File.stat(provisioner.sandbox_path).mode)[1, 4]
+        .must_equal "0755"
     end
 
     it "#create_sandbox logs an info message" do
@@ -270,8 +260,8 @@ describe Kitchen::Provisioner::Base do
     it "#create_sandbox logs a debug message" do
       provisioner.create_sandbox
 
-      logged_output.string.
-        must_match debug_line_starting_with("Creating local sandbox in ")
+      logged_output.string
+                   .must_match debug_line_starting_with("Creating local sandbox in ")
     end
 
     it "#cleanup_sandbox deletes the sandbox directory" do
@@ -285,23 +275,21 @@ describe Kitchen::Provisioner::Base do
       provisioner.create_sandbox
       provisioner.cleanup_sandbox
 
-      logged_output.string.
-        must_match debug_line_starting_with("Cleaning up local sandbox in ")
+      logged_output.string
+                   .must_match debug_line_starting_with("Cleaning up local sandbox in ")
     end
 
     def info_line(msg)
-      %r{^I, .* : #{Regexp.escape(msg)}$}
+      /^I, .* : #{Regexp.escape(msg)}$/
     end
 
     def debug_line_starting_with(msg)
-      %r{^D, .* : #{Regexp.escape(msg)}}
+      /^D, .* : #{Regexp.escape(msg)}/
     end
   end
 
   describe "#sudo" do
-
     describe "with :sudo set" do
-
       before { config[:sudo] = true }
 
       it "prepends sudo command" do
@@ -316,7 +304,6 @@ describe Kitchen::Provisioner::Base do
     end
 
     describe "with :sudo falsey" do
-
       before { config[:sudo] = false }
 
       it "does not include sudo command" do
@@ -332,9 +319,7 @@ describe Kitchen::Provisioner::Base do
   end
 
   describe "#sudo_command" do
-
     describe "with :sudo set" do
-
       before { config[:sudo] = true }
 
       it "returns the default sudo_command" do
@@ -349,7 +334,6 @@ describe Kitchen::Provisioner::Base do
     end
 
     describe "with :sudo falsey" do
-
       before { config[:sudo] = false }
 
       it "returns empty string for default sudo_command" do
@@ -365,9 +349,7 @@ describe Kitchen::Provisioner::Base do
   end
 
   describe "#prefix_command" do
-
     describe "with :command_prefix set" do
-
       before { config[:command_prefix] = "my_prefix" }
 
       it "prepends the command with the prefix" do
@@ -376,7 +358,6 @@ describe Kitchen::Provisioner::Base do
     end
 
     describe "with :command_prefix unset" do
-
       before { config[:command_prefix] = nil }
 
       it "returns an unaltered command" do