aruba 1.1.2 → 2.1.0

data/lib/aruba/platforms/command_monitor.rb

@@ -15,7 +15,7 @@ module Aruba
     attr_reader :registered_commands, :last_command_started, :last_command_stopped
 
     class DefaultLastCommandStopped
-      def nil?
+      def empty?
         true
       end
 
@@ -29,7 +29,7 @@ module Aruba
     end
 
     class DefaultLastCommandStarted
-      def nil?
+      def empty?
         true
       end
 

data/lib/aruba/platforms/unix_environment_variables.rb

@@ -108,8 +108,6 @@ module Aruba
         value = value.to_s
 
         actions << UpdateAction.new(name.to_s => value)
-
-        value
       end
 
       # Append value to variable

data/lib/aruba/platforms/unix_platform.rb

@@ -1,4 +1,5 @@
 require "rbconfig"
+require "rubygems"
 require "pathname"
 
 require "aruba/aruba_path"
@@ -31,7 +32,7 @@ module Aruba
     # @private
     class UnixPlatform
       def self.match?
-        !Cucumber::WINDOWS
+        !Gem.win_platform?
       end
 
       def environment_variables
@@ -99,7 +100,7 @@ module Aruba
       end
 
       def require_matching_files(pattern, base)
-        ::Dir.glob(::File.expand_path(pattern, base)).each { |f| require_relative f }
+        ::Dir.glob(::File.expand_path(pattern, base)).sort.each { |f| require_relative f }
       end
 
       # Create directory and subdirectories

data/lib/aruba/platforms/windows_environment_variables.rb

@@ -76,7 +76,7 @@ module Aruba
       end
 
       def self.upcase_env(env)
-        env.each_with_object({}) { |(k, v), a| a[k.to_s.upcase] = v }
+        env.to_h.transform_keys { |k| k.to_s.upcase }
       end
 
       private

data/lib/aruba/platforms/windows_platform.rb

@@ -1,5 +1,3 @@
-require "cucumber/platform"
-
 require "aruba/platforms/unix_platform"
 require "aruba/platforms/windows_command_string"
 require "aruba/platforms/windows_environment_variables"
@@ -20,7 +18,7 @@ module Aruba
     # @private
     class WindowsPlatform < UnixPlatform
       def self.match?
-        Cucumber::WINDOWS
+        Gem.win_platform?
       end
 
       # @see UnixPlatform#command_string

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
 

data/lib/aruba/processes/basic_process.rb

@@ -130,6 +130,10 @@ module Aruba
         []
       end
 
+      def empty?
+        false
+      end
+
       private
 
       def truncate(string, max_length)

data/lib/aruba/version.rb

@@ -1,3 +1,3 @@
 module Aruba
-  VERSION = "1.1.2".freeze
+  VERSION = "2.1.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aruba
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Aslak Hellesøy, Matt Wynne and other Aruba Contributors
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-20 00:00:00.000000000 Z
+date: 2022-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -76,20 +76,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.10'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.15.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: pry-doc
   requirement: !ruby/object:Gem::Requirement
@@ -228,28 +248,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.0
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: '1.28'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.29.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: '1.28'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.29.0
 - !ruby/object:Gem::Dependency
   name: rubocop-packaging
   requirement: !ruby/object:Gem::Requirement
@@ -270,28 +296,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -372,6 +398,7 @@ files:
 - lib/aruba/cucumber/environment.rb
 - lib/aruba/cucumber/file.rb
 - lib/aruba/cucumber/hooks.rb
+- lib/aruba/cucumber/parameter_types.rb
 - lib/aruba/cucumber/testing_frameworks.rb
 - lib/aruba/errors.rb
 - lib/aruba/event_bus.rb
@@ -382,12 +409,7 @@ files:
 - lib/aruba/hooks.rb
 - lib/aruba/in_config_wrapper.rb
 - lib/aruba/initializer.rb
-- lib/aruba/matchers/base/base_matcher.rb
 - lib/aruba/matchers/base/message_indenter.rb
-- lib/aruba/matchers/base/object_formatter.rb
-- lib/aruba/matchers/collection.rb
-- lib/aruba/matchers/collection/all.rb
-- lib/aruba/matchers/collection/include_an_object.rb
 - lib/aruba/matchers/command.rb
 - lib/aruba/matchers/command/be_successfully_executed.rb
 - lib/aruba/matchers/command/have_exit_status.rb
