shindo 0.3.5 → 0.3.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 888bcf6781e3e4d16d3c58277eb19c992ee939a57e38aea00fe82cf0c7d0890c
+  data.tar.gz: cdfe64692891230c776c77b3bdf19ddd132c6186a55f082bfb2d504f620c2f90
+SHA512:
+  metadata.gz: b97f6871025c5be6baab36c4f957839badf929a2665141abd637c356945fc0b5047520385b621e9be929866277e838dd65a0bc5ca3cca4c3d3035c877c1d054a
+  data.tar.gz: 38dd3fc1958d55ddceb266e0b991142f1e7dc20d05897318e97093614cf2b2bd854cd2f11bd6f50845484e98788c6f66f8321913aa2d21e3f2291199a8a9c1f6

data/CONTRIBUTING.md

@@ -0,0 +1,18 @@
+## Getting Involved
+
+New contributors are always welcome, when it doubt please ask questions. We strive to be an open and welcoming community. Please be nice to one another.
+
+### Coding
+
+* Pick a task:
+  * Offer feedback on open [pull requests](https://github.com/geemus/shindo/pulls).
+  * Review open [issues](https://github.com/geemus/shindo/issues) for things to help on.
+  * [Create an issue](https://github.com/geemus/shindo/issues/new) to start a discussion on additions or features.
+* Fork the project, add your changes and tests to cover them in a topic branch.
+* Commit your changes and rebase against `geemus/shindo` to ensure everything is up to date.
+* [Submit a pull request](https://github.com/geemus/shindo/compare/).
+
+### Non-Coding
+
+* Offer feedback on open [issues](https://github.com/geemus/shindo/issues).
+* Organize or volunteer at events.

data/CONTRIBUTORS.md

@@ -0,0 +1,14 @@
+* Kenichi Kamiya <kachick1@gmail.com>
+* Kevin Ball <kball@causes.com>
+* Lee Jarvis <lee@jarvis.co>
+* Lincoln Stoll <me@lstoll.net>
+* Max Lincoln <max@devopsy.com>
+* Sergio Rubio <rubiojr@frameos.org>
+* Vít Ondruch <vondruch@redhat.com>
+* Wesley Beary <geemus@engineyard.com>
+* Wesley Beary <geemus@gmail.com>
+* Wesley Beary <wbeary@engineyard.com>
+* geemus (Wesley Beary) <geemus@gmail.com>
+* geemus (Wesley Beary) <wbeary@engineyard.com>
+* geemus <geemus@gmail.com>
+* starbelly <starbelly@pobox.com>

data/LICENSE.md

@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2009-2018 [CONTRIBUTORS.md](https://github.com/geemus/shindo/blob/master/CONTRIBUTORS.md)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -45,7 +45,7 @@ end
 
 require File.join(File.dirname(__FILE__), 'lib', 'shindo', 'rake')
 Shindo::Rake.new
-task :default => :tests
+task :default => :shindo_tests
 
 desc "Generate RCov test coverage and open in your browser"
 task :coverage do
@@ -140,3 +140,12 @@ task :validate do
     exit!
   end
 end
+
+task :shindo_tests do
+  system "shindo -build_error"
+  fail "Tests excluding build error should pass" unless $? == 0
+
+  puts "2"
+  system "shindo +build_error"
+  fail "The build_error test should fail" unless $? != 0
+end

data/bin/shindo

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
 @thread_locals = { :interactive => true }
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'verbose'))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'bin'))
+if Kernel.respond_to?(:require_relative)
+  require_relative File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'bin'))
+else
+  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'bin'))
+end

data/bin/shindont

@@ -1,4 +1,8 @@
 #!/usr/bin/env ruby
 @thread_locals = { :interactive => false }
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'taciturn'))
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'bin'))
+if Kernel.respond_to?(:require_relative)
+  require_relative File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'bin'))
+else
+  require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'bin'))
+end

data/lib/shindo.rb

@@ -5,7 +5,7 @@ module Shindo
   class Pending < StandardError; end
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.5'
+    VERSION = '0.3.10'
   end
 
   def self.tests(description = nil, tags = [], &block)
@@ -22,7 +22,7 @@ module Shindo
       @tag_stack          = []
       Thread.current[:reload] = false
       Thread.current[:tags] ||= []
