shoe 0.6.0 → 0.6.1

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+== 0.6.1 -- 2010 April 22
+
+* Reformat warning messages.
+* Sample-require redgreen in the generated test/helper.
+* Include common dvelopment dependencies in the generated gemspec.
+* Fix a couple of typos.
+* Document extensions to OptionParser.
+
 == 0.6.0 -- 2010 April 20
 
 * Add --webcvs to rdoc_options in generated gemspec.

data/bin/shoe

@@ -7,7 +7,7 @@ rescue LoadError
 
   lib = File.expand_path('../../lib', __FILE__)
   if !$:.include?(lib)
-    warn "#{$!}. Trying again with #{lib} on the $LOAD_PATH."
+    warn "WARN: #{$!}.\n  Trying again with #{lib} on the $LOAD_PATH..."
     $:.unshift(lib)
     retry
   end

data/data/shoe/templates/gemspec.erb

@@ -20,8 +20,10 @@ Gem::Specification.new do |spec|
   # You may find these helpful:
   # spec.requirements = ['git'] # If your library shells out to git
   # spec.required_rubygems_version = ">= 1.3.6" # If you depend on prerelease gems
-  # spec.add_bundler_dependencies # I'm not sure how to use this yet...
   # spec.add_runtime_dependency 'nokogiri' # Or what have you
+  # spec.add_development_dependency 'cucumber'
+  # spec.add_development_dependency 'redgreen'
+  # spec.add_development_dependency 'ronn'
   spec.add_development_dependency 'shoe'
 
   # This may not be the best way to select files for inclusion in your gem, but

data/data/shoe/templates/manpage.erb

@@ -11,14 +11,14 @@ Write your description here.
 
 ## OPTIONS
 
-`<%= name %>` also responds to the followng standard options:
+`<%= name %>` also responds to the following standard options:
 
 * `-h`, `--help`:
   Print a help message and exit.
 
 * `-v`, `--version`[=all]:
-  Print `shoe`'s version number and exit. If `=all` is given, also print
-  version numbers of `shoe`'s dependencies. (This is standard `optparse` behavior
+  Print `<%= name %>`'s version number and exit. If `=all` is given, also print
+  version numbers of `<%= name %>`'s dependencies. (This is standard `optparse` behavior
   that deserves more attention!)
 
 ## AUTHOR

data/data/shoe/templates/test_helper.erb

@@ -1,2 +1,9 @@
 require 'test/unit'
 require '<%= name %>'
+
+begin
+  require 'redgreen' if $stdout.tty?
+rescue LoadError
+  # It's nice not to have hard dependencies on any gems for testing, so that
+  # it's super-easy for your users to run `gem check --test <%= name %>.`
+end

data/features/generator.feature

@@ -27,6 +27,6 @@ Feature: Getting started
     Given I have created a directory called "my_project"
     And I have created a file called "my_project/Rakefile" containing "# RAKEFILE CONTENTS"
     When I run shoe inside "my_project"
-    Then I should see "Rakefile exists. Not clobbering." on standard error
+    Then I should see "WARN: not clobbering existing Rakefile" on standard error
     And the contents of "my_project/Rakefile" should still be "# RAKEFILE CONTENTS"
 

data/lib/shoe.rb

@@ -3,7 +3,7 @@ require 'rbconfig'
 require 'rbconfig/datadir'
 
 module Shoe
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 
   autoload :Extensions, 'shoe/extensions'
   autoload :Generator,  'shoe/generator'
@@ -13,7 +13,7 @@ module Shoe
     @@datadir ||= begin
       datadir = RbConfig.datadir('shoe')
       if !File.exist?(datadir)
-        warn "#{datadir} does not exist. Trying again with relative data directory."
+        warn "WARN: #{datadir} does not exist.\n  Trying again with relative data directory..."
         datadir = File.expand_path('../../data/shoe', __FILE__)
       end
       Pathname.new(datadir)

data/lib/shoe/extensions/option_parser.rb

@@ -1,23 +1,52 @@
 module Shoe
   module Extensions
 
+    # This extension allows for default options in OptionParser, processing
+    # them before any given options and appending them nicely to the help
+    # message. (It also does the conventional thing and errors with usage when
+    # there's trouble parsing options.)
+    #
+    # Note that it's important to use #order rather than #permute, to ensure
+    # that the given options have a chance to override the defaults. (These are
+    # <tt>POSIX</tt>-ly correct semantics.)
+    #
+    # To use:
+    #   parser = OptionsParser.new do |opts|
+    #              opts.extend(Shoe::Extensions::OptionParser)
+    #              opts.defaults = %w(--foo --no-bar --baz=5)
+    #              # ... and so on ...
+    #            end
+    #
+    #   parser.order(ARGV)
     module OptionParser
-      attr_accessor :defaults
+      attr_reader :defaults
+
+      def defaults=(defaults)
+        @defaults = defaults.extend(Defaults)
+      end
 
       def order(*args, &block)
         begin
-          super(defaults.dup.concat(*args), &block)
+          super(*defaults.followed_by(*args), &block)
         rescue ::OptionParser::ParseError
           abort($!)
         end
       end
 
-      def summarize(*args, &block)
-        return <<-END.gsub(/^ {10}/, '')
-          #{super}
-          Defaults:
-          #{summary_indent}#{defaults.join(' ')}
-        END
+      def help
+        defaults.help(super, summary_indent)
+      end
+
+      private
+
+      module Defaults #:nodoc:
+        def followed_by(*args)
+          dup.concat(*args)
+        end
+
+        def help(before, indent)
+          "#{before}\nDefaults:\n#{indent}#{join ' '}"
+        end
       end
     end
 

data/lib/shoe/extensions/pathname.rb

@@ -4,7 +4,7 @@ module Shoe
     module Pathname
       def install(contents, mode)
         if exist?
-          warn "#{to_s} exists. Not clobbering."
+          warn "WARN: not clobbering existing #{to_s}"
         else
           open('w') { |file| file.write(contents) }
           chmod(mode)

data/lib/shoe/tasks/cucumber.rb

@@ -21,7 +21,7 @@ module Shoe
         begin
           require 'cucumber/rake/task'
         rescue LoadError
-          warn "It seems you don't have cucumber installed."
+          warn "WARN: Please `gem install cucumber`."
         else
           define_tasks
         end

data/lib/shoe/tasks/release.rb

@@ -39,7 +39,7 @@ module Shoe
           sh "git tag #{version_tag(spec.version)}"
 
           if there_is_no_tag_for('semver')
-            warn "It seems you don't have a 'semver' tag. See http://semver.org/."
+            warn "WARN: Please `git tag semver`. <http://semver.org/>"
           end
 
           if there_is_a_remote_called('origin')

data/lib/shoe/tasks/ronn.rb

@@ -33,7 +33,7 @@ module Shoe
         begin
           require 'ronn'
         rescue LoadError
-          warn "It seems you don't have 'ronn' installed."
+          warn "WARN: Please `gem install ronn`."
         else
           define_tasks
         end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Matthew Todd
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 +03:00
+date: 2010-04-22 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -142,10 +142,10 @@ rdoc_options:
 - --main
 - README.rdoc
 - --title
-- shoe-0.6.0
+- shoe-0.6.1
 - --inline-source
 - --webcvs
-- http://github.com/matthewtodd/shoe/blob/v0.6.0/
+- http://github.com/matthewtodd/shoe/blob/v0.6.1/
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement