aruba 1.0.0.pre.alpha.2 → 1.0.0.pre.alpha.3

data/lib/aruba/cucumber/hooks.rb

@@ -3,10 +3,8 @@ require 'aruba/api'
 require 'aruba/platform'
 World(Aruba::Api)
 
-if Aruba::VERSION >= '1.0.0'
-  Around do |_, block|
-    with_environment(&block)
-  end
+Around do |_, block|
+  with_environment(&block)
 end
 
 Before do
@@ -16,11 +14,14 @@ Before do
 end
 
 After do
-  restore_env
   terminate_all_commands
   aruba.command_monitor.clear
 end
 
+Before('@no-clobber') do
+  setup_aruba(false)
+end
+
 Before('~@no-clobber') do
   setup_aruba
 end
@@ -41,12 +42,6 @@ Before('@announce-command-filesystem-status') do
   aruba.announcer.activate :command_filesystem_status
 end
 
-Before('@announce-cmd') do
-  Aruba.platform.deprecated 'The use of "@announce-cmd"-hook is deprecated. Please use "@announce-command"'
-
-  aruba.announcer.activate :command
-end
-
 Before('@announce-output') do
   aruba.announcer.activate :stdout
   aruba.announcer.activate :stderr
@@ -60,12 +55,6 @@ Before('@announce-stderr') do
   aruba.announcer.activate :stderr
 end
 
-Before('@announce-dir') do
-  Aruba.platform.deprecated 'The use of "@announce-dir"-hook is deprecated. Please use "@announce-directory"'
-
-  aruba.announcer.activate :directory
-end
-
 Before('@announce-directory') do
   aruba.announcer.activate :directory
 end
@@ -74,28 +63,10 @@ Before('@announce-stop-signal') do
   aruba.announcer.activate :stop_signal
 end
 
-Before('@announce-env') do
-  Aruba.platform.deprecated 'The use of "@announce-env"-hook is deprecated. Please use "@announce-changed-environment"'
-
-  aruba.announcer.activate :environment
-end
-
-Before('@announce-environment') do
-  Aruba.platform.deprecated '@announce-environment is deprecated. Use @announce-changed-environment instead'
-
-  aruba.announcer.activate :changed_environment
-end
-
 Before('@announce-full-environment') do
   aruba.announcer.activate :full_environment
 end
 
-Before('@announce-modified-environment') do
-  Aruba.platform.deprecated '@announce-modified-environment is deprecated. Use @announce-changed-environment instead'
-
-  aruba.announcer.activate :changed_environment
-end
-
 Before('@announce-changed-environment') do
   aruba.announcer.activate :changed_environment
 end
@@ -124,23 +95,8 @@ Before('@announce') do
   aruba.announcer.activate :command_filesystem_status
 end
 
-Before('@ansi') do
-  # rubocop:disable Metrics/LineLength
-  Aruba::Platform.deprecated('The use of "@ansi" is deprecated. Use "@keep-ansi-escape-sequences" instead. But be aware, that this hook uses the aruba configuration and not an instance variable')
-  # rubocop:enable Metrics/LineLength
-
-  aruba.config.remove_ansi_escape_sequences = false
-end
-
 Before('@keep-ansi-escape-sequences') do
   aruba.config.remove_ansi_escape_sequences = false
-  aruba.config.keep_ansi = true
-end
-
-Before '@mocked_home_directory' do
-  Aruba.platform.deprecated('The use of "@mocked_home_directory" is deprecated. Use "@mocked-home-directory" instead')
-
-  set_environment_variable 'HOME', expand_path('.')
 end
 
 Before '@mocked-home-directory' do
@@ -151,18 +107,6 @@ Before('@disable-bundler') do
   unset_bundler_env_vars
 end
 
-Before('@spawn') do
-  Aruba.platform.deprecated('The use of "@spawn" is deprecated. Use "@command-launcher-spawn" instead')
-
-  aruba.config.command_launcher = :spawn
-end
-
-Before('@in_process') do
-  Aruba.platform.deprecated('The use of "@in_process" is deprecated. Use "@command-launcher-in-process" instead')
-
-  aruba.config.command_launcher = :in_process
-end
-
 Before('@debug') do
   aruba.config.command_launcher = :debug
 end

data/lib/aruba/event_bus/name_resolver.rb

@@ -37,13 +37,12 @@ module Aruba
 
               # Go down the ancestors to check if it is owned directly. The check
               # stops when we reach Object or the end of ancestors tree.
-              # rubocop:disable Style/EachWithObject
               constant = constant.ancestors.inject do |const, ancestor|
                 break const    if ancestor == Object
                 break ancestor if ancestor.const_defined?(name, false)
+
                 const
               end
-              # rubocop:enable Style/EachWithObject
 
               # owner is in Object, so raise
               constant.const_get(name, false)

data/lib/aruba/hooks.rb

@@ -18,7 +18,7 @@ module Aruba
     # @param [String, Symbol] label
     #   The name of the hook
     #
