aruba 0.14.14 → 1.0.0

data/lib/aruba/cucumber/testing_frameworks.rb

@@ -1,25 +1,33 @@
 # Cucumber
-Then /^the feature(?:s)? should( not)?(?: all)? pass$/ do |negated|
-  if negated
-    step 'the output should contain " failed)"'
-    step 'the exit status should be 1'
-  else
-    step 'the output should not contain " failed)"'
-    step 'the output should not contain " undefined)"'
-    step 'the exit status should be 0'
-  end
+Then /^the feature(?:s)? should not(?: all)? pass$/ do
+  step 'the output should contain " failed)"'
+  step 'the exit status should be 1'
+end
+
+# Cucumber
+Then /^the feature(?:s)? should(?: all)? pass$/ do
+  step 'the output should not contain " failed)"'
+  step 'the output should not contain " undefined)"'
+  step 'the exit status should be 0'
 end
 
 # Cucumber
-Then /^the feature(?:s)? should( not)?(?: all)? pass with( regex)?:$/ do |negated, regex, string|
-  if negated
-    step 'the output should contain " failed)"'
-    step 'the exit status should be 1'
+Then /^the feature(?:s)? should not(?: all)? pass with( regex)?:$/ do |regex, string|
+  step 'the output should contain " failed)"'
+  step 'the exit status should be 1'
+
+  if regex
+    step "the output should match %r<#{string}>"
   else
-    step 'the output should not contain " failed)"'
-    step 'the output should not contain " undefined)"'
-    step 'the exit status should be 0'
+    step 'the output should contain:', string
   end
+end
+
+# Cucumber
+Then /^the feature(?:s)? should(?: all)? pass with( regex)?:$/ do |regex, string|
+  step 'the output should not contain " failed)"'
+  step 'the output should not contain " undefined)"'
+  step 'the exit status should be 0'
 
   if regex
     step "the output should match %r<#{string}>"
@@ -29,30 +37,38 @@ Then /^the feature(?:s)? should( not)?(?: all)? pass with( regex)?:$/ do |negate
 end
 
 # RSpec
-Then /^the spec(?:s)? should( not)?(?: all)? pass(?: with (\d+) failures?)?$/ do |negated, count_failures|
-  if negated
-    if count_failures.nil?
-      step 'the output should not contain "0 failures"'
-    else
-      step %(the output should contain "#{count_failures} failures")
-    end
-
-    step 'the exit status should be 1'
+Then /^the spec(?:s)? should not(?: all)? pass(?: with (\d+) failures?)?$/ do |count_failures|
+  if count_failures.nil?
+    step 'the output should not contain "0 failures"'
   else
-    step 'the output should contain "0 failures"'
-    step 'the exit status should be 0'
+    step %(the output should contain "#{count_failures} failures")
   end
+
+  step 'the exit status should be 1'
 end
 
 # RSpec
-Then /^the spec(?:s)? should( not)?(?: all)? pass with( regex)?:$/ do |negated, regex, string|
-  if negated
-    step 'the output should not contain "0 failures"'
-    step 'the exit status should be 1'
+Then /^the spec(?:s)? should all pass$/ do
+  step 'the output should contain "0 failures"'
+  step 'the exit status should be 0'
+end
+
+# RSpec
+Then /^the spec(?:s)? should not(?: all)? pass with( regex)?:$/ do |regex, string|
+  step 'the output should not contain "0 failures"'
+  step 'the exit status should be 1'
+
+  if regex
+    step "the output should match %r<#{string}>"
   else
-    step 'the output should contain "0 failures"'
-    step 'the exit status should be 0'
+    step 'the output should contain:', string
   end
+end
+
+# RSpec
+Then /^the spec(?:s)? should(?: all)? pass with( regex)?:$/ do |regex, string|
+  step 'the output should contain "0 failures"'
+  step 'the exit status should be 0'
 
   if regex
     step "the output should match %r<#{string}>"
@@ -62,30 +78,38 @@ Then /^the spec(?:s)? should( not)?(?: all)? pass with( regex)?:$/ do |negated,
 end
 
 # Minitest
