aruba 1.0.0.pre.alpha.5 → 1.0.4

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)

data/lib/aruba/platforms/simple_table.rb

@@ -31,8 +31,8 @@ module Aruba
 
         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_environment_variables.rb

@@ -9,11 +9,9 @@ module Aruba
         attr_reader :other_env, :block
 
         def initialize(other_env, &block)
-          @other_env = other_env.to_h.each_with_object({}) { |(k, v), a| a[k] = v.to_s }
+          @other_env = other_env.to_h.transform_values(&:to_s)
 
-          @block = if block_given?
-                     block
-                   end
+          @block = block
         end
 
         def call(env)
@@ -188,6 +186,13 @@ module Aruba
         value
       end
 
+      def nest
+        old_actions = @actions.dup
+        yield(self)
+      ensure
+        @actions = old_actions
+      end
+
       def self.hash_from_env
         ENV.to_hash
       end

data/lib/aruba/platforms/unix_platform.rb

@@ -31,7 +31,7 @@ module Aruba
     # @private
     class UnixPlatform
       def self.match?
-        !FFI::Platform.windows?
+        !Cucumber::WINDOWS
       end
 
       def environment_variables
@@ -62,8 +62,8 @@ module Aruba
         DetermineFileSize.new.call(*args)
       end
 
-      def determine_disk_usage(*args)
-        DetermineDiskUsage.new.call(*args)
+      def determine_disk_usage(paths)
+        DetermineDiskUsage.new.call(paths)
       end
 
       def create_file(*args)
@@ -83,7 +83,7 @@ module Aruba
       end
 
       def detect_ruby(cmd)
-        if cmd =~ /^ruby\s/
+        if /^ruby\s/.match?(cmd)
           cmd.gsub(/^ruby\s/, "#{current_ruby} ")
         else
           cmd
@@ -136,13 +136,13 @@ module Aruba
       end
 
       # Copy file/directory
-      def cp(args, options)
-        FileUtils.cp_r(args, options)
+      def cp(src, dest)
+        FileUtils.cp_r(src, dest)
       end
 
       # Move file/directory
-      def mv(args, options)
-        FileUtils.mv(args, options)
+      def mv(src, dest)
+        FileUtils.mv(src, dest)
       end
 
       # Change mode of file/directory
@@ -195,8 +195,8 @@ module Aruba
       #     * /bin/command.sh
       #     * command.sh
       def relative_command?(path)
-        p = ArubaPath.new(path)
-        p.relative? && p.depth > 1
+        p = Pathname.new(path)
+        p.relative? && p.basename != p
       end
 
       # Check if command is relative

data/lib/aruba/platforms/unix_which.rb

@@ -13,7 +13,7 @@ module Aruba
         end
 
         def call(program, path)
-          fail %(Invalid input program "#{program}" and/or path "#{path}".)
+          raise %(Invalid input program "#{program}" and/or path "#{path}".)
         end
       end
 

data/lib/aruba/platforms/windows_command_string.rb