-    # @para [Proc] block
+    # @param [Proc] block
     #   The block which should be run for the hook
     def append(label, block)
       if store.key?(label.to_sym) && store[label.to_sym].respond_to?(:<<)

data/lib/aruba/initializer.rb

@@ -68,7 +68,7 @@ module Aruba
 
       no_commands do
         def self.match?(framework)
-          :rspec == framework.downcase.to_sym
+          framework.downcase.to_sym == :rspec
         end
       end
 
@@ -109,7 +109,7 @@ module Aruba
 
       no_commands do
         def self.match?(framework)
-          :cucumber == framework.downcase.to_sym
+          framework.downcase.to_sym == :cucumber
         end
       end
 
@@ -134,7 +134,7 @@ module Aruba
 
       no_commands do
         def self.match?(framework)
-          :minitest == framework.downcase.to_sym
+          framework.downcase.to_sym == :minitest
         end
       end
 

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

@@ -72,14 +72,14 @@ module Aruba
         end
 
         # @private
-        # rubocop:disable Style/PredicateName
+        # rubocop:disable Naming/PredicateName
         def self.has_default_failure_messages?(matcher)
           matcher.method(:failure_message).owner == self &&
             matcher.method(:failure_message_when_negated).owner == self
         rescue NameError
           false
         end
-        # rubocop:enable Style/PredicateName
+        # rubocop:enable Naming/PredicateName
       end
 
       include DefaultFailureMessages

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

@@ -0,0 +1,19 @@
+module Aruba
+  module Matchers
+    module Base
+      # Provide #indent_multiline_message helper method.
+      #
+      # @api private
+      module MessageIndenter
+        module_function
+
+        def indent_multiline_message(message)
+          message = message.sub(/\n+\z/, '')
+          message.lines.map do |line|
+            line =~ /\S/ ? '   ' + line : line
+          end.join
+        end
+      end
+    end
+  end
+end

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

@@ -57,7 +57,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
@@ -66,7 +66,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/include_an_object.rb

@@ -1,4 +1,5 @@
 require 'aruba/matchers/base/base_matcher'
+require 'aruba/matchers/base/message_indenter'
 
 # Aruba
 module Aruba
@@ -8,6 +9,8 @@ module Aruba
     # Provides the implementation for `include_an_object`.
     # Not intended to be instantiated directly.
     class IncludeAnObject < BaseMatcher
+      include Base::MessageIndenter
+
       protected
 
       # @private
@@ -19,7 +22,7 @@ module Aruba
 
       def initialize(matcher)
         @matcher              = matcher
-        @failed_objects       = {}
+        @failed_objects       = []
         @any_succeeded_object = false
       end
 
@@ -30,8 +33,10 @@ module Aruba
           return "#{improve_hash_formatting(super)}, but was not iterable"
         end
 
+        return failed_objects.first if failed_objects.size == 1
+
         all_messages = [improve_hash_formatting(super)]
-        failed_objects.each do |index, matcher_failure_message|
+        failed_objects.each_with_index do |matcher_failure_message, index|
           all_messages << failure_message_for_item(index, matcher_failure_message)
         end
         all_messages.join("\n\n")
@@ -92,13 +97,6 @@ module Aruba
       def add_new_line_if_needed(message)
         message.start_with?("\n") ? message : "\n#{message}"
       end
-
-      def indent_multiline_message(message)
-        message = message.sub(/\n+\z/, '')
-        message.lines.map do |line|
-          line =~ /\S/ ? '   ' + line : line
-        end.join
-      end
     end
   end
 end

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

@@ -6,7 +6,7 @@ require 'aruba/matchers/command/have_finished_in_time'
 # @!method be_successfuly_executed
 #   This matchers checks if execution of <command> was successful
 #
-#   @return [TrueClass, FalseClass] The result
+#   @return [Boolean] The result
 #
 #     false:
 #     * if command was not successful
@@ -29,6 +29,4 @@ RSpec::Matchers.define :be_successfully_executed do
   end
 end
 
-if RSpec::Expectations::Version::STRING >= '3.1'
-  RSpec::Matchers.define_negated_matcher :have_failed_running, :be_successfully_executed
-end
+RSpec::Matchers.define_negated_matcher :have_failed_running, :be_successfully_executed

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

@@ -4,7 +4,7 @@
 #   @param [Integer] status
 #     The value of the exit status
 #
-#   @return [TrueClass, FalseClass] The result
+#   @return [Boolean] The result
 #
 #     false:
 #     * if command does not have exit status

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

@@ -4,7 +4,7 @@ require 'rspec/expectations/version'
 #   This matchers checks if <command> run too long. Say the timeout is 10
 #   seconds and it takes <command> to finish in 15. This matchers will succeed.
 #
-#   @return [TrueClass, FalseClass] The result
+#   @return [Boolean] The result
 #
 #     false:
 #     * if command not to run too long
@@ -32,6 +32,4 @@ RSpec::Matchers.define :have_finished_in_time do
   end
 end
 
-if RSpec::Expectations::Version::STRING >= '3.1'
-  RSpec::Matchers.define_negated_matcher :run_too_long, :have_finished_in_time
-end
+RSpec::Matchers.define_negated_matcher :run_too_long, :have_finished_in_time

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

@@ -1,7 +1,9 @@
+require 'aruba/matchers/base/message_indenter'
+
 # @!method have_output
 #   This matchers checks if <command> has created output
 #
-#   @return [TrueClass, FalseClass] The result
+#   @return [Boolean] The result
 #
 #     false:
 #     * if command has not created output
@@ -29,8 +31,11 @@ RSpec::Matchers.define :have_output do |expected|
   diffable
 
   description { "have output: #{description_of expected}" }
-end
 
-if RSpec::Expectations::Version::STRING >= '3.0'
-  RSpec::Matchers.alias_matcher :a_command_having_output, :have_output
+  failure_message do |_actual|
+    "expected `#{@old_actual.commandline}` to have output #{description_of expected}\n" \
+      "but was:\n#{Aruba::Matchers::Base::MessageIndenter.indent_multiline_message @actual}"
+  end
 end
+
+RSpec::Matchers.alias_matcher :a_command_having_output, :have_output

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

@@ -1,7 +1,7 @@
 # @!method have_output_on_stderr
 #   This matchers checks if <command> has created output on stderr
 #
-#   @return [TrueClass, FalseClass] The result
+#   @return [Boolean] The result
 #
 #     false:
 #     * if command has not created output on stderr

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

@@ -1,7 +1,7 @@
 # @!method have_output_on_stdout
 #   This matchers checks if <command> has created output on stdout
 #
-#   @return [TrueClass, FalseClass] The result
+#   @return [Boolean] The result
 #
 #     false:
 #     * if command has not created output on stdout

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

@@ -4,7 +4,7 @@
 #   @param [String] output
 #     The content which should be checked
 #
-#   @return [TrueClass, FalseClass] The result
+#   @return [Boolean] The result
 #
 #     false:
 #     * if output does not have size

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

@@ -3,7 +3,7 @@ require 'rspec/expectations/version'
 # @!method be_an_existing_directory
 #   This matchers checks if <directory> exists in filesystem
 #
-#   @return [TrueClass, FalseClass] The result
+#   @return [Boolean] The result
 #
 #     false:
 #     * if directory does not exist
@@ -25,14 +25,12 @@ RSpec::Matchers.define :be_an_existing_directory do |_|
   end
 
   failure_message do |actual|
-    format("expected that directory \"%s\" exists", actual)
+    format('expected that directory "%s" exists', actual)
   end
 
   failure_message_when_negated do |actual|
-    format("expected that directory \"%s\" does not exist", actual)
+    format('expected that directory "%s" does not exist', actual)
   end
 end
 
-if RSpec::Expectations::Version::STRING >= '3.0'
-  RSpec::Matchers.alias_matcher :an_existing_directory, :be_an_existing_directory
-end
+RSpec::Matchers.alias_matcher :an_existing_directory, :be_an_existing_directory

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

@@ -6,7 +6,7 @@ require 'rspec/expectations/version'
 #   @param [Array] sub_directory
 #      A list of sub-directory relative to current directory
 #
-#   @return [TrueClass, FalseClass] The result
+#   @return [Boolean] The result
 #
 #     false:
 #     * if directory does not have sub-directory
@@ -40,14 +40,12 @@ RSpec::Matchers.define :have_sub_directory do |expected|
   diffable
 
   failure_message do |actual|
-    format("expected that directory \"%s\" has the following sub-directories: %s.", actual.join(', '), expected)
+    format('expected that directory "%s" has the following sub-directories: %s.', 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(', '), expected)
+    format('expected that directory "%s" does not have the following sub-directories: %s.', actual.join(', '), expected)
   end
 end
 
-if RSpec::Expectations::Version::STRING >= '3.0'
-  RSpec::Matchers.alias_matcher :a_directory_having_sub_directory, :have_sub_directory
-end
+RSpec::Matchers.alias_matcher :a_directory_having_sub_directory, :have_sub_directory

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

@@ -3,7 +3,7 @@ require 'rspec/expectations/version'
 # @!method be_a_command_found_in_path
 #   This matchers checks if <command> can be found in path
 #
-#   @return [TrueClass, FalseClass] The result
+#   @return [Boolean] The result
 #
 #     false:
 #     * if command was not found in PATH
@@ -31,6 +31,4 @@ RSpec::Matchers.define :be_a_command_found_in_path do
   end
 end
 
-if RSpec::Expectations::Version::STRING >= '3.0'
-  RSpec::Matchers.alias_matcher :a_command_found_in_path, :be_a_command_found_in_path
-end
+RSpec::Matchers.alias_matcher :a_command_found_in_path, :be_a_command_found_in_path