shoe 0.7.1 → 0.8.0

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+== 0.8.0 -- 2011 February 21
+
+* Rubygems 1.5.0 removes <tt>Gem::Validator#unit_test</tt>. Switch to using <tt>testrb</tt> for <tt>Shoe::Tasks::Test</tt>.
+* Shoe is now testable with rubygems-test.
+
+== 0.7.1 -- 2010 October 12
+
+* Include top-level rdoc files in the shoe gem.
+
 == 0.7.0 -- 2010 October 11
 
 * 1.9 compatibility!

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shoe (0.7.1)
+    shoe (0.8.0)
       rake (~> 0.8.7)
 
 GEM
@@ -34,6 +34,5 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   cucumber (~> 0.6.4)
-  rake (~> 0.8.7)
   ronn (~> 0.5)
   shoe!

data/README.rdoc

@@ -2,10 +2,9 @@
 
 Configuration-free Rake tasks that {read your
 gemspec}[http://yehudakatz.com/2010/04/02/using-gemspecs-as-intended/] and
-re-use
-{built-in}[http://rubygems.rubyforge.org/rubygems-update/Gem/Ext/ExtConfBuilder.html]
-{Rubygems}[http://rubygems.rubyforge.org/rubygems-update/Gem/DocManager.html]
-{functionality}[http://rubygems.rubyforge.org/rubygems-update/Gem/Validator.html].
+re-use built-in
+{Rubygems}[http://rubygems.rubyforge.org/rubygems-update/Gem/Ext/ExtConfBuilder.html]
+{functionality}[http://rubygems.rubyforge.org/rubygems-update/Gem/DocManager.html].
 
 Shoe works great on both Ruby 1.8 and 1.9.
 

data/TODO.rdoc

@@ -1,6 +1,7 @@
 = Next Up
 
-* Start running on 1.9: Gem::Validator uses MiniTest::Unit.
+* Re-work for rubygems-test. https://github.com/erikh/rubygems-test
+* Use minitest/pride for colors.
 
 = Someday Maybe
 

data/lib/shoe/extensions.rb

@@ -2,6 +2,5 @@ module Shoe
   module Extensions
     autoload :DocManager,    'shoe/extensions/doc_manager'
     autoload :Specification, 'shoe/extensions/specification'
-    autoload :Validator,     'shoe/extensions/validator'
   end
 end

data/lib/shoe/tasks/test.rb

@@ -1,42 +1,39 @@
-require 'rubygems/validator'
-
 module Shoe
   module Tasks
 
     # Defines <tt>`rake test`</tt> to run your tests.
     #
-    # Uses
-    # <tt>{Gem::Validator}[http://rubygems.rubyforge.org/rubygems-update/Gem/Validator.html]</tt>,
-    # so tests are run locally just as they will be with <tt>`{gem
-    # check}[http://docs.rubygems.org/read/chapter/10#page30] --test
-    # your_project`</tt>.
+    # Uses <tt>testrb</tt> to run your <tt>test_files</tt>.
     #
     # To enable and configure, edit the
     # <tt>test_files[http://docs.rubygems.org/read/chapter/20#test_files]</tt>
     # in your gemspec.
     #
+    # (You may also want to add a <tt>.gemtest</tt> file to the root of your
+    # gem, so that others can run your tests via
+    # {rubygems-test}[https://github.com/rubygems/rubygems-test].)
+    #
     # = A Few Precautions
     #
-    # * Using <tt>Gem::Validator</tt> means that only <tt>Test::Unit</tt> (all
+    # * Using <tt>testrb</tt> means that only <tt>Test::Unit</tt> (all
     #   Rubies) and <tt>MiniTest::Unit</tt> (Ruby 1.9) tests will be run.
     #
     # * You'll need to <tt>Bundler.setup(:default, :development)</tt> in your
-    #   <tt>Rakefile</tt> so that the <tt>Gem::Validator</tt> can find your
-    #   code. (If you put this line in your <tt>test_helper</tt> instead,
-    #   you'll break <tt>`gem check --test`</tt> for people who don't have
-    #   Bundler installed.)
-    #
-    # * The <tt>test</tt> directory will not be in the <tt>$LOAD_PATH</tt>, so
-    #   you'll have to <tt>require 'test/test_helper'</tt>.
-    #
-    # = Pretty Colors
+    #   <tt>Rakefile</tt> so that <tt>testrb</tt> can find your code.
     #
-    # For Ruby 1.8, Shoe patches the <tt>Gem::Validator</tt> to play nicely with
-    # {redgreen}[http://rubygems.org/gems/redgreen]</tt>.
+    # * Your <tt>test_files</tt> need only contain actual tests -- support
+    #   files, like test_helper, need not be included.
     #
-    # For Ruby 1.9, <tt>require 'shoe/util/minitest_colors'</tt> in your
-    # <tt>test_helper</tt>.
+    # * The <tt>LOAD_PATH</tt> will contain all of the immediate parent
+    #   directories of your <tt>test_files</tt>. You should not count on the
+    #   top-level project directory being included -- in other words,
+    #   <tt>"require 'test/test_helper'"</tt> may not work, and <tt>"require
+    #   'test_helper'"</tt> will only work if <tt>test_helper</tt> is a sibling
+    #   of one of your <tt>test_files</tt>.
     #
+    # For further clarification on these guidelines, you may find it helpful to
+    # browse {Shoe's own test
+    # setup}[https://github.com/matthewtodd/shoe/tree/master/test].
     class Test < Task
       def active?
         !spec.test_files.empty?
@@ -49,8 +46,7 @@ module Shoe
         END
 
         task :test do
-          Gem::Validator.extend(Extensions::Validator)
-          Gem::Validator.new.unit_test(spec)
+          system 'testrb', *spec.test_files
         end
 
         task :prepare

data/lib/shoe/version.rb

@@ -1,3 +1,3 @@
 module Shoe
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

data/man/shoe.3

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.5
 .\" http://github.com/rtomayko/ronn/
 .
-.TH "SHOE" "3" "October 2010" "Matthew Todd" "RubyGems Manual"
+.TH "SHOE" "3" "February 2011" "Matthew Todd" "RubyGems Manual"
 .
 .SH "NAME"
 \fBshoe\fR \-\- standard Rake tasks for your RubyGems project
@@ -48,7 +48,8 @@ be available via \fBgem\-man(1)\fR once your gem is installed.)
 .
 .TP
 \fBrake test\fR
-Run tests with RubyGems' built\-in Gem::Validator, which reads the \fBtest_files\fR field in your Gem::Specification to know which tests to run.
+Run tests with Ruby's built\-in testrb, reading the \fBtest_files\fR field in your
+Gem::Specification to know which tests to run.
 .
 .P
 Note these tasks check conditions before defining themselves, so that your \fBrake \-\-tasks\fR list stays relevant and compact. You won't see all the tasks all

data/man/shoe.3.ronn

@@ -38,8 +38,8 @@ Gem::Specification, and they assume you are using `git(1)`.
   be available via `gem-man(1)` once your gem is installed.)
 
 * `rake test`:
-  Run tests with RubyGems' built-in Gem::Validator, which reads the
-  `test_files` field in your Gem::Specification to know which tests to run.
+  Run tests with Ruby's built-in testrb, reading the `test_files` field in your
+  Gem::Specification to know which tests to run.
 
 Note these tasks check conditions before defining themselves, so that your
 `rake --tasks` list stays relevant and compact. You won't see all the tasks all

data/shoe.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'ronn',     '~> 0.5'
 
   s.files            = `git ls-files`.split("\n")
-  s.test_files       = `git ls-files -- test`.split("\n")
+  s.test_files       = `git ls-files -- test/*_test.rb`.split("\n")
   s.extra_rdoc_files = `git ls-files -- {**/,}*.rdoc`.split("\n")
   s.require_paths    = ['lib']
 

data/test/helper.rb

@@ -11,4 +11,10 @@ class Shoe::TestCase < Test::Unit::TestCase
   end
 end
 
-Dir['test/support/*.rb'].each { |path| require path }
+require 'support/assertions'
+require 'support/command_runner'
+require 'support/declarative_tests'
+require 'support/example_project'
+require 'support/file_manipulation'
+require 'support/gemspec_manipulation'
+require 'support/project_files'

data/test/{system/rake_test.rb → rake_test.rb}

@@ -1,4 +1,4 @@
-require 'test/helper'
+require 'helper'
 
 class RakeTest < Shoe::TestCase
   describe 'rake clean' do
@@ -34,28 +34,26 @@ class RakeTest < Shoe::TestCase
   end
 
   describe 'rake cucumber' do
-    requires 'cucumber' do
-      it 'is active only if there are profiles in cucumber.yml' do
-        add_development_dependency 'cucumber'
-        assert_task_added 'cucumber', 'cucumber:wip' do
-          add_files_for_cucumber
-        end
-      end
-
-      it 'runs cucumber features' do
-        add_development_dependency 'cucumber'
+    it 'is active only if there are profiles in cucumber.yml' do
+      add_development_dependency 'cucumber'
+      assert_task_added 'cucumber', 'cucumber:wip' do
         add_files_for_cucumber
-        system 'rake cucumber'
-        assert_match '1 scenario (1 passed)', output
       end
+    end
 
-      it 'depends (perhaps indirectly) on rake compile' do
-        add_development_dependency 'cucumber'
-        add_files_for_c_extension
-        add_files_for_cucumber 'require "foo/extension"'
-        system 'rake cucumber'
-        assert_match '1 scenario (1 passed)', output
-      end
+    it 'runs cucumber features' do
+      add_development_dependency 'cucumber'
+      add_files_for_cucumber
+      system 'rake cucumber'
+      assert_match '1 scenario (1 passed)', output
+    end
+
+    it 'depends (perhaps indirectly) on rake compile' do
+      add_development_dependency 'cucumber'
+      add_files_for_c_extension
+      add_files_for_cucumber 'require "foo/extension"'
+      system 'rake cucumber'
+      assert_match '1 scenario (1 passed)', output
     end
   end
 
@@ -75,29 +73,27 @@ class RakeTest < Shoe::TestCase
   end
 
   describe 'rake ronn' do
-    requires 'ronn' do
-      it 'is enabled if there are ronn files' do
-        add_development_dependency 'ronn'
-        assert_task_added 'ronn' do
-          add_files_for_ronn
-        end
-      end
-
-      it 'generates man pages' do
-        add_development_dependency 'ronn'
+    it 'is enabled if there are ronn files' do
+      add_development_dependency 'ronn'
+      assert_task_added 'ronn' do
         add_files_for_ronn
-        system 'MANPAGER=/bin/cat rake ronn'
-        assert_file 'man/foo.3'
-        assert_match 'FOO(3)', output
       end
+    end
 
-      it 'registers itself as a prerequisite of rake build' do
-        add_development_dependency 'ronn'
-        add_files_for_ronn
-        mask_gemspec_todos
-        system 'rake build'
-        assert_file 'man/foo.3'
-      end
+    it 'generates man pages' do
+      add_development_dependency 'ronn'
+      add_files_for_ronn
+      system 'MANPAGER=/bin/cat rake ronn'
+      assert_file 'man/foo.3'
+      assert_match 'FOO(3)', output
+    end
+
+    it 'registers itself as a prerequisite of rake build' do
+      add_development_dependency 'ronn'
+      add_files_for_ronn
+      mask_gemspec_todos
+      system 'rake build'
+      assert_file 'man/foo.3'
     end
   end
 

data/test/support/declarative_tests.rb

@@ -6,14 +6,6 @@ module DeclarativeTests
     @context.pop
   end
 
-  def requires(lib, &block)
-    require lib
-  rescue LoadError
-    warn "#{lib} is not available. Skipping some tests."
-  else
-    block.call
-  end
-
   def it(name, &block)
     describe(name) do
       define_method("test #{@context.join(' ')}", &block)

data/test/support/example_project.rb

@@ -12,6 +12,8 @@ module ExampleProject
     self.initial_directory = Dir.pwd
     self.working_directory = Dir.mktmpdir
 
+    ENV['BUNDLE_GEMFILE'] = nil
+
     Dir.chdir working_directory
     system 'bundle gem foo'
     Dir.chdir 'foo'
@@ -23,8 +25,6 @@ module ExampleProject
       require 'shoe'
       Shoe.install_tasks
     END
-
-    ENV['BUNDLE_GEMFILE'] = nil
   end
 
   def teardown

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: shoe
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
-  segments: 
-  - 0
-  - 7
-  - 1
-  version: 0.7.1
+  prerelease: 
+  version: 0.8.0
 platform: ruby
 authors: 
 - Matthew Todd
@@ -15,72 +10,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +03:00
+date: 2011-02-21 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: rake
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
         version: 0.8.7
-  requirement: *id001
   type: :runtime
-  name: rake
   prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: bundler
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
-  requirement: *id002
   type: :development
-  name: bundler
   prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: cucumber
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 6
-        - 4
         version: 0.6.4
-  requirement: *id003
   type: :development
-  name: cucumber
   prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: ronn
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 5
         version: "0.5"
-  requirement: *id004
   type: :development
-  name: ronn
   prerelease: false
+  version_requirements: *id004
 description: Configuration-free Rake tasks that read your gemspec. These tasks re-use built-in Rubygems functionality so you can be confident you're shipping what you think you are.
 email: 
 - matthew.todd@gmail.com
@@ -93,6 +69,7 @@ extra_rdoc_files:
 - README.rdoc
 - TODO.rdoc
 files: 
+- .gemtest
 - .gitignore
 - .rvmrc
 - CHANGELOG.rdoc
@@ -105,7 +82,6 @@ files:
 - lib/shoe/extensions.rb
 - lib/shoe/extensions/doc_manager.rb
 - lib/shoe/extensions/specification.rb
-- lib/shoe/extensions/validator.rb
 - lib/shoe/tasks.rb
 - lib/shoe/tasks/clean.rb
 - lib/shoe/tasks/compile.rb
@@ -120,6 +96,7 @@ files:
 - man/shoe.3.ronn
 - shoe.gemspec
 - test/helper.rb
+- test/rake_test.rb
 - test/support/assertions.rb
 - test/support/command_runner.rb
 - test/support/declarative_tests.rb
@@ -127,8 +104,6 @@ files:
 - test/support/file_manipulation.rb
 - test/support/gemspec_manipulation.rb
 - test/support/project_files.rb
-- test/support/redgreen.rb
-- test/system/rake_test.rb
 has_rdoc: true
 homepage: http://github.com/matthewtodd/shoe
 licenses: []
@@ -138,10 +113,10 @@ rdoc_options:
 - --main
 - README.rdoc
 - --title
-- shoe-0.7.1
+- shoe-0.8.0
 - --inline-source
 - --webcvs
-- http://github.com/matthewtodd/shoe/blob/v0.7.1/
+- http://github.com/matthewtodd/shoe/blob/v0.8.0/
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -149,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 846404257
       segments: 
       - 0
       version: "0"
@@ -158,27 +133,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: 
 - git
 rubyforge_project: shoe
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Configuration-free Rake tasks that read your gemspec.
 test_files: 
-- test/helper.rb
-- test/support/assertions.rb
-- test/support/command_runner.rb
-- test/support/declarative_tests.rb
-- test/support/example_project.rb
-- test/support/file_manipulation.rb
-- test/support/gemspec_manipulation.rb
-- test/support/project_files.rb
-- test/support/redgreen.rb
-- test/system/rake_test.rb
+- test/rake_test.rb

data/lib/shoe/extensions/validator.rb

@@ -1,56 +0,0 @@
-
-module Shoe
-  module Extensions
-
-    module Validator
-      def self.extended(base)
-        if RUBY_VERSION < '1.9'
-          require 'test/unit'
-          Test::Unit.run = true
-          base.send :include, Ruby18::InstanceMethods
-          base.send :remove_const, :TestRunner
-          base.send :const_set,    :TestRunner, Ruby18::TestRunner
-        else
-          require 'minitest/unit'
-          MiniTest::Unit.class_eval('@@installed_at_exit = true')
-        end
-      end
-
-      module Ruby18 #:nodoc:
-        module InstanceMethods #:nodoc:
-          def alert_error(*args)
-            # no-op
-          end
-
-          def unit_test(*args)
-            exit(1) unless super.passed?
-          end
-        end
-
-        module TestRunner #:nodoc:
-          # Conforms the normal TestRunner interface to the slightly different form
-          # called by Gem::Validator.
-          #
-          # Note that we use Test::Unit::AutoRunner (rather than going directly for
-          # Test::Unit::UI::Console::TestRunner) in order to give redgreen a chance
-          # to register itself, should it have been required in one of the
-          # test_files.
-          def self.run(suite, ui)
-            runner = Test::Unit::AutoRunner.new(false)
-            runner.collector = lambda { suite }
-            runner.run.extend(BooleanPassed)
-          end
-
-          private
-
-          module BooleanPassed #:nodoc:
-            def passed?
-              self
-            end
-          end
-        end
-      end
-    end
-
-  end
-end

data/test/support/redgreen.rb

@@ -1,6 +0,0 @@
-begin
-  require 'redgreen' if $stdout.tty?
-rescue LoadError
-  # Since we don't have hard gem dependencies for testing, folks can run `gem
-  # check --test shoe` without installing anything else.
-end