@@ -22,7 +22,7 @@ module Aruba
 
       def escaped_arguments
         @arguments.map { |arg| arg.gsub(/"/, '"""') }
-                  .map { |arg| arg =~ / / ? "\"#{arg}\"" : arg }
+                  .map { |arg| / /.match?(arg) ? "\"#{arg}\"" : arg }
       end
 
       def escaped_command

data/lib/aruba/platforms/windows_environment_variables.rb

@@ -16,7 +16,8 @@ module Aruba
     #   C:>set PATH
     #   C:>Path=.;.\bin;c:\rubys\ruby-2.1.6-p336\bin;
     #
-    # @example If you access environment variables through ENV, you can access values no matter the case of the key:
+    # @example If you access environment variables through ENV, you can access
+    # values no matter the case of the key:
     #     ENV["Path"] # => ".;.\bin;c:\rubys\ruby-2.1.6-p336\bin;"
     #     ENV["PATH"] # => ".;.\bin;c:\rubys\ruby-2.1.6-p336\bin;"
     #

data/lib/aruba/platforms/windows_platform.rb

@@ -1,4 +1,4 @@
-require 'ffi'
+require 'cucumber/platform'
 
 require 'aruba/platforms/unix_platform'
 require 'aruba/platforms/windows_command_string'
@@ -20,7 +20,7 @@ module Aruba
     # @private
     class WindowsPlatform < UnixPlatform
       def self.match?
-        FFI::Platform.windows?
+        Cucumber::WINDOWS
       end
 
       # @see UnixPlatform#command_string
@@ -39,7 +39,7 @@ module Aruba
       end
 
       def builtin_shell_commands
-        ['cd', 'dir', 'echo', 'exit', 'set', 'type']
+        %w(cd dir echo exit set type)
       end
     end
   end

data/lib/aruba/platforms/windows_which.rb

@@ -13,7 +13,7 @@ module Aruba
         end
 
         def call(program, path)
-          fail %(Invalid input program "#{program}" and/or path "#{path}".)
+          raise %(Invalid input program "#{program}" and/or path "#{path}".)
         end
       end
 
@@ -96,7 +96,11 @@ module Aruba
       private
 
       def windows_executable_extentions
-        ENV['PATHEXT'] ? format('.{%s}', ENV['PATHEXT'].tr(';', ',').tr('.', '')).downcase : '.{exe,com,bat}'
+        if ENV['PATHEXT']
+          format('.{%s}', ENV['PATHEXT'].tr(';', ',').tr('.', '')).downcase
+        else
+          '.{exe,com,bat}'
+        end
       end
     end
   end

data/lib/aruba/processes/basic_process.rb

@@ -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
@@ -111,10 +111,8 @@ module Aruba
       def after_run; end
 
       def inspect
-        # rubocop:disable Style/UnneededInterpolation
-        out = truncate("#{stdout(wait_for_io: 0).inspect}", 35)
-        err = truncate("#{stderr(wait_for_io: 0).inspect}", 35)
-        # rubocop:enable Style/UnneededInterpolation
+        out = truncate(stdout(wait_for_io: 0).inspect, 35)
+        err = truncate(stderr(wait_for_io: 0).inspect, 35)
 
         fmt = '#<%s:%s commandline="%s": stdout=%s stderr=%s>'
         format fmt, self.class, object_id, commandline, out, err
@@ -137,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

@@ -41,7 +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
@@ -49,7 +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

@@ -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,7 +61,7 @@ module Aruba
 
       # Start command
       def start
-        fail '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
 
@@ -109,7 +109,9 @@ module Aruba
 
       # Close io
       def close_io(name)
-        fail ArgumentError, 'Only stdin stdout and stderr are allowed to close' unless [:stdin, :stdout, :stderr].include? name
+        unless [:stdin, :stdout, :stderr].include? name
+          raise ArgumentError, 'Only stdin stdout and stderr are allowed to close'
+        end
 
         get_instance_variable(name.to_sym).close
       end

data/lib/aruba/processes/spawn_process.rb

@@ -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
@@ -63,16 +63,15 @@ module Aruba
       # @yield [SpawnProcess]
       #   Run code for process which was started
       #
-      # rubocop:disable Metrics/MethodLength
       def start
-        # rubocop:disable Metrics/LineLength
         if started?
-          error_message = %(Command "#{commandline}" has already been started. Please `#stop` the command first and `#start` it again. Alternatively use `#restart`.\n#{caller.join("\n")})
-          fail CommandAlreadyStartedError, error_message
+          error_message =
+            "Command \"#{commandline}\" has already been started." \
+            ' Please `#stop` the command first and `#start` it again.' \
+            ' Alternatively use `#restart`.'
+          raise CommandAlreadyStartedError, error_message
         end
 
-        # rubocop:enable Metrics/LineLength
-
         @started = true
 
         @process = ChildProcess.build(*command_string.to_a)
@@ -204,18 +203,19 @@ module Aruba
             # ... and set the exit status
             wait
           else
-            @process.stop
+            begin
+              @process.stop
+            rescue Errno::EPERM # This can occur on MacOS
+              nil
+            end
           end
         end
 
-        @exit_status  = @process.exit_code
-  
+        @exit_status = @process.exit_code
+
         @stdout_cache = read_temporary_output_file @stdout_file
         @stderr_cache = read_temporary_output_file @stderr_file
 
-        # @stdout_file = nil
-        # @stderr_file = nil
-
         @started = false
 
         @exit_status
@@ -234,7 +234,7 @@ module Aruba
       #   The signal, i.e. 'TERM'
       def send_signal(signal)
         error_message = %(Command "#{commandline}" with PID "#{pid}" has already stopped.)
-        fail CommandAlreadyStoppedError, error_message if @process.exited?
+        raise CommandAlreadyStoppedError, error_message if @process.exited?
 
         Process.kill signal, pid
       rescue Errno::ESRCH
@@ -265,12 +265,23 @@ module Aruba
       private
 
       def command_string
-        fail LaunchError, %(Command "#{command}" not found in PATH-variable "#{environment['PATH']}".) if command_path.nil?
+        if command_path.nil?
+          raise LaunchError,
+                %(Command "#{command}" not found in PATH-variable "#{environment['PATH']}".)
+        end
+
         Aruba.platform.command_string.new(command_path, *arguments)
       end
 
       def command_path
-        @command_path ||= (Aruba.platform.builtin_shell_commands.include?(command) ? command : Aruba.platform.which(command, environment['PATH']))
+        @command_path ||=
+          begin
+            if Aruba.platform.builtin_shell_commands.include?(command)
+              command
+            else
+              Aruba.platform.which(command, environment['PATH'])
+            end
+          end
       end
 
       def wait_for_io(time_to_wait)

data/lib/aruba/rspec.rb

@@ -13,8 +13,10 @@ RSpec.configure do |config|
       setup_aruba
 
       # Modify PATH to include project/bin
-      prepend_environment_variable 'PATH',
-                                   aruba.config.command_search_paths.join(File::PATH_SEPARATOR) + File::PATH_SEPARATOR
+      prepend_environment_variable(
+        'PATH',
+        aruba.config.command_search_paths.join(File::PATH_SEPARATOR) + File::PATH_SEPARATOR
+      )
 
       # Use configured home directory as HOME
       set_environment_variable 'HOME', aruba.config.home_directory
@@ -47,19 +49,27 @@ RSpec.configure do |config|
   config.before :each do |example|
     next unless self.class.include?(Aruba::Api)
 
-    aruba.announcer.activate(:full_environment)     if example.metadata[:announce_full_environment]
-    aruba.announcer.activate(:changed_environment)  if example.metadata[:announce_changed_environment]
-
-    aruba.announcer.activate(:command)                   if example.metadata[:announce_command]
-    aruba.announcer.activate(:directory)                 if example.metadata[:announce_directory]
-    aruba.announcer.activate(:full_environment)          if example.metadata[:announce_full_environment]
-    aruba.announcer.activate(:stderr)                    if example.metadata[:announce_stderr]
-    aruba.announcer.activate(:stdout)                    if example.metadata[:announce_stdout]
-    aruba.announcer.activate(:stop_signal)               if example.metadata[:announce_stop_signal]
-    aruba.announcer.activate(:timeout)                   if example.metadata[:announce_timeout]
-    aruba.announcer.activate(:wait_time)                 if example.metadata[:announce_wait_time]
-    aruba.announcer.activate(:command_content)           if example.metadata[:announce_command_content]
-    aruba.announcer.activate(:command_filesystem_status) if example.metadata[:announce_command_filesystem_status]
+    if example.metadata[:announce_full_environment]
+      aruba.announcer.activate(:full_environment)
+    end
+    if example.metadata[:announce_changed_environment]
+      aruba.announcer.activate(:changed_environment)
+    end
+
+    aruba.announcer.activate(:command) if example.metadata[:announce_command]
+    aruba.announcer.activate(:directory) if example.metadata[:announce_directory]
+    if example.metadata[:announce_full_environment]
+      aruba.announcer.activate(:full_environment)
+    end
+    aruba.announcer.activate(:stderr) if example.metadata[:announce_stderr]
+    aruba.announcer.activate(:stdout) if example.metadata[:announce_stdout]
+    aruba.announcer.activate(:stop_signal) if example.metadata[:announce_stop_signal]
+    aruba.announcer.activate(:timeout) if example.metadata[:announce_timeout]
+    aruba.announcer.activate(:wait_time) if example.metadata[:announce_wait_time]
+    aruba.announcer.activate(:command_content) if example.metadata[:announce_command_content]
+    if example.metadata[:announce_command_filesystem_status]
+      aruba.announcer.activate(:command_filesystem_status)
+    end
 
     if example.metadata[:announce_output]
       aruba.announcer.activate(:stderr)

data/lib/aruba/runtime.rb

@@ -42,14 +42,16 @@ module Aruba
     def initialize(opts = {})
       @event_bus       = EventBus.new(EventBus::NameResolver.new(Aruba::Events))
       @announcer       = opts.fetch(:announcer, Aruba.platform.announcer.new)
-      @config          = opts.fetch(:config, ConfigWrapper.new(Aruba.config.make_copy, @event_bus))
+      @config          = opts.fetch(:config,
+                                    ConfigWrapper.new(Aruba.config.make_copy, @event_bus))
       @environment     = opts.fetch(:environment, Aruba.platform.environment_variables.new)
       @current_directory = ArubaPath.new(@config.working_directory)
       @root_directory    = ArubaPath.new(@config.root_directory)
 
       @environment.update(@config.command_runtime_environment)
 
-      @command_monitor = opts.fetch(:command_monitor, Aruba.platform.command_monitor.new(announcer: @announcer))
+      @command_monitor = opts.fetch(:command_monitor,
+                                    Aruba.platform.command_monitor.new(announcer: @announcer))
 
       @logger = opts.fetch(:logger, Aruba.platform.logger.new)
       @logger.mode = @config.log_level
@@ -81,12 +83,17 @@ module Aruba
         candidates = config.fixtures_directories.map { |dir| File.join(root_directory, dir) }
         directory = candidates.find { |d| Aruba.platform.directory? d }
 
-        fail "No existing fixtures directory found in #{candidates.map { |d| format('"%s"', d) }.join(', ')}." unless directory
+        unless directory
+          canditates_display = candidates.map { |d| format('"%s"', d) }.join(', ')
+          raise "No existing fixtures directory found in #{canditates_display}."
+        end
 
         directory
       end
 
-      fail %(Fixtures directory "#{@fixtures_directory}" is not a directory) unless Aruba.platform.directory?(@fixtures_directory)
+      unless Aruba.platform.directory?(@fixtures_directory)
+        raise %(Fixtures directory "#{@fixtures_directory}" is not a directory)
+      end
 
       ArubaPath.new(@fixtures_directory)
     end