jeweler 1.2.1 → 1.3.0

data/.gitignore

@@ -4,6 +4,7 @@ doc
 rdoc
 tags
 test/tmp
+test/jeweler/version_tmp
 test/version_tmp
 tmp
 .yardoc

data/README.markdown

@@ -39,7 +39,7 @@ The yield object here, `gemspec`, is a `Gem::Specification` object. See the [Cus
 
 ## Using to start a new project
 
-Jeweler provides a generator. It requires you to [setup your name and email for git](http://github.com/guides/tell-git-your-user-name-and-email-address) and [your username and token for GitHub](http://github.com/guides/local-github-config).
+Jeweler provides a generator. It requires you to [setup your name and email for git](http://help.github.com/git-email-settings/) and [your username and token for GitHub](http://github.com/guides/local-github-config).
 
     jeweler the-perfect-gem
 
@@ -105,7 +105,22 @@ Jeweler can also handle releasing to [Gemcutter](http://gemcutter.org). There ar
 
  * [Create an account on Gemcutter](http://gemcutter.org/sign_up)
  * Install the Gemcutter gem: sudo gem install gemcutter
- * Run 'gemcutter tumble' to set up gemcutter
+ * Run 'gemcutter tumble' to set up RubyGems to use gemcutter as the default source
+ * Update your Rakefile to make an instance of `Jeweler::GemcutterTasks`
+
+
+A Rakefile setup for gemcutter would include something like this:
+
+    begin
+      require 'jeweler'
+      Jeweler::Tasks.new do |gem|
+        # ommitted for brevity
+      end
+      Jeweler::GemcutterTasks.new
+    rescue LoadError
+      puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+    end
+
 
 With all that setup out of the way, you can now release to Gemcutter with impunity. This would release the current version of your gem.
 
@@ -116,59 +131,32 @@ With all that setup out of the way, you can now release to Gemcutter with impuni
 Jeweler can also handle releasing to [RubyForge](http://rubyforge.org). There are a few steps you need to do before doing any RubyForge releases with Jeweler:
 
  * [Create an account on RubyForge](http://rubyforge.org/account/register.php)
- * Request a project on RubyForge. This involves waiting for a project approval, which can take any amount of time from a few hours to a week
-   * You might want to create an umbrella project where you can publish your gems, instead of one project per gem
+ * Request a project on RubyForge.
  * Install the RubyForge gem: sudo gem install rubyforge
  * Run 'rubyforge setup' and fill in your username and password for RubyForge
  * Run 'rubyforge config' to pull down information about your projects
  * Run 'rubyforge login' to make sure you are able to login
+ * In Jeweler::Tasks, you must set `rubyforge_project` to the project you just created
+ * Add Jeweler::RubyforgeTasks to bring in the appropriate tasks.
+ * Note, using `jeweler --rubyforge` when generating the project does this for you automatically.
 
-With this in place, you now update your Jeweler::Tasks to setup `rubyforge_project` with the RubyForge project you've just created. (Note, using `jeweler --rubyforge` when generating the project does this for you automatically.)
+A Rakefile setup for rubyforge would include something like this:
 
     begin
       require 'jeweler'
       Jeweler::Tasks.new do |s|
-        s.name = "the-perfect-gem"
-        s.summary = "TODO"
-        s.description = "TODO"
-        s.email = "josh@technicalpickles.com"
-        s.homepage = "http://github.com/technicalpickles/the-perfect-gem"
-        s.description = "TODO"
-        s.authors = ["Josh Nichols"]
+        # ommitted for brevity
         s.rubyforge_project = 'the-perfect-gem' # This line would be new
       end
-    rescue LoadError
-      puts "Jeweler not available. Install it with: sudo gem install jeweler"
-    end
 
-    # These are new tasks
-    begin
-      require 'rake/contrib/sshpublisher'
-      namespace :rubyforge do
-        
-        desc "Release gem and RDoc documentation to RubyForge"
-        task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-        
-        namespace :release do
-          desc "Publish RDoc to RubyForge."
-          task :docs => [:rdoc] do
-            config = YAML.load(
-                File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-            )
-    
-            host = "#{config['username']}@rubyforge.org"
-            remote_dir = "/var/www/gforge-projects/the-perfect-gem/"
-            local_dir = 'rdoc'
-    
-            Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-          end
-        end
+      Jeweler::RubyforgeTasks.new do |rubyforge|
+        rubyforge.doc_task = "rdoc"
       end
     rescue LoadError
-      puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+      puts "Jeweler, or a dependency, not available. Install it with: sudo gem install jeweler"
     end
 
-Now you must initially create a 'package' for your gem in your 'project':
+Now you must initially create a 'package' for your gem in your RubyForge 'project':
 
     $ rake rubyforge:setup
 
@@ -176,7 +164,7 @@ With all that setup out of the way, you can now release to RubyForge with impuni
 
     $ rake rubyforge:release
 
-## Workflow
+## Release Workflow
 
  * Hack, commit, hack, commit, etc, etc
  * `rake version:bump:patch release` to do the actual version bump and release

data/Rakefile

@@ -2,39 +2,33 @@ require 'rake'
 
 $LOAD_PATH.unshift('lib')
 
-gem 'git'
-require 'git'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "jeweler"
-    gem.summary = "Simple and opinionated helper for creating Rubygem projects on GitHub"
-    gem.email = "josh@technicalpickles.com"
-    gem.homepage = "http://github.com/technicalpickles/jeweler"
-    gem.description = "Simple and opinionated helper for creating Rubygem projects on GitHub"
-    gem.authors = ["Josh Nichols"]
-    gem.files.include %w(lib/jeweler/templates/.document lib/jeweler/templates/.gitignore)
-
-    gem.add_dependency "git", ">= 1.2.1"
-    gem.add_dependency "rubyforge"
-
-    gem.rubyforge_project = "pickles"
-
-    gem.add_development_dependency "thoughtbot-shoulda"
-    gem.add_development_dependency "mhennemeyer-output_catcher"
-    gem.add_development_dependency "rr"
-    gem.add_development_dependency "mocha"
-    gem.add_development_dependency "redgreen"
-  end
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  gem.name = "jeweler"
+  gem.summary = "Simple and opinionated helper for creating Rubygem projects on GitHub"
+  gem.email = "josh@technicalpickles.com"
+  gem.homepage = "http://github.com/technicalpickles/jeweler"
+  gem.description = "Simple and opinionated helper for creating Rubygem projects on GitHub"
+  gem.authors = ["Josh Nichols"]
+  gem.files.include %w(lib/jeweler/templates/.document lib/jeweler/templates/.gitignore)
+
+  gem.add_dependency "git", ">= 1.2.5"
+  gem.add_dependency "rubyforge", ">= 2.0.0"
+  gem.add_dependency "gemcutter", ">= 0.1.0"
+
+  gem.rubyforge_project = "pickles"
+
+  gem.add_development_dependency "thoughtbot-shoulda"
+  gem.add_development_dependency "mhennemeyer-output_catcher"
+  gem.add_development_dependency "rr"
+  gem.add_development_dependency "mocha"
+  gem.add_development_dependency "redgreen"
+end
 
-  Jeweler::GemcutterTasks.new
+Jeweler::GemcutterTasks.new
 
-  Jeweler::RubyforgeTasks.new do |t|
-    t.doc_task = :yardoc
-  end
-rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"
+Jeweler::RubyforgeTasks.new do |t|
+  t.doc_task = :yardoc
 end
 
 

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
-:minor: 2
-:patch: 1
+:patch: 0
 :major: 1
+:minor: 3
+:build: 

data/bin/jeweler

@@ -1,8 +1,5 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require 'optparse'
-
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'jeweler'
+require 'jeweler/generator'
 
 Jeweler::Generator::Application.run!(*ARGV)

data/features/generator/cucumber.feature

@@ -12,7 +12,7 @@ Feature: generating cucumber stories
     And a file named 'the-perfect-gem/features/the-perfect-gem.feature' is not created
     And a file named 'the-perfect-gem/features/support/env.rb' is not created
     And a file named 'the-perfect-gem/features/steps/the-perfect-gem_steps.rb' is not created
-    
+
   Scenario: basic cucumber setup
     Given a working directory
     And I have configured git sanely
@@ -60,8 +60,8 @@ Feature: generating cucumber stories
     And I want cucumber stories
     When I generate a minitest project named 'the-perfect-gem' that is 'zomg, so good'
 
-    Then 'features/support/env.rb' requires 'mini/test'
-    And cucumber world extends "Mini::Test::Assertions"
+    Then 'features/support/env.rb' requires 'minitest/unit'
+    And cucumber world extends "MiniTest::Assertions"
 
   Scenario: cucumber setup for rspec
     Given a working directory

data/features/generator/directory_layout.feature

@@ -32,8 +32,8 @@ Feature: generated directory layout
 
     Then a directory named 'the-perfect-gem/test' is created
 
-    And a file named 'the-perfect-gem/test/test_helper.rb' is created
-    And a file named 'the-perfect-gem/test/the-perfect-gem_test.rb' is created
+    And a file named 'the-perfect-gem/test/helper.rb' is created
+    And a file named 'the-perfect-gem/test/test_the-perfect-gem.rb' is created
 
   Scenario: rspec
     Given a working directory
@@ -52,8 +52,8 @@ Feature: generated directory layout
 
     Then a directory named 'the-perfect-gem/test' is created
 
-    And a file named 'the-perfect-gem/test/test_helper.rb' is created
-    And a file named 'the-perfect-gem/test/the-perfect-gem_test.rb' is created
+    And a file named 'the-perfect-gem/test/helper.rb' is created
+    And a file named 'the-perfect-gem/test/test_the-perfect-gem.rb' is created
 
   Scenario: testunit
     Given a working directory
@@ -62,8 +62,8 @@ Feature: generated directory layout
 
     Then a directory named 'the-perfect-gem/test' is created
 
-    And a file named 'the-perfect-gem/test/test_helper.rb' is created
-    And a file named 'the-perfect-gem/test/the-perfect-gem_test.rb' is created
+    And a file named 'the-perfect-gem/test/helper.rb' is created
+    And a file named 'the-perfect-gem/test/test_the-perfect-gem.rb' is created
 
   Scenario: micronaut
     Given a working directory

data/features/generator/git.feature

@@ -48,8 +48,8 @@ Feature: git support
     And I have configured git sanely
     When I generate a minitest project named 'the-perfect-gem' that is 'zomg, so good'
 
-    Then 'test/test_helper.rb' was checked in
-    And 'test/the-perfect-gem_test.rb' was checked in
+    Then 'test/helper.rb' was checked in
+    And 'test/test_the-perfect-gem.rb' was checked in
 
   Scenario: rspec
     Given a working directory
@@ -64,16 +64,16 @@ Feature: git support
     And I have configured git sanely
     When I generate a shoulda project named 'the-perfect-gem' that is 'zomg, so good'
 
-    Then 'test/test_helper.rb' was checked in
-    And 'test/the-perfect-gem_test.rb' was checked in
+    Then 'test/helper.rb' was checked in
+    And 'test/test_the-perfect-gem.rb' was checked in
 
   Scenario: testunit
     Given a working directory
     And I have configured git sanely
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
 
-    Then 'test/test_helper.rb' was checked in
-    And 'test/the-perfect-gem_test.rb' was checked in
+    Then 'test/helper.rb' was checked in
+    And 'test/test_the-perfect-gem.rb' was checked in
 
   Scenario: micronaut
     Given a working directory

data/features/generator/rakefile.feature

@@ -22,7 +22,7 @@ Feature: generated Rakefile
   Scenario: bacon
     When I generate a bacon project named 'the-perfect-gem' that is 'zomg, so good'
 
-    
+
     Then 'Rakefile' requires 'rcov/rcovtask'
     And Rakefile has 'spec/**/*_spec.rb' for the Rake::TestTask pattern
     And Rakefile has 'spec/**/*_spec.rb' for the Rcov::RcovTask pattern
@@ -33,8 +33,8 @@ Feature: generated Rakefile
     When I generate a minitest project named 'the-perfect-gem' that is 'zomg, so good'
 
     Then 'Rakefile' requires 'rcov/rcovtask'
-    And Rakefile has 'test/**/*_test.rb' for the Rake::TestTask pattern
-    And Rakefile has 'test/**/*_test.rb' for the Rcov::RcovTask pattern
+    And Rakefile has 'test/**/test_*.rb' for the Rake::TestTask pattern
+    And Rakefile has 'test/**/test_*.rb' for the Rcov::RcovTask pattern
     And Rakefile has 'test' in the Rcov::RcovTask libs
     And Rakefile has "test" as the default task
 
@@ -49,8 +49,8 @@ Feature: generated Rakefile
     When I generate a shoulda project named 'the-perfect-gem' that is 'zomg, so good'
 
     Then 'Rakefile' requires 'rcov/rcovtask'
-    And Rakefile has 'test/**/*_test.rb' for the Rake::TestTask pattern
-    And Rakefile has 'test/**/*_test.rb' for the Rcov::RcovTask pattern
+    And Rakefile has 'test/**/test_*.rb' for the Rake::TestTask pattern
+    And Rakefile has 'test/**/test_*.rb' for the Rcov::RcovTask pattern
     And Rakefile has 'test' in the Rcov::RcovTask libs
     And Rakefile has "test" as the default task
 
@@ -65,47 +65,47 @@ Feature: generated Rakefile
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
 
     Then 'Rakefile' requires 'rcov/rcovtask'
-    Then Rakefile has 'test/**/*_test.rb' for the Rake::TestTask pattern
-    And Rakefile has 'test/**/*_test.rb' for the Rcov::RcovTask pattern
+    Then Rakefile has 'test/**/test_*.rb' for the Rake::TestTask pattern
+    And Rakefile has 'test/**/test_*.rb' for the Rcov::RcovTask pattern
     And Rakefile has 'test' in the Rcov::RcovTask libs
     And Rakefile has "test" as the default task
 
   Scenario: no cucumber
     Given I do not want cucumber stories
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
-    Then Rakefile does not require 'cucumber/rake/task' 
+    Then Rakefile does not require 'cucumber/rake/task'
     And Rakefile does not instantiate a Cucumber::Rake::Task
 
   Scenario: cucumber
     Given I want cucumber stories
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
-    Then Rakefile requires 'cucumber/rake/task' 
+    Then Rakefile requires 'cucumber/rake/task'
     And Rakefile instantiates a Cucumber::Rake::Task
 
   Scenario: no reek
     Given I do not want reek
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
-    Then Rakefile does not require 'reek/rake_task' 
+    Then Rakefile does not require 'reek/rake_task'
     And Rakefile does not instantiate a Reek::RakeTask
 
   Scenario: reek
     Given I want reek
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
-    Then Rakefile requires 'reek/rake_task' 
+    Then Rakefile requires 'reek/rake_task'
     And Rakefile instantiates a Reek::RakeTask
 
   Scenario: no roodi
     Given I do not want roodi
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
-    Then Rakefile does not require 'roodi' 
-    And Rakefile does not require 'roodi_task' 
+    Then Rakefile does not require 'roodi'
+    And Rakefile does not require 'roodi_task'
     And Rakefile does not instantiate a RoodiTask
 
   Scenario: roodi
     Given I want roodi
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
-    Then Rakefile requires 'roodi' 
-    And Rakefile requires 'roodi_task' 
+    Then Rakefile requires 'roodi'
+    And Rakefile requires 'roodi_task'
     And Rakefile instantiates a RoodiTask
 
   Scenario: no rubyforge
@@ -121,7 +121,7 @@ Feature: generated Rakefile
   Scenario: yard
     Given I want to use yard instead of rdoc
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
-    
+
     Then 'Rakefile' does not require 'rake/rdoctask'
     And 'Rakefile' requires 'yard'
     And Rakefile instantiates a YARD::Rake::YardocTask
@@ -129,7 +129,7 @@ Feature: generated Rakefile
   Scenario: rdoc
     Given I want to use rdoc instead of yard
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
-    
+
     Then 'Rakefile' does not require 'yard'
     And 'Rakefile' requires 'rake/rdoctask'
     And Rakefile does not instantiate a YARD::Rake::YardocTask

data/features/generator/test.feature

@@ -13,7 +13,7 @@ Feature: generated test or spec
     Given a working directory
     And I have configured git sanely
     When I generate a minitest project named 'the-perfect-gem' that is 'zomg, so good'
-    Then 'test/the-perfect-gem_test.rb' should define 'ThePerfectGemTest' as a subclass of 'Mini::Test::TestCase'
+    Then 'test/test_the-perfect-gem.rb' should define 'TestThePerfectGem' as a subclass of 'MiniTest::Unit::TestCase'
 
   Scenario: rspec
     Given a working directory
@@ -26,16 +26,23 @@ Feature: generated test or spec
     And I have configured git sanely
     And I intend to test with shoulda
     When I generate a project named 'the-perfect-gem' that is 'zomg, so good'
-    Then 'test/the-perfect-gem_test.rb' should define 'ThePerfectGemTest' as a subclass of 'Test::Unit::TestCase'
+    Then 'test/test_the-perfect-gem.rb' should define 'TestThePerfectGem' as a subclass of 'Test::Unit::TestCase'
 
   Scenario: testunit
     Given a working directory
     And I have configured git sanely
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
-    Then 'test/the-perfect-gem_test.rb' should define 'ThePerfectGemTest' as a subclass of 'Test::Unit::TestCase'
+    Then 'test/test_the-perfect-gem.rb' should define 'TestThePerfectGem' as a subclass of 'Test::Unit::TestCase'
 
   Scenario: micronaut
     Given a working directory
     And I have configured git sanely
     When I generate a micronaut project named 'the-perfect-gem' that is 'zomg, so good'
     Then 'examples/the-perfect-gem_example.rb' should describe 'ThePerfectGem'
+
+  Scenario: riot
+    Given a working directory
+      And I have configured git sanely
+    When I generate a riot project named 'the-perfect-gem' that is 'zomg, so good'
+    Then 'test/the-perfect-gem_test.rb' should contextualize 'the-perfect-gem'
+      And 'test/the-perfect-gem_test.rb' requires 'teststrap'

data/features/generator/test_helper.feature

@@ -14,9 +14,9 @@ Feature: generated test or spec
     Given a working directory
     And I have configured git sanely
     When I generate a minitest project named 'the-perfect-gem' that is 'zomg, so good'
-    Then 'test/test_helper.rb' requires 'mini/test'
-    And 'test/test_helper.rb' requires 'the-perfect-gem'
-    And 'test/test_helper.rb' should autorun tests
+    Then 'test/helper.rb' requires 'minitest/unit'
+    And 'test/helper.rb' requires 'the-perfect-gem'
+    And 'test/helper.rb' should autorun tests
 
   Scenario: rspec
     Given a working directory
@@ -29,17 +29,17 @@ Feature: generated test or spec
     Given a working directory
     And I have configured git sanely
     When I generate a shoulda project named 'the-perfect-gem' that is 'zomg, so good'
-    Then 'test/test_helper.rb' requires 'test/unit'
-    And 'test/test_helper.rb' requires 'shoulda'
-    And 'test/test_helper.rb' requires 'the-perfect-gem'
+    Then 'test/helper.rb' requires 'test/unit'
+    And 'test/helper.rb' requires 'shoulda'
+    And 'test/helper.rb' requires 'the-perfect-gem'
 
   Scenario: testunit
     Given a working directory
     And I have configured git sanely
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
-    Then 'test/test_helper.rb' requires 'test/unit'
-    And 'test/test_helper.rb' requires 'the-perfect-gem'
-  
+    Then 'test/helper.rb' requires 'test/unit'
+    And 'test/helper.rb' requires 'the-perfect-gem'
+
   Scenario: micronaut
     Given a working directory
     And I have configured git sanely
@@ -47,3 +47,10 @@ Feature: generated test or spec
     Then 'examples/example_helper.rb' requires 'rubygems'
     Then 'examples/example_helper.rb' requires 'micronaut'
     Then 'examples/example_helper.rb' requires 'the-perfect-gem'
+
+  Scenario: riot
+    Given a working directory
+      And I have configured git sanely
+    When I generate a riot project named 'the-perfect-gem' that is 'zomg, so good'
+    Then 'test/teststrap.rb' requires 'riot'
+      And 'test/teststrap.rb' requires 'the-perfect-gem'