uspec 0.2.2 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62e31cb81d9310131f0336f4a946e8adbb499cf36864a83d76eaf0054821dff0
-  data.tar.gz: c91492ba7e80c49e9781af2ce08f5396e269d0f41148c61d682d1d89a603f71d
+  metadata.gz: c6763c9a1b9995386967bfb824889265c9bee560a86012728055bb107a4dd910
+  data.tar.gz: 74912e14810a2b03d596addcb14fe3696cd79efd3f8c104c49a4d65055aaca87
 SHA512:
-  metadata.gz: a0c3a167ad68a9ca32439346761a1520360bf84c52097cf0ed1356b7569c810581d261e65a0b22fae4201415e2e517b589ac6f6dc5c6b95747e41d7dae2f3211
-  data.tar.gz: 7b8e868bf9d42b008f9b5ee5fc8aea44b557c9d59e7021a500dcf1a08c4ec30a7316c0c6fdaa498ae02fab84b498707f7ce6036fc424b9cc6eba6967ca5eefa9
+  metadata.gz: ead8cbbee34c75b337685d1c3533c6129d39d870cd9abf94b7365317760f6c42aeab6a7d30749fab352139c947669514c2870d3542bbcd1e2160e020f5574fcc
+  data.tar.gz: cfa24d4154e3b0a95257cd544fa45451c551e460cb3a7f6ac995c3446a1a09623729d03843c41bace49adfda04ea1a58e42cb1eb62e431a4e149d83afaa85e13

data/.circleci/config.yml

@@ -0,0 +1,16 @@
+version: 2.1
+orbs:
+  ruby: circleci/ruby@0.1.2 
+
+jobs:
+  build:
+    executor: ruby/default
+    steps:
+      - checkout
+      - run:
+          name: Which bundler?
+          command: bundle -v
+      - ruby/bundle-install
+      - run:
+          name: Uspec tests
+          command: bundle exec uspec

data/.ruby-version

@@ -1 +1 @@
-2.3.7
+3.0.1

data/README.markdown