-      Thread.current[:totals] ||= { :failed => 0, :pending => 0, :skipped => 0, :succeeded => 0 }
+      Thread.current[:totals] ||= { :failed => 0, :errored => 0, :pending => 0, :skipped => 0, :succeeded => 0 }
       @if_tagged = []
       @unless_tagged = []
       for tag in Thread.current[:tags]
@@ -33,6 +33,7 @@ module Shindo
           @unless_tagged << tag[1..-1]
         end
       end
+      @pending = nil
       Formatador.display_line
       tests(description, tags, &block)
     end
@@ -130,7 +131,7 @@ module Shindo
               instance_eval(&block)
             rescue Shindo::Pending
               @pending = true
-            rescue => error
+            rescue Exception => error
               error
             end
             [value, value.is_a?(expectation)]

data/lib/shindo/bin.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), '..', 'shindo')
 
-@interrupt = lambda do
+@interrupt = proc do
   unless Thread.main[:exit]
     Formatador.display_line('Gracefully Exiting... (ctrl-c to force)')
     Thread.main[:exit] = true
@@ -20,7 +20,7 @@ if File.directory?('lib')
 end
 
 helpers = Dir.glob(File.join('tests', '**', '*helper.rb')).sort_by {|helper| helper.count(File::SEPARATOR)}
-tags = []
+tags, tests = [], nil
 for argument in ARGV
   if argument.match(/^[\+\-]/)
     tags << argument
@@ -71,13 +71,14 @@ def run_in_thread(helpers, tests, thread_locals)
 end
 run_in_thread(helpers, tests, @thread_locals.merge({:tags => tags}))
 
-@totals   ||= { :failed => 0, :pending => 0, :succeeded => 0 }
-@success  = @totals[:failed] == 0
+@totals   ||= { :failed => 0, :errored => 0, :pending => 0, :succeeded => 0 }
+@success  = @totals[:failed] + @totals[:errored] == 0
 status = []
-status << "[red]#{@totals[:failed]} failed[/]," if @totals[:failed] > 0
-status << "[yellow]#{@totals[:pending]} pending[/]," if @totals[:pending] > 0
+status << "[red]#{@totals[:failed]} failed[/]" if @totals[:failed] > 0
+status << "[red]#{@totals[:errored]} errored[/]" if @totals[:errored] > 0
+status << "[yellow]#{@totals[:pending]} pending[/]" if @totals[:pending] > 0
 status << "[green]#{@totals[:succeeded]} succeeded[/]"
-status = status[0...-2].join(', ') << ' and ' << status[-1] if status.length > 3
+status = [status[0...-1].join(', '), 'and', status[-1]] if status.length >= 2
 status << "in [bold]#{Time.now - @started_at}[/] seconds"
 Formatador.display_lines(['', status.join(' '), ''])
 

data/lib/shindo/rake.rb

@@ -8,6 +8,7 @@ module Shindo
       desc "Run shindo tests"
       task :tests do
         system 'shindo'
+        fail if $? != 0
       end
     end
 

data/lib/shindo/taciturn.rb

@@ -20,6 +20,7 @@ module Shindo
     end
 
     def display_error(error)
+      Thread.current[:totals][:errored] += 1
       Formatador.display_lines(['', Thread.current[:file]])
       display_description_stack
       Formatador.display_line("[red]#{error.message} (#{error.class})[/]")

data/lib/shindo/verbose.rb

@@ -13,6 +13,7 @@ module Shindo
     end
 
     def display_error(error)
+      Thread.current[:totals][:errored] += 1
       Formatador.display_line("[red]#{error.message} (#{error.class})[/]")
       unless error.backtrace.empty?
         Formatador.indent do

data/shindo.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'shindo'
-  s.version           = '0.3.5'
-  s.date              = '2012-11-30'
+  s.version           = '0.3.10'
+  s.date              = '2021-03-01'
   s.rubyforge_project = 'shindo'
 
   ## Make sure your summary is short. The description may be as long