-Then /^the tests(?:s)? should( not)?(?: all)? pass(?: with (\d+) failures?)?$/ do |negated, count_failures|
-  if negated
-    if count_failures.nil?
-      step 'the output should not contain "0 errors"'
-    else
-      step %(the output should contain "#{count_failures} errors")
-    end
-
-    step 'the exit status should be 1'
+Then /^the tests(?:s)? should not(?: all)? pass(?: with (\d+) failures?)?$/ do |count_failures|
+  if count_failures.nil?
+    step 'the output should not contain "0 errors"'
   else
-    step 'the output should contain "0 errors"'
-    step 'the exit status should be 0'
+    step %(the output should contain "#{count_failures} errors")
   end
+
+  step 'the exit status should be 1'
 end
 
 # Minitest
-Then /^the test(?:s)? should( not)?(?: all)? pass with( regex)?:$/ do |negated, regex, string|
-  if negated
-    step 'the output should contain "0 errors"'
-    step 'the exit status should be 1'
+Then /^the tests(?:s)? should all pass$/ do
+  step 'the output should contain "0 errors"'
+  step 'the exit status should be 0'
+end
+
+# Minitest
+Then /^the test(?:s)? should not(?: all)? pass with( regex)?:$/ do |regex, string|
+  step 'the output should contain "0 errors"'
+  step 'the exit status should be 1'
+
+  if regex
+    step "the output should match %r<#{string}>"
   else
-    step 'the output should not contain "0 errors"'
-    step 'the exit status should be 0'
+    step 'the output should contain:', string
   end
+end
+
+# Minitest
+Then /^the test(?:s)? should(?: all)? pass with( regex)?:$/ do |regex, string|
+  step 'the output should not contain "0 errors"'
+  step 'the exit status should be 0'
 
   if regex
     step "the output should match %r<#{string}>"

data/lib/aruba/cucumber.rb

@@ -1,14 +1,8 @@
 require 'aruba/version'
 
 require 'aruba/api'
-World(Aruba::Api)
-
 require 'aruba/cucumber/hooks'
 require 'aruba/cucumber/command'
-require 'aruba/cucumber/core'
-require 'aruba/cucumber/deprecated'
 require 'aruba/cucumber/environment'
 require 'aruba/cucumber/file'
 require 'aruba/cucumber/testing_frameworks'
-require 'aruba/cucumber/rvm'
-require 'aruba/reporting'

data/lib/aruba/event_bus/name_resolver.rb

@@ -10,17 +10,12 @@ module Aruba
       # Helpers for Resolvers
       module ResolveHelpers
         def camel_case(underscored_name)
-          if RUBY_VERSION < '1.9.3'
-            underscored_name.to_s.split('_').map { |word| word.upcase.chars.to_a[0] + word.chars.to_a[1..-1].join }.join
-          else
-            underscored_name.to_s.split('_').map { |word| word.upcase[0] + word[1..-1] }.join
-          end
+          underscored_name.to_s.split('_').map { |word| word.upcase[0] + word[1..-1] }.join
         end
 
         # Thanks ActiveSupport
         # (Only needed to support Ruby 1.9.3 and JRuby)
         # rubocop:disable Metrics/CyclomaticComplexity
-        # rubocop:disable Metrics/MethodLength
         def constantize(camel_cased_word)
           names = camel_cased_word.split('::')
 
@@ -36,23 +31,18 @@ module Aruba
             else
               candidate = constant.const_get(name)
 
-              if RUBY_VERSION < '1.9.3'
-                next candidate if constant.const_defined?(name)
-              else
-                next candidate if constant.const_defined?(name, false)
-              end
+              next candidate if constant.const_defined?(name, false)
 
               next candidate unless Object.const_defined?(name)
 
               # 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)
@@ -60,7 +50,6 @@ module Aruba
           end
         end
         # rubocop:enable Metrics/CyclomaticComplexity
-        # rubocop:enable Metrics/MethodLength
       end
 
       # @private
@@ -159,9 +148,9 @@ module Aruba
       def transform(event_id)
         resolvers.find { |r| r.match? event_id }.new.transform(default_namespace, event_id)
       rescue => e
