uspec 1.1.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 659b5228eb82a76f457af1da9a275cfdcc5914f03d40083fdca08f79c8b1fac6
-  data.tar.gz: d89c4ee71c95dc202adf14110a140f9f4d667698f0e8b443a884226b6881e57d
+  metadata.gz: d17e77cb5065265172f613c90f9edfb022c217386b56d34af6858b078ba406d8
+  data.tar.gz: 1c77be04e49ca61e243d7c35aa84c9de56dac3ae8f099ba351f6efa5d9a5ca38
 SHA512:
-  metadata.gz: 021b318bd832f4c5f290db67bca30a05e8e545fcc9b633506ab63ce2dc55cf53389885bc42d956e007f76d44245817aaa915f35f940b514eca43cbde32cc0c2a
-  data.tar.gz: 44f6373981caa474dbb6df5f48f9fcf38c9fc3d59f680e6198940f758c098f4157ce30dc6ad13294cb3bca99c7f659ca60395d5760b11830905144368ef5a8b0
+  metadata.gz: cf99ec58c05e076e9060b7ac71271e5fcdfd8ab44e03810b41a1ac2a67a4921777dca4ed2a5c27637f071b20fabb0262118b4a7214448b63ea8193450dc663b6
+  data.tar.gz: eb1c4de66aef1dfef542774fd18b9484bf26778bfe5651c0594fc6cd543472003c32484048435a41d9baacdf3695376fcb1e25fd659ff36183072ddb44eafb41

data/Gemfile

@@ -2,3 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in uspec.gemspec
 gemspec
+
+unless ENV['CI'] then
+  gem 'pry'
+  gem 'pry-doc'
+  gem 'pry-theme'
+  gem 'pry-coolline'
+end

data/README.markdown

@@ -12,26 +12,20 @@ Philosophy / Why Uspec?
 
 > Uspec is just Ruby!
 
-Unlike other testing frameworks there's no need for special matchers,
-there can only be one assertion per test,
-and you never have to worry that your tests lack assertions.
+- There's no need for special matchers
+- You never have to worry that your tests lack assertions
+- There is no monkey patching of core classes
 
-That's because when the `spec` block is evaluated the return value is used (in a very ruby-like way)
-to determine if the test has passed or failed. Standard Ruby comparisons are your friend!
-No more digging around in your test framework's documentation to figure out what matcher you're supposed to use.
-This also means *no monkey patching* core classes!
+No more digging around in your test framework's documentation to figure out what matcher you're supposed to use. Because you just use Ruby!
 