@@ -464,15 +486,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
-summary: aruba-1.1.2
+summary: aruba-2.1.0
 test_files: []

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

@@ -1,87 +0,0 @@
-require "aruba/matchers/base/object_formatter"
-
-# Aruba
-module Aruba
-  # Matchers
-  module Matchers
-    # Base Matcher
-    class BaseMatcher
-      # @api private
-      # Used to detect when no arg is passed to `initialize`.
-      # `nil` cannot be used because it's a valid value to pass.
-      UNDEFINED = Object.new.freeze
-
-      # @private
-      attr_reader :actual, :expected, :rescued_exception
-
-      def initialize(expected = UNDEFINED)
-        @expected = expected unless UNDEFINED.equal?(expected)
-      end
-
-      # @api private
-      # Indicates if the match is successful. Delegates to `match`, which
-      # should be defined on a subclass. Takes care of consistently
-      # initializing the `actual` attribute.
-      def matches?(actual)
-        @actual = actual
-        match(expected, actual)
-      end
-
-      def iterable?
-        @actual.respond_to?(:each_with_index)
-      end
-
-      # @private
-      module HashFormatting
-        module_function
-
-        # `{ :a => 5, :b => 2 }.inspect` produces:
-        #
-        #     {:a=>5, :b=>2}
-        #
-        # ...but it looks much better as:
-        #
-        #     {:a => 5, :b => 2}
-        #
-        # This is idempotent and safe to run on a string multiple times.
-        def improve_hash_formatting(inspect_string)
-          inspect_string.gsub(/(\S)=>(\S)/, '\1 => \2')
-        end
-      end
-
-      include HashFormatting
-
-      # @api private
-      # Provides default implementations of failure messages, based on the `description`.
-      module DefaultFailureMessages
-        # @api private
-        # Provides a good generic failure message. Based on `description`.
-        # When subclassing, if you are not satisfied with this failure message
-        # you often only need to override `description`.
-        # @return [String]
-        def failure_message
-          "expected #{description_of @actual} to #{description}"
-        end
-
-        # @api private
-        # Provides a good generic negative failure message. Based on `description`.
-        # When subclassing, if you are not satisfied with this failure message
-        # you often only need to override `description`.
-        # @return [String]
-        def failure_message_when_negated
-          "expected #{description_of @actual} not to #{description}"
-        end
-      end
-
-      include DefaultFailureMessages
-
-      # Returns the description of the given object in a way that is
-      # aware of composed matchers. If the object is a matcher with
-      # a `description` method, returns the description; otherwise
-      # returns `object.inspect`.
-      def description_of(object)
-        Aruba::Matchers::ObjectFormatter.format(object)
-      end
-    end
-  end
-end

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

@@ -1,104 +0,0 @@
-# Aruba
-module Aruba
-  # Matchers
-  module Matchers
-    # Provide additional output details beyond what `inspect` provides when
-    # printing Time, DateTime, or BigDecimal
-    #
-    # @private
-    module ObjectFormatter
-      # @api private
-      def self.format(object)
-        prepare_for_inspection(object).inspect
-      end
-
-      # @private
-      # Prepares the provided object to be formatted by wrapping it as needed
-      # in something that, when `inspect` is called on it, will produce the
-      # desired output.
-      #
-      # This allows us to apply the desired formatting to hash/array data structures
-      # at any level of nesting, simply by walking that structure and replacing items
-      # with custom items that have `inspect` defined to return the desired output
-      # for that item. Then we can just use `Array#inspect` or `Hash#inspect` to
-      # format the entire thing.
-      def self.prepare_for_inspection(object)
-        case object
-        when Array
-          return object.map { |o| prepare_for_inspection(o) }
-        when Hash
-          return prepare_hash(object)
-        when Time
-          inspection = format_time(object)
-        else
-          if defined?(DateTime) && DateTime === object
-            inspection = format_date_time(object)
-          elsif defined?(BigDecimal) && BigDecimal === object
-            inspection = "#{object.to_s 'F'} (#{object.inspect})"
-          elsif RSpec::Support.is_a_matcher?(object) && object.respond_to?(:description)
-            inspection = object.description
-          else
-            return DelegatingInspector.new(object)
-          end
-        end
-
-        InspectableItem.new(inspection)
-      end
-
-      # @private
-      def self.prepare_hash(input)
-        input.each_with_object({}) do |(k, v), hash|
-          hash[prepare_for_inspection(k)] = prepare_for_inspection(v)
-        end
-      end
-
-      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
-      end
-
-      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.
-      # @private
-      def self.format_date_time(date_time)
-        if defined?(ActiveSupport)
-          date_time.strftime(DATE_TIME_FORMAT)
-        else
-          date_time.inspect
-        end
-      end
-
-      # @private
-      InspectableItem = Struct.new(:inspection) do
-        def inspect
-          inspection
-        end
-
-        def pretty_print(pp)
-          pp.text inspection
-        end
-      end
-
-      # @private
-      DelegatingInspector = Struct.new(:object) do
-        def inspect
-          if defined?(::Delegator) && ::Delegator === object
-            "#<#{object.class}(#{ObjectFormatter.format(object.__getobj__)})>"
-          else
-            object.inspect
-          end
-        end
-
-        def pretty_print(pp)
-          pp.text inspect
-        end
-      end
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-require "rspec/expectations"
-
-# Aruba
-module Aruba
-  # Matchers
-  module Matchers
-    include ::RSpec::Matchers
-
-    module_function :all
-  end
-end

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

