aruba 1.0.2 → 1.1.2

data/lib/aruba/matchers/base/base_matcher.rb

@@ -1,4 +1,4 @@
-require 'aruba/matchers/base/object_formatter'
+require "aruba/matchers/base/object_formatter"
 
 # Aruba
 module Aruba

data/lib/aruba/matchers/base/message_indenter.rb

@@ -8,9 +8,9 @@ module Aruba
         module_function
 
         def indent_multiline_message(message)
-          message = message.sub(/\n+\z/, '')
+          message = message.sub(/\n+\z/, "")
           message.lines.map do |line|
-            /\S/.match?(line) ? '   ' + line : line
+            /\S/.match?(line) ? "   #{line}" : line
           end.join
         end
       end

data/lib/aruba/matchers/base/object_formatter.rb

@@ -52,7 +52,7 @@ module Aruba
         end
       end
 
-      TIME_FORMAT = '%Y-%m-%d %H:%M:%S'.freeze
+      TIME_FORMAT = "%Y-%m-%d %H:%M:%S".freeze
 
       if Time.method_defined?(:nsec)
         # @private
@@ -61,7 +61,7 @@ module Aruba
         end
       end
 
-      DATE_TIME_FORMAT = '%a, %d %b %Y %H:%M:%S.%N %z'.freeze
+      DATE_TIME_FORMAT = "%a, %d %b %Y %H:%M:%S.%N %z".freeze
 
       # ActiveSupport sometimes overrides inspect. If `ActiveSupport` is
       # defined use a custom format string that includes more time precision.

data/lib/aruba/matchers/collection.rb

@@ -1 +1 @@
-Aruba.platform.require_matching_files('../collection/**/*.rb', __FILE__)
+Aruba.platform.require_matching_files("../collection/**/*.rb", __FILE__)

data/lib/aruba/matchers/collection/all.rb

@@ -1,4 +1,4 @@
-require 'rspec/expectations'
+require "rspec/expectations"
 
 # Aruba
 module Aruba

data/lib/aruba/matchers/collection/include_an_object.rb

@@ -1,5 +1,5 @@
-require 'aruba/matchers/base/base_matcher'
-require 'aruba/matchers/base/message_indenter'
+require "aruba/matchers/base/base_matcher"
+require "aruba/matchers/base/message_indenter"
 
 # Aruba
 module Aruba

data/lib/aruba/matchers/command.rb

@@ -1 +1 @@
-Aruba.platform.require_matching_files('../command/**/*.rb', __FILE__)
+Aruba.platform.require_matching_files("../command/**/*.rb", __FILE__)

data/lib/aruba/matchers/command/be_successfully_executed.rb

@@ -1,7 +1,7 @@
-require 'rspec/expectations/version'
+require "rspec/expectations/version"
 
-require 'aruba/matchers/command/have_exit_status'
-require 'aruba/matchers/command/have_finished_in_time'
+require "aruba/matchers/command/have_exit_status"
+require "aruba/matchers/command/have_finished_in_time"
 
 # @!method be_successfuly_executed
 #   This matchers checks if execution of <command> was successful
@@ -30,7 +30,7 @@ RSpec::Matchers.define :be_successfully_executed do
 
   failure_message do |_actual|
     "Expected `#{@actual}` to succeed" \
-      ' but got non-zero exit status and the following output:' \
+      " but got non-zero exit status and the following output:" \
       "\n\n#{@old_actual.output}\n"
   end
 end

data/lib/aruba/matchers/command/have_finished_in_time.rb

@@ -1,4 +1,4 @@
-require 'rspec/expectations/version'
+require "rspec/expectations/version"
 
 # @!method run_too_long
 #   This matchers checks if <command> run too long. Say the timeout is 10

data/lib/aruba/matchers/command/have_output.rb

@@ -1,4 +1,4 @@
-require 'aruba/matchers/base/message_indenter'
+require "aruba/matchers/base/message_indenter"
 
 # @!method have_output
 #   This matchers checks if <command> has created output

data/lib/aruba/matchers/directory.rb

@@ -1 +1 @@
-Aruba.platform.require_matching_files('../directory/**/*.rb', __FILE__)
+Aruba.platform.require_matching_files("../directory/**/*.rb", __FILE__)

data/lib/aruba/matchers/directory/be_an_existing_directory.rb

@@ -1,4 +1,4 @@
-require 'rspec/expectations/version'
+require "rspec/expectations/version"
 
 # @!method be_an_existing_directory
 #   This matchers checks if <directory> exists in filesystem
@@ -19,7 +19,7 @@ RSpec::Matchers.define :be_an_existing_directory do |_|
   match do |actual|
     stop_all_commands
 
-    raise 'String expected' unless actual.is_a? String
+    raise "String expected" unless actual.is_a? String
 
     directory?(actual)
   end

data/lib/aruba/matchers/directory/have_sub_directory.rb

@@ -1,4 +1,4 @@
-require 'rspec/expectations/version'
+require "rspec/expectations/version"
 
 # @!method have_sub_directory(sub_directory)
 #   This matchers checks if <directory> has given sub-directory