-Uspec's output is in beautiful ansi technicolor,
-with red for failures, green for successes, and yellow for pending specs. Here's a screenshot:
-
-![Screenshot!](https://i.imgur.com/Baqggck.png)
+Uspec is well under 500 lines of code. Most of that is there to gracefully handle the weird edge cases that pop up all the time during development and testing of software. Uspec will catch issues at every stage and display a nicely formatted message to provide hints at what might have gone wrong.
 
 Uspec is tiny, painless, and easy to use. Download it and give it a try!
 
-Example
--------
+Writing Tests
+----------
 
-Uspec is **just Ruby**. The DSL is minimal - there's only one method to remember!
+Uspec is deceptively simple. You only need to remember one method: `spec`. 
 
 Writing a spec is easy:
 
@@ -43,31 +37,18 @@ end
 
 That's it!
 
-Installation
-------------
-
-Add this line to your application's Gemfile:
-
-    gem 'uspec'
-
-And then execute:
-
-    $ bundle
-
-Or install it directly with:
-
-    $ gem install uspec
-
-
 Quickstart
 ----------
 
-0. Create a `uspec` directory to keep your specs in.
-1. Name your specs ending with `_spec.rb`.
-2. Write some specs in Ruby using the `spec` method (example above).
-2. Use the included `uspec` executable to run your specs.
+1. Install in the typical way using Rubygems or Bundler:
+    - `gem install uspec`
+    - `echo 'gem "uspec"' >> Gemfile && bundle install`
+2. Create a `uspec` directory to keep your specs in
+3. Name your specs ending with `_spec.rb`
+4. Write some specs in Ruby using the `spec` method (example above)
+5. Use the included `uspec` executable to run your specs
 
-**Hint:** A lot of people also put `require_relative 'spec_helper'` at the top of their test files for sharing code between tests.
+And always remember that Uspec is **just Ruby**!
 
 Commandline Usage
 -----------------
@@ -78,19 +59,23 @@ uspec - minimalistic ruby testing framework
 usage: uspec [<file_or_path>...]
 ```
 
-- Without arguments the `uspec` command will automatially look for a `uspec` directory and load any `*_spec.rb` files inside them.
+- Without arguments the `uspec` command will automatically look for a `uspec` directory and load any `*_spec.rb` files inside it.
 - You can also pass in arbitrary files and it will attempt to run them as specs.
 - If you pass in directories `uspec` will scan for and run any specs inside them.
-- Uspec will return the number of failures as its status code to the commandline, 0 if none.
+- Uspec will return the number of failures as its exit status code to the or `0` if none.
 
 Output
 ------
 
+Uspec's output is in beautiful ANSI technicolor, with red for failures, green for successes, and yellow for pending specs.
+
+![Screenshot!](https://i.imgur.com/Baqggck.png)
+
 A brief explanation of `uspec`'s output to show you what it can do!
 
 ### Success
 
-If a spec passes (returns true):
+If a spec passes (returns `true`):
 
 ```
  -- AwesomeMcCoolname.generate creates a cool name: true
@@ -98,7 +83,7 @@ If a spec passes (returns true):
 
 ### Failure
 
-If a spec fails (returns false):
+If a spec fails (returns `false`):
 
 ```
  -- AwesomeMcCoolname.generate creates a cool name: false
@@ -106,7 +91,7 @@ If a spec fails (returns false):
 
 ### Exception
 
-If the spec encounters an error (raises an Exception):
+If the spec encounters an error (raises an `Exception`):
 
 ```
  -- AwesomeMcCoolname.generate creates a cool name: Exception
@@ -132,7 +117,7 @@ end
 
 Then Uspec will let you know so you can debug it:
 
-```ruby
+```
  -- AwesomeMcCoolname.generate creates a badass name: Failed
 
     Spec did not return a boolean value
@@ -155,8 +140,59 @@ When you run the test Uspec will helpfully display:
  -- a feature I have not implemented yet: pending
 ```
 
-Tips & Tricks
--------------
+Reusing Test Code
+------------
+
+Test code reuse doesn't require doing anything special. It's just like any other Ruby code. But here are a few examples!
+
+**Hint:** A lot of people put `require_relative 'spec_helper'` at the top of their test files and put shared code and helper methods in a file called `spec_helper.rb`.
+
+### Methods
+
+If you find yourself repeating the same code in tests several times you can extract that code into a method and then call it within your `spec` blocks.
+
+```ruby
+def new_generator
+  AwesomeMcCoolname.new max_length: 15
+end
+
+spec 'generates a cool name' do
+  new_generator.generate.include? 'Badass'
+end
+```
+
+### Instance Variables
+
+This also works for instance variables!
+
+```ruby
+@favorite_color = 'fuschia'
+
+spec 'remembers favorite color' do
+  ColorDB.fetch(:favorite) == @favorite_color
+end
+```
+
+### Memoized Methods
+
+By combining the previous two capabilities of Ruby, it is trivial to memoize method output as well:
+
+```ruby
+def reusable_generator
+  @reusable_generator ||= AwesomeMcCoolname.new max_length: 15
+end
+
+spec 'generates a cool name' do
+  reusable_generator.generate.include? 'Badass'
+end
+```
+
+This is all the same kind of code that you use when writing any other Ruby object. You can put methods into objects and use those if you like too!
+
+Test Matching in Plain Ruby
+-----------
+
+When the `spec` block is evaluated the `return` value is used (in a very Ruby-like way) to determine if the test has passed or failed. Standard Ruby comparisons are your friend!
 
 Because there's no matchers and only one method there's no need for specialized reference documentation, but here are some ideas to get you going!
 
@@ -198,8 +234,8 @@ end
 ```
 
 If there's no error, then Uspec will see the result of the method call (whatever it might be).
-If the wrong Exception is raised, then because of reraising (by just calling `raise` without parameters),
-Ruby will dutifully pass along the error for Uspec to display.
+
+If the wrong Exception is raised, then because of reraising (by just calling `raise` without parameters), Ruby will dutifully pass along the error for Uspec to display.
 
 Mocks, Spies, Stubs, and More!
 -----------------------
@@ -218,4 +254,4 @@ Contributing
 Author
 ------
 
-> Anthony M. Cook 2013-2021
+> Anthony M. Cook 2013-2024

data/lib/uspec/cli.rb

@@ -8,9 +8,9 @@ class Uspec::CLI
     @paths = args
     @pwd = Pathname.pwd.freeze
     @stats = Uspec::Stats.new
-    @dsl = Uspec::DSL.new self
+    @harness = Uspec::Harness.new self
   end
-  attr :stats, :dsl
+  attr :stats, :harness
 
   def usage
     warn "uspec v#{::Uspec::VERSION} - minimalistic ruby testing framework"
@@ -24,14 +24,32 @@ class Uspec::CLI
 
   def invoke
     run_specs
-    puts @stats.summary
-    exit exit_code
+    die!
   end
 
   def exit_code
     [@stats.failure.size, 255].min
   end
 
+  def handle_interrupt! type = Interrupt
+    if SignalException === type || SystemExit === type then
+      if type === Module then
+        err = type
+        msg = "signal"
+      else
+        err = type.class
+        msg = type.message
+      end
+      puts "Uspec received #{err} #{msg} - exiting!"
+      die!
+    end
+  end
+
+  def die!
+    puts @stats.summary
+    exit exit_code
+  end
+
   def paths
     if @paths.empty? then
       ['spec', 'uspec', 'test'].each do |path|
@@ -56,12 +74,16 @@ class Uspec::CLI
       end
     elsif path.exist? then
       puts "#{path.basename path.extname}:"
-      dsl.instance_eval(path.read, path.to_s)
+      harness.define.instance_eval(path.read, path.to_s)
     else
       warn "path not found: #{path}"
     end
   rescue Exception => error
 
+    if SignalException === error || SystemExit === error then
+      exit 3
+    end
+
     error_file, error_line, _ = error.backtrace.first.split ?:
 
     message = <<-MSG
@@ -79,7 +101,9 @@ class Uspec::CLI
     MSG
     puts
     warn message
-    stats.failure << Uspec::Result.new(message, error, caller)
+    stats << Uspec::Result.new(message, error, caller)
+
+    handle_interrupt! error
   end
 
 end

data/lib/uspec/define.rb

@@ -0,0 +1,12 @@
+module Uspec
+  class Define
+
+    def initialize harness
+      @__uspec_harness = harness
+    end
+
+    def spec description, &block
+      @__uspec_harness.spec_eval description, &block
+    end
+  end
+end

data/lib/uspec/harness.rb

@@ -0,0 +1,58 @@
+require_relative "result"
+require_relative "spec"
+
+module Uspec
+  class Harness
+
+    def initialize cli
+      @cli = cli
+      @define = Uspec::Define.new self
+    end
+    attr_accessor :cli, :define
+
+    def stats
+      cli.stats
+    end
+
+    def spec_eval description, &block
+      state = 0
+      print ' -- ', description
+
+      if block then
+        begin
+          state = 1
+          raw_result = Uspec::Spec.new(self, description, &block).__uspec_block
+          state = 2
+        rescue Exception => raw_result
+          state = 3
+        end
+      end
+
+      result = Uspec::Result.new description, raw_result, caller
+
+      unless block then
+        state = 4
+        result.pending!
+      end
+
+      stats << result
+
+      print ': ', result.pretty, "\n"
+    rescue => error
+      state = 5
+      message = <<-MSG
+        #{error.class} : #{error.message}
+
+        Uspec encountered an internal error, please report this bug: https://github.com/acook/uspec/issues/new
+
+\t#{error.backtrace.join "\n\t"}
+      MSG
+      puts
+      warn message
+      stats << Uspec::Result.new(message, error, caller)
+    ensure
+      cli.handle_interrupt! result.raw
+      return [state, error, result, raw_result]
+    end
+  end
+end

data/lib/uspec/result.rb

@@ -5,7 +5,7 @@ module Uspec
   class Result
     include Terminal
 
-    PREFIX = "#{Terminal.newline}#{Terminal.yellow}>\t#{Terminal.normal}"
+    PREFIX = "#{Uspec::Terminal.newline}#{Uspec::Terminal.yellow}>\t#{Uspec::Terminal.normal}"
 
     def initialize spec, raw, source
       @spec = spec

data/lib/uspec/spec.rb

@@ -0,0 +1,34 @@
+require_relative "result"
+
+module Uspec
+  class Spec
+
+    def initialize harness, description, &block
+      @__uspec_description = description
+      @__uspec_harness = harness
+      ns = harness.define
+
+      ns.instance_variables.each do |name|
+        self.instance_variable_set(
+          name,
+          ns.instance_variable_get(name)
+        ) unless name.to_s.include? '@__uspec'
+      end
+
+      ns.methods(false).each do |name|
+        self.define_singleton_method name do |*args, &block|
+          ns.send name, *args, &block
+        end unless name.to_s.include? '__uspec'
+      end
+
+      if block then
+        self.define_singleton_method :__uspec_block, &block
+      else
+        self.define_singleton_method :__uspec_block do
+          raise NotImplementedError, "Uspec: No block provided for `#{@__uspec_description}`"
+        end
+      end
+    end # initialize
+
+  end
+end

data/lib/uspec/stats.rb

@@ -5,19 +5,22 @@ module Uspec
     end
     attr :success, :failure, :pending
 
+    def << result
+      if result.success?
+        self.success << result
+      elsif result.pending?
+        self.pending << result
+      else
+        self.failure << result
+      end
+    end
+
     def clear_results!
       @success = Array.new
       @failure = Array.new
       @pending = Array.new
     end
 
-    def inspect
-      <<-INFO
-        #{super} Failures: #{exit_code}
-        #{results.map{|r| r.inspect}.join "\n\t" }
-      INFO
-    end
-
     def results
       @success + @failure + @pending
     end

data/lib/uspec/version.rb

@@ -1,3 +1,3 @@
 module Uspec
-  VERSION = '1.1.2'
+  VERSION = '1.3.0'
 end

data/lib/uspec.rb

@@ -1,5 +1,6 @@
 require_relative 'uspec/version'
-require_relative 'uspec/dsl'
+require_relative 'uspec/harness'
+require_relative 'uspec/define'
 require_relative 'uspec/stats'
 
 module Uspec

data/uspec/cli_spec.rb

@@ -1,5 +1,14 @@
 require_relative 'uspec_helper'
 
+def new_cli path  = '.'
+  Uspec::CLI.new(Array(path))
+end
+
+def run_specs path
+  new_cli(path).run_specs
+end
+
+
 spec 'shows usage' do
   output = capture do
     exec 'bin/uspec -h'
@@ -8,42 +17,62 @@ spec 'shows usage' do
   output.include? 'usage'
 end
 
-spec 'pending test doesn\'t crash'
-
 spec 'runs a path of specs' do
-  output = capture do
-    path = Pathname.new(__FILE__).parent.parent.join('example_specs').to_s
-    Uspec::CLI.new(Array(path)).run_specs
+  output = outstr do
+    run_specs exdir.to_s
   end
 
   output.include?('I love passing tests') || output
 end
 
 spec 'runs an individual spec' do
-  output = capture do
-    path =  Pathname.new(__FILE__).parent.parent.join('example_specs', 'example_spec.rb').to_s
-    Uspec::CLI.new(Array(path)).run_specs
+  output = outstr do
+    run_specs exdir.join('example_spec.rb').to_s
   end
 
   output.include?('I love passing tests') || output
 end
 
 spec 'broken requires in test files count as test failures' do
-  path =  Pathname.new(__FILE__).parent.join('test_specs', 'broken_require_spec')
+  output, status = Open3.capture2e "#{root}/bin/uspec #{testdir.join('broken_require_spec')}"
 
-  output = capture do
-    exec "bin/uspec #{path}"
+  status.exitstatus == 1 || status
+end
+
+spec 'displays information about test file with broken require' do
+  output, status = Open3.capture2e "#{root}/bin/uspec #{testdir.join('broken_require_spec')}"
+
+  output.include?('cannot load such file') || output
+end
+
+spec 'exit code is the number of failures' do
+  expected = 50
+  cli = new_cli
+
+  outstr do
+    expected.times do |count|
+      cli.harness.define.spec "fail ##{count + 1}" do
+        false
+      end
+    end
   end
 
-  $?.exitstatus == 1 || $?
+  actual = cli.exit_code
+  actual == expected || output
 end
 
-spec 'displays information about test file with broken require' do
-  path =  Pathname.new(__FILE__).parent.join('test_specs', 'broken_require_spec')
+spec 'when more than 255 failures, exit status is 255' do
+  expected = 255
+  cli = new_cli
 
-  output = capture do
-    exec "bin/uspec #{path}"
+  output = outstr do
+    500.times do
+      cli.harness.define.spec 'fail' do
+        false
+      end
+    end
   end
 
-  output.include?('cannot load such file') || output
+  actual = cli.exit_code
+  actual == expected || [$?, output]
 end

data/uspec/dsl_spec.rb

@@ -1,20 +1,109 @@
 require_relative "uspec_helper"
 
+spec 'catches errors' do
+  cli = new_cli
+
+  output = outstr do
+    cli.harness.define.spec 'exception' do
+      raise 'test exception'
+    end
+  end
+
+  output.include?('Exception') || output
+end
+
+spec 'catches even non-StandardError-subclass exceptions' do
+  cli = new_cli
+
+  output = outstr do
+    cli.harness.define.spec 'not implemented error' do
+      raise ::NotImplementedError, 'test exception'
+    end
+  end
+
+  output.include?('Exception') || output
+end
+
+spec 'Uspec exits when sent a termination signal' do
+  path = testdir.join('kill_this_spec')
+
+  stdin, allout, thread = Open3.popen2e "#{testdir}/kill_this_script.sh \"#{path}\""
+  stdin.close
+  output = allout.read
+
+  begin
+    Process.waitpid(thread.pid)
+  rescue Errno::ECHILD
+    nil
+  end
+
+  summary_match = output.match(/0.*successful.*,.*1.*failed.*,.*0.*pending/)
+  no_copy_match = output.match(/2.{0,5}pending/) # previous versions continued after "exiting"
+
+  (!!summary_match && !no_copy_match) || output
+end
+
+spec 'complains when spec block returns non boolean' do
+  cli = new_cli
+
+  output = outstr do
+    cli.harness.define.spec 'whatever' do
+      "string"
+    end
+  end
+
+  output.include?('Failed') || output
+end
+
+spec 'marks test as pending when no block supplied' do
+  path = testdir.join('pending_spec')
+
+  output = capture do
+    exec "#{root}/bin/uspec #{path}"
+  end
+
+  output.include?('1 pending') || output
+end
+
+spec 'should not define DSL methods on arbitrary objects' do
+  !(Array.respond_to? :spec)
+end
+
+spec 'when return used in spec, capture it as an error' do
+  path = testdir.join('return_spec')
+
+  output = capture do
+    exec "#{root}/bin/uspec #{path}"
+  end
+
+  output.include?('Invalid return') || output.include?('Spec did not return a boolean value') || output
+end
+
+spec 'when break used in spec, capture it as an error' do
+  path = testdir.join('break_spec')
+
+  output = capture do
+    exec "#{root}/bin/uspec #{path}"
+  end
+
+  output.include?('Invalid break') || output.include?('Spec did not return a boolean value') || output
+end
+
 spec 'when instance variables are defined in the DSL instance, they are available in the spec body' do
-  path =  Pathname.new(__FILE__).parent.join('test_specs', 'ivar_spec')
+  path = testdir.join('ivar_spec')
 
   output = capture do
-    exec "bin/uspec #{path}"
+    exec "#{root}/bin/uspec #{path}"
   end
 
   output.include?('1 successful') || output
 end
 
 spec 'when methods are defined in the DSL instance, they are available in the spec body' do
-  path =  Pathname.new(__FILE__).parent.join('test_specs', 'method_spec')
+  path = testdir.join('method_spec')
 
   output = capture do
-    exec "bin/uspec #{path}"
+    exec "#{root}/bin/uspec #{path}"
   end
 
   output.include?('1 successful') || output

data/uspec/stats_spec.rb

@@ -0,0 +1,12 @@
+require_relative 'uspec_helper'
+
+spec 'stats can be inspected' do
+  actual = @__uspec_harness.stats.inspect
+  actual.include?("failure") || actual
+end
+
+spec 'stats inspect does not have any stray whitespace' do
+  output = @__uspec_harness.stats.inspect
+  match = output.match /(.*(?:  |\n))/m
+  match == nil || match
+end

data/uspec/test_specs/kill_this_script.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env sh
+
+command_exists() { command -v "$1" 1>&- 2>&-; }
+
+THISDIR="$(realpath "$(dirname "$0")")"
+ROOTDIR="$(realpath "$THISDIR/../..")"
+
+path="$1"
+
+if ! [ -f "$path" ]; then
+  echo "file not found: $path"
+  exit 255
+fi
+
+if command_exists bundle; then
+  echo running with bundler
+  bundle exec "$ROOTDIR/bin/uspec" "$path" 2>&1 &
+  pid="$!"
+else
+  echo running directly
+  "$ROOTDIR/bin/uspec" "$path" 2>&1 &
+  pid="$!"
+fi
+
+sleep 1
+kill "$pid"

data/uspec/test_specs/kill_this_spec

@@ -0,0 +1,8 @@
+spec 'nap time, i sure hope no one kills me in my sleep' do
+  sleep 10
+  true
+end
+
+spec 'how did we get here?'
+
+spec 'something probably went wrong'

data/uspec/test_specs/pending_spec

@@ -1,6 +1,3 @@
-
 require_relative "../uspec_helper"
 
 spec "why is this broken??"
-
-

data/uspec/uspec_helper.rb

@@ -1,4 +1,10 @@
-require 'pry'
+begin
+  require 'pry'
+rescue LoadError => err
+  nil
+end
+require 'open3'
+require 'stringio'
 
 require_relative '../lib/uspec'
 extend Uspec
@@ -19,3 +25,37 @@ def capture
 
   output
 end
+
+def outstr
+  old_stdout = $stdout
+  old_stderr = $stderr
+
+  outio = StringIO.new
+  $stdout = outio
+
+  errio = StringIO.new
+  $stderr = errio
+
+  val = yield
+
+  outio.string + errio.string
+ensure
+  $stdout = old_stdout
+  $stderr = old_stderr
+end
+
+def root
+  Pathname.new(__FILE__).parent.parent
+end
+
+def exdir
+  root.join('example_specs')
+end
+
+def specdir
+  root.join('uspec')
+end
+
+def testdir
+  specdir.join('test_specs')
+end

data/uspec/uspec_spec.rb

@@ -1,77 +1 @@
 require_relative 'uspec_helper'
-
-spec 'catches errors' do
-  output = capture do
-    spec 'exception' do
-      raise 'test exception'
-    end
-  end
-
-  output.include?('Exception') || output
-end
-
-spec 'catches even non-StandardError-subclass exceptions' do
-  output = capture do
-    spec 'not implemented error' do
-      raise ::NotImplementedError, 'test exception'
-    end
-  end
-
-  output.include?('Exception') || output
-end
-
-spec 'complains when spec block returns non boolean' do
-  output = capture do
-    spec 'whatever' do
-      "string"
-    end
-  end
-
-  output.include?('Failed') || output
-end
-
-spec 'marks test as pending when no block supplied' do
-  output = capture do
-    spec 'pending test'
-  end
-
-  output.include?('pending') || output
-end
-
-spec 'should not define DSL methods on arbitrary objects' do
-  !(Array.respond_to? :spec)
-end
-
-spec 'exit code is the number of failures' do
-  expected = 50
-  output = capture do
-    __uspec_stats.clear_results! # because we're forking, we will have a copy of the current results
-
-    expected.times do |count|
-      spec "fail ##{count + 1}" do
-        false
-      end
-    end
-
-    exit __uspec_cli.exit_code
-  end
-  actual = $?.exitstatus
-
-  actual == expected || output
-end
-
-spec 'when more than 255 failures, exit status is 255' do
-  output = capture do
-    __uspec_stats.clear_results! # because we're forking, we will have a copy of the current results
-
-    500.times do
-      spec 'fail' do
-        false
-      end
-    end
-
-    exit __uspec_cli.exit_code
-  end
-
-  $?.exitstatus == 255 || [$?, output]
-end

data/uspec.gemspec

@@ -22,8 +22,5 @@ Gem::Specification.new do |gem|
   # technically should still work in 2.0 but some of the test suite won't pass
   gem.required_ruby_version = ">= 2.1"
 
-  gem.add_dependency "that_object_is_so_basic", "~> 0.0.5"
-
-  gem.add_development_dependency "pry"
-  gem.add_development_dependency "pry-doc"
+  gem.add_dependency "that_object_is_so_basic", ">= 0.0.5"
 end

metadata

@@ -1,57 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: uspec
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Anthony M. Cook
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-20 00:00:00.000000000 Z
+date: 2024-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: that_object_is_so_basic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.5
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-doc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
 description: Uspec is a shiny little spec framework for your apps! Unlike other testing
   frameworks there's no need for matchers, there can only be one assertion per test,
   and you never have to worry that your tests lack assertions.
@@ -77,19 +49,23 @@ files:
 - example_specs/spec_helper.rb
 - lib/uspec.rb
 - lib/uspec/cli.rb
-- lib/uspec/dsl.rb
+- lib/uspec/define.rb
+- lib/uspec/harness.rb
 - lib/uspec/result.rb
+- lib/uspec/spec.rb
 - lib/uspec/stats.rb
 - lib/uspec/terminal.rb
 - lib/uspec/version.rb
 - uspec.gemspec
 - uspec/cli_spec.rb
 - uspec/dsl_spec.rb
-- uspec/jump_spec.rb
 - uspec/result_spec.rb
+- uspec/stats_spec.rb
 - uspec/test_specs/break_spec
 - uspec/test_specs/broken_require_spec
 - uspec/test_specs/ivar_spec
+- uspec/test_specs/kill_this_script.sh
+- uspec/test_specs/kill_this_spec
 - uspec/test_specs/method_spec
 - uspec/test_specs/pending_spec
 - uspec/test_specs/return_spec

data/lib/uspec/dsl.rb

@@ -1,86 +0,0 @@
-require_relative "result"
-
-module Uspec
-  class DSL
-    USPEC_CLI_BLOCK = -> { @__uspec_dsl.__uspec_cli }
-    USPEC_STAT_BLOCK = -> { @__uspec_dsl.__uspec_cli.stats }
-    USPEC_SPEC_BLOCK = ->(description, &block) { @__uspec_dsl.spec description, &block }
-
-    def initialize cli
-      @__uspec_cli = cli
-    end
-
-    def __uspec_cli
-      @__uspec_cli
-    end
-
-    def __uspec_stats
-      @__uspec_cli.stats
-    end
-
-    def __uspec_eval block
-      o = Object.new
-      o.define_singleton_method :__uspec_stats, USPEC_STAT_BLOCK
-      o.define_singleton_method :__uspec_cli, USPEC_CLI_BLOCK
-      o.instance_variable_set :@__uspec_cli, @__uspec_cli
-      o.instance_variable_set :@__uspec_dsl, self
-      o.define_singleton_method :spec, USPEC_SPEC_BLOCK
-      o.define_singleton_method :spec_block, &block
-      self.instance_variables.each do |name|
-        o.instance_variable_set(name, self.instance_variable_get(name)) unless name.to_s.include? '@__uspec'
-      end
-      self.methods(false).each do |name|
-        o.define_singleton_method name do |*args, &block|
-          @__uspec_dsl.send name, *args, &block
-        end unless name.to_s.include? '__uspec'
-      end
-      o.spec_block
-    end
-
-    def spec description, &block
-      state = 0
-      print ' -- ', description
-
-      if block then
-        begin
-          state = 1
-          raw_result = __uspec_eval block
-          state = 2
-        rescue Exception => raw_result
-          state = 3
-        end
-      end
-
-      result = Result.new description, raw_result, caller
-
-      unless block then
-        state = 4
-        result.pending!
-      end
-
-      if result.success?
-        __uspec_stats.success << result
-      elsif result.pending?
-        __uspec_stats.pending << result
-      else
-        __uspec_stats.failure << result
-      end
-
-      print ': ', result.pretty, "\n"
-    rescue => error
-      state = 5
-      message = <<-MSG
-        #{error.class} : #{error.message}
-
-        Uspec encountered an internal error, please report this bug: https://github.com/acook/uspec/issues/new
-
-\t#{error.backtrace.join "\n\t"}
-      MSG
-      puts
-      warn message
-      __uspec_stats.failure << Uspec::Result.new(message, error, caller)
-    ensure
-      return [state, error, result, raw_result]
-    end
-  end
-end

data/uspec/jump_spec.rb

@@ -1,21 +0,0 @@
-require_relative "uspec_helper"
-
-spec 'when return used in spec, capture it as an error' do
-  path =  Pathname.new(__FILE__).parent.join('test_specs', 'return_spec')
-
-  output = capture do
-    exec "bin/uspec #{path}"
-  end
-
-  output.include?('Invalid return') || output.include?('Spec did not return a boolean value') || output
-end
-
-spec 'when break used in spec, capture it as an error' do
-  path =  Pathname.new(__FILE__).parent.join('test_specs', 'break_spec')
-
-  output = capture do
-    exec "bin/uspec #{path}"
-  end
-
-  output.include?('Invalid break') || output.include?('Spec did not return a boolean value') || output
-end