spectre-core 2.0.3 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b37c624f29760c1122c88ec60a107bb60a96c7402aeedd5b2bc3919bbe68f7d
-  data.tar.gz: fe69db81edfcdc648bce5f5d32f584a766b6869c7b9bd398bd9f97fab9015aa7
+  metadata.gz: 903623ea7a511af71aebe1919c91b0b298fed6819310d60a38dc8ad3fd74127d
+  data.tar.gz: 52e66bd3838d220bd3ab57fc91f81d3eff5c7c9c85c5651611a75e99ed133c44
 SHA512:
-  metadata.gz: 53b943ea103803174ad87d51eaeb64a77724b09ce49ad1f9d97446db527e5f62b1b4ab02eec0c779f3ffedf0e2c192a6b47ce71dc6b2b1852d3ae6f68ce1b301
-  data.tar.gz: c29017035f83ac51f171b27647a3b714b4461a77322d2d2ae8d46749cf8a1ed6c24a03bd176f5accb6de33e568ca6aaac73144f21b3312a359ab632980b97104
+  metadata.gz: 97ac252558b5acbc8ad88995759632f69adf7a5b8dd38e373b1f8cf176a047e89019fd568ebd02d0b6a556e6d210499f25ea3f3d7ff74ccaa00f9796d0619c09
+  data.tar.gz: e12befe6472a287a0d94755853e123da29066aab9aeaa8e60e5366019776638730e274f9a0e9f4d3fd87023faaa9961b51fbf9ffc5cfb66edc524f68ec54d7ce

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])
@@ -187,6 +187,8 @@ when 'run', 'ru'
   engine.report(runs)
 when 'env', 'en'
   engine.formatter.environment(engine.env)
+when 'envs'
+  engine.formatter.envs(engine.environments)
 when 'mixins', 'mi', 'mx'
   search = ARGV.first
   mixins = engine.mixins.select { |x| search.nil? or x.include? search }

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

data/lib/spectre/version.rb

@@ -1,3 +1,3 @@
 module Spectre
-  VERSION = '2.0.3'.freeze
+  VERSION = '2.1.1'.freeze
 end

data/lib/spectre.rb

@@ -335,6 +335,12 @@ module Spectre
       @out.puts env.to_h.pretty
     end
 
+    def envs envs
+      @out.puts envs
+        .map { |env_name, _| env_name }
+        .join("\n")
+    end
+
     def scope desc, type
       if desc
         colored_desc = case type
@@ -490,19 +496,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"
@@ -554,6 +560,8 @@ module Spectre
         {
           name: spec.name,
           desc: spec.desc,
+          subj: spec.root.desc,
+          ctxt: spec.parent.desc,
           tags: spec.tags,
           file: spec.file,
           data: spec.data,
@@ -586,6 +594,12 @@ module Spectre
       @out.puts env.to_json
     end
 
+    def envs envs
+      @out.puts envs
+        .map { |env_name, _| env_name }
+        .to_json
+    end
+
     def scope desc, type
       id = SecureRandom.hex(8)
 
@@ -779,7 +793,7 @@ module Spectre
 
     # :stopdoc:
 
-    attr_reader :name, :parent, :type, :logs, :error,
+    attr_reader :name, :parent, :context, :type, :logs, :error,
                 :evaluations, :started, :finished, :properties, :data
 
     ##
@@ -807,7 +821,18 @@ module Spectre
       @threads = {}
 
       @name = parent.name
-      @name += "-#{type}" unless type == :spec
+
+      # If the run type is an actual spec, the context
+      # of the run is its parent +Specification+ 's parent.
+      if type == :spec
+        @context = parent.parent
+      else
+        # Otherwise the run context is the parent itself
+        # This is the case when a setup or teardown block
+        # is executet, which uses its own run context.
+        @context = parent
+        @name += "-#{type}"
+      end
 
       @bag = OpenStruct.new(bag)
 
@@ -956,20 +981,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
 
@@ -1410,7 +1437,7 @@ module Spectre
   DEFAULT_ENV_NAME = 'default'
 
   class Engine
-    attr_reader :env, :formatter, :config, :contexts, :mixins, :collections, :resources
+    attr_reader :env, :environments, :formatter, :config, :contexts, :mixins, :collections, :resources
 
     @@current = nil
     @@modules = []
@@ -1665,8 +1692,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,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: spectre-core
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.1
 platform: ruby
 authors:
 - Christian Neubauer
 bindir: exe
 cert_chain: []
-date: 2025-03-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug
@@ -113,7 +113,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: []