@@ -42,13 +42,13 @@ RSpec::Matchers.define :have_sub_directory do |expected|
 
   failure_message do |actual|
     format('expected that directory "%s" has the following sub-directories: %s.',
-           actual.join(', '),
+           actual.join(", "),
            expected)
   end
 
   failure_message_when_negated do |actual|
     format('expected that directory "%s" does not have the following sub-directories: %s.',
-           actual.join(', '),
+           actual.join(", "),
            expected)
   end
 end

data/lib/aruba/matchers/environment.rb

@@ -1 +1 @@
-Aruba.platform.require_matching_files('../matchers/environment/*.rb', __FILE__)
+Aruba.platform.require_matching_files("../matchers/environment/*.rb", __FILE__)

data/lib/aruba/matchers/file.rb

@@ -1 +1 @@
-Aruba.platform.require_matching_files('../file/**/*.rb', __FILE__)
+Aruba.platform.require_matching_files("../file/**/*.rb", __FILE__)

data/lib/aruba/matchers/file/be_a_command_found_in_path.rb

@@ -1,4 +1,4 @@
-require 'rspec/expectations/version'
+require "rspec/expectations/version"
 
 # @!method be_a_command_found_in_path
 #   This matchers checks if <command> can be found in path

data/lib/aruba/matchers/file/be_an_existing_executable.rb

@@ -1,5 +1,5 @@
-require 'rspec/expectations/version'
-require 'shellwords'
+require "rspec/expectations/version"
+require "shellwords"
 
 # @!method be_an_existing_executable
 #   This matchers checks if <file> exists in filesystem

data/lib/aruba/matchers/file/be_an_existing_file.rb

@@ -1,4 +1,4 @@
-require 'rspec/expectations/version'
+require "rspec/expectations/version"
 
 # @!method be_an_existing_file
 #   This matchers checks if <file> exists in filesystem
@@ -19,7 +19,7 @@ RSpec::Matchers.define :be_an_existing_file do |_|
   match do |actual|
     stop_all_commands
 
-    raise 'String expected' unless actual.is_a? String
+    raise "String expected" unless actual.is_a? String
 
     file?(actual)
   end

data/lib/aruba/matchers/file/have_file_content.rb

@@ -1,4 +1,4 @@
-require 'rspec/expectations/version'
+require "rspec/expectations/version"
 
 # @!method have_file_content(content)
 #   This matchers checks if <file> has content. `content` can be a string,

data/lib/aruba/matchers/file/have_file_size.rb

@@ -1,4 +1,4 @@
-require 'rspec/expectations/version'
+require "rspec/expectations/version"
 
 # @!method have_file_size(size)
 #   This matchers checks if path has file size

data/lib/aruba/matchers/file/have_same_file_content.rb

@@ -1,5 +1,5 @@
-require 'rspec/expectations/version'
-require 'fileutils'
+require "rspec/expectations/version"
+require "fileutils"
 
 # @!method have_same_file_content_as(file_name)
 #   This matchers checks if <file1> has the same content like <file2>

data/lib/aruba/matchers/path.rb

@@ -1 +1 @@
-Aruba.platform.require_matching_files('../path/**/*.rb', __FILE__)
+Aruba.platform.require_matching_files("../path/**/*.rb", __FILE__)

data/lib/aruba/matchers/path/a_path_matching_pattern.rb

@@ -1,4 +1,4 @@
-require 'rspec/expectations/version'
+require "rspec/expectations/version"
 
 # @!method a_path_matching_pattern(/pattern/)
 #   This matchers checks if <path> matches pattern. `pattern` can be a string,

data/lib/aruba/matchers/path/be_an_absolute_path.rb

@@ -1,4 +1,4 @@
-require 'rspec/expectations/version'
+require "rspec/expectations/version"
 
 # @!method be_an_absolute_path
 #   This matchers checks if <path> exists in filesystem

data/lib/aruba/matchers/path/be_an_existing_path.rb

@@ -1,4 +1,4 @@
-require 'rspec/expectations/version'
+require "rspec/expectations/version"
 
 # @!method be_an_existing_path
 #   This matchers checks if <path> exists in filesystem

data/lib/aruba/matchers/path/have_permissions.rb

@@ -1,4 +1,4 @@
-require 'rspec/expectations/version'
+require "rspec/expectations/version"
 
 # @!method have_permissions(permissions)
 #   This matchers checks if <file> or <directory> has <perm> permissions
@@ -39,10 +39,11 @@ RSpec::Matchers.define :have_permissions do |expected|
     @old_actual = actual
     @actual = permissions(expand_path(@old_actual))
 
-    @expected = if expected.is_a? Integer
+    @expected = case expected
+                when Integer
                   expected.to_s(8)
-                elsif expected.is_a? String
-                  expected.gsub(/^0*/, '')
+                when String
+                  expected.gsub(/^0*/, "")
                 else
                   expected
                 end

data/lib/aruba/matchers/string.rb

@@ -1 +1 @@
-Aruba.platform.require_matching_files('../string/**/*.rb', __FILE__)
+Aruba.platform.require_matching_files("../string/**/*.rb", __FILE__)

data/lib/aruba/matchers/string/include_output_string.rb

