spectre-core 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2343f54b9e9837df93c730210d5652256643d8514b0456670292b492dc7f770e
-  data.tar.gz: 6d934a08ecee932b5346a3d9e98fcd96bc27384f5b9f17cd01b9c08b430c0ff2
+  metadata.gz: 3e75cee429c0765480965f1e1177c85f5ecf769651332e7167b1be5db8601cda
+  data.tar.gz: 6ad3c26cf386b69b57db775bec8fb8e1ae011a8d6abfb21a1aa250fec6198104
 SHA512:
-  metadata.gz: 137d6c2c7012d535ba7a93072b67f0cd471ca6b9c5b83225ccb9eb06a433645f078a9928a21c61598059e299c476fe2cbad9f6a4112fd5a0d2d86ed7c2f392e2
-  data.tar.gz: ab497f00a4ef0a3ca453f304a6a7e2ac30e0ecdd4910bc27c14c533079638866a2e609e6f618641cdd0ffa337e9575a340a658b1079f2fb18b38cf9cf6adadf4
+  metadata.gz: '09f0c500ce8ed1416a418b75af0716a6f7bd1083abf3b2d402c0adf381c0ce60bf51e8cb8e06f6f26bb5d19c1c3e8d8034361bcc320821f82835d39b427189f5'
+  data.tar.gz: 23d0113096cb9b69f78f40b1ae5ad7c6aa9201593fa9ac3e885f95ad14f53a5343673cbd932aca8603904638b3ef10afea6f81a5e55d47167b604836dc5e310a

data/lib/spectre/version.rb

@@ -1,3 +1,3 @@
 module Spectre
-  VERSION = '2.1.2'.freeze
+  VERSION = '2.1.3'.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(Spectre.pwd, '.'),
+    loc.path.sub(Dir.pwd, '.'),
     loc.lineno
   ]
 end
@@ -78,13 +78,6 @@ 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
   #
@@ -265,13 +258,14 @@ module Spectre
       counter = 0
 
       specs
-        .group_by { |x| x.parent.root }
+        .group_by { |x| x.parent.root.name }
         .each_value do |spec_group|
-          spec_group.sort_by!(&:name)
-          spec_group.each do |spec|
-            spec_id = "[#{spec.name}]".send(@colors[counter % @colors.length])
-            @out.puts "#{spec_id} #{spec.full_desc} #{spec.tags.map { |x| "##{x}" }.join(' ').cyan}"
-          end
+          spec_group
+            .sort
+            .each do |spec|
+              spec_id = "[#{spec.name}]".send(@colors[counter % @colors.length])
+              @out.puts "#{spec_id} #{spec.full_desc} #{spec.tags.map { |x| "##{x}" }.join(' ').cyan}"
+            end
 
           counter += 1
         end
@@ -280,15 +274,15 @@ module Spectre
     ##
     # Outputs all the specs for all contexts
     #
-    def describe contexts, level = 0
-      contexts.each do |context|
+    def describe contexts, level = 0, parent: nil
+      contexts.select { |x| x.parent == parent }.each do |context|
         @out.puts("#{'  ' * level}#{context.desc.send(level.positive? ? :magenta : :blue)}")
 
         context.specs.each do |spec|
           @out.puts("#{'  ' * (level + 1)}#{spec.desc}")
         end
 
-        describe(context.children, level + 1)
+        describe(contexts, level + 1, parent: context)
       end
     end
 
@@ -327,7 +321,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(Spectre.pwd, '.')}:#{mixin.line}"
+        output += "  location...: #{mixin.file.sub(Dir.pwd, '.')}:#{mixin.line}"
         paragraphs << output
       end
 
@@ -1188,6 +1182,19 @@ module Spectre
       @full_desc = "#{@parent.full_desc} #{@desc}"
     end
 
+    def <=>(other)
+      # Split on dash: text part and numeric part
+      self_parts = @name.split('-')
+      other_parts = other.name.split('-')
+
+      text_compare = self_parts[0] <=> other_parts[0]
+
+      # If the text parts are already different, we can return here
+      return text_compare unless text_compare.zero?
+
+      self_parts[1].to_i <=> other_parts[1].to_i
+    end
+
     ##
     # Creates a new +RunContext+ and executes the spec,
     # +before+ and +after+ blocks
@@ -1220,13 +1227,13 @@ module Spectre
   class DefinitionContext
     include Delegate
 
-    attr_reader :id, :name, :desc, :parent, :full_desc, :children, :specs, :file
+    attr_reader :id, :name, :desc, :parent, :full_desc, :specs, :file
 
-    def initialize desc, file, parent = nil
+    def initialize desc, file, engine, parent = nil
+      @engine = engine
       @parent = parent
       @desc = desc
       @file = file
-      @children = []
       @specs = []
 
       @setups = []
@@ -1239,6 +1246,8 @@ module Spectre
       @name = @parent.name + '-' + @name unless @parent.nil?
 
       @full_desc = @parent.nil? ? @desc : "#{@parent.full_desc} #{@desc}"
+
+      @engine.contexts << self
     end
 
     ##
@@ -1248,13 +1257,6 @@ module Spectre
       @parent ? @parent.root : self
     end
 
