Fixes chefstyle

Rakefile

@@ -14,7 +14,7 @@ RuboCop::RakeTask.new(:lint) do |task|
 end
 #
 # run tests
-task default: [:test, :lint]
+task default: %i{test lint}
 
 Rake::TestTask.new do |t|
   t.libs << "test"
@@ -59,7 +59,7 @@ namespace :test do
 
     sh_cmd = "cd #{path} && target=#{args[:target]} key_files=#{key_files}"
 
-    sh_cmd += " debug=#{ENV['debug']}" if ENV["debug"]
+    sh_cmd += " debug=#{ENV["debug"]}" if ENV["debug"]
     sh_cmd += " ruby -I ../../lib test_ssh.rb tests/"
     sh_cmd += ENV["test"] || "*"
 

contrib/fixup_requiretty.rb

@@ -15,9 +15,10 @@
 # FIXME
 user = ENV["TRAIN_SUDO_USER"] || "todo-some-clever-default-maybe-current-user"
 sudoer = "/etc/sudoers.d/#{user}"
+warning = "Warning: a sudoers configuration for user #{user} already exists, "\
+  "doing nothing (override with TRAIN_SUDO_VERY_MUCH=yes)"
 
-log "Warning: a sudoers configuration for user #{user} already exists, "\
-    "doing nothing (override with TRAIN_SUDO_VERY_MUCH=yes)" do
+log warning do
   only_if "test -f #{sudoer} || grep #{user} /etc/sudoers"
 end
 

examples/plugins/train-local-rot13/test/unit/connection_test.rb

@@ -27,10 +27,10 @@
   end
 
   # Since this is a Local-type connection, we MUST implement these three.
-  [
-    :file_via_connection,
-    :run_command_via_connection,
-  ].each do |method_name|
+  %i{
+    file_via_connection
+    run_command_via_connection
+  }.each do |method_name|
     it "should provide a #{method_name}() method" do
       # false passed to instance_methods says 'don't use inheritance'
       connection_class.instance_methods(false).must_include(method_name)

lib/train.rb

@@ -76,6 +76,7 @@ def self.target_config(config = nil)
 
     group_keys_and_keyfiles(conf) # TODO: move logic into SSH plugin
     return conf if conf[:target].to_s.empty?
+
     unpack_target_from_uri(conf[:target], conf).merge(conf)
   end
 
@@ -146,6 +147,7 @@ def self.parse_uri(string)
   # TODO: this actually does no validation of the credential options whatsoever
   def self.validate_backend(credentials, default_transport_name = "local")
     return default_transport_name if credentials.nil?
+
     transport_name = credentials[:backend]
 
     # TODO: Determine if it is ever possible (or supported) for transport_name to be 'localhost'
@@ -155,16 +157,16 @@ def self.validate_backend(credentials, default_transport_name = "local")
         "To run this locally with elevated privileges, run the command with `sudo ...`."
     end
 
-    return transport_name if !transport_name.nil?
+    return transport_name unless transport_name.nil?
 
-    if !credentials[:target].nil?
+    unless credentials[:target].nil?
       # We should not get here, because if target_uri unpacking was successful,
       # it would have set credentials[:backend]
       raise Train::UserError, "Cannot determine backend from target "\
            "configuration #{credentials[:target]}. Valid example: ssh://192.168.0.1"
     end
 
-    if !credentials[:host].nil?
+    unless credentials[:host].nil?
       raise Train::UserError, "Host configured, but no backend was provided. Please "\
            "specify how you want to connect. Valid example: ssh://192.168.0.1"
     end

lib/train/extras/command_wrapper.rb

@@ -55,6 +55,7 @@ def initialize(backend, options)
     def verify
       res = @backend.run_command(run("echo"))
       return nil if res.exit_status == 0
