test-kitchen 1.14.1 → 1.14.2

data/spec/kitchen/diagnostic_spec.rb

@@ -21,33 +21,32 @@ require_relative "../spec_helper"
 require "kitchen/diagnostic"
 
 describe Kitchen::Diagnostic do
-
   let(:loader) do
-    stub(:diagnose => { :who => "loader" })
+    stub(diagnose: { who: "loader" })
   end
 
   let(:instances) do
     [
       stub(
-        :name => "i1",
-        :diagnose => { :stuff => "sup" },
-        :diagnose_plugins => {
-          :driver => { :name => "driva", :a => "b" },
-          :provisioner => { :name => "prov", :c => "d" },
-          :transport => { :name => "transa", :e => "f" },
-          :verifier => { :name => "verve", :g => "h" }
+        name: "i1",
+        diagnose: { stuff: "sup" },
+        diagnose_plugins: {
+          driver: { name: "driva", a: "b" },
+          provisioner: { name: "prov", c: "d" },
+          transport: { name: "transa", e: "f" },
+          verifier: { name: "verve", g: "h" },
         }
       ),
       stub(
-        :name => "i2",
-        :diagnose => { :stuff => "yo" },
-        :diagnose_plugins => {
-          :driver => { :name => "driva", :a => "b" },
-          :provisioner => { :name => "presto", :i => "j" },
-          :transport => { :name => "tressa", :k => "l" },
-          :verifier => { :name => "verve", :g => "h" }
+        name: "i2",
+        diagnose: { stuff: "yo" },
+        diagnose_plugins: {
+          driver: { name: "driva", a: "b" },
+          provisioner: { name: "presto", i: "j" },
+          transport: { name: "tressa", k: "l" },
+          verifier: { name: "verve", g: "h" },
         }
-      )
+      ),
     ]
   end
 
@@ -62,8 +61,8 @@ describe Kitchen::Diagnostic do
   it "#read returns a timestamp in UTC" do
     Time.stubs(:now).returns(Time.at(0))
 
-    Kitchen::Diagnostic.new.read["timestamp"].
-      must_equal "1970-01-01 00:00:00 UTC"
+    Kitchen::Diagnostic.new.read["timestamp"]
+      .must_equal "1970-01-01 00:00:00 UTC"
   end
 
   it "#read doesn't return a loader hash if not given one" do
@@ -71,39 +70,39 @@ describe Kitchen::Diagnostic do
   end
 
   it "#read returns the loader's diganose hash if a loader is present" do
-    Kitchen::Diagnostic.new(:loader => loader).
-      read["loader"].must_equal("who" => "loader")
+    Kitchen::Diagnostic.new(loader: loader)
+                       .read["loader"].must_equal("who" => "loader")
   end
 
   it "#read returns an error hash for loader if error hash is passed in" do
-    Kitchen::Diagnostic.new(:loader => { :error => "damn" }).
-      read["loader"].must_equal("error" => "damn")
+    Kitchen::Diagnostic.new(loader: { error: "damn" })
+                       .read["loader"].must_equal("error" => "damn")
   end
 
   it "#read returns the unique set of plugins' diagnose hash if :plugins is set" do
-    Kitchen::Diagnostic.new(:instances => instances, :plugins => true).
-      read["plugins"].
-      must_equal(
+    Kitchen::Diagnostic.new(instances: instances, plugins: true)
+                       .read["plugins"]
+      .must_equal(
         "driver" => {
-          "driva" => { "a" => "b" }
+          "driva" => { "a" => "b" },
         },
         "provisioner" => {
           "prov" => { "c" => "d" },
-          "presto" => { "i" => "j" }
+          "presto" => { "i" => "j" },
         },
         "transport" => {
           "transa" => { "e" => "f" },
-          "tressa" => { "k" => "l" }
+          "tressa" => { "k" => "l" },
         },
         "verifier" => {
-          "verve" => { "g" => "h" }
+          "verve" => { "g" => "h" },
         }
       )
   end
 
   it "#read returns an empty plugins hash if no instances were given" do
-    Kitchen::Diagnostic.new(:plugins => true).
-      read["plugins"].must_equal Hash.new
+    Kitchen::Diagnostic.new(plugins: true)
+                       .read["plugins"].must_equal Hash.new
   end
 
   it "#read returns an empty instances hash if no instances were given" do
@@ -112,18 +111,18 @@ describe Kitchen::Diagnostic do
 
   it "#read returns an error hash for plugins if error hash is passed in" do
     Kitchen::Diagnostic.new(
-      :instances => { :error => "shoot" }, :plugins => true
+      instances: { error: "shoot" }, plugins: true
     ).read["plugins"].must_equal("error" => "shoot")
   end
 
   it "#read returns the instances' diganose hashes if instances are present" do
-    Kitchen::Diagnostic.new(:instances => instances).
-      read["instances"].
-      must_equal("i1" => { "stuff" => "sup" }, "i2" => { "stuff" => "yo" })
+    Kitchen::Diagnostic.new(instances: instances)
+                       .read["instances"]
+      .must_equal("i1" => { "stuff" => "sup" }, "i2" => { "stuff" => "yo" })
   end
 
   it "#read returns an error hash for instances if error hash is passed in" do
-    Kitchen::Diagnostic.new(:instances => { :error => "shoot" }).
-      read["instances"].must_equal("error" => "shoot")
+    Kitchen::Diagnostic.new(instances: { error: "shoot" })
+                       .read["instances"].must_equal("error" => "shoot")
   end
 end

data/spec/kitchen/driver/base_spec.rb

@@ -23,19 +23,15 @@ require "stringio"
 require "kitchen"
 
 module Kitchen
-
   module Driver
-
     class Speedy < Base
     end
 
     class Dodgy < Base
-
       no_parallel_for :setup
     end
 
     class Slow < Base
-
       no_parallel_for :create, :destroy
       no_parallel_for :verify
     end
@@ -43,22 +39,21 @@ module Kitchen
 end
 
 describe Kitchen::Driver::Base do
-
   let(:logged_output) { StringIO.new }
   let(:logger)        { Logger.new(logged_output) }
   let(:config)        { Hash.new }
   let(:state)         { Hash.new }
 
   let(:busser) do
-    stub(:setup_cmd => "setup", :sync_cmd => "sync", :run_cmd => "run")
+    stub(setup_cmd: "setup", sync_cmd: "sync", run_cmd: "run")
   end
 
   let(:instance) do
     stub(
-      :name => "coolbeans",
-      :logger => logger,
-      :busser => busser,
-      :to_str => "instance"
+      name: "coolbeans",
+      logger: logger,
+      busser: busser,
+      to_str: "instance"
     )
   end
 
@@ -85,7 +80,6 @@ describe Kitchen::Driver::Base do
   end
 
   [:create, :setup, :verify, :destroy].each do |action|
-
     it "has a #{action} method that takes state" do
       # TODO: revert back
       # state = Hash.new
@@ -95,7 +89,6 @@ describe Kitchen::Driver::Base do
   end
 
   describe ".no_parallel_for" do
-
     it "registers no serial actions when none are declared" do
       Kitchen::Driver::Speedy.serial_actions.must_equal nil
     end
@@ -113,9 +106,9 @@ describe Kitchen::Driver::Base do
     end
 
     it "raises a ClientError if value is not an action method" do
-      proc {
+      proc do
         Class.new(Kitchen::Driver::Base) { no_parallel_for :telling_stories }
-      }.must_raise Kitchen::ClientError
+      end.must_raise Kitchen::ClientError
     end
   end
 end

data/spec/kitchen/driver/dummy_spec.rb

@@ -23,14 +23,13 @@ require "stringio"
 require "kitchen/driver/dummy"
 
 describe Kitchen::Driver::Dummy do
-
   let(:logged_output) { StringIO.new }
   let(:logger)        { Logger.new(logged_output) }
   let(:config)        { Hash.new }
   let(:state)         { Hash.new }
 
   let(:instance) do
-    stub(:name => "coolbeans", :logger => logger, :to_str => "instance")
+    stub(name: "coolbeans", logger: logger, to_str: "instance")
   end
 
   let(:driver) do
@@ -46,7 +45,6 @@ describe Kitchen::Driver::Dummy do
   end
 
   describe "default_config" do
-
     it "sets :sleep to 0 by default" do
       driver[:sleep].must_equal 0
     end
@@ -57,7 +55,6 @@ describe Kitchen::Driver::Dummy do
   end
 
   describe "#create" do
-
     it "sets :my_id to a unique value as an example" do
       driver.create(state)
 
@@ -104,7 +101,6 @@ describe Kitchen::Driver::Dummy do
   end
 
   describe "#setup" do
-
     it "calls sleep if :sleep value is greater than 0" do
       config[:sleep] = 12.5
       driver.expects(:sleep).with(12.5).returns(true)
@@ -133,7 +129,6 @@ describe Kitchen::Driver::Dummy do
   end
 
   describe "#verify" do
-
     it "calls sleep if :sleep value is greater than 0" do
       config[:sleep] = 12.5
       driver.expects(:sleep).with(12.5).returns(true)
@@ -162,7 +157,6 @@ describe Kitchen::Driver::Dummy do
   end
 
   describe "#destroy" do
-
     it "removes :my_id from the state hash" do
       state[:my_id] = "90210"
       driver.destroy(state)

data/spec/kitchen/driver/proxy_spec.rb

@@ -21,17 +21,16 @@ require_relative "../../spec_helper"
 require "kitchen/driver/proxy"
 
 describe Kitchen::Driver::Proxy do
-
   let(:logged_output) { StringIO.new }
   let(:logger)        { Logger.new(logged_output) }
   let(:state)         { Hash.new }
 
   let(:config) do
-    { :host => "foobnoobs.com", :reset_command => "mulligan" }
+    { host: "foobnoobs.com", reset_command: "mulligan" }
   end
 
   let(:instance) do
-    stub(:name => "coolbeans", :logger => logger, :to_str => "instance")
+    stub(name: "coolbeans", logger: logger, to_str: "instance")
   end
 
   let(:driver) do
@@ -43,7 +42,6 @@ describe Kitchen::Driver::Proxy do
   end
 
   describe "non-parallel action" do
-
     it "create must be serially executed" do
       Kitchen::Driver::Proxy.serial_actions.must_include :create
     end
@@ -54,7 +52,6 @@ describe Kitchen::Driver::Proxy do
   end
 
   describe "required_config" do
-
     [:host, :reset_command].each do |attr|
       it "requires :#{attr}" do
         config.delete(attr)
@@ -74,7 +71,6 @@ describe Kitchen::Driver::Proxy do
   end
 
   describe "#create" do
-
     it "sets :hostname in state config" do
       driver.stubs(:ssh)
       driver.create(state)
@@ -100,7 +96,6 @@ describe Kitchen::Driver::Proxy do
   end
 
   describe "#destroy" do
-
     before do
       state[:hostname] = "beep"
     end

data/spec/kitchen/driver/ssh_base_spec.rb

@@ -23,11 +23,8 @@ require "kitchen/transport/ssh"
 require "kitchen/verifier/busser"
 
 module Kitchen
-
   module Driver
-
     class BackCompat < Kitchen::Driver::SSHBase
-
       def use_run_remote(state, command)
         connection = Kitchen::SSH.new(*build_ssh_args(state))
         run_remote(command, connection)
@@ -43,12 +40,10 @@ module Kitchen
     end
 
     class DodgyCompat < Kitchen::Driver::SSHBase
-
       no_parallel_for :converge
     end
 
     class SlowCompat < Kitchen::Driver::SSHBase
-
       no_parallel_for :create, :destroy
       no_parallel_for :verify
     end
@@ -56,7 +51,6 @@ module Kitchen
 end
 
 describe Kitchen::Driver::SSHBase do
-
   let(:logged_output) { StringIO.new }
   let(:logger)        { Logger.new(logged_output) }
   let(:config)        { Hash.new }
@@ -78,13 +72,13 @@ describe Kitchen::Driver::SSHBase do
 
   let(:provisioner) do
     stub(
-      :install_command  => "install",
-      :init_command     => "init",
-      :prepare_command  => "prepare",
-      :run_command      => "run",
-      :create_sandbox   => true,
-      :cleanup_sandbox  => true,
-      :sandbox_path     => "/tmp/sandbox"
+      install_command: "install",
+      init_command: "init",
+      prepare_command: "prepare",
+      run_command: "run",
+      create_sandbox: true,
+      cleanup_sandbox: true,
+      sandbox_path: "/tmp/sandbox"
     )
   end
 
@@ -96,12 +90,12 @@ describe Kitchen::Driver::SSHBase do
 
   let(:instance) do
     stub(
-      :name         => "coolbeans",
-      :logger       => logger,
-      :verifier     => verifier,
-      :provisioner  => provisioner,
-      :transport    => transport,
-      :to_str       => "instance"
+      name: "coolbeans",
+      logger: logger,
+      verifier: verifier,
+      provisioner: provisioner,
+      transport: transport,
+      to_str: "instance"
     )
   end
 
@@ -114,7 +108,6 @@ describe Kitchen::Driver::SSHBase do
   end
 
   describe "configuration" do
-
     it ":sudo defaults to true" do
       driver[:sudo].must_equal true
     end
@@ -135,19 +128,18 @@ describe Kitchen::Driver::SSHBase do
   # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
   def self.constructs_an_ssh_connection
     describe "constructs an SSH connection" do
-
       it "with hostname set from state" do
-        transport.expects(:connection).with { |state|
+        transport.expects(:connection).with do |state|
           state[:hostname].must_equal "fizzy"
-        }.returns(stub(:login_command => stub))
+        end.returns(stub(login_command: stub))
 
         cmd
       end
 
       it "with username set from state" do
-        transport.expects(:connection).with { |state|
+        transport.expects(:connection).with do |state|
           state[:username].must_equal "bork"
-        }.returns(stub(:login_command => stub))
+        end.returns(stub(login_command: stub))
 
         cmd
       end
@@ -155,9 +147,9 @@ describe Kitchen::Driver::SSHBase do
       it "with :ssh_key option set from config" do
         config[:ssh_key] = "wicked"
 
-        transport.expects(:connection).with { |state|
+        transport.expects(:connection).with do |state|
           state[:ssh_key].must_equal "wicked"
-        }.returns(stub(:login_command => stub))
+        end.returns(stub(login_command: stub))
 
         cmd
       end
@@ -165,17 +157,17 @@ describe Kitchen::Driver::SSHBase do
       it "with :ssh_key option set from state" do
         state[:ssh_key] = "wicked"
 
-        transport.expects(:connection).with { |state|
+        transport.expects(:connection).with do |state|
           state[:ssh_key].must_equal "wicked"
-        }.returns(stub(:login_command => stub))
+        end.returns(stub(login_command: stub))
 
         cmd
       end
 
       it "with :password option set to falsey by default" do
-        transport.expects(:connection).with { |state|
+        transport.expects(:connection).with do |state|
           state[:password].nil?
-        }.returns(stub(:login_command => stub))
+        end.returns(stub(login_command: stub))
 
         cmd
       end
@@ -183,9 +175,9 @@ describe Kitchen::Driver::SSHBase do
       it "with :password option set if given in config" do
         config[:password] = "psst"
 
-        transport.expects(:connection).with { |state|
+        transport.expects(:connection).with do |state|
           state[:password].must_equal "psst"
-        }.returns(stub(:login_command => stub))
+        end.returns(stub(login_command: stub))
 
         cmd
       end
@@ -193,17 +185,17 @@ describe Kitchen::Driver::SSHBase do
       it "with :password option set if given in state" do
         state[:password] = "psst"
 
-        transport.expects(:connection).with { |state|
+        transport.expects(:connection).with do |state|
           state[:password].must_equal "psst"
-        }.returns(stub(:login_command => stub))
+        end.returns(stub(login_command: stub))
 
         cmd
       end
 
       it "with :forward_agent option set to falsey by default" do
-        transport.expects(:connection).with { |state|
+        transport.expects(:connection).with do |state|
           state[:forward_agent].nil?
-        }.returns(stub(:login_command => stub))
+        end.returns(stub(login_command: stub))
 
         cmd
       end
@@ -211,9 +203,9 @@ describe Kitchen::Driver::SSHBase do
       it "with :forward_agent option set if given in config" do
         config[:forward_agent] = "yeah?"
 
-        transport.expects(:connection).with { |state|
+        transport.expects(:connection).with do |state|
           state[:forward_agent].must_equal "yeah?"
-        }.returns(stub(:login_command => stub))
+        end.returns(stub(login_command: stub))
 
         cmd
       end
@@ -221,17 +213,17 @@ describe Kitchen::Driver::SSHBase do
       it "with :forward_agent option set if given in state" do
         state[:forward_agent] = "yeah?"
 
-        transport.expects(:connection).with { |state|
+        transport.expects(:connection).with do |state|
           state[:forward_agent].must_equal "yeah?"
-        }.returns(stub(:login_command => stub))
+        end.returns(stub(login_command: stub))
 
         cmd
       end
 
       it "with :port option set to 22 by default" do
-        transport.expects(:connection).with { |state|
+        transport.expects(:connection).with do |state|
           state[:port].must_equal 22
-        }.returns(stub(:login_command => stub))
+        end.returns(stub(login_command: stub))
 
         cmd
       end
@@ -239,9 +231,9 @@ describe Kitchen::Driver::SSHBase do
       it "with :port option set if customized in config" do
         config[:port] = 1234
 
-        transport.expects(:connection).with { |state|
+        transport.expects(:connection).with do |state|
           state[:port].must_equal 1234
-        }.returns(stub(:login_command => stub))
+        end.returns(stub(login_command: stub))
 
         cmd
       end
@@ -249,9 +241,9 @@ describe Kitchen::Driver::SSHBase do
       it "with :port option set if customized in state" do
         state[:port] = 9999
 
-        transport.expects(:connection).with { |state|
+        transport.expects(:connection).with do |state|
           state[:port].must_equal 9999
-        }.returns(stub(:login_command => stub))
+        end.returns(stub(login_command: stub))
 
         cmd
       end
@@ -260,7 +252,6 @@ describe Kitchen::Driver::SSHBase do
   # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
   describe "#login_command" do
-
     let(:cmd) { driver.login_command(state) }
 
     before do
@@ -269,7 +260,7 @@ describe Kitchen::Driver::SSHBase do
     end
 
     it "returns a LoginCommand" do
-      transport.stubs(:connection).returns(stub(:login_command => "command"))
+      transport.stubs(:connection).returns(stub(login_command: "command"))
 
       cmd.must_equal "command"
     end
@@ -278,9 +269,8 @@ describe Kitchen::Driver::SSHBase do
   end
 
   describe "#converge" do
-
     let(:cmd)         { driver.converge(state) }
-    let(:connection)  { stub(:execute => true, :upload => true) }
+    let(:connection)  { stub(execute: true, upload: true) }
 
     before do
       state[:hostname] = "fizzy"
@@ -340,25 +330,25 @@ describe Kitchen::Driver::SSHBase do
       cmd
     end
 
-    it "invokes the #install_command with ENV[\"http_proxy\"] set" do
+    it 'invokes the #install_command with ENV["http_proxy"] set' do
       ENV["http_proxy"] = "http://proxy"
       transport.stubs(:connection).yields(connection)
       if running_tests_on_windows?
-        connection.expects(:execute).
-          with("env http_proxy=http://proxy HTTP_PROXY=http://proxy install")
+        connection.expects(:execute)
+                  .with("env http_proxy=http://proxy HTTP_PROXY=http://proxy install")
       else
         connection.expects(:execute).with("env http_proxy=http://proxy install")
       end
       cmd
     end
 
-    it "invokes the #install_command with ENV[\"http_proxy\"] and ENV[\"no_proxy\"] set" do
+    it 'invokes the #install_command with ENV["http_proxy"] and ENV["no_proxy"] set' do
       ENV["http_proxy"] = "http://proxy"
       ENV["no_proxy"]   = "http://no"
       transport.stubs(:connection).yields(connection)
       if running_tests_on_windows?
-        connection.expects(:execute).
-          with("env http_proxy=http://proxy HTTP_PROXY=http://proxy " \
+        connection.expects(:execute)
+                  .with("env http_proxy=http://proxy HTTP_PROXY=http://proxy " \
             "no_proxy=http://no NO_PROXY=http://no install")
       else
         connection.expects(:execute).with("env http_proxy=http://proxy " \
@@ -375,25 +365,25 @@ describe Kitchen::Driver::SSHBase do
       cmd
     end
 
-    it "invokes the #install_command with ENV[\"https_proxy\"] set" do
+    it 'invokes the #install_command with ENV["https_proxy"] set' do
       ENV["https_proxy"] = "https://proxy"
       transport.stubs(:connection).yields(connection)
       if running_tests_on_windows?
-        connection.expects(:execute).
-          with("env https_proxy=https://proxy HTTPS_PROXY=https://proxy install")
+        connection.expects(:execute)
+                  .with("env https_proxy=https://proxy HTTPS_PROXY=https://proxy install")
       else
         connection.expects(:execute).with("env https_proxy=https://proxy install")
       end
       cmd
     end
 
-    it "invokes the #install_command with ENV[\"https_proxy\"] and ENV[\"no_proxy\"] set" do
+    it 'invokes the #install_command with ENV["https_proxy"] and ENV["no_proxy"] set' do
       ENV["https_proxy"] = "https://proxy"
       ENV["no_proxy"]    = "https://no"
       transport.stubs(:connection).yields(connection)
       if running_tests_on_windows?
-        connection.expects(:execute).
-          with("env https_proxy=https://proxy HTTPS_PROXY=https://proxy " \
+        connection.expects(:execute)
+                  .with("env https_proxy=https://proxy HTTPS_PROXY=https://proxy " \
           "no_proxy=https://no NO_PROXY=https://no install")
       else
         connection.expects(:execute).with("env https_proxy=https://proxy " \
@@ -410,25 +400,25 @@ describe Kitchen::Driver::SSHBase do
       cmd
     end
 
-    it "invokes the #install_command with ENV[\"ftp_proxy\"] set" do
+    it 'invokes the #install_command with ENV["ftp_proxy"] set' do
       ENV["ftp_proxy"] = "ftp://proxy"
       transport.stubs(:connection).yields(connection)
       if running_tests_on_windows?
-        connection.expects(:execute).
-          with("env ftp_proxy=ftp://proxy FTP_PROXY=ftp://proxy install")
+        connection.expects(:execute)
+                  .with("env ftp_proxy=ftp://proxy FTP_PROXY=ftp://proxy install")
       else
         connection.expects(:execute).with("env ftp_proxy=ftp://proxy install")
       end
       cmd
     end
 
-    it "invokes the #install_command with ENV[\"ftp_proxy\"] and ENV[\"no_proxy\"] set" do
+    it 'invokes the #install_command with ENV["ftp_proxy"] and ENV["no_proxy"] set' do
       ENV["ftp_proxy"]  = "ftp://proxy"
       ENV["no_proxy"]   = "http://no"
       transport.stubs(:connection).yields(connection)
       if running_tests_on_windows?
-        connection.expects(:execute).
-          with("env ftp_proxy=ftp://proxy FTP_PROXY=http://proxy " \
+        connection.expects(:execute)
+                  .with("env ftp_proxy=ftp://proxy FTP_PROXY=http://proxy " \
             "no_proxy=http://no NO_PROXY=http://no install")
       else
         connection.expects(:execute).with("env ftp_proxy=ftp://proxy " \
@@ -449,7 +439,6 @@ describe Kitchen::Driver::SSHBase do
     end
 
     describe "transferring files" do
-
       before do
         transport.stubs(:connection).yields(connection)
         connection.stubs(:upload)
@@ -465,8 +454,8 @@ describe Kitchen::Driver::SSHBase 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 "logs to debug" do
@@ -491,7 +480,6 @@ describe Kitchen::Driver::SSHBase do
   end
 
   describe "#setup" do
-
     let(:cmd)         { driver.setup(state) }
     let(:connection)  { mock }
 
@@ -553,9 +541,8 @@ describe Kitchen::Driver::SSHBase do
   end
 
   describe "#verify" do
-
     let(:cmd)         { driver.verify(state) }
-    let(:connection)  { stub(:execute => true, :upload => true) }
+    let(:connection)  { stub(execute: true, upload: true) }
 
     before do
       state[:hostname] = "fizzy"
@@ -590,7 +577,7 @@ describe Kitchen::Driver::SSHBase do
       cmd
     end
 
-    %W[init prepare run].each do |phase|
+    %w{init prepare run}.each do |phase|
       it "invokes Verifier##{phase}_command over ssh" do
         connection.expects(:execute).with(phase)
 
@@ -632,8 +619,8 @@ describe Kitchen::Driver::SSHBase 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
@@ -649,8 +636,8 @@ describe Kitchen::Driver::SSHBase 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
@@ -663,17 +650,16 @@ describe Kitchen::Driver::SSHBase do
   end
 
   describe "#ssh" do
-
-    let(:cmd)         { driver.ssh(["host", "user", { :one => "two" }], "go") }
+    let(:cmd)         { driver.ssh(["host", "user", { one: "two" }], "go") }
     let(:connection)  { mock }
 
     it "creates an SSH connection" do
       connection.stubs(:execute)
       transport.expects(:connection).with(
-        :hostname => "host",
-        :username => "user",
-        :port => 22,
-        :one => "two"
+        hostname: "host",
+        username: "user",
+        port: 22,
+        one: "two"
       ).yields(connection)
 
       cmd
@@ -688,7 +674,6 @@ describe Kitchen::Driver::SSHBase do
   end
 
   describe "#remote_command" do
-
     let(:cmd)         { driver.remote_command(state, "shipit") }
     let(:connection)  { mock }
 
@@ -699,9 +684,9 @@ describe Kitchen::Driver::SSHBase do
 
     it "creates an SSH connection" do
       transport.expects(:connection).with(
-        :hostname => "fizzy",
-        :username => "bork",
-        :port => 22
+        hostname: "fizzy",
+        username: "bork",
+        port: 22
       )
 
       cmd
@@ -716,18 +701,17 @@ describe Kitchen::Driver::SSHBase do
   end
 
   describe "#wait_for_sshd" do
-
     let(:cmd) do
-      driver.send(:wait_for_sshd, "host", "user", :one => "two")
+      driver.send(:wait_for_sshd, "host", "user", one: "two")
     end
 
     it "creates an SSH connection with merged options" do
       transport.expects(:connection).with(
-        :hostname => "host",
-        :username => "user",
-        :port => 22,
-        :one => "two"
-      ).returns(stub(:wait_until_ready => true))
+        hostname: "host",
+        username: "user",
+        port: 22,
+        one: "two"
+      ).returns(stub(wait_until_ready: true))
 
       cmd
     end
@@ -742,7 +726,6 @@ describe Kitchen::Driver::SSHBase do
   end
 
   describe "to maintain backwards compatibility" do
-
     let(:driver) do
       Kitchen::Driver::BackCompat.new(config).finalize_config!(instance)
     end
@@ -756,7 +739,6 @@ describe Kitchen::Driver::SSHBase do
     end
 
     describe "#logger" do
-
       before  { @klog = Kitchen.logger }
       after   { Kitchen.logger = @klog }
 
@@ -795,7 +777,6 @@ describe Kitchen::Driver::SSHBase do
     end
 
     describe ".no_parallel_for" do
-
       it "registers no serial actions when none are declared" do
         Kitchen::Driver::SpeedyCompat.serial_actions.must_equal nil
       end
@@ -813,52 +794,52 @@ describe Kitchen::Driver::SSHBase do
       end
 
       it "raises a ClientError if value is not an action method" do
-        proc {
-          Class.new(Kitchen::Driver::BackCompat) {
+        proc do
+          Class.new(Kitchen::Driver::BackCompat) do
             no_parallel_for :telling_stories
-          }
-        }.must_raise Kitchen::ClientError
+          end
+        end.must_raise Kitchen::ClientError
       end
     end
 
     # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def self.constructs_an_ssh_object
       it "with hostname set from state" do
-        Kitchen::SSH.expects(:new).with { |hostname, _username, _opts|
+        Kitchen::SSH.expects(:new).with do |hostname, _username, _opts|
           hostname.must_equal "fizzy"
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
 
       it "with username set from state" do
-        Kitchen::SSH.expects(:new).with { |_hostname, username, _opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, username, _opts|
           username.must_equal "bork"
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
 
       it "with :user_known_hosts_file option set to /dev/null" do
-        Kitchen::SSH.expects(:new).with { |_hostname, _username, opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, _username, opts|
           opts[:user_known_hosts_file].must_equal "/dev/null"
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
 
       it "with :paranoid option set to false" do
-        Kitchen::SSH.expects(:new).with { |_hostname, _username, opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, _username, opts|
           opts[:paranoid].must_equal false
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
 
       it "with :keys_only option set to falsey by default" do
-        Kitchen::SSH.expects(:new).with { |_hostname, _username, opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, _username, opts|
           opts[:keys_only].nil?
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
@@ -866,9 +847,9 @@ describe Kitchen::Driver::SSHBase do
       it "with :keys_only option set to true if :ssh_key is set in config" do
         config[:ssh_key] = "wicked"
 
-        Kitchen::SSH.expects(:new).with { |_hostname, _username, opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, _username, opts|
           opts[:keys_only].must_equal true
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
@@ -876,17 +857,17 @@ describe Kitchen::Driver::SSHBase do
       it "with :keys_only option set to true if :ssh_key is set in state" do
         state[:ssh_key] = "wicked"
 
-        Kitchen::SSH.expects(:new).with { |_hostname, _username, opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, _username, opts|
           opts[:keys_only].must_equal true
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
 
       it "with :keys option set to falsey by default" do
-        Kitchen::SSH.expects(:new).with { |_hostname, _username, opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, _username, opts|
           opts[:keys].nil?
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
@@ -894,9 +875,9 @@ describe Kitchen::Driver::SSHBase do
       it "with :keys option set to an array if :ssh_key is set in config" do
         config[:ssh_key] = "wicked"
 
-        Kitchen::SSH.expects(:new).with { |_hostname, _username, opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, _username, opts|
           opts[:keys].must_equal ["wicked"]
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
@@ -904,17 +885,17 @@ describe Kitchen::Driver::SSHBase do
       it "with :keys option set to an array if :ssh_key is set in state" do
         state[:ssh_key] = "wicked"
 
-        Kitchen::SSH.expects(:new).with { |_hostname, _username, opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, _username, opts|
           opts[:keys].must_equal ["wicked"]
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
 
       it "with :password option set to falsey by default" do
-        Kitchen::SSH.expects(:new).with { |_hostname, _username, opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, _username, opts|
           opts[:password].nil?
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
@@ -922,9 +903,9 @@ describe Kitchen::Driver::SSHBase do
       it "with :password option set if given in config" do
         config[:password] = "psst"
 
-        Kitchen::SSH.expects(:new).with { |_hostname, _username, opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, _username, opts|
           opts[:password].must_equal "psst"
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
@@ -932,17 +913,17 @@ describe Kitchen::Driver::SSHBase do
       it "with :password option set if given in state" do
         state[:password] = "psst"
 
-        Kitchen::SSH.expects(:new).with { |_hostname, _username, opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, _username, opts|
           opts[:password].must_equal "psst"
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
 
       it "with :forward_agent option set to falsey by default" do
-        Kitchen::SSH.expects(:new).with { |_hostname, _username, opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, _username, opts|
           opts[:forward_agent].nil?
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
@@ -950,9 +931,9 @@ describe Kitchen::Driver::SSHBase do
       it "with :forward_agent option set if given in config" do
         config[:forward_agent] = "yeah?"
 
-        Kitchen::SSH.expects(:new).with { |_hostname, _username, opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, _username, opts|
           opts[:forward_agent].must_equal "yeah?"
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
@@ -960,17 +941,17 @@ describe Kitchen::Driver::SSHBase do
       it "with :forward_agent option set if given in state" do
         state[:forward_agent] = "yeah?"
 
-        Kitchen::SSH.expects(:new).with { |_hostname, _username, opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, _username, opts|
           opts[:forward_agent].must_equal "yeah?"
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
 
       it "with :port option set to 22 by default" do
-        Kitchen::SSH.expects(:new).with { |_hostname, _username, opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, _username, opts|
           opts[:port].must_equal 22
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
@@ -978,9 +959,9 @@ describe Kitchen::Driver::SSHBase do
       it "with :port option set if customized in config" do
         config[:port] = 1234
 
-        Kitchen::SSH.expects(:new).with { |_hostname, _username, opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, _username, opts|
           opts[:port].must_equal 1234
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
@@ -988,17 +969,17 @@ describe Kitchen::Driver::SSHBase do
       it "with :port option set if customized in state" do
         state[:port] = 9999
 
-        Kitchen::SSH.expects(:new).with { |_hostname, _username, opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, _username, opts|
           opts[:port].must_equal 9999
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
 
       it "with :logger option set to driver's logger" do
-        Kitchen::SSH.expects(:new).with { |_hostname, _username, opts|
+        Kitchen::SSH.expects(:new).with do |_hostname, _username, opts|
           opts[:logger].must_equal logger
-        }.returns(connection)
+        end.returns(connection)
 
         cmd
       end
@@ -1006,9 +987,8 @@ describe Kitchen::Driver::SSHBase do
     # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
     describe "#run_remote" do
-
       let(:cmd)         { driver.use_run_remote(state, "huh") }
-      let(:connection)  { stub(:exec => true) }
+      let(:connection)  { stub(exec: true) }
 
       before do
         state[:hostname] = "fizzy"
@@ -1074,10 +1054,9 @@ describe Kitchen::Driver::SSHBase do
     end
 
     describe "#transfer_path" do
-
       let(:cmd)         { driver.use_transfer_path(state, ["nope"], "nadda") }
-      let(:channel)     { stub(:wait => true) }
-      let(:connection)  { stub(:upload_path! => true, :upload_path => channel) }
+      let(:channel)     { stub(wait: true) }
+      let(:connection)  { stub(upload_path!: true, upload_path: channel) }
 
       before do
         state[:hostname] = "fizzy"