-    ##
-    # A flattened list of all specs including those of child contexts.
-    #
-    def all_specs
-      @specs + @children.map(&:all_specs).flatten
-    end
-
     ##
     # Creates a new sub context with the given block.
     #
@@ -1262,10 +1264,9 @@ module Spectre
       file = caller
         .first
         .gsub(/:in .*/, '')
-        .gsub(Spectre.pwd, '.')
+        .gsub(Dir.pwd, '.')
 
-      context = DefinitionContext.new(desc, file, self)
-      @children << context
+      context = DefinitionContext.new(desc, file, @engine, self)
       context.instance_eval(&)
     end
 
@@ -1312,12 +1313,18 @@ module Spectre
       file = caller
         .first
         .gsub(/:in .*/, '')
-        .gsub(Spectre.pwd, '.')
+        .gsub(Dir.pwd, '.')
 
       with ||= [nil]
 
-      with.each_with_index do |data, _index|
-        spec_index = root.all_specs.count + 1
+      initial_index = @engine
+        .contexts
+        .select { |x| x.root.name == root.name }
+        .flat_map(&:specs)
+        .count + 1
+
+      with.each_with_index do |data, index|
+        spec_index = initial_index + index
         name = "#{root.name}-#{spec_index}"
 
         spec = Specification.new(self, name, desc, tags, data, file, block)
@@ -1327,23 +1334,23 @@ module Spectre
     end
 
     # :nodoc:
-    def run engine, specs
+    def run specs
       runs = []
 
-      return runs unless all_specs.any? { |x| specs.include? x }
-
       selected = @specs.select { |x| specs.include? x }
 
-      engine.formatter.scope(@desc, self) do
+      return runs if selected.empty?
+
+      @engine.formatter.scope(@desc, self) do
         if selected.any?
           setup_bag = nil
 
           if @setups.any?
-            setup_run = RunContext.new(engine, self, :setup) do |run_context|
+            setup_run = RunContext.new(@engine, self, :setup) do |run_context|
               @setups.each do |block|
-                engine.formatter.scope('setup', :setup) do
-                  engine.logger.correlate do
-                    engine.logger.debug("setup \"#{@desc}\"")
+                @engine.formatter.scope('setup', :setup) do
+                  @engine.logger.correlate do
+                    @engine.logger.debug("setup \"#{@desc}\"")
                     run_context.execute(nil, &block)
                   end
                 end
@@ -1358,18 +1365,18 @@ module Spectre
           # Only run specs if setup was successful
           if runs.all? { |x| x.status == :success }
             runs += selected.map do |spec|
-              engine.logger.correlate do
-                spec.run(engine, @befores, @afters, setup_bag)
+              @engine.logger.correlate do
+                spec.run(@engine, @befores, @afters, setup_bag)
               end
             end
           end
 
           if @teardowns.any?
-            runs << RunContext.new(engine, self, :teardown, setup_bag) do |run_context|
+            runs << RunContext.new(@engine, self, :teardown, setup_bag) do |run_context|
               @teardowns.each do |block|
-                engine.formatter.scope('teardown', :teardown) do
-                  engine.logger.correlate do
-                    engine.logger.debug("teardown \"#{@desc}\"")
+                @engine.formatter.scope('teardown', :teardown) do
+                  @engine.logger.correlate do
+                    @engine.logger.debug("teardown \"#{@desc}\"")
                     run_context.execute(nil, &block)
                   end
                 end
@@ -1378,9 +1385,12 @@ module Spectre
           end
         end
 
-        @children.each do |context|
-          engine.logger.correlate do
-            runs += context.run(engine, specs)
+        @engine
+          .contexts
+          .select { |x| x.parent == self }
+          .each do |context|
+          @engine.logger.correlate do
+            runs += context.run(specs)
           end
         end
       end
@@ -1581,9 +1591,6 @@ module Spectre
           require module_name
         end
       end
-    ensure
-      # return to the previous working directory
-      Dir.chdir(Spectre.pwd)
     end
 
     # :nodoc:
@@ -1609,8 +1616,7 @@ module Spectre
       tag_filter = config['tags'] || []
 
       @contexts
-        .map(&:all_specs)
-        .flatten
+        .flat_map(&:specs)
         .select do |spec|
           (spec_filter.empty? and tag_filter.empty?) or
             spec_filter.any? { |x| spec.name.match?("^#{x.gsub('*', '.*')}$") } or
@@ -1632,10 +1638,9 @@ module Spectre
 
       list
         .group_by { |x| x.parent.root }
-        .map do |context, specs|
-          context.run(self, specs)
+        .flat_map do |context, specs|
+          context.run(specs)
         end
-        .flatten
     rescue Interrupt
       # Do nothing here
     end
@@ -1669,15 +1674,15 @@ module Spectre
     ##
     # Describe a test subject
     #
-    def describe(name, &)
+    def describe(desc, &)
       file = caller
         .first
         .gsub(/:in .*/, '')
-        .gsub(Spectre.pwd, '.')
+        .gsub(Dir.pwd, '.')
 
-      main_context = DefinitionContext.new(name, file)
-      @contexts << main_context
-      main_context.instance_eval(&)
+      DefinitionContext
+        .new(desc, file, self)
+        .instance_eval(&)
     end
 
     ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spectre-core
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Christian Neubauer