uspec 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 641541f23b26b9c14b11950c55f9161aa89142aa41b8627a9f2dcbe54ac11584
-  data.tar.gz: a02353485421133ac4fa3eb639a7942992152faee3db2f484da4da56917014d6
+  metadata.gz: adfc4745c3e11f9afa82923366d86c5515745666b98606ded26418cb520b9bb9
+  data.tar.gz: b62be6efc2f67ba658c2701b6984764d7fdb36e0acc79f1e20378efeef1c534c
 SHA512:
-  metadata.gz: 1776508a0bc6ca4da5e90167072244305b9994b407d75fce53048bda6cad1a439adee75ecb0ddf534728f6ab6ad268a44588013a57f225df74f38a0e1c85a5c8
-  data.tar.gz: 1b39cb64033e21f466ee0a8edaea706e20589f92b3cbae80eb41e624c3dca9f24f1c376f277a7c5061f8b5d20608ea49cf1de71b9014409d4d5bc28b6d1ad702
+  metadata.gz: b89e9ab10352cbe0d18278c1d5aa823b72d3d9c40dbf49d0c2791b6f92748841d2018e6ac1ddee04016fa40c6353a76c94d8c6c7bfe11c7197a60606e38180b5
+  data.tar.gz: 51dc3f357ffff68b6e7ffc3d1a81376ad2755813490a2749e55bbcef6142ae3432f92076b7dcd5599625f55fb77ce6a8f099612972119bf90f24315e30d7f688

data/.circleci/config.yml

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

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?

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)
+    self.class.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?
+        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,
@@ -53,9 +55,9 @@ module Uspec
     # Attempts to inspect an object
     def inspector
       if String === raw && raw.include?(?\n) then
-        # if object is a multiline string, display it escaped and unescaped
+        # if object is a multiline string, display it unescaped
         [
-          handler.inspector!, vspace,
+          vspace,
           hspace, yellow('"""'), newline,
           raw, normal, newline,
           hspace, yellow('"""')
@@ -86,6 +88,22 @@ module Uspec
       MSG
     end
 
+    def success?
+      raw == true
+    end
+
+    def failure?
+      raw != true && !@pending
+    end
+
+    def pending?
+      !!@pending
+    end
+
+    def pending!
+      @pending = true
+    end
+
     def inspect
       "#{self.class} for `#{spec}` -> #{pretty}"
     end

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.3.0'
+  VERSION = '1.0.0'
 end

data/uspec/cli_spec.rb

@@ -12,7 +12,7 @@ end
 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
@@ -21,7 +21,7 @@ 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

data/uspec/uspec_spec.rb

@@ -45,7 +45,7 @@ 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
+    __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
@@ -53,7 +53,7 @@ spec 'exit code is the number of failures' do
       end
     end
 
-    puts(Uspec::Stats.inspect) unless Uspec::Stats.exit_code == expected
+    exit __uspec_cli.exit_code
   end
   actual = $?.exitstatus
 
@@ -62,13 +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
+    __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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uspec
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Anthony M. Cook
@@ -62,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

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