@@ -54,12 +54,18 @@ Gem::Specification.new do |s|
   ## those that are only needed during development
   # s.add_development_dependency('DEVDEPNAME', [">= 1.1.0", "< 2.0.0"])
 
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rdoc')
+
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE
   ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
   # = MANIFEST =
   s.files = %w[
+    CONTRIBUTING.md
+    CONTRIBUTORS.md
     Gemfile
+    LICENSE.md
     README.rdoc
     Rakefile
     bin/shindo
@@ -72,11 +78,14 @@ Gem::Specification.new do |s|
     shindo.gemspec
     tests/basic_tests.rb
     tests/bin_tests.rb
+    tests/data/contained-error
+    tests/data/error
     tests/data/exception
     tests/data/failure
     tests/data/negative
     tests/data/pending
     tests/data/positive
+    tests/data/sigint
     tests/data/success
     tests/tag_tests.rb
     tests/tests_helper.rb

data/tests/bin_tests.rb

@@ -28,4 +28,19 @@ Shindo.tests('bin') do
     tests('$?.exitstatus').returns(0) { $?.exitstatus }
   end
 
-end
+  tests('error') do
+    @output = bin(path('error'))
+    includes('ok + returns true')                   { @output }
+    includes('1 errored and 1 succeeded')           { @output }
+
+    tests('$?.exitstatus').returns(1) { $?.exitstatus }
+  end
+
+  tests('contained-error') do
+    @output = bin(path('contained-error'))
+    includes('ok + returns true')                   { @output }
+    includes('1 failed, 1 errored and 1 succeeded') { @output }
+
+    tests('$?.exitstatus').returns(1) { $?.exitstatus }
+  end
+end

data/tests/data/contained-error

@@ -0,0 +1,24 @@
+def given_something
+  raise 'ERROR!'
+end
+
+Shindo.tests('Shindo build errors', ['build_error']) do
+  tests('ok').returns(true) do
+    true
+  end
+
+  tests('contained') do
+    given_something do
+      tests('success').returns(true) do
+        false
+      end
+      tests('never_reached').return(true) do
+        true
+      end
+    end
+  end
+
+  tests('fail').returns(true) do
+    false
+  end
+end

data/tests/data/error

@@ -0,0 +1,22 @@
+def given_something
+  raise 'ERROR!'
+end
+
+Shindo.tests('Shindo build errors', ['build_error']) do
+  tests('ok').returns(true) do
+    true
+  end
+
+  given_something do
+    tests('success').returns(true) do
+      false
+    end
+    tests('never_reached').return(true) do
+      true
+    end
+  end
+
+  tests('fail').returns(true) do
+    false
+  end
+end

data/tests/data/sigint

@@ -0,0 +1,4 @@
+Shindo.tests do
+  test('success') { true }
+  sleep(20)
+end

data/tests/tests_helper.rb

@@ -1,9 +1,10 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo'))
+require 'open3'
 
 BIN = File.join(File.dirname(__FILE__), '..', 'bin', 'shindo')
 
 def bin(arguments)
-  `RUBYOPT="-rubygems" #{BIN} #{arguments}`
+  `RUBYOPT="-rrubygems" #{BIN} #{arguments}`
 end
 
 def path(name)

metadata

@@ -1,32 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: shindo
 version: !ruby/object:Gem::Version
-  version: 0.3.5
-  prerelease: 
+  version: 0.3.10
 platform: ruby
 authors:
 - geemus (Wesley Beary)
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: formatador
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: rdoc
+  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'
 description: Work with your tests, not against them.
 email: geemus@gmail.com
 executables:
@@ -36,7 +61,10 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- CONTRIBUTING.md
+- CONTRIBUTORS.md
 - Gemfile
+- LICENSE.md
 - README.rdoc
 - Rakefile
 - bin/shindo
@@ -49,40 +77,38 @@ files:
 - shindo.gemspec
 - tests/basic_tests.rb
 - tests/bin_tests.rb
+- tests/data/contained-error
+- tests/data/error
 - tests/data/exception
 - tests/data/failure
 - tests/data/negative
 - tests/data/pending
 - tests/data/positive
+- tests/data/sigint
 - tests/data/success
 - tests/tag_tests.rb
 - tests/tests_helper.rb
 homepage: http://github.com/geemus/shindo
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -213069165045248108
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: shindo
-rubygems_version: 1.8.23
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 2
 summary: Simple depth first Ruby testing.
 test_files: []