aruba 1.0.1 → 1.1.1

data/lib/aruba/platforms/aruba_logger.rb

@@ -1,4 +1,4 @@
-require 'logger'
+require "logger"
 
 # Aruba
 module Aruba
@@ -47,20 +47,21 @@ module Aruba
     def logger
       l = ::Logger.new($stderr)
 
-      case mode
-      when :debug
-        l.level = ::Logger::DEBUG
+      if mode == :debug
         format_debug(l)
-      when :silent
-        l.level = 9_999
-      when :info
-        l.level = ::Logger::INFO
-        format_standard(l)
       else
-        l.level = ::Logger::INFO
         format_standard(l)
       end
 
+      l.level = case mode
+                when :debug
+                  ::Logger::DEBUG
+                when :silent
+                  9_999
+                else
+                  ::Logger::INFO
+                end
+
       l
     end
 

data/lib/aruba/platforms/command_monitor.rb

@@ -1,4 +1,4 @@
-require 'aruba/errors'
+require "aruba/errors"
 
 # Aruba
 module Aruba
@@ -12,7 +12,7 @@ module Aruba
 
     public
 
-    attr_reader :registered_commands, :last_command_started
+    attr_reader :registered_commands, :last_command_started, :last_command_stopped
 
     class DefaultLastCommandStopped
       def nil?
@@ -20,7 +20,7 @@ module Aruba
       end
 
       def method_missing(*)
-        raise NoCommandHasBeenStoppedError, 'No last command stopped available'
+        raise NoCommandHasBeenStoppedError, "No last command stopped available"
       end
 
       def respond_to_missing?(*)
@@ -34,7 +34,7 @@ module Aruba
       end
 
       def method_missing(*)
-        raise NoCommandHasBeenStartedError, 'No last command started available'
+        raise NoCommandHasBeenStartedError, "No last command started available"
       end
 
       def respond_to_missing?(*)
@@ -52,8 +52,6 @@ module Aruba
       raise ArgumentError, e.message
     end
 
-    attr_reader :last_command_stopped
-
     # Set last command started
     #
     # @param [String] cmd
@@ -98,7 +96,7 @@ module Aruba
     def all_stdout
       registered_commands.each(&:stop)
 
-      registered_commands.each_with_object('') { |e, a| a << e.stdout }
+      registered_commands.each_with_object("") { |e, a| a << e.stdout }
     end
 
     # Get stderr of all commands
@@ -108,7 +106,7 @@ module Aruba
     def all_stderr
       registered_commands.each(&:stop)
 
-      registered_commands.each_with_object('') { |e, a| a << e.stderr }
+      registered_commands.each_with_object("") { |e, a| a << e.stderr }
     end
 
     # Get stderr and stdout of all commands

data/lib/aruba/platforms/determine_disk_usage.rb

@@ -1,4 +1,4 @@
-require 'aruba/file_size'
+require "aruba/file_size"
 
 module Aruba
   module Platforms
@@ -7,9 +7,7 @@ module Aruba
     # @private
     class DetermineDiskUsage
       def call(paths)
-        size = paths.flatten.map do |path|
-          minimum_disk_space_used path
-        end.inject(0, &:+)
+        size = paths.flatten.sum { |path| minimum_disk_space_used path }
 
         FileSize.new(size)
       end

data/lib/aruba/platforms/filesystem_status.rb

@@ -1,28 +1,34 @@
-require 'forwardable'
-
 module Aruba
   module Platforms
     # File System Status object
     #
     # This is a wrapper for File::Stat returning only a subset of information.
     class FilesystemStatus
-      METHODS = [
-        :executable?,
-        :ctime,
-        :atime,
-        :mtime,
-        :size
-      ].freeze
-
-      extend Forwardable
-
       private
 
       attr_reader :status
 
       public
 
-      def_delegators :@status, *METHODS
+      def executable?
+        status.executable?
+      end
+
+      def ctime
+        status.ctime
+      end
+
+      def atime
+        status.atime
+      end
+
+      def mtime
+        status.mtime
+      end
+
+      def size
+        status.size
+      end
 
       def initialize(path)
         @status = File::Stat.new(path)
@@ -30,7 +36,7 @@ module Aruba
 
       # Return permissions
       def mode
-        format('%o', status.mode)[-4, 4].gsub(/^0*/, '')
+        format("%o", status.mode)[-4, 4].gsub(/^0*/, "")
       end
 
       # Return owner

data/lib/aruba/platforms/simple_table.rb

@@ -27,12 +27,12 @@ module Aruba
       #   The table
       def to_s
         longest_key = hash.keys.map(&:to_s).max_by(&:length)
-        return '' if longest_key.nil?
+        return "" if longest_key.nil?
 
         name_size = longest_key.length
 
-        rows = hash.each_with_object([]) do |(k, v), a|
-          a << format("# %-#{name_size}s => %s", k, v)
+        rows = hash.map do |k, v|
+          format("# %-#{name_size}s => %s", k, v)
         end
 
         if opts[:sort] == true

data/lib/aruba/platforms/unix_command_string.rb

@@ -1,5 +1,5 @@
-require 'delegate'
-require 'shellwords'
+require "delegate"
+require "shellwords"
 
 # Aruba
 module Aruba

data/lib/aruba/platforms/unix_environment_variables.rb

@@ -11,7 +11,7 @@ module Aruba
         def initialize(other_env, &block)
           @other_env = other_env.to_h.transform_values(&:to_s)
 
-          @block = (block if block_given?)
+          @block = block
         end
 
         def call(env)

data/lib/aruba/platforms/unix_platform.rb

@@ -1,20 +1,20 @@
-require 'rbconfig'
-require 'pathname'
-
-require 'aruba/aruba_path'
-
-require 'aruba/platforms/simple_table'
-require 'aruba/platforms/unix_command_string'
-require 'aruba/platforms/unix_which'
-require 'aruba/platforms/determine_file_size'
-require 'aruba/platforms/determine_disk_usage'
-require 'aruba/platforms/aruba_file_creator'
-require 'aruba/platforms/aruba_fixed_size_file_creator'
-require 'aruba/platforms/local_environment'
-require 'aruba/platforms/aruba_logger'
-require 'aruba/platforms/announcer'
-require 'aruba/platforms/command_monitor'
-require 'aruba/platforms/filesystem_status'
+require "rbconfig"
+require "pathname"
+
+require "aruba/aruba_path"
+
+require "aruba/platforms/simple_table"
+require "aruba/platforms/unix_command_string"
+require "aruba/platforms/unix_which"
+require "aruba/platforms/determine_file_size"
+require "aruba/platforms/determine_disk_usage"
+require "aruba/platforms/aruba_file_creator"
+require "aruba/platforms/aruba_fixed_size_file_creator"
+require "aruba/platforms/local_environment"
+require "aruba/platforms/aruba_logger"
+require "aruba/platforms/announcer"
+require "aruba/platforms/command_monitor"
+require "aruba/platforms/filesystem_status"
 
 # Aruba
 module Aruba
@@ -31,7 +31,7 @@ module Aruba
     # @private
     class UnixPlatform
       def self.match?
-        !FFI::Platform.windows?
+        !Cucumber::WINDOWS
       end
 
       def environment_variables
@@ -79,7 +79,7 @@ module Aruba
       end
 
       def default_shell
-        'bash'
+        "bash"
       end
 
       def detect_ruby(cmd)
@@ -91,11 +91,11 @@ module Aruba
       end
 
       def deprecated(msg)
-        warn(format('%s. Called by %s', msg, caller[1]))
+        warn(format("%s. Called by %s", msg, caller[1]))
       end
 
       def current_ruby
-        ::File.join(RbConfig::CONFIG['bindir'], RbConfig::CONFIG['ruby_install_name'])
+        ::File.join(RbConfig::CONFIG["bindir"], RbConfig::CONFIG["ruby_install_name"])
       end
 
       def require_matching_files(pattern, base)
@@ -125,7 +125,7 @@ module Aruba
       def chdir(dir_name, &block)
         dir_name = ::File.expand_path(dir_name.to_s)
 
-        with_environment 'OLDPWD' => getwd, 'PWD' => dir_name do
+        with_environment "OLDPWD" => getwd, "PWD" => dir_name do
           ::Dir.chdir(dir_name, &block)
         end
       end
@@ -233,7 +233,7 @@ module Aruba
       # @param [String] path
       #   The PATH, a string concatenated with ":", e.g. /usr/bin/:/bin on a
       #   UNIX-system
-      def which(program, path = ENV['PATH'])
+      def which(program, path = ENV["PATH"])
         UnixWhich.new.call(program, path)
       end
 

data/lib/aruba/platforms/unix_which.rb

@@ -70,7 +70,7 @@ module Aruba
       #
       # @param [String] path
       #   ENV['PATH']
-      def call(program, path = ENV['PATH'])
+      def call(program, path = ENV["PATH"])
         raise ArgumentError, "ENV['PATH'] cannot be empty" if path.nil? || path.empty?
 
         program = program.to_s

data/lib/aruba/platforms/windows_command_string.rb

@@ -15,7 +15,7 @@ module Aruba
 
       # Convert to array
       def to_a
-        [cmd_path, '/c', [escaped_command, *escaped_arguments].join(' ')]
+        [cmd_path, "/c", [escaped_command, *escaped_arguments].join(" ")]
       end
 
       private
@@ -30,7 +30,7 @@ module Aruba
       end
 
       def cmd_path
