scampi 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ab326398426699068726dee799fa312709c6d44bfffb607de4c467d0a52a2ad
-  data.tar.gz: e3937c018adbf534d156bffc262001cee773ac741abb5a0b7d950b075e125153
+  metadata.gz: 82b9fac36711a5125614536636294d45b5d94a013894a7de447e131cf46f6cc8
+  data.tar.gz: 4ba5a553e3f7d94ce7c53c8f331af6646aaf06f18b5ef88838b4585c33987e40
 SHA512:
-  metadata.gz: 719acff10a6ca528087b0b5dde1b375e85c33c9c9aa16a1eab184cd26073f845d1c3a4a96c2dcdaf71d5480e74ccd8a8c7c3feeaed9bf908f7442d380bd15af9
-  data.tar.gz: 5a23a60fae7c9181bb425799ce76f5c9555739ad2748270ec3a1066fbed54ccdaf424f0aa100813eaa93cbab03a8ade669d8fbeb0ddb109dfcd95851ea4a5fee
+  metadata.gz: 55a95005509df9d72b5cf3ccf1e1dbcae5f71f67cb6cc697a63e874e3e23d175b2fef36c73a726f902da8b83c9676207a261f4c5438e4a65d01c37c736d04691
+  data.tar.gz: 252ca9f7c5f9fb2b8837bb1c1201054372455f2c7740500f9ba8e2a8234aad2f48c44e27b46faec49124329729d2adb2ff4b2dc017d4bd9198b9d9000de8de00

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scampi (0.1.2)
+    scampi (0.1.4)
       colorize-extended
 
 GEM
@@ -22,7 +22,7 @@ DEPENDENCIES
 CHECKSUMS
   colorize (1.1.0) sha256=30b5237f0603f6662ab8d1fc2bd4a96142b806c6415d79e45ef5fdc6a0cfc837
   colorize-extended (0.1.0) sha256=e8c39986e41ee2e14623c8fa02cf851ef4b83d2fe1392daa2b4d81f0df7bedc9
-  scampi (0.1.2)
+  scampi (0.1.4)
 
 BUNDLED WITH
   4.0.7

data/exe/scampi

@@ -7,7 +7,7 @@ require 'scampi'
 ENV["TEST"] = "true"
 
 files = if ARGV.empty?
-  `rg -l "^test do$" test`.split("\n")
+  `rg -l "^test do$" .`.split("\n")
 else
   ARGV.flat_map { |pattern| Dir.glob(pattern) }
 end

data/lib/scampi/monkey_patches.rb

@@ -60,14 +60,9 @@ module Kernel
   end
 
   # Allow `it` at the top level (outside a describe block).
-  # Wraps the spec in an anonymous context derived from the caller's filename.
+  # Stored as a raw spec — only `describe` creates subtests.
   def it(description, &block)
-    loc = caller_locations(1, 1).first
-    file = loc.path || loc.absolute_path || "(unknown)"
-    ctx_name = File.basename(file, File.extname(file))
-    ctx = Scampi::Context.new(ctx_name) {}
-    ctx.it(description, &block)
-    ctx.register
-    Scampi.queue << ctx
+    block ||= proc { should.flunk "not implemented" }
+    Scampi.queue << [:spec, description, block]
   end
 end

data/lib/scampi/version.rb

@@ -1,5 +1,5 @@
 module Scampi
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end
 
 require_relative '../rubygems_plugin'

data/lib/scampi.rb

@@ -35,20 +35,26 @@ module Scampi
     @ran = true
 
     # Register: evaluate all describe blocks to discover specs
-    @queue.each(&:register)
+    @queue.each { |item| item.register if item.is_a?(Context) }
 
-    # TAP version + plan (one entry per top-level describe)
+    # TAP version + plan
     puts "TAP version 14"
     puts "1..#{@queue.size}"
 
-    # Execute all specs as subtests
-    @queue.each_with_index do |context, i|
-      passed = context.execute(0)
+    # Execute: contexts become subtests, raw specs become flat lines
+    @queue.each_with_index do |item, i|
       n = i + 1
-      if passed
-        puts "#{"ok".green} #{n} - #{context.name}"
+      if item.is_a?(Context)
+        passed = item.execute(0)
+        if passed
+          puts "#{"ok".green} #{n} - #{item.name}"
+        else
+          puts "#{"not ok".red} #{n} - #{item.name}"
+        end
       else
-        puts "#{"not ok".red} #{n} - #{context.name}"
+        _, description, block = item
+        Counter[:specifications] += 1
+        passed = run_bare_spec(description, block, n)
       end
     end
 
@@ -88,6 +94,47 @@ module Scampi
       false
     end
   end
+
+  def self.run_bare_spec(description, block, n)
+    handle_requirement(description, 0, n) do
+      begin
+        Counter[:depth] += 1
+        rescued = false
+        begin
+          prev_req = Counter[:requirements]
+          block.call
+        rescue Object => e
+          rescued = true
+          raise e
+        ensure
+          if Counter[:requirements] == prev_req and not rescued
+            raise Error.new(:missing, "empty specification: #{description}")
+          end
+        end
+      rescue SystemExit, Interrupt
+        raise
+      rescue Object => e
+        ErrorLog << "#{e.class}: #{e.message}\n"
+        e.backtrace.find_all { |line| line !~ /bin\/scampi|\/scampi\.rb:\d+/ }.
+          each_with_index { |line, i|
+          ErrorLog << "\t#{line}#{i==0 ? ": #{description}" : ""}\n"
+        }
+        ErrorLog << "\n"
+
+        if e.kind_of? Error
+          Counter[e.count_as] += 1
+          e.count_as.to_s.upcase
+        else
+          Counter[:errors] += 1
+          "ERROR: #{e.class}"
+        end
+      else
+        ""
+      ensure
+        Counter[:depth] -= 1
+      end
+    end
+  end
 end
 
 require_relative 'scampi/error'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scampi
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Nathan K