@@ -18,7 +18,7 @@
 #     end
 RSpec::Matchers.define :include_output_string do |expected|
   match do |actual|
-    actual.force_encoding('UTF-8')
+    actual.force_encoding("UTF-8")
     @expected = Regexp.new(Regexp.escape(sanitize_text(expected.to_s)), Regexp::MULTILINE)
     @actual   = sanitize_text(actual)
 

data/lib/aruba/matchers/string/match_output_string.rb

@@ -18,7 +18,7 @@
 #     end
 RSpec::Matchers.define :match_output_string do |expected|
   match do |actual|
-    actual.force_encoding('UTF-8')
+    actual.force_encoding("UTF-8")
     @expected = Regexp.new(unescape_text(expected), Regexp::MULTILINE)
     @actual   = sanitize_text(actual)
 

data/lib/aruba/matchers/string/output_string_eq.rb

@@ -18,7 +18,7 @@
 #     end
 RSpec::Matchers.define :output_string_eq do |expected|
   match do |actual|
-    actual.force_encoding('UTF-8')
+    actual.force_encoding("UTF-8")
     @expected = sanitize_text(expected.to_s)
     @actual   = sanitize_text(actual.to_s)
 

data/lib/aruba/platform.rb

@@ -1,5 +1,5 @@
-require 'aruba/platforms/unix_platform'
-require 'aruba/platforms/windows_platform'
+require "aruba/platforms/unix_platform"
+require "aruba/platforms/windows_platform"
 
 # Aruba
 module Aruba

data/lib/aruba/platforms/announcer.rb

@@ -1,7 +1,7 @@
-require 'shellwords'
-require 'aruba/colorizer'
+require "shellwords"
+require "aruba/colorizer"
 
-Aruba::Colorizer.coloring = false if !STDOUT.tty? && !ENV.key?('AUTOTEST')
+Aruba::Colorizer.coloring = false if !$stdout.tty? && !ENV.key?("AUTOTEST")
 
 # Aruba
 module Aruba
@@ -81,29 +81,29 @@ module Aruba
       private
 
       def after_init
-        output_format :changed_configuration, proc { |n, v| format('# %s = %s', n, v) }
+        output_format :changed_configuration, proc { |n, v| format("# %s = %s", n, v) }
         output_format :changed_environment,
-                      proc { |n, v| format('$ export %s=%s', n, Shellwords.escape(v)) }
-        output_format :command, '$ %s'
-        output_format :directory, '$ cd %s'
+                      proc { |n, v| format("$ export %s=%s", n, Shellwords.escape(v)) }
+        output_format :command, "$ %s"
+        output_format :directory, "$ cd %s"
         output_format :environment,
-                      proc { |n, v| format('$ export %s=%s', n, Shellwords.escape(v)) }
+                      proc { |n, v| format("$ export %s=%s", n, Shellwords.escape(v)) }
         output_format :full_environment,
                       proc { |h|
                         format("<<-ENVIRONMENT\n%s\nENVIRONMENT",
                                Aruba.platform.simple_table(h))
                       }
         output_format :modified_environment,
-                      proc { |n, v| format('$ export %s=%s', n, Shellwords.escape(v)) }
+                      proc { |n, v| format("$ export %s=%s", n, Shellwords.escape(v)) }
         output_format :stderr, "<<-STDERR\n%s\nSTDERR"
         output_format :stdout, "<<-STDOUT\n%s\nSTDOUT"
         output_format :command_content, "<<-COMMAND\n%s\nCOMMAND"
         output_format :stop_signal,
                       proc { |p, s|
-                        format('Command will be stopped with `kill -%s %s`', s, p)
+                        format("Command will be stopped with `kill -%s %s`", s, p)
                       }
-        output_format :timeout, '# %s-timeout: %s seconds'
-        output_format :wait_time, '# %s: %s seconds'
+        output_format :timeout, "# %s-timeout: %s seconds"
+        output_format :wait_time, "# %s: %s seconds"
         output_format :command_filesystem_status,
                       proc { |status|
                         format("<<-COMMAND FILESYSTEM STATUS\n%s\nCOMMAND FILESYSTEM STATUS",
@@ -111,8 +111,8 @@ module Aruba
                       }
       end
 
-      def output_format(channel, string = '%s', &block)
-        output_formats[channel.to_sym] = if block_given?
+      def output_format(channel, string = "%s", &block)
+        output_formats[channel.to_sym] = if block
                                            block
                                          elsif string.is_a?(Proc)
                                            string
@@ -180,7 +180,7 @@ module Aruba
         the_output_format = if output_formats.key? channel
                               output_formats[channel]
                             else
-                              proc { |v| format('%s', v) }
+                              proc { |v| format("%s", v) }
                             end
 
         return unless activated?(channel)

data/lib/aruba/platforms/aruba_fixed_size_file_creator.rb

@@ -28,7 +28,7 @@ module Aruba
 
         Aruba.platform.mkdir(File.dirname(path))
 
-        File.open(path, 'wb') do |f|
+        File.open(path, "wb") do |f|
           f.seek(size - 1)
           f.write("\0")
         end

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