spectre-core 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f4f326a4af327d079fbf3ec5d7dc1e249432b975c4192246d214430c99a3b03
-  data.tar.gz: 01cd31db52a056f496111ddae40fbb8ceb0fcd6728e3aec26f29306b83c49d7f
+  metadata.gz: 2343f54b9e9837df93c730210d5652256643d8514b0456670292b492dc7f770e
+  data.tar.gz: 6d934a08ecee932b5346a3d9e98fcd96bc27384f5b9f17cd01b9c08b430c0ff2
 SHA512:
-  metadata.gz: 96f973c643e9e670ec791b433834fa394ee5814acc0534b52ddd09b47f9ddc46b4c50900a66ab7ba453ab3fb64c97ffa4e0a7f202fd53640eb51b6cb229ca463
-  data.tar.gz: 3d68d5b96ee5e93bdc67e646498b606ab78dbe359faa3729993c6a13ee95e240688a5a89586f279a593d5b908b4c8db80472bcf5438432a3658dc7b4f3160483
+  metadata.gz: 137d6c2c7012d535ba7a93072b67f0cd471ca6b9c5b83225ccb9eb06a433645f078a9928a21c61598059e299c476fe2cbad9f6a4112fd5a0d2d86ed7c2f392e2
+  data.tar.gz: ab497f00a4ef0a3ca453f304a6a7e2ac30e0ecdd4910bc27c14c533079638866a2e609e6f618641cdd0ffa337e9575a340a658b1079f2fb18b38cf9cf6adadf4

data/exe/spectre

@@ -121,7 +121,7 @@ options = OptionParser.new do |opts|
           'Override config option. Use `spectre show` to get list of available options') do |option|
     index = option.index('=')
     key = option[0...index]
-    val = option[index + 1..]
+    val = option[(index + 1)..]
 
     val = val.split(',') if Spectre::CONFIG[key].is_a? Array
     val = ['true', '1'].include? val if [true, false].include?(Spectre::CONFIG[key])

data/lib/spectre/assertion.rb

@@ -11,7 +11,7 @@ module Spectre
         @val = val
       end
 
-      def evaluate predicate, actual, negate
+      def evaluate? predicate, actual, negate
         !(!negate ^ predicate.call(@val, actual))
       end
 
@@ -31,8 +31,8 @@ module Spectre
         @second = ValueWrapper.wrap(second)
       end
 
-      def evaluate predicate, actual, negate
-        @first.evaluate(predicate, actual, negate) or @second.evaluate(predicate, actual, negate)
+      def evaluate? predicate, actual, negate
+        @first.evaluate?(predicate, actual, negate) or @second.evaluate?(predicate, actual, negate)
       end
 
       # :nodoc:
@@ -48,8 +48,8 @@ module Spectre
         @second = ValueWrapper.wrap(second)
       end
 
-      def evaluate predicate, actual, negate
-        @first.evaluate(predicate, actual, negate) and @second.evaluate(predicate, actual, negate)
+      def evaluate? predicate, actual, negate
+        @first.evaluate?(predicate, actual, negate) and @second.evaluate?(predicate, actual, negate)
       end
 
       # :nodoc:
@@ -88,7 +88,7 @@ module Spectre
         @var_name = file_content
           .lines[location.lineno - 1]
           .strip
-          .match(/[\s\(]([^\s]+|\[.*\]|{.*})\.(to|not_to)[\s\(]/)
+          .match(/[\s(]([^\s]+|\[.*\]|{.*})\.(to|not_to)[\s(]/)
           .captures
           .first
           .strip
@@ -98,7 +98,7 @@ module Spectre
         @repr += " to #{method}"
         @repr += expected.nil? ? ' empty' : " #{@expected}"
 
-        success = @expected.evaluate(@predicate, @actual, @negate)
+        success = @expected.evaluate?(@predicate, @actual, @negate)
 
         return if success
 

data/lib/spectre/expectation.rb

@@ -10,7 +10,7 @@ module Spectre
       def should_be value
         predicate = proc { |expected, actual| expected.to_s == actual.to_s }
         value = Spectre::Assertion::ValueWrapper.wrap(value)
-        success = value.evaluate(predicate, self, false)
+        success = value.evaluate?(predicate, self, false)
 
         return if success
 
@@ -20,7 +20,7 @@ module Spectre
       def should_be_empty
         predicate = proc { |_, actual| actual.nil? or (actual.respond_to?(:empty?) and actual.empty?) }
         value = Spectre::Assertion::ValueWrapper.wrap(nil)
-        success = value.evaluate(predicate, self, false)
+        success = value.evaluate?(predicate, self, false)
 
         return if success
 
@@ -30,7 +30,7 @@ module Spectre
       def should_not_be(value)
         predicate = proc { |expected, actual| expected.to_s == actual.to_s }
         value = Spectre::Assertion::ValueWrapper.wrap(value)
-        success = value.evaluate(predicate, self, true)
+        success = value.evaluate?(predicate, self, true)
 
         return if success
 
@@ -40,7 +40,7 @@ module Spectre
       def should_not_exist
         predicate = proc { |expected, _| expected.respond_to? :nil? and expected.nil? }
         value = Spectre::Assertion::ValueWrapper.wrap(value)
-        success = value.evaluate(predicate, self, true)
+        success = value.evaluate?(predicate, self, true)
 
         return if success
 
@@ -50,7 +50,7 @@ module Spectre
       def should_not_be_empty
         predicate = proc { |_, actual| actual.nil? or (actual.respond_to?(:empty?) and actual.empty?) }
         value = Spectre::Assertion::ValueWrapper.wrap(nil)
-        success = value.evaluate(predicate, self, true)
+        success = value.evaluate?(predicate, self, true)
 
         return if success
 
@@ -64,7 +64,7 @@ module Spectre
         end
 
         value = Spectre::Assertion::ValueWrapper.wrap(value)
-        success = value.evaluate(predicate, self, false)
+        success = value.evaluate?(predicate, self, false)
 
         return if success
 
@@ -78,7 +78,7 @@ module Spectre
         end
 
         value = Spectre::Assertion::ValueWrapper.wrap(value)
-        success = value.evaluate(predicate, self, true)
+        success = value.evaluate?(predicate, self, true)
 
         return if success
 

data/lib/spectre/helpers.rb

@@ -43,7 +43,7 @@ class ::String
   ##
   # Trims the string to the given length and adds +...+ at the end
   def trim size = 50
-    return "#{self[0..size - 4]}..." if (length + 3) > size
+    return "#{self[0..(size - 4)]}..." if (length + 3) > size
 
     self
   end
@@ -122,7 +122,7 @@ end
 module Spectre
   module Helpers
     class << self
-      def uuid length = niL
+      def uuid length = nil
         return SecureRandom.hex(length / 2) if length
 
         SecureRandom.uuid

data/lib/spectre/version.rb

@@ -1,3 +1,3 @@
 module Spectre
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.1.2'.freeze
 end

data/lib/spectre.rb

@@ -20,7 +20,7 @@ def get_call_location call_stack
     .find { |x| x.label.include? 'Spectre::Engine#load_files' or x.base_label == '<top (required)>' }
 
   [
-    loc.path.sub(Dir.pwd, '.'),
+    loc.path.sub(Spectre.pwd, '.'),
     loc.lineno
   ]
 end
@@ -78,6 +78,13 @@ end
 # The main module containing all logic for the framework
 #
 module Spectre
+  # Cache Dir.pwd to avoid repeated system calls
+  @pwd = Dir.pwd
+
+  def self.pwd
+    @pwd
+  end
+
   ##
   # Exception to throw in order to abort a spec run
   #
@@ -320,7 +327,7 @@ module Spectre
       mixins.each_value do |mixin|
         output  = "#{mixin.desc.yellow}\n"
         output += "  params.....: #{mixin.params.join ', '}\n" if mixin.params.any?
-        output += "  location...: #{mixin.file.sub(Dir.pwd, '.')}:#{mixin.line}"
+        output += "  location...: #{mixin.file.sub(Spectre.pwd, '.')}:#{mixin.line}"
         paragraphs << output
       end
 
@@ -496,19 +503,19 @@ module Spectre
             .select { |x| x.failures.any? }
 
           failed.each_with_index do |eval, eval_idx|
-            output += if failed.count == 1
+            output += if failed.one?
                         "     #{eval.desc}, but"
                       else
                         "     #{index}.#{eval_idx + 1}) #{eval.desc}, but"
                       end
 
-            if eval.failures.count == 1
+            if eval.failures.one?
               output += " #{eval.failures.first.message}\n"
             else
               output += " #{eval.failures.count} failures occured\n"
 
               eval.failures.each_with_index do |fail, fail_idx|
-                output += if failed.count == 1
+                output += if failed.one?
                             "       #{index}.#{fail_idx + 1}) #{fail.message}\n"
                           else
                             "       #{index}.#{eval_idx + 1}.#{fail_idx + 1}) #{fail.message}\n"
@@ -802,7 +809,6 @@ module Spectre
     DEFAULT_ASYNC_NAME = 'default'
 
     @@current = nil
-    @@location_cache = {}
     @@skip_count = 0
 
     ##
@@ -981,20 +987,22 @@ module Spectre
       define_method(method) do |evaluation, &block|
         desc = "#{method} #{evaluation}"
 
-        @evaluations << if block
-                          EvaluationContext.new(@engine, desc, &block)
-                        else
-                          EvaluationContext.new(@engine, desc) do
-                            unless evaluation.failure.nil?
-                              @failures << Failure.new(
-                                evaluation.failure,
-                                evaluation.call_location
-                              )
-                            end
-                          end
-                        end
+        evaluation = if block
+                       EvaluationContext.new(@engine, desc, &block)
+                     else
+                       EvaluationContext.new(@engine, desc) do
+                         unless evaluation.failure.nil?
+                           @failures << Failure.new(
+                             evaluation.failure,
+                             evaluation.call_location
+                           )
+                         end
+                       end
+                     end
+
+        @evaluations << evaluation
 
-        raise AbortException if method == :assert and @evaluations.any? { |x| x.failures.any? }
+        raise AbortException if method == :assert and evaluation.failures.any?
       end
     end
 
@@ -1069,10 +1077,7 @@ module Spectre
     def await name = DEFAULT_ASYNC_NAME
       return unless @threads.key? name
 
-      threads = @threads[name].map(&:join)
-
-      @threads.delete(name)
-
+      threads = @threads.delete(name)
       threads.map(&:join)
     end
 
@@ -1257,7 +1262,7 @@ module Spectre
       file = caller
         .first
         .gsub(/:in .*/, '')
-        .gsub(Dir.pwd, '.')
+        .gsub(Spectre.pwd, '.')
 
       context = DefinitionContext.new(desc, file, self)
       @children << context
@@ -1307,7 +1312,7 @@ module Spectre
       file = caller
         .first
         .gsub(/:in .*/, '')
-        .gsub(Dir.pwd, '.')
+        .gsub(Spectre.pwd, '.')
 
       with ||= [nil]
 
@@ -1552,9 +1557,11 @@ module Spectre
         resource_files = Dir.glob File.join(resource_path, '**/*')
 
         resource_files.each do |file|
-          file.slice! resource_path
-          file = file[1..]
-          @resources[file] = File.expand_path File.join(resource_path, file)
+          relative_file = file
+            .delete_prefix(resource_path)
+            .delete_prefix('/')
+
+          @resources[relative_file] = File.expand_path(file)
         end
       end
 
@@ -1574,6 +1581,9 @@ module Spectre
           require module_name
         end
       end
+    ensure
+      # return to the previous working directory
+      Dir.chdir(Spectre.pwd)
     end
 
     # :nodoc:
@@ -1663,15 +1673,10 @@ module Spectre
       file = caller
         .first
         .gsub(/:in .*/, '')
-        .gsub(Dir.pwd, '.')
-
-      main_context = @contexts.find { |x| x.desc == name }
-
-      if main_context.nil?
-        main_context = DefinitionContext.new(name, file)
-        @contexts << main_context
-      end
+        .gsub(Spectre.pwd, '.')
 
+      main_context = DefinitionContext.new(name, file)
+      @contexts << main_context
       main_context.instance_eval(&)
     end
 
@@ -1690,8 +1695,9 @@ module Spectre
 
       patterns.each do |pattern|
         Dir.glob(pattern).each do |file|
-          content = File.read File.absolute_path(file)
-          instance_eval(content, file, 1)
+          abs_path = File.absolute_path(file)
+          content = File.read abs_path
+          instance_eval(content, abs_path, 1)
         end
       end
 

metadata

@@ -1,84 +1,98 @@
 --- !ruby/object:Gem::Specification
 name: spectre-core
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Christian Neubauer
 bindir: exe
 cert_chain: []
-date: 2025-03-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ectoplasm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fiddle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: stringio
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: A DSL and command line tool to describe and run automated tests
 email:
 - christian.neubauer@ionos.com
@@ -113,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Describe and run automated tests
 test_files: []