shindo 0.3.4 → 0.3.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 0e242a66a1e32f046b9679b17b4bfc81e6c96acca406c59a142a315192f18f91
+  data.tar.gz: 1b24e9ce0a145f077b3e30eb2bc2b6e6ea5f76a855adec26ebde472f9c139db3
+SHA512:
+  metadata.gz: cfcc6bc96a24b0f0a986b53a587c27a1dbe391531206206ad29a908185e616f54f374b22970f1876becebc39a6365dba82c06e01bd380eac04a24959cc8f45dd
+  data.tar.gz: 8da45cf108ab6a42195f01d5d7b272c4bd9070bd177662ec8ef557c1f7bf24c68abde37fda0a3b14184a8249badc20f9ad3074403d0f196d94e43f5d6da67f20

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
@@ -55,7 +55,7 @@ task :coverage do
   sh "open coverage/index.html"
 end
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "#{name} #{version}"
@@ -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.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'verbose')
-require File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'bin')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'verbose'))
+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.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'taciturn')
-require File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'bin')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'shindo', 'taciturn'))
+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

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'formatador'
 
 module Shindo
@@ -6,7 +5,7 @@ module Shindo
   class Pending < StandardError; end
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.4'
+    VERSION = '0.3.9'
   end
 
   def self.tests(description = nil, tags = [], &block)
@@ -23,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]
@@ -34,6 +33,7 @@ module Shindo
           @unless_tagged << tag[1..-1]
         end
       end
+      @pending = nil
       Formatador.display_line
       tests(description, tags, &block)
     end
@@ -53,7 +53,7 @@ module Shindo
     def tests(description, tags = [], &block)
       return self if Thread.main[:exit] || Thread.current[:reload]
 
-      tags = [*tags]
+      tags = [*tags].collect { |tag| tag.to_s }
       @tag_stack.push(tags)
       @befores.push([])
       @afters.push([])
@@ -131,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,10 +71,11 @@ 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 << "[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

data/lib/shindo/rake.rb

@@ -2,10 +2,13 @@ module Shindo
 
   class Rake
 
+    include ::Rake::DSL
+
     def initialize
       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.4'
-  s.date              = '2011-03-21'
+  s.version           = '0.3.9'
+  s.date              = '2020-12-04'
   s.rubyforge_project = 'shindo'
 
   ## Make sure your summary is short. The description may be as long
@@ -53,13 +53,24 @@ Gem::Specification.new do |s|
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
   # s.add_development_dependency('DEVDEPNAME', [">= 1.1.0", "< 2.0.0"])
+  
+  if RUBY_VERSION.to_f <= 1.8
+    s.add_development_dependency('rake', '~> 10.5')
+  else
+    s.add_development_dependency('rake')
+  end
+
+  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 +83,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, 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, 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)
-  `#{BIN} #{arguments}`
+  `RUBYOPT="-rrubygems" #{BIN} #{arguments}`
 end
 
 def path(name)

metadata

@@ -1,50 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shindo
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 4
-  version: 0.3.4
+version: !ruby/object:Gem::Version
+  version: 0.3.9
 platform: ruby
-authors: 
+authors:
 - geemus (Wesley Beary)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-21 00:00:00 -07:00
-default_executable: shindo
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2020-12-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: formatador
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    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: 
+executables:
 - shindo
 - shindont
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
+- CONTRIBUTING.md
+- CONTRIBUTORS.md
 - Gemfile
+- LICENSE.md
 - README.rdoc
 - Rakefile
 - bin/shindo
@@ -57,47 +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
-has_rdoc: true
 homepage: http://github.com/geemus/shindo
 licenses: []
-
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options:
+- "--charset=UTF-8"
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: shindo
-rubygems_version: 1.4.1
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 2
 summary: Simple depth first Ruby testing.
 test_files: []
-