uspec 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6763c9a1b9995386967bfb824889265c9bee560a86012728055bb107a4dd910
-  data.tar.gz: 74912e14810a2b03d596addcb14fe3696cd79efd3f8c104c49a4d65055aaca87
+  metadata.gz: 8d937f702b24f432fa7a241bd2fdd4f01a6119f6da79f98f1efd3e5f726cba22
+  data.tar.gz: 297733864622a5a0032918a9c6d83bac21e90df4b141c5898e7309a248cb1982
 SHA512:
-  metadata.gz: ead8cbbee34c75b337685d1c3533c6129d39d870cd9abf94b7365317760f6c42aeab6a7d30749fab352139c947669514c2870d3542bbcd1e2160e020f5574fcc
-  data.tar.gz: cfa24d4154e3b0a95257cd544fa45451c551e460cb3a7f6ac995c3446a1a09623729d03843c41bace49adfda04ea1a58e42cb1eb62e431a4e149d83afaa85e13
+  metadata.gz: e6bb5da0e65a04f60292ee4b74184e02081571eaf942c915eb239a9b98b7bb9f420d7a4da0b2fbacb9f370fb0769b2336deee1686fe250c5793953fe7ba8ed41
+  data.tar.gz: 6c1a3721ed8a8d41bc65583812a9abafeacf251dba910867b3567addb412c646237f64c68971a0cbc87e38f0abdaaeb8b652139c9f0b8a412e92dfae9c4e5609

data/.circleci/config.yml

@@ -1,16 +1,23 @@
 version: 2.1
 orbs:
-  ruby: circleci/ruby@0.1.2 
+  ruby: circleci/ruby@2.0.0
 
 jobs:
   build:
-    executor: ruby/default
+    docker:
+      - image: cimg/ruby:3.1.2
+
+    working_directory: ~/repo
+
     steps:
       - checkout
       - run:
-          name: Which bundler?
-          command: bundle -v
-      - ruby/bundle-install
+          name: install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+      # run tests!
       - run:
-          name: Uspec tests
-          command: bundle exec uspec
+          name: run tests
+          command:
+            bundle exec uspec

data/.gitignore

@@ -15,3 +15,6 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+
+tags
+TAGS

data/.ruby-version

@@ -1 +1 @@
-3.0.1
+3.3.0

data/lib/uspec/dsl.rb

@@ -2,6 +2,10 @@ 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
@@ -14,19 +18,35 @@ module Uspec
       @__uspec_cli.stats
     end
 
-    def spec description
+    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
+      o.spec_block
+    end
+
+    def spec description, &block
+      state = 0
       print ' -- ', description
 
-      if block_given? then
+      if block then
         begin
-          raw_result = yield
+          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_given? then
+      unless block then
+        state = 4
         result.pending!
       end
 
@@ -40,6 +60,7 @@ module Uspec
 
       print ': ', result.pretty, "\n"
     rescue => error
+      state = 5
       message = <<-MSG
         #{error.class} : #{error.message}
 
@@ -50,6 +71,8 @@ module Uspec
       puts
       warn message
       __uspec_stats.failure << Uspec::Result.new(message, error, caller)
+    ensure
+      return [state, error, result, raw_result]
     end
   end
 end

data/lib/uspec/result.rb

@@ -5,6 +5,8 @@ module Uspec
   class Result
     include Terminal
 
+    PREFIX = "#{Terminal.newline}#{Terminal.yellow}>\t#{Terminal.normal}"
+
     def initialize spec, raw, source
       @spec = spec
       @raw = raw
@@ -56,11 +58,9 @@ module Uspec
     def inspector
       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('"""')
+          raw.split(newline).unshift(newline).join(PREFIX), normal, newline,
         ].join
       else
         handler.inspector!

data/lib/uspec/version.rb

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

data/uspec/jump_spec.rb

@@ -0,0 +1,21 @@
+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

data/uspec/result_spec.rb

@@ -61,9 +61,9 @@ spec "display a useful error message when a user-defined inspect method fails" d
 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, []
+  string = "this string:\nshould display \e\[42;2mproperly"
+  expected = /this string:\n.*should display \e\[42;2mproperly/
+  result = Uspec::Result.new "Inspect Fail Result", string, []
   actual =  result.pretty
-  actual.include?(expected) || result.inspector
+  actual.match?(expected) || result.inspector
 end
-

data/uspec/test_specs/break_spec

@@ -0,0 +1,3 @@
+spec "break spec" do
+  break 12345
+end

data/uspec/test_specs/pending_spec

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

data/uspec/test_specs/return_spec

@@ -0,0 +1,3 @@
+spec "return spec" do
+  return 12345
+end

data/uspec/test_specs/value_spec

@@ -0,0 +1,3 @@
+spec 'non-boolean value spec' do
+  "abcdef"
+end

data/uspec/uspec_helper.rb

@@ -1,3 +1,5 @@
+require 'pry'
+
 require_relative '../lib/uspec'
 extend Uspec
 
@@ -17,4 +19,3 @@ def capture
 
   output
 end
-

data/uspec/uspec_spec.rb

@@ -7,7 +7,7 @@ spec 'catches errors' do
     end
   end
 
-  output.include? 'Exception'
+  output.include?('Exception') || output
 end
 
 spec 'catches even non-StandardError-subclass exceptions' do
@@ -17,7 +17,7 @@ spec 'catches even non-StandardError-subclass exceptions' do
     end
   end
 
-  output.include? 'Exception'
+  output.include?('Exception') || output
 end
 
 spec 'complains when spec block returns non boolean' do
@@ -27,7 +27,7 @@ spec 'complains when spec block returns non boolean' do
     end
   end
 
-  output.include? 'Failed'
+  output.include?('Failed') || output
 end
 
 spec 'marks test as pending when no block supplied' do
@@ -35,7 +35,7 @@ spec 'marks test as pending when no block supplied' do
     spec 'pending test'
   end
 
-  output.include? 'pending'
+  output.include?('pending') || output
 end
 
 spec 'should not define DSL methods on arbitrary objects' do
@@ -57,11 +57,11 @@ spec 'exit code is the number of failures' do
   end
   actual = $?.exitstatus
 
-  actual == expected || puts("", output) || $?
+  actual == expected || output
 end
 
-spec 'if more than 255 failures, exit status is 255' do
-  capture do
+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
@@ -73,5 +73,5 @@ spec 'if more than 255 failures, exit status is 255' do
     exit __uspec_cli.exit_code
   end
 
-  $?.exitstatus == 255 || $?
+  $?.exitstatus == 255 || [$?, output]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uspec
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Anthony M. Cook
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2024-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: that_object_is_so_basic
@@ -84,15 +84,20 @@ files:
 - lib/uspec/version.rb
 - uspec.gemspec
 - uspec/cli_spec.rb
+- uspec/jump_spec.rb
 - uspec/result_spec.rb
+- uspec/test_specs/break_spec
 - uspec/test_specs/broken_require_spec
+- uspec/test_specs/pending_spec
+- uspec/test_specs/return_spec
+- uspec/test_specs/value_spec
 - uspec/uspec_helper.rb
 - uspec/uspec_spec.rb
 homepage: http://github.com/acook/uspec#readme
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -107,8 +112,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: a shiny little spec framework for your apps!
 test_files: []