aruba 1.0.2 → 1.1.2

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,7 +27,7 @@ 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
 

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

data/lib/aruba/processes/in_process.rb

@@ -1,7 +1,7 @@
-require 'shellwords'
-require 'stringio'
-require 'aruba/processes/basic_process'
-require 'aruba/platform'
+require "shellwords"
+require "stringio"
+require "aruba/processes/basic_process"
+require "aruba/platform"
 
 # Aruba
 module Aruba
@@ -46,7 +46,7 @@ module Aruba
       # @private
       attr_reader :main_class
 
-      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
@@ -61,14 +61,14 @@ module Aruba
 
       # Start command
       def start
-        raise 'You need to call aruba.config.main_class = YourMainClass' unless main_class
+        raise "You need to call aruba.config.main_class = YourMainClass" unless main_class
 
         @started = true
 
         Dir.chdir @working_directory do
           before_run
 
-          Aruba.platform.with_environment environment.merge('PWD' => @working_directory) do
+          Aruba.platform.with_environment environment.merge("PWD" => @working_directory) do
             main_class.new(@argv, @stdin, @stdout, @stderr, @kernel).execute!
           end
 
@@ -110,7 +110,7 @@ module Aruba
       # Close io
       def close_io(name)
         unless [:stdin, :stdout, :stderr].include? name
-          raise ArgumentError, 'Only stdin stdout and stderr are allowed to close'
+          raise ArgumentError, "Only stdin stdout and stderr are allowed to close"
         end
 
         get_instance_variable(name.to_sym).close

data/lib/aruba/processes/spawn_process.rb

@@ -1,10 +1,10 @@
-require 'childprocess'
-require 'tempfile'
-require 'shellwords'
+require "childprocess"
+require "tempfile"
+require "shellwords"
 
-require 'aruba/errors'
-require 'aruba/processes/basic_process'
-require 'aruba/platform'
+require "aruba/errors"
+require "aruba/processes/basic_process"
+require "aruba/platform"
 
 # Aruba
 module Aruba
@@ -48,7 +48,7 @@ module Aruba
       #
       # @param [Numeric] startup_wait_time
       #   The amount of seconds to wait after Aruba has started a command.
-      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)
         super
@@ -67,31 +67,28 @@ module Aruba
         if started?
           error_message =
             "Command \"#{commandline}\" has already been started." \
-            ' Please `#stop` the command first and `#start` it again.' \
-            ' Alternatively use `#restart`.'
+            " Please `#stop` the command first and `#start` it again." \
+            " Alternatively use `#restart`."
           raise CommandAlreadyStartedError, error_message
         end
 
         @started = true
 
         @process = ChildProcess.build(*command_string.to_a)
-        @stdout_file = Tempfile.new('aruba-stdout-')
-        @stderr_file = Tempfile.new('aruba-stderr-')
+        @stdout_file = Tempfile.new("aruba-stdout-")
+        @stderr_file = Tempfile.new("aruba-stderr-")
 
         @stdout_file.sync = true
         @stderr_file.sync = true
 
-        if RUBY_VERSION >= '1.9'
-          @stdout_file.set_encoding('ASCII-8BIT')
-          @stderr_file.set_encoding('ASCII-8BIT')
-        end
+        @stdout_file.set_encoding("ASCII-8BIT")
+        @stderr_file.set_encoding("ASCII-8BIT")
 
         @exit_status = nil
         @duplex      = true
 
         before_run
 
-        @process.leader    = true
         @process.io.stdout = @stdout_file
         @process.io.stderr = @stderr_file
         @process.duplex    = @duplex
@@ -275,12 +272,10 @@ module Aruba
 
       def command_path
         @command_path ||=
-          begin
-            if Aruba.platform.builtin_shell_commands.include?(command)
-              command
-            else
-              Aruba.platform.which(command, environment['PATH'])
-            end
+          if Aruba.platform.builtin_shell_commands.include?(command)
+            command
+          else
+            Aruba.platform.which(command, environment["PATH"])
           end
       end
 
@@ -295,7 +290,7 @@ module Aruba
         data = file.read
         file.close
 
-        data.force_encoding('UTF-8')
+        data.force_encoding("UTF-8")
       end
     end
   end