spectre-core 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 903623ea7a511af71aebe1919c91b0b298fed6819310d60a38dc8ad3fd74127d
-  data.tar.gz: 52e66bd3838d220bd3ab57fc91f81d3eff5c7c9c85c5651611a75e99ed133c44
+  metadata.gz: 2343f54b9e9837df93c730210d5652256643d8514b0456670292b492dc7f770e
+  data.tar.gz: 6d934a08ecee932b5346a3d9e98fcd96bc27384f5b9f17cd01b9c08b430c0ff2
 SHA512:
-  metadata.gz: 97ac252558b5acbc8ad88995759632f69adf7a5b8dd38e373b1f8cf176a047e89019fd568ebd02d0b6a556e6d210499f25ea3f3d7ff74ccaa00f9796d0619c09
-  data.tar.gz: e12befe6472a287a0d94755853e123da29066aab9aeaa8e60e5366019776638730e274f9a0e9f4d3fd87023faaa9961b51fbf9ffc5cfb66edc524f68ec54d7ce
+  metadata.gz: 137d6c2c7012d535ba7a93072b67f0cd471ca6b9c5b83225ccb9eb06a433645f078a9928a21c61598059e299c476fe2cbad9f6a4112fd5a0d2d86ed7c2f392e2
+  data.tar.gz: ab497f00a4ef0a3ca453f304a6a7e2ac30e0ecdd4910bc27c14c533079638866a2e609e6f618641cdd0ffa337e9575a340a658b1079f2fb18b38cf9cf6adadf4

data/lib/spectre/assertion.rb

@@ -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

data/lib/spectre/helpers.rb

@@ -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.1'.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
 
@@ -802,7 +809,6 @@ module Spectre
     DEFAULT_ASYNC_NAME = 'default'
 
     @@current = nil
-    @@location_cache = {}
     @@skip_count = 0
 
     ##
@@ -1071,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
 
@@ -1259,7 +1262,7 @@ module Spectre
       file = caller
         .first
         .gsub(/:in .*/, '')
-        .gsub(Dir.pwd, '.')
+        .gsub(Spectre.pwd, '.')
 
       context = DefinitionContext.new(desc, file, self)
       @children << context
@@ -1309,7 +1312,7 @@ module Spectre
       file = caller
         .first
         .gsub(/:in .*/, '')
-        .gsub(Dir.pwd, '.')
+        .gsub(Spectre.pwd, '.')
 
       with ||= [nil]
 
@@ -1554,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
 
@@ -1576,6 +1581,9 @@ module Spectre
           require module_name
         end
       end
+    ensure
+      # return to the previous working directory
+      Dir.chdir(Spectre.pwd)
     end
 
     # :nodoc:
@@ -1665,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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spectre-core
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Christian Neubauer
@@ -13,72 +13,86 @@ dependencies:
   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