-        Aruba.platform.which('cmd.exe')
+        Aruba.platform.which("cmd.exe")
       end
     end
   end

data/lib/aruba/platforms/windows_environment_variables.rb

@@ -1,4 +1,4 @@
-require 'aruba/platforms/unix_environment_variables'
+require "aruba/platforms/unix_environment_variables"
 
 # Aruba
 module Aruba

data/lib/aruba/platforms/windows_platform.rb

@@ -1,9 +1,9 @@
-require 'ffi'
+require "cucumber/platform"
 
-require 'aruba/platforms/unix_platform'
-require 'aruba/platforms/windows_command_string'
-require 'aruba/platforms/windows_environment_variables'
-require 'aruba/platforms/windows_which'
+require "aruba/platforms/unix_platform"
+require "aruba/platforms/windows_command_string"
+require "aruba/platforms/windows_environment_variables"
+require "aruba/platforms/windows_which"
 
 # Aruba
 module Aruba
@@ -20,7 +20,7 @@ module Aruba
     # @private
     class WindowsPlatform < UnixPlatform
       def self.match?
-        FFI::Platform.windows?
+        Cucumber::WINDOWS
       end
 
       # @see UnixPlatform#command_string
@@ -34,7 +34,7 @@ module Aruba
       end
 
       # @see UnixPlatform#which
-      def which(program, path = ENV['PATH'])
+      def which(program, path = ENV["PATH"])
         WindowsWhich.new.call(program, path)
       end
 

data/lib/aruba/platforms/windows_which.rb

@@ -49,7 +49,7 @@ module Aruba
             file = File.join(dir, program)
             # Dir[] doesn't handle backslashes properly, so convert them. Also, if
             # the program name doesn't have an extension, try them all.
-            file = file.tr('\\', '/')
+            file = file.tr('\\', "/")
 
             found = Dir[file].first
 
@@ -84,7 +84,7 @@ module Aruba
       #
       # @param [String] path
       #   ENV['PATH']
-      def call(program, path = ENV['PATH'])
+      def call(program, path = ENV["PATH"])
         raise ArgumentError, "ENV['PATH'] cannot be empty" if path.nil? || path.empty?
 
         program = program.to_s
@@ -96,10 +96,10 @@ module Aruba
       private
 
       def windows_executable_extentions
-        if ENV['PATHEXT']
-          format('.{%s}', ENV['PATHEXT'].tr(';', ',').tr('.', '')).downcase
+        if ENV["PATHEXT"]
+          format(".{%s}", ENV["PATHEXT"].tr(";", ",").tr(".", "")).downcase
         else
-          '.{exe,com,bat}'
+          ".{exe,com,bat}"
         end
       end
     end

data/lib/aruba/processes/basic_process.rb

@@ -1,5 +1,5 @@
-require 'aruba/platform'
-require 'shellwords'
+require "aruba/platform"
+require "shellwords"
 
 # Aruba
 module Aruba
@@ -14,7 +14,7 @@ module Aruba
       attr_reader :exit_status, :environment, :working_directory, :main_class,
                   :io_wait_timeout, :exit_timeout, :startup_wait_time, :stop_signal
 
-      def initialize(cmd, exit_timeout, io_wait_timeout, working_directory,
+      def initialize(cmd, exit_timeout, io_wait_timeout, working_directory, # rubocop:disable Metrics/ParameterLists
                      environment = Aruba.platform.environment_variables.hash_from_env,
                      main_class = nil, stop_signal = nil, startup_wait_time = 0)
         @cmd               = cmd
@@ -135,7 +135,7 @@ module Aruba
       def truncate(string, max_length)
         return string if string.length <= max_length
 
-        string[0, max_length - 1] + ' ...'
+        "#{string[0, max_length - 1]} ..."
       end
     end
   end

data/lib/aruba/processes/debug_process.rb

@@ -1,4 +1,4 @@
-require 'aruba/processes/spawn_process'
+require "aruba/processes/spawn_process"
 
 # Aruba
 module Aruba
@@ -41,8 +41,8 @@ module Aruba
       # @return [String]
       #   A predefined string to make users aware they are using the DebugProcess
       def stdout(*)
-        'This is the debug launcher on STDOUT.' \
-          ' If this output is unexpected, please check your setup.'
+        "This is the debug launcher on STDOUT." \
+          " If this output is unexpected, please check your setup."
       end
 
       # Return stderr
@@ -50,8 +50,8 @@ module Aruba
       # @return [String]
       #   A predefined string to make users aware they are using the DebugProcess
       def stderr(*)
-        'This is the debug launcher on STDERR.' \
-          ' If this output is unexpected, please check your setup.'
+        "This is the debug launcher on STDERR." \
+          " If this output is unexpected, please check your setup."
       end
 
       # Write to nothing