scampi 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87c645091946d4a08fb92032e2e72424ab882e3fdea782321a80adb2afc14116
-  data.tar.gz: 0d39f5c822180e01583b9d2c21cf2659cc0361582274660db691f4b741fa3a73
+  metadata.gz: ebaf159a976cdda7cb655ad11defb7db1533a8c9a77c5874c03fea4887fa20ce
+  data.tar.gz: fda454180c407b8f5dea77d6c7a954c62705885126b73888409c7ab0e3277610
 SHA512:
-  metadata.gz: 7670887328769ef711129c2c63a1056916f2a7e7ae3f40452ee7d295db0212724f2966113f790e5995111cc65efb49b6c165661ca07eb3200df8f4bac472e5a2
-  data.tar.gz: 82d40f00f67ff6c15f26f9766980f133459bb6d4b5d301e3a51a65169dc815bfedf5d3228df4e63aa07e9e09b39670c5a696a44a3795ac877530047d253f4bfb
+  metadata.gz: f0c78a891d43b2a5a6f8f340fcc4febe0bab4845d5c942b26c1c5ff607dc32e4ba14f85964fcb1de46ccfdf711d7730ce93cb1b33a2f8d9da8e6b2c3013870e5
+  data.tar.gz: 7f035622b13ebef90ec6ef03616f11f2006102df6f3ebdc47f88777058d181c0529646a18e63ec0fa2866b95ff32cea63dd7948e9d6a3961af4c59e54e2a68a6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scampi (0.1.3)
+    scampi (0.1.5)
       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.3)
+  scampi (0.1.5)
 
 BUNDLED WITH
   4.0.7

data/README.md

@@ -11,16 +11,18 @@ Tests can live alongside your code using the `test` block — it only runs when
 def greet(name) = "hello #{name}"
 
 test do
+  greeting = proc { |name| greet(name) }
+
   it "equality and matching" do
-    greet("world").should == "hello world"
-    greet("world").should.equal "hello world"
-    greet("world").should =~ /hello/
-    greet("world").should.match(/hello/)
+    greeting.("world").should == "hello world"
+    greeting.("world").should.equal "hello world"
+    greeting.("world").should =~ /hello/
+    greeting.("world").should.match(/hello/)
   end
 
   it "negation" do
-    greet("world").should.not == "goodbye"
-    greet("world").should.not.match(/goodbye/)
+    greeting.("world").should.not == "goodbye"
+    greeting.("world").should.not.match(/goodbye/)
   end
 
   it "predicates" do

data/lib/rubygems_plugin.rb

@@ -1,38 +1 @@
-module Kernel
-  # Conditionally run a test block.
-  #
-  # When placed in a Ruby file, the block is executed only when the file is
-  # run directly (ruby myfile.rb) or when ENV["TEST"] is set to "true".
-  # This lets you co-locate tests alongside implementation code.
-  #
-  #   # mylib.rb
-  #   def greet(name) = "hello #{name}"
-  #
-  #   test do
-  #     describe "greet" do
-  #       it "says hello" do
-  #         greet("world").should == "hello world"
-  #       end
-  #     end
-  #   end
-  #
-  def test(&block)
-    loc = caller_locations(1, 1).first
-    caller_file = loc.absolute_path || loc.path
-
-    if ENV["TEST"] == "true"
-      require_relative 'scampi' unless defined?(Scampi)
-      Scampi.summary_on_exit
-      block.call
-    elsif caller_file && $0
-      program = File.expand_path($0) rescue $0
-      caller_expanded = File.expand_path(caller_file) rescue caller_file
-      if caller_expanded == program
-        require_relative 'scampi' unless defined?(Scampi)
-        Scampi.summary_on_exit
-        block.call
-      end
-    end
-  end
-  private :test
-end
+require 'scampi'

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,3 @@
 module Scampi
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end
-
-require_relative '../rubygems_plugin'

data/lib/scampi/version.rb.erb

@@ -1,5 +1,3 @@
 module Scampi
   VERSION = "<%= version %>"
 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,10 +94,51 @@ 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'
 require_relative 'scampi/context'
 require_relative 'scampi/should'
 require_relative 'scampi/monkey_patches'
-require_relative 'rubygems_plugin'
+require_relative 'scampi/kernel_ext'

metadata

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