@@ -4,7 +4,7 @@ Uspec
 Uspec is a shiny little testing framework for your apps!
 
 [![Gem Version](https://img.shields.io/gem/v/uspec.svg?style=for-the-badge)](https://rubygems.org/gems/uspec/)
-[![Build Status](https://img.shields.io/travis/acook/uspec.svg?style=for-the-badge)](https://travis-ci.org/acook/uspec)
+[![Build Status](https://img.shields.io/circleci/build/github/acook/uspec.svg?style=for-the-badge)](https://app.circleci.com/pipelines/github/acook/uspec)
 [![Code Climate](https://img.shields.io/codeclimate/maintainability/acook/uspec.svg?style=for-the-badge)](https://codeclimate.com/github/acook/uspec)
 
 Philosophy / Why Uspec?
@@ -24,7 +24,7 @@ This also means *no monkey patching* core classes!
 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!](http://i.imgur.com/M2F5YvO.png)
+![Screenshot!](https://i.imgur.com/Baqggck.png)
 
 Uspec is tiny, painless, and easy to use. Download it and give it a try!
 
@@ -62,12 +62,12 @@ Or install it directly with:
 Quickstart
 ----------
 
-0. Create a `spec` (or `uspec`) directory to keep your specs in.
+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.
 
-**Hint:** A lot of people also put `require_relative 'spec_helper'` in their tests for shared code between tests.
+**Hint:** A lot of people also put `require_relative 'spec_helper'` at the top of their test files for sharing code between tests.
 
 Commandline Usage
 -----------------
@@ -78,7 +78,7 @@ uspec - minimalistic ruby testing framework
 usage: uspec [<file_or_path>...]
 ```
 
-- Without arguments the `uspec` command will automatially look for `spec` and `uspec` directories and load any `*_spec.rb` files inside them.
+- Without arguments the `uspec` command will automatially look for a `uspec` directory and load any `*_spec.rb` files inside them.
 - 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.
@@ -86,11 +86,11 @@ usage: uspec [<file_or_path>...]
 Output
 ------
 
-Wonder what Uspec looks like?
+A brief explanation of `uspec`'s output to show you what it can do!
 
 ### Success
 
-If a spec passes:
+If a spec passes (returns true):
 
 ```
  -- AwesomeMcCoolname.generate creates a cool name: true
@@ -98,7 +98,7 @@ If a spec passes:
 
 ### Failure
 
-If a spec fails:
+If a spec fails (returns false):
 
 ```
  -- AwesomeMcCoolname.generate creates a cool name: false
@@ -106,13 +106,13 @@ If a spec fails:
 
 ### Exception
 
-If the spec throws an error:
+If the spec encounters an error (raises an Exception):
 
 ```
  -- AwesomeMcCoolname.generate creates a cool name: Exception
 
     Encountered an Exception while running spec
-    at uspec/awesome_mc_coolname_spec.rb:3: in `<main>'
+    in spec at uspec/awesome_mc_coolname_spec.rb:3: in `<main>'
 
     RuntimeError < StandardError: 'wtf'
 
@@ -130,13 +130,13 @@ spec 'AwesomeMcCoolname.generate creates a cool name' do
 end
 ```
 
-Then Uspec will let you know:
+Then Uspec will let you know so you can debug it:
 
 ```ruby
- -- AwesomeMcCoolname.generate creates a badass name: Unknown Result
+ -- AwesomeMcCoolname.generate creates a badass name: Failed
 
     Spec did not return a boolean value
-    at uspec/awesome_mc_coolname_spec.rb:6: in `<main>'
+    in spec at uspec/awesome_mc_coolname_spec.rb:6: in `<main>'
 
     Integer < Numeric: 5
 ```
@@ -158,7 +158,7 @@ When you run the test Uspec will helpfully display:
 Tips & Tricks
 -------------
 
-Because there's no matchers and only one method there's no reference documentation to look at, so here are some ideas to get you going!
+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!
 
 ### String matching
 
@@ -201,43 +201,10 @@ If there's no error, then Uspec will see the result of the method call (whatever
 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.
 
-Assertions & Debugging
-----------------------
-
-You can also use `uspec` to track assertions in an application or any object you want. Every spec block you use will be tracked and recorded. It's really no problem at all to do.
-
-You can load Uspec's features directly into a class and use its DSL:
-
-```ruby
-require 'uspec'
-
-class MyFoo
-  extend Uspec::DSL
-
-  def assert
-    spec 'foo is valid' do
-      false
-    end
-  end
-end
-
-MyFoo.new.assert
-```
-
-If there are any specs that fail, your application will exit with an error code equal to the number of failures.
-
-```
-$ ruby foo.rb
- -- foo is valid: false
-$ echo $?
-1
-```
-
-Uspec is just Ruby
-------------------
+Mocks, Spies, Stubs, and More!
+-----------------------
 
-If for some reason you don't want to use the `uspec` command, you can `require 'uspec'` and `extend Uspec::DSL`.
-From there you can just run the file with ruby: `ruby my_test_spec.rb`
+Since `uspec` is a very straight forward testing utility it is easy to use any of the standard Ruby mocking frameworks with it. However, the [Impasta gem](https://github.com/acook/impasta) was made specifically for simple but comprehensive mocking, stubbing, and spying.
 
 Contributing
 ------------
@@ -251,4 +218,4 @@ Contributing
 Author
 ------
 
-> Anthony M. Cook 2013-2019
+> Anthony M. Cook 2013-2021

data/bin/uspec

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 require_relative '../lib/uspec/cli'
-Uspec::CLI.invoke ARGV
+Uspec::CLI.new(ARGV).invoke

data/lib/uspec.rb

@@ -8,15 +8,10 @@ module Uspec
     exit 2
   end
 
+  # this method used to be how we injected the spec method
   def self.extended object
-    object.extend Uspec::DSL
+    #unless object.respond_to? :spec
+    #  object.extend Uspec::DSL
+    #end
   end
 end
-
-at_exit do
-  failures = Uspec::Stats.exit_code
-  status = $!.respond_to?(:status) ? $!.status : 0
-  errors = $!.respond_to?(:cause) && $!.cause ? 1 : 0
-  code = [failures, status, errors].max
-  exit code
-end

data/lib/uspec/cli.rb

@@ -2,29 +2,34 @@ require 'pathname'
 require_relative '../uspec'
 
 class Uspec::CLI
-  class << self
-    def usage
-      warn "uspec v#{::Uspec::VERSION} - minimalistic ruby testing framework"
-      warn "usage: #{File.basename $0} [<file_or_path>...]"
-    end
+  def initialize args
+    usage unless (args & %w[-h --help -? /? -v --version]).empty?
 
-    def run_specs paths
-      uspec_cli = self.new paths
-      uspec_cli.run_paths
-    end
+    @paths = args
+    @pwd = Pathname.pwd.freeze
+    @stats = Uspec::Stats.new
+    @dsl = Uspec::DSL.new self
+  end
+  attr :stats, :dsl
 
-    def invoke args
-      if (args & %w[-h --help -? /? -v --version]).empty? then
-        run_specs args
-      else
-        usage
-      end
-    end
+  def usage
+    warn "uspec v#{::Uspec::VERSION} - minimalistic ruby testing framework"
+    warn "usage: #{File.basename $0} [<file_or_path>...]"
+    exit 1
   end
 
-  def initialize paths
-    @paths = paths
-    @pwd = Pathname.pwd.freeze
+  def run_specs
+    run_paths
+  end
+
+  def invoke
+    run_specs
+    puts @stats.summary
+    exit exit_code
+  end
+
+  def exit_code
+    [@stats.failure.size, 255].min
   end
 
   def paths
@@ -51,7 +56,7 @@ class Uspec::CLI
       end
     elsif path.exist? then
       puts "#{path.basename path.extname}:"
-      Uspec::DSL.instance_eval(path.read, path.to_s)
+      dsl.instance_eval(path.read, path.to_s)
     else
       warn "path not found: #{path}"
     end
@@ -74,7 +79,7 @@ class Uspec::CLI
     MSG
     puts
     warn message
-    Uspec::Stats.results << Uspec::Result.new(message, error, caller)
+    stats.failure << Uspec::Result.new(message, error, caller)
   end
 
 end

data/lib/uspec/dsl.rb

@@ -1,23 +1,42 @@
 require_relative "result"
 
 module Uspec
-  module DSL
-    module_function
-    def spec description
-      terminal = Uspec::Terminal
+  class DSL
+    def initialize cli
+      @__uspec_cli = cli
+    end
 
-      print ' -- ', description
+    def __uspec_cli
+      @__uspec_cli
+    end
 
-      return print(': ' + terminal.yellow('pending') + terminal.newline) unless block_given?
+    def __uspec_stats
+      @__uspec_cli.stats
+    end
 
-      begin
-        raw_result = yield
-      rescue Exception => raw_result
+    def spec description
+      print ' -- ', description
+
+      if block_given? then
+        begin
+          raw_result = yield
+        rescue Exception => raw_result
+        end
       end
 
       result = Result.new description, raw_result, caller
 
-      Uspec::Stats.results << result
+      unless block_given? then
+        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
@@ -30,7 +49,7 @@ module Uspec
       MSG
       puts
       warn message
-      Uspec::Stats.results << Uspec::Result.new(message, error, caller)
+      __uspec_stats.failure << Uspec::Result.new(message, error, caller)
     end
   end
 end

data/lib/uspec/result.rb

@@ -18,6 +18,8 @@ module Uspec
         green raw
       elsif raw == false then
         red raw
+      elsif pending? then
+        yellow 'pending'
       elsif Exception === raw then
         [
           red('Exception'), vspace,
@@ -28,10 +30,10 @@ module Uspec
         ].join
       else
         [
-          red('Unknown Result'), vspace,
+          red('Failed'), vspace,
           hspace, 'Spec did not return a boolean value ', newline,
           hspace, 'in spec at ', source.first, vspace,
-          hspace, red(klassinfo), inspector, newline
+          hspace, red(subklassinfo), inspector, (Class === raw ? ' Class' : ''), newline
         ].join
       end
     end
@@ -43,18 +45,28 @@ module Uspec
     end
 
     def message
-      "#{red klassinfo}#{raw.message}"
+      "#{red subklassinfo}#{raw.message}"
     end
 
-    def klassinfo
-      superklass ? "#{klass} < #{superklass}: " : "#{klass}: "
+    def subklassinfo
+      "#{handler.subklassinfo}: "
     end
 
     # Attempts to inspect an object
     def inspector
-      klass && klass.public_method_defined?(:inspect) ? raw.inspect : "#<#{klass}:0x#{get_id}>"
+      if String === raw && raw.include?(?\n) then
+        # if object is a multiline string, display it unescaped
+        [
+          vspace,
+          hspace, yellow('"""'), newline,
+          raw, normal, newline,
+          hspace, yellow('"""')
+        ].join
+      else
+        handler.inspector!
+      end
     rescue Exception => error
-      return "#<#{klass}:0x#{get_id}>" if error.message.include? get_id
+      return handler.simple_inspector if error.message.include? handler.get_id
 
       error_file, error_line, _ = error.backtrace[4].split ?:
 
@@ -76,38 +88,20 @@ module Uspec
       MSG
     end
 
-    # Returns the class of the object if it isn't already a class
-    def klass
-      Module === raw ? raw : ancestor_klasses[1]
-    end
-
-    # Returns the superclass of the object
-    def superklass
-      ancestor_klasses[2]
-    end
-
-    # Gets the object ID of an object
-    def get_id
-      raw.__id__.to_s(16) rescue 0
-    end
-
-    # Obtain the singleton class of an object
-    def singleton
-      @singleton ||= (class << raw; self; end) rescue raw.class
+    def success?
+      raw == true
     end
 
-    def ancestor_klasses
-      @ancestor_klasses ||= ancestors.select{|a| a.is_a? Class}
+    def failure?
+      raw != true && !@pending
     end
 
-    # Collects the ancestors of an object
-    def ancestors
-      @ancestors ||= safe_send singleton, :ancestors
+    def pending?
+      !!@pending
     end
 
-    # Works around BasicObject and other objects that are missing/overwrite important methods
-    def safe_send object, method, *args, &block
-      (Module === object ? Module : Object).instance_method(method).bind(object).call(*args, &block)
+    def pending!
+      @pending = true
     end
 
     def inspect

data/lib/uspec/stats.rb

@@ -1,30 +1,36 @@
 module Uspec
   class Stats
-    class << self
-      def results?
-        !results.empty?
-      end
-
-      def results
-        @results ||= clear_results!
-      end
-
-      def clear_results!
-        @results = Array.new
-      end
+    def initialize
+      clear_results!
+    end
+    attr :success, :failure, :pending
 
-      def exit_code
-        # checking for truthy isn't good enough, it must be exactly true!
-        failures = results.count{|result| result.raw != true }
-        failures > 255 ? 255 : failures
-      end
+    def clear_results!
+      @success = Array.new
+      @failure = Array.new
+      @pending = Array.new
+    end
 
-      def inspect
-        <<-INFO
+    def inspect
+      <<-INFO
         #{super} Failures: #{exit_code}
         #{results.map{|r| r.inspect}.join "\n\t" }
-        INFO
-      end
+      INFO
+    end
+
+    def results
+      @success + @failure + @pending
+    end
+
+    def summary
+      [
+        "test summary: ",
+        Uspec::Terminal.green("#{@success.size} successful"),
+        ", ",
+        Uspec::Terminal.red("#{@failure.size} failed"),
+        ", ",
+        Uspec::Terminal.yellow("#{@pending.size} pending")
+      ].join
     end
   end
 end

data/lib/uspec/version.rb

@@ -1,3 +1,3 @@
 module Uspec
-  VERSION = '0.2.2'
+  VERSION = '1.0.2'
 end

data/uspec.gemspec

@@ -22,6 +22,8 @@ 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"
 end

data/uspec/cli_spec.rb

@@ -1,5 +1,4 @@
 require_relative 'uspec_helper'
-require 'open3'
 
 spec 'shows usage' do
   output = capture do
@@ -9,22 +8,24 @@ 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.run_specs Array(path)
+    Uspec::CLI.new(Array(path)).run_specs
   end
 
-  output.include? 'I love passing tests'
+  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.run_specs Array(path)
+    Uspec::CLI.new(Array(path)).run_specs
   end
 
-  output.include? 'I love passing tests'
+  output.include?('I love passing tests') || output
 end
 
 spec 'broken requires in test files count as test failures' do

data/uspec/result_spec.rb

@@ -13,11 +13,32 @@ end
 class ::TestObject < BasicObject; end
 obj = TestObject.new
 
-spec "ensure BasicObject subclasses work" do
+spec "ensure BasicObject subclass instances work" do
   result = Uspec::Result.new "BasicObject Subclass Result", obj, []
-  expected = "#<TestObject:"
+  expected = "#<BasicObject/TestObject:"
   actual =  result.pretty
-  actual.include?(expected) || result.inspector
+  actual.include?(expected) || result.pretty
+end
+
+spec "display basic info about Object" do
+  result = Uspec::Result.new "Object Result", Object.new, []
+  expected = "Object < BasicObject: \e[0m#<Object:"
+  actual =  result.pretty
+  actual.include?(expected) || result.pretty
+end
+
+spec "display basic info about Array" do
+  result = Uspec::Result.new "Array Result", [], []
+  expected = "Array < Object"
+  actual =  result.pretty
+  actual.include?(expected) || result.pretty
+end
+
+spec "display basic info about Array class" do
+  result = Uspec::Result.new "Array Class Result", Array, []
+  expected = "Class < Module: \e[0mArray Class"
+  actual =  result.pretty
+  actual.include?(expected) || result.pretty
 end
 
 parent = [obj]
@@ -38,3 +59,11 @@ spec "display a useful error message when a user-defined inspect method fails" d
   actual =  result.pretty
   actual.include?(expected) || result.inspector
 end
+
+spec "display strings more like their actual contents" do
+  expected = "this string:\nshould display \e[42;2mproperly"
+  result = Uspec::Result.new "Inspect Fail Result", expected, []
+  actual =  result.pretty
+  actual.include?(expected) || result.inspector
+end
+

data/uspec/uspec_spec.rb

@@ -27,7 +27,7 @@ spec 'complains when spec block returns non boolean' do
     end
   end
 
-  output.include? 'Unknown Result'
+  output.include? 'Failed'
 end
 
 spec 'marks test as pending when no block supplied' do
@@ -45,13 +45,15 @@ 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
 
-    puts(Uspec::Stats.inspect) unless Uspec::Stats.exit_code == expected
+    exit __uspec_cli.exit_code
   end
   actual = $?.exitstatus
 
@@ -60,11 +62,15 @@ end
 
 spec 'if more than 255 failures, exit status is 255' do
   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 || $?

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: uspec
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.2
 platform: ruby
 authors:
 - Anthony M. Cook
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2021-05-04 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
@@ -48,12 +62,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".editorconfig"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.markdown
@@ -93,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: a shiny little spec framework for your apps!

data/.travis.yml

@@ -1,31 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.6.3
-  - 2.5.5
-  - 2.4.6
-  - 2.3.8
-  - 2.2.10
-  - 2.1.10
-  
-  - 2.0.0
-  - 1.9.3
-  - 1.9.2
-  - jruby-19mode
-  - ruby-head
-
-before_install:
-  - gem update bundler
-before_script:
-  - bundle exec gem list
-script: bundle exec uspec
-
-matrix:
-  allow_failures:
-    - rvm: 2.0.0
-    - rvm: 1.9.3
-    - rvm: 1.9.2
-    - rvm: ruby-head
-    - rvm: jruby-19mode
-
-sudo: false