+
       rawerr = res.stdout + " " + res.stderr
 
       {
@@ -164,6 +165,7 @@ class CommandWrapper
     def self.load(transport, options)
       if transport.platform.unix?
         return nil unless LinuxCommand.active?(options)
+
         res = LinuxCommand.new(transport, options)
         verification_res = res.verify
         if verification_res

lib/train/extras/stat.rb

@@ -23,9 +23,12 @@ def self.stat(shell_escaped_path, backend, follow_symlink)
       if backend.os.aix? || (backend.os.solaris? && backend.os[:release].to_i < 11) || backend.os.hpux?
         return aix_stat(shell_escaped_path, backend, follow_symlink)
       end
+
       return bsd_stat(shell_escaped_path, backend, follow_symlink) if backend.os.bsd?
+
       # linux,solaris 11 and esx will use standard linux stats
       return linux_stat(shell_escaped_path, backend, follow_symlink) if backend.os.unix? || backend.os.esx?
+
       # all other cases we don't handle
       # TODO: print an error if we get here, as it shouldn't be invoked
       # on non-unix
@@ -75,9 +78,9 @@ def self.bsd_stat(shell_escaped_path, backend, follow_symlink)
       #      ...
       #      gu      Display group or user name.
       lstat = follow_symlink ? " -L" : ""
-      res = backend.run_command(
-        "stat#{lstat} -f '%z\n%p\n%Su\n%u\n%Sg\n%g\n%a\n%m' "\
-        "#{shell_escaped_path}")
+      cmd = "stat#{lstat} -f '%z\n%p\n%Su\n%u\n%Sg\n%g\n%a\n%m' "\
+        "#{shell_escaped_path}"
+      res = backend.run_command(cmd)
 
       return {} if res.exit_status != 0
 
@@ -113,8 +116,10 @@ def self.aix_stat(shell_escaped_path, backend, follow_symlink)
 
       res = backend.run_command(stat_cmd)
       return {} if res.exit_status != 0
+
       fields = res.stdout.split("\n")
       return {} if fields.length != 7
+
       tmask = fields[0].to_i(8)
       {
         type: find_type(tmask),

lib/train/file/local.rb

@@ -19,6 +19,7 @@ def content
 
       def link_path
         return nil unless symlink?
+
         begin
           @link_path ||= ::File.realpath(@path)
         rescue Errno::ELOOP => _
@@ -29,6 +30,7 @@ def link_path
 
       def shallow_link_path
         return nil unless symlink?
+
         @link_path ||= ::File.readlink(@path)
       end
 

lib/train/file/local/windows.rb

@@ -8,24 +8,25 @@ class Windows < Train::File::Local
         # @see https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx#naming_conventions
         def sanitize_filename(path)
           return if path.nil?
+
           # we do not filter :, backslash and forward slash, since they are part of the path
           @spath = path.gsub(/[<>"|?*]/, "")
         end
 
         def product_version
-          @product_version ||= @backend.run_command(
-            "[System.Diagnostics.FileVersionInfo]::GetVersionInfo(\"#{@spath}\").ProductVersion").stdout.chomp
+          cmd = "[System.Diagnostics.FileVersionInfo]::GetVersionInfo(\"#{@spath}\").ProductVersion"
+          @product_version ||= @backend.run_command(cmd).stdout.chomp
         end
 
         def file_version
-          @file_version ||= @backend.run_command(
-            "[System.Diagnostics.FileVersionInfo]::GetVersionInfo(\"#{@spath}\").FileVersion").stdout.chomp
+          cmd = "[System.Diagnostics.FileVersionInfo]::GetVersionInfo(\"#{@spath}\").FileVersion"
+          @file_version ||= @backend.run_command(cmd).stdout.chomp
         end
 
         def owner
-          owner = @backend.run_command(
-            "Get-Acl \"#{@spath}\" | select -expand Owner").stdout.strip
+          owner = @backend.run_command("Get-Acl \"#{@spath}\" | select -expand Owner").stdout.strip
           return if owner.empty?
+
           owner
         end
 

lib/train/file/remote.rb

@@ -5,11 +5,13 @@ class File
     class Remote < Train::File
       def basename(suffix = nil, sep = "/")
         raise "Not yet supported: Suffix in file.basename" unless suffix.nil?
+
         @basename ||= detect_filename(path, sep || "/")
       end
 
       def stat
         return @stat if defined?(@stat)
+
         @stat = Train::Extras::Stat.stat(@spath, @backend, @follow_symlink)
       end
 
@@ -19,8 +21,10 @@ def stat
       def detect_filename(path, sep)
         idx = path.rindex(sep)
         return path if idx.nil?
+
         idx += 1
         return detect_filename(path[0..-2], sep) if idx == path.length
+
         path[idx..-1]
       end
     end

lib/train/file/remote/aix.rb

@@ -8,12 +8,14 @@ class Remote
       class Aix < Train::File::Remote::Unix
         def link_path
           return nil unless symlink?
+
           @link_path ||=
             @backend.run_command("perl -e 'print readlink shift' #{@spath}").stdout.chomp
         end
 
         def shallow_link_path
           return nil unless symlink?
+
           @shallow_link_path ||=
             @backend.run_command("perl -e 'print readlink shift' #{@spath}").stdout.chomp
         end

lib/train/file/remote/linux.rb

@@ -8,8 +8,10 @@ class Remote
       class Linux < Train::File::Remote::Unix
         def content
           return @content if defined?(@content)
+
           @content = @backend.run_command("cat #{@spath} || echo -n").stdout
           return @content unless @content.empty?
+
           @content = nil if directory? || size.nil? || (size > 0)
           @content
         end

lib/train/file/remote/unix.rb

@@ -22,8 +22,7 @@ def content
         def exist?
           @exist ||= begin
             f = @follow_symlink ? "" : " || test -L #{@spath}"
-            @backend.run_command("test -e #{@spath}" + f)
-                    .exit_status == 0
+            @backend.run_command("test -e #{@spath}" + f).exit_status == 0
           end
         end
 
@@ -58,6 +57,7 @@ def link_path
 
         def shallow_link_path
           return nil unless symlink?
+
           @shallow_link_path ||=
             @backend.run_command("readlink #{@spath}").stdout.chomp
         end
@@ -74,6 +74,7 @@ def unix_mode_mask(owner, type)
 
         def path
           return @path unless @follow_symlink && symlink?
+
           @link_path ||= read_target_path
         end
 

lib/train/file/remote/windows.rb

@@ -9,6 +9,7 @@ class Windows < Train::File::Remote
         # @see https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx#naming_conventions
         def sanitize_filename(path)
           return if path.nil?
+
           # we do not filter :, backslash and forward slash, since they are part of the path
           @spath = path.gsub(/[<>"|?*]/, "")
         end
@@ -19,22 +20,26 @@ def basename(suffix = nil, sep = '\\')
 
         def content
           return @content if defined?(@content)
+
           @content = @backend.run_command("Get-Content(\"#{@spath}\") | Out-String").stdout
           return @content unless @content.empty?
+
           @content = nil if directory? # or size.nil? or size > 0
           @content
         end
 
         def exist?
           return @exist if defined?(@exist)
-          @exist = @backend.run_command(
-            "(Test-Path -Path \"#{@spath}\").ToString()").stdout.chomp == "True"
+
+          cmd = "(Test-Path -Path \"#{@spath}\").ToString()"
+          @exist = @backend.run_command(cmd).stdout.chomp == "True"
         end
 
         def owner
-          owner = @backend.run_command(
-            "Get-Acl \"#{@spath}\" | select -expand Owner").stdout.strip
+          cmd = "Get-Acl \"#{@spath}\" | select -expand Owner"
+          owner = @backend.run_command(cmd).stdout.strip
           return if owner.empty?
+
           owner
         end
 
@@ -46,6 +51,7 @@ def type
           elsif attributes.include?("Directory")
             return :directory
           end
+
           :unknown
         end
 
@@ -56,13 +62,13 @@ def size
         end
 
         def product_version
-          @product_version ||= @backend.run_command(
-            "[System.Diagnostics.FileVersionInfo]::GetVersionInfo(\"#{@spath}\").ProductVersion").stdout.chomp
+          cmd = "[System.Diagnostics.FileVersionInfo]::GetVersionInfo(\"#{@spath}\").ProductVersion"
+          @product_version ||= @backend.run_command(cmd).stdout.chomp
         end
 
         def file_version
-          @file_version ||= @backend.run_command(
-            "[System.Diagnostics.FileVersionInfo]::GetVersionInfo(\"#{@spath}\").FileVersion").stdout.chomp
+          cmd = "[System.Diagnostics.FileVersionInfo]::GetVersionInfo(\"#{@spath}\").FileVersion"
+          @file_version ||= @backend.run_command(cmd).stdout.chomp
         end
 
         %w{
@@ -89,8 +95,9 @@ def mounted
 
         def attributes
           return @attributes if defined?(@attributes)
-          @attributes = @backend.run_command(
-            "(Get-ItemProperty -Path \"#{@spath}\").attributes.ToString()").stdout.chomp.split(/\s*,\s*/)
+
+          cmd = "(Get-ItemProperty -Path \"#{@spath}\").attributes.ToString()"
+          @attributes = @backend.run_command(cmd).stdout.chomp.split(/\s*,\s*/)
         end
       end
     end

lib/train/options.rb

@@ -15,14 +15,14 @@ def option(name, conf = nil, &block)
         d = conf || {}
         unless d.is_a? Hash
           raise Train::ClientError,
-               "The transport plugin #{self} declared an option #{name} "\
-               "and didn't provide a valid configuration hash."
+            "The transport plugin #{self} declared an option #{name} "\
+            "and didn't provide a valid configuration hash."
         end
 
         if !conf.nil? && !conf[:default].nil? && block_given?
           raise Train::ClientError,
-               "The transport plugin #{self} declared an option #{name} "\
-               "with both a default value and block. Only use one of these."
+            "The transport plugin #{self} declared an option #{name} "\
+            "with both a default value and block. Only use one of these."
         end
 
         d[:default] = block if block_given?
@@ -38,7 +38,7 @@ def default_options
       def include_options(other)
         unless other.respond_to?(:default_options)
           raise "Trying to include options from module #{other.inspect}, "\
-               "which doesn't seem to support options."
+            "which doesn't seem to support options."
         end
         default_options.merge!(other.default_options)
       end
@@ -56,6 +56,7 @@ def merge_options(base, opts)
         res = base.merge(opts || {})
         default_options.each do |field, hm|
           next unless res[field].nil? && hm.key?(:default)
+
           default = hm[:default]
           if default.is_a? Proc
             res[field] = default.call(res)
@@ -70,7 +71,7 @@ def validate_options(opts)
         default_options.each do |field, hm|
           if opts[field].nil? && hm[:required]
             raise Train::ClientError,
-                 "You must provide a value for #{field.to_s.inspect}."
+              "You must provide a value for #{field.to_s.inspect}."
           end
         end
         opts

lib/train/platforms.rb

@@ -83,7 +83,7 @@ def self.list_all
   def self.print_children(parent, pad = 2)
     parent.children.each do |key, value|
       obj = key
-      puts "#{' ' * pad}-> #{obj.title}#{value unless value.empty?}"
+      puts "#{" " * pad}-> #{obj.title}#{value unless value.empty?}"
       print_children(obj, pad + 2) if defined?(obj.children) && !obj.children.nil?
     end
   end