@@ -1,120 +0,0 @@
-require "aruba/matchers/base/base_matcher"
-require "aruba/matchers/base/message_indenter"
-
-# Aruba
-module Aruba
-  # Matchers
-  module Matchers
-    # @api private
-    # Provides the implementation for `include_an_object`.
-    # Not intended to be instantiated directly.
-    class IncludeAnObject < BaseMatcher
-      include Base::MessageIndenter
-
-      protected
-
-      # @private
-      attr_reader :matcher, :failed_objects
-      # @private
-      attr_accessor :any_succeeded_object
-
-      public
-
-      def initialize(matcher)
-        @matcher              = matcher
-        @failed_objects       = []
-        @any_succeeded_object = false
-      end
-
-      # @api private
-      # @return [String]
-      def failure_message
-        return "#{improve_hash_formatting(super)}, but was not iterable" unless iterable?
-
-        return failed_objects.first if failed_objects.size == 1
-
-        all_messages = [improve_hash_formatting(super)]
-        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")
-      end
-
-      # @api private
-      # @return [String]
-      def description
-        improve_hash_formatting "include an object #{description_of matcher}"
-      end
-
-      def does_not_match?(actual)
-        @actual = actual
-
-        return false unless iterable?
-
-        index_objects
-
-        any_succeeded_object == false
-      end
-
-      private
-
-      def match(expected, actual)
-        @actual   = actual
-        @expected = expected
-
-        return false unless iterable?
-
-        index_objects
-
-        any_succeeded_object == true
-      end
-
-      def index_objects
-        actual.each_with_index do |actual_item, index|
-          cloned_matcher = matcher.clone
-          begin
-            matches = cloned_matcher.matches?(actual_item)
-          rescue StandardError
-            matches = nil
-          end
-
-          if matches
-            self.any_succeeded_object = true
-            break
-          else
-            failed_objects[index] = cloned_matcher.failure_message
-          end
-        end
-      end
-
-      def failure_message_for_item(index, failure_message)
-        failure_message = indent_multiline_message(add_new_line_if_needed(failure_message))
-        indent_multiline_message(
-          "object at index #{index} failed to match:#{failure_message}"
-        )
-      end
-
-      def add_new_line_if_needed(message)
-        message.start_with?("\n") ? message : "\n#{message}"
-      end
-    end
-  end
-end
-
-module RSpec
-  module Matchers
-    # Passes if the provided matcher passes when checked against any
-    # element of the collection.
-    #
-    # @example
-    #   expect([1, 4, 5]).to include_an_object be_odd
-    #
-    # @note You can also use this with compound matchers as well.
-    #
-    # @example
-    #   expect([1, 4, 'a']).to include_an_object( be_odd.and be_an(Integer) )
-    def include_an_object(expected)
-      ::Aruba::Matchers::IncludeAnObject.new(expected)
-    end
-  end
-end

data/lib/aruba/matchers/collection.rb

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