-        # rubocop:disable Metrics/LineLength
+        # rubocop:disable Layout/LineLength
         raise EventNameResolveError, %(Transforming "#{event_id}" into an event class failed. Supported types are: #{@resolvers.map(&:supports).flatten.join(', ')}. #{e.message}.\n\n#{e.backtrace.join("\n")})
-        # rubocop:enable Metrics/LineLength
+        # rubocop:enable Layout/LineLength
       end
     end
   end

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/in_config_wrapper.rb

@@ -15,10 +15,14 @@ module Aruba
     end
 
     def method_missing(name, *args)
-      fail ArgumentError, 'Options take no argument' if args.count > 0
+      fail ArgumentError, 'Options take no argument' if args.any?
       fail UnknownOptionError, %(Option "#{name}" is unknown. Please use only earlier defined options) unless config.key? name
 
       config[name]
     end
+
+    def respond_to_missing?(*)
+      true
+    end
   end
 end

data/lib/aruba/initializer.rb

@@ -23,7 +23,11 @@ module Aruba
                   end
 
         content = if File.exist? file
-                    %(gem 'aruba', '~> #{Aruba::VERSION}')
+                    file_ends_with_carriage_return = File.open(file, 'r').readlines.last.match(/.*\n$/)
+
+                    prefix = file_ends_with_carriage_return ? '' : "\n"
+
+                    %(#{prefix}gem 'aruba', '~> #{Aruba::VERSION}')
                   else
                     %(source 'https://rubygems.org'\ngem 'aruba', '~> #{Aruba::VERSION}'\n)
                   end
@@ -68,7 +72,7 @@ module Aruba
 
       no_commands do
         def self.match?(framework)
-          :rspec == framework.downcase.to_sym
+          framework.downcase.to_sym == :rspec
         end
       end
 
@@ -80,23 +84,18 @@ module Aruba
                     :create_file
                   end
 
-        send creator, file, <<-EOS
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+        send creator, file, <<~EOS
+          $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
-if RUBY_VERSION < '1.9.3'
-  ::Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require File.join(File.dirname(f), File.basename(f, '.rb')) }
-  ::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require File.join(File.dirname(f), File.basename(f, '.rb')) }
-else
-  ::Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require_relative f }
-  ::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require_relative f }
-end
-EOS
+          ::Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require_relative f }
+          ::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require_relative f }
+        EOS
       end
 
       def create_support_file
-        create_file 'spec/support/aruba.rb', <<-EOS
-require 'aruba/rspec'
-EOS
+        create_file 'spec/support/aruba.rb', <<~EOS
+          require 'aruba/rspec'
+        EOS
       end
     end
   end
@@ -114,14 +113,14 @@ module Aruba
 
       no_commands do
         def self.match?(framework)
-          :cucumber == framework.downcase.to_sym
+          framework.downcase.to_sym == :cucumber
         end
       end
 
       def create_support_file
-        create_file 'features/support/aruba.rb', <<-EOS
-require 'aruba/cucumber'
-EOS
+        create_file 'features/support/aruba.rb', <<~EOS
+          require 'aruba/cucumber'
+        EOS
       end
     end
   end
@@ -139,7 +138,7 @@ module Aruba
 
       no_commands do
         def self.match?(framework)
-          :minitest == framework.downcase.to_sym
+          framework.downcase.to_sym == :minitest
         end
       end
 
@@ -151,35 +150,30 @@ module Aruba
                     :create_file
                   end
 
-        send creator, file, <<-EOS
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+        send creator, file, <<~EOS
+          $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
-if RUBY_VERSION < '1.9.3'
-  ::Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require File.join(File.dirname(f), File.basename(f, '.rb')) }
-  ::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require File.join(File.dirname(f), File.basename(f, '.rb')) }
-else
-  ::Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require_relative f }
-  ::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require_relative f }
-end
-EOS
+          ::Dir.glob(::File.expand_path('../support/*.rb', __FILE__)).each { |f| require_relative f }
+          ::Dir.glob(::File.expand_path('../support/**/*.rb', __FILE__)).each { |f| require_relative f }
+        EOS
       end
 
       def create_example
-        create_file 'test/use_aruba_with_minitest.rb', <<-EOS
-$LOAD_PATH.unshift File.expand_path('../test', __FILE__)
+        create_file 'test/use_aruba_with_minitest.rb', <<~EOS
+          $LOAD_PATH.unshift File.expand_path('../test', __FILE__)
 
-require 'test_helper'
-require 'minitest/autorun'
-require 'aruba/api'
+          require 'test_helper'
+          require 'minitest/autorun'
+          require 'aruba/api'
 
-class FirstRun < Minitest::Test
-  include Aruba::Api
+          class FirstRun < Minitest::Test
+            include Aruba::Api
 
-  def setup
-    aruba_setup
-  end
-end
-EOS
+            def setup
+              aruba_setup
+            end
+          end
+        EOS
       end
     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|
+            /\S/.match?(line) ? '   ' + line : line
+          end.join
+        end
+      end
+    end
+  end
+end

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

@@ -12,7 +12,6 @@ module Aruba
         prepare_for_inspection(object).inspect
       end
 
-      # rubocop:disable MethodLength
       # rubocop:disable Metrics/CyclomaticComplexity
 
       # @private
@@ -48,7 +47,6 @@ module Aruba
         InspectableItem.new(inspection)
       end
       # rubocop:enable Metrics/CyclomaticComplexity
-      # rubocop:enable MethodLength
 
       # @private
       def self.prepare_hash(input)
@@ -57,21 +55,16 @@ 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
         def self.format_time(time)
           time.strftime("#{TIME_FORMAT}.#{format('%09d', time.nsec)} %z")
         end
-      else # for 1.8.7
-        # @private
-        def self.format_time(time)
-          time.strftime("#{TIME_FORMAT}.#{format('%06d', time.usec)} %z")
-        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
@@ -27,8 +27,10 @@ RSpec::Matchers.define :be_successfully_executed do
 
     expect(@old_actual).to have_exit_status(0)
   end
-end
 
-if RSpec::Expectations::Version::STRING >= '3.1'
-  RSpec::Matchers.define_negated_matcher :have_failed_running, :be_successfully_executed
+  failure_message do |_actual|
+    "Expected `#{@actual}` to succeed but got non-zero exit status and the following output:\n\n#{@old_actual.output}\n"
+  end
 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
@@ -23,16 +23,26 @@ RSpec::Matchers.define :have_exit_status do |expected|
     @old_actual.stop
     @actual = actual.exit_status
 
-    next false unless @old_actual.respond_to? :exit_status
+    raise "Expected #{@old_actual} to respond to #exit_status" unless @old_actual.respond_to? :exit_status
 
     values_match? expected, @actual
   end
 
   failure_message do |actual|
-    format(%(expected that command "%s" has exit status of "%s", but has "%s".), @old_actual.commandline, expected.to_s, actual.to_s)
+    format(
+      %(expected that command "%s" has exit status of "%s", but has "%s".),
+      @old_actual.commandline,
+      expected.to_s,
+      actual.to_s
+    )
   end
 
   failure_message_when_negated do |actual|
-    format(%(expected that command "%s" does not have exit status of "%s", but has "%s".), @old_actual.commandline, expected.to_s, actual.to_s)
+    format(
+      %(expected that command "%s" does not have exit status of "%s", but has "%s".),
+      @old_actual.commandline,
+      expected.to_s,
+      actual.to_s
+    )
   end
 end

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
@@ -24,7 +24,7 @@ RSpec::Matchers.define :have_finished_in_time do
     @old_actual = actual
     @actual     = @old_actual.commandline
 
-    next false unless @old_actual.respond_to? :timed_out?
+    raise "Expected #{@old_actual} to respond to #timed_out?" unless @old_actual.respond_to? :timed_out?
 
     @old_actual.stop
 
@@ -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
@@ -17,7 +19,7 @@ RSpec::Matchers.define :have_output do |expected|
   match do |actual|
     @old_actual = actual
 
-    next false unless @old_actual.respond_to? :output
+    raise "Expected #{@old_actual} to respond to #output" unless @old_actual.respond_to? :output
 
     @old_actual.stop
 
@@ -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