technicalpickles-jeweler 0.4.1 → 0.5.1

data/README.markdown

@@ -11,7 +11,7 @@ Trouble is when developing your Rubygems on GitHub, you generally do one of the
  * Use hoe or echoe for generating the gemspec
   * ... why use utilities made for the days before GitHub existed?
   * ... why have extra stuff you aren't going to use?
- 
+
 Jeweler was created with a few goals in mind:
 
  * Only use a Gem::Specification as configuration
@@ -48,7 +48,7 @@ Armed with the gem, we can begin diving into an example. [the-perfect-gem](http:
     rescue LoadError
       puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
     end
-    
+
 Here's a rundown of what's happening:
 
  * Wrap everything in a begin block, and rescue from LoadError
@@ -72,18 +72,18 @@ Here's a rundown of what's happening:
      * `executables`, if you have any scripts
      * `add_dependency`, if you have any dependencies
     * Keep in mind that this is a `Gem::Specification`, so you can do whatever you would need to do to get your gem in shape
-     
+
 ## Bootstrap a new project
 
 Before proceeding, take a minute to setup your git environment, specifically your name and email address:
 
     $ git config --global user.email johndoe@example.com
     $ git config --global user.name 'John Doe'
-    
+
 Jeweler provides a generator of sorts, `jeweler`. It takes two arguments: your GitHub username and a repository name.
 
     $ jeweler technicalpickles the-perfect-gem
-    
+
 Basically, this does:
 
  * Creates the the-perfect-gem directory
@@ -98,13 +98,13 @@ Basically, this does:
  * Makes it a git repo
  * Sets up `git@github.com:technicalpickles/jeweler.git` as the `origin` git remote
  * Makes an initial commit, but does not push
- 
+
 At this point, you probably should create a repository by wandering to [http://github.com/repositories/new](http://github.com/repositories/new). Be sure to use the same project name you told Jeweler.
 
 With the repository firmly created, just push it:
 
     $ git push origin master
-    
+
 You also probably should [enable RubyGem creation for you repository](http://github.com/blog/51-github-s-rubygem-server): Go to your project's edit page and check the 'RubyGem' box.
 
 ## Overview of Jeweler workflow
@@ -115,7 +115,7 @@ Here's the general idea:
  * Version bump
  * Release
  * Have a delicious scotch
- 
+
 The hacking and the scotch are up to you, but Jeweler provides rake tasks for the rest.
 
 ### Versioning
@@ -125,9 +125,9 @@ Versioning information is stored in `VERSION.yml`. It's a plain ol' YAML file wh
  * major
  * minor
  * patch
- 
+
 Consider, for a second, `1.5.3`.
- 
+
  * major = 1
  * minor = 5
  * patch = 3
@@ -161,7 +161,7 @@ The process of version bumping does a commit to your repo, so make sure your rep
 It's pretty straight forward:
 
     $ rake release
-    
+
 This takes care of:
 
  * Generating a `.gemspec` for you project, with the version you just bumped to
@@ -179,5 +179,5 @@ If it happens to be down, you can also check out the GitHub Gem repo's [list](ht
 
     <hack, hack, hack, commit>
     $ rake version:bump:patch release
-    
+
 Now browse to http://gems.github.com/yourname/yourproject, and wait for it to be built.

data/Rakefile

@@ -25,7 +25,7 @@ end
 
 Rake::TestTask.new do |t|
   t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
+  t.pattern = 'test/*_test.rb'
   t.verbose = false
 end
 

data/VERSION.yml

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

data/bin/jeweler

@@ -1,15 +1,46 @@
 #!/usr/bin/env ruby
 require 'rubygems'
+require 'optparse'
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'jeweler'
 
-unless ARGV.size == 2
-  puts "jeweler takes 2 arguments: GitHub username and a repo that will eventually live there. Example: jeweler technicalpickles the-perfect-gem"
+class JewelerOpts < Hash
+  attr_reader :opts
+  
+  def initialize(args)
+    super()
+    
+    self[:test_style] = :shoulda
+    
+    @opts = OptionParser.new do |o|
+      o.banner = "Usage: #{File.basename($0)} [options] reponame\ne.g. #{File.basename($0)} the-perfect-gem"
+      
+      o.on('--bacon', 'generate bacon specs') do
+        self[:test_style] = :bacon
+      end
+      
+      o.on('--shoulda', 'generate shoulda tests') do
+        self[:test_style] = :shoulda
+      end
+      
+      o.on_tail('-h', '--help', 'display this help and exit') do
+        puts o
+        exit
+      end
+    end
+    
+    @opts.parse!(args)
+  end
+end
+
+options = JewelerOpts.new(ARGV)
+
+unless ARGV.size == 1
+  puts options.opts
   exit 1
 end
 
-github_username = ARGV.first
-github_repo_name = ARGV.last
-generator = Jeweler::Generator.new github_username, github_repo_name
-generator.run
+github_repo_name = ARGV.first
+generator = Jeweler::Generator.new github_repo_name, options
+generator.run

data/lib/jeweler/bumping.rb

@@ -32,7 +32,7 @@ class Jeweler
       major ||= 0
       minor ||= 0
       patch ||= 0
-      
+
       File.open(version_yaml_path, 'w+') do |f|
         version_hash = {
           'major' => major.to_i,
@@ -43,7 +43,7 @@ class Jeweler
       end
 
       refresh_version
-      
+
       @gemspec.version = version
 
       puts "Wrote to #{version_yaml_path}: #{version}"

data/lib/jeweler/errors.rb

@@ -2,7 +2,7 @@ class Jeweler
   # Gemspec related error
    class GemspecError < StandardError
    end
-   
+
    class VersionYmlError < StandardError
    end
 end

data/lib/jeweler/gemspec.rb

@@ -10,7 +10,7 @@ class Jeweler
       end
       puts "Generated: #{gemspec_path}"
     end
-    
+
     # Validates the gemspec in an environment similar to how GitHub would build
     # it. See http://gist.github.com/16215
     def validate_gemspec
@@ -22,8 +22,8 @@ class Jeweler
         raise
       end
     end
-    
-    
+
+
     def valid_gemspec?
       begin
         parse_gemspec
@@ -32,12 +32,12 @@ class Jeweler
         false
       end
     end
-    
+
     def parse_gemspec(data = nil)
       data ||= File.read(gemspec_path)
       Thread.new { eval("$SAFE = 3\n#{data}", binding, gemspec_path) }.join
     end
-    
+
   protected
     def gemspec_path
       denormalized_path = File.join(@base_dir, "#{@gemspec.name}.gemspec")

data/lib/jeweler/generator.rb

@@ -10,33 +10,31 @@ class Jeweler
   end
   class NoGitHubRepoNameGiven < StandardError
   end
-  class NoGitHubUsernameGiven < StandardError
+  class NoGitHubUser < StandardError
+  end
+  class GitInitFailed < StandardError
   end
     
+
   class Generator
     attr_accessor :target_dir, :user_name, :user_email,
                   :github_repo_name, :github_remote, :github_url, :github_username,
-                  :lib_dir, :test_dir, :constant_name, :file_name_prefix
+                  :lib_dir, :constant_name, :file_name_prefix, :config, :test_style
 
-    def initialize(github_username, github_repo_name, dir = nil)
-      if github_username.nil?
-        raise NoGitHubUsernameGiven
-      end
-      self.github_username = github_username
+    def initialize(github_repo_name, options = {})
+      check_user_git_config()
       
       if github_repo_name.nil?
         raise NoGitHubRepoNameGiven
       end
       self.github_repo_name = github_repo_name
-      
+
       self.github_remote = "git@github.com:#{github_username}/#{github_repo_name}.git"
       self.github_url = "http://github.com/#{github_username}/#{github_repo_name}"
-      
-      check_user_git_config()
-      
-      self.target_dir = dir || self.github_repo_name
+
+      self.test_style = options[:test_style] || :shoulda
+      self.target_dir = options[:directory] || self.github_repo_name
       self.lib_dir = File.join(target_dir, 'lib')
-      self.test_dir = File.join(target_dir, 'test')
       self.constant_name = self.github_repo_name.split(/[-_]/).collect{|each| each.capitalize }.join
       self.file_name_prefix = self.github_repo_name.gsub('-', '_')
     end
@@ -45,14 +43,27 @@ class Jeweler
       create_files
       gitify
     end
-    
+
+    def testspec
+      case test_style
+      when :shoulda
+        'test'
+      when :bacon
+        'spec'
+      end
+    end
+
+    def test_dir
+      File.join(target_dir, testspec)
+    end
+
+
   private
     def create_files
-      begin
+      unless File.exists?(target_dir) || File.directory?(target_dir)
         FileUtils.mkdir target_dir
-      rescue Errno::EEXIST => e
-        puts "The directory #{target_dir} already exists, aborting. Maybe move it out of the way before continuing?"
-        exit 1
+      else
+        raise FileInTheWay, "The directory #{target_dir} already exists, aborting. Maybe move it out of the way before continuing?"
       end
 
       FileUtils.mkdir lib_dir
@@ -62,27 +73,35 @@ class Jeweler
       output_template_in_target('Rakefile')
       output_template_in_target('LICENSE')
       output_template_in_target('README')
-      output_template_in_target('test/test_helper.rb')
-      output_template_in_target('test/flunking_test.rb', "test/#{file_name_prefix}_test.rb")
-      
+      output_template_in_target("#{testspec}/#{testspec}_helper.rb")
+      output_template_in_target("#{testspec}/flunking_#{testspec}.rb", "#{testspec}/#{file_name_prefix}_#{testspec}.rb")
+
       FileUtils.touch File.join(lib_dir, "#{file_name_prefix}.rb")
     end
-  
+
     def check_user_git_config
-      config = read_git_config
+      self.config = read_git_config
+      
       unless config.has_key? 'user.name'
         raise NoGitUserName, %Q{No user.name set in ~/.gitconfig. Set it with: git config --global user.name 'Your Name Here'}
       end
+      
       unless config.has_key? 'user.email'
         raise NoGitUserEmail, %Q{No user.name set in ~/.gitconfig. Set it with: git config --global user.name 'Your Name Here'}
       end
+      
+      unless config.has_key? 'github.user'
+        raise NoGitHubUser, %Q{No github.user set in ~/.gitconfig. Set it with: git config --global github.user 'Your username here'}
+      end
 
       self.user_name = config['user.name']
       self.user_email = config['user.email']
+      self.github_username = config['github.user']
     end
-    
+
     def output_template_in_target(source, destination = source)
       template = ERB.new(File.read(File.join(File.dirname(__FILE__), 'templates', source)))
+
       File.open(File.join(target_dir, destination), 'w') {|file| file.write(template.result(binding))}
     end
 
@@ -90,18 +109,36 @@ class Jeweler
       saved_pwd = Dir.pwd
       Dir.chdir(target_dir)
       begin
-        repo = Git.init()
-        repo.add('.')
-        repo.commit "Initial commit to #{github_repo_name}."
-        repo.add_remote('origin', github_remote)
-      rescue Git::GitExecuteError => e
-        puts "Encountered an error during gitification. Maybe the repo already exists, or has already been pushed to?"
-        puts
-        raise
+        begin
+          repo = Git.init()
+        rescue Git::GitExecuteError => e
+          raise GitInitFailed, "Encountered an error during gitification. Maybe the repo already exists, or has already been pushed to?"
+        end
+
+        begin
+          repo.add('.')
+        rescue Git::GitExecuteError => e
+          #raise GitAddFailed, "There was some problem adding this directory to the git changeset"
+          raise
+        end
+
+        begin
+          repo.commit "Initial commit to #{github_repo_name}."
+        rescue Git::GitExecuteError => e
+          raise
+        end
+
+        begin
+          repo.add_remote('origin', github_remote)
+        rescue Git::GitExecuteError => e
+          puts "Encountered an error while adding origin remote. Maybe you have some weird settings in ~/.gitconfig?"
+          raise
+        end
+      ensure
+        Dir.chdir(saved_pwd)
       end
-      Dir.chdir(saved_pwd)
     end
-    
+
     def read_git_config
       # we could just use Git::Base's .config, but that relies on a repo being around already
       # ... which we don't have yet, since this is part of a sanity check
@@ -109,4 +146,4 @@ class Jeweler
       config = lib.parse_config '~/.gitconfig'
     end
   end
-end
+end

data/lib/jeweler/release.rb

@@ -1,17 +1,17 @@
 class Jeweler
   module Release
-    
+
     def release
       @repo.checkout('master')
-      
+
       raise "Hey buddy, try committing them files first" if any_pending_changes?
-      
+
       write_gemspec()
-      
+
       @repo.add(gemspec_path)
       @repo.commit("Regenerated gemspec for version #{version}")
       @repo.push
-      
+
       @repo.add_tag(release_tag)
       @repo.push('origin', release_tag)
     end
@@ -19,10 +19,10 @@ class Jeweler
     def release_tag
       @release_tag ||= "v#{version}"
     end
-    
+
   protected
     def any_pending_changes?
-      @repo.status.added.empty? && @repo.status.deleted.empty? && @repo.status.changed.empty? && @repo.status.untracked.empty?
+      !(@repo.status.added.empty? && @repo.status.deleted.empty? && @repo.status.changed.empty? && @repo.status.untracked.empty?)
     end
   end
 end

data/lib/jeweler/tasks.rb

@@ -4,14 +4,14 @@ require 'rake/tasklib'
 class Jeweler
   class Tasks < ::Rake::TaskLib
     def initialize(gemspec = nil, &block)
-      @gemspec = Gem::Specification.new()
-      block.call(@gemspec) if block
+      @gemspec = gemspec || Gem::Specification.new()
+      yield @gemspec if block_given?
 
       @jeweler = Jeweler.new(@gemspec)
-      
+
       define_tasks
     end
-    
+
   private
     def ensure_version_yml(&block)
       unless File.exists? 'VERSION.yml'
@@ -19,7 +19,7 @@ class Jeweler
       end
       block.call if block
     end
-    
+
     def define_tasks
       desc "Generate and validates gemspec"
       task :gemspec => ['gemspec:generate', 'gemspec:validate']
@@ -77,12 +77,12 @@ class Jeweler
           end
         end
       end
-      
+
       desc "Release the current version. Includes updating the gemspec, pushing, and tagging the release"
       task :release do
         @jeweler.release
       end
-      
+
     end
   end
 end

data/lib/jeweler/templates/Rakefile

@@ -19,21 +19,21 @@ end
 
 Rake::TestTask.new do |t|
   t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
+  t.pattern = '<%= testspec %>/**/*_<%= testspec %>.rb'
   t.verbose = false
 end
 
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Jeweler'
+  rdoc.title    = '<%= github_repo_name %>'
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
 Rcov::RcovTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/**/*_test.rb']
+  t.libs << "<%= testspec %>"
+  t.test_files = FileList['<%= testspec %>/**/*_<%= testspec %>.rb']
   t.verbose = true
 end
 

data/lib/jeweler/templates/spec/flunking_spec.rb

@@ -0,0 +1,7 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "<%= constant_name %>" do
+  it "fails" do
+    should.flunk "hey buddy, you should probably rename this file and start specing for real"
+  end
+end

data/lib/jeweler/templates/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require 'rubygems'
+require 'bacon'
+
+# get a summary of errors raised and such
+Bacon.summary_on_exit

data/lib/jeweler/versioning.rb

@@ -23,18 +23,18 @@ class Jeweler
     def version
       "#{major_version}.#{minor_version}.#{patch_version}"
     end
-    
+
   protected
     def version_yaml_path
       denormalized_path = File.join(@base_dir, 'VERSION.yml')
       absolute_path = File.expand_path(denormalized_path)
       absolute_path.gsub(Dir.getwd + File::SEPARATOR, '')
     end
-    
+
     def version_yaml
       @version_yaml ||= read_version_yaml
     end
-    
+
     def read_version_yaml
       if File.exists?(version_yaml_path)
         YAML.load_file(version_yaml_path)
@@ -42,7 +42,7 @@ class Jeweler
         raise VersionYmlError, "#{version_yaml_path} does not exist!"
       end
     end
-    
+
     def refresh_version
       @version_yaml = read_version_yaml
     end

data/lib/jeweler.rb

@@ -15,17 +15,17 @@ class Jeweler
   include Jeweler::Versioning
   include Jeweler::Gemspec
   include Jeweler::Release
-  
+
   attr_reader :gemspec
   attr_accessor :base_dir
-  
+
   def initialize(gemspec, base_dir = '.')
     raise(GemspecError, "Can't create a Jeweler with a nil gemspec") if gemspec.nil?
     @gemspec = gemspec
     @base_dir = base_dir
-    
+
     @gemspec.files ||= FileList["[A-Z]*.*", "{bin,generators,lib,test,spec}/**/*"]
-    
+
     if File.exists?(File.join(base_dir, '.git'))
       @repo = Git.open(base_dir)
     end

data/test/jeweler_generator_test.rb

@@ -1,21 +1,21 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 class JewelerTest < Test::Unit::TestCase
-  
+
   def self.should_create_directory(directory)
     should "create #{directory} directory" do
       assert File.exists?(File.join(@tmp_dir, directory))
       assert File.directory?(File.join(@tmp_dir, directory))
     end
   end
-  
+
   def self.should_create_file(file)
     should "create file #{file}" do
       assert File.exists?(File.join(@tmp_dir, file))
       assert File.file?(File.join(@tmp_dir, file))
     end
   end
-  
+
   def self.should_be_checked_in(file)
     should "have #{file} checked in" do
       status = @repo.status[file]
@@ -24,22 +24,10 @@ class JewelerTest < Test::Unit::TestCase
       assert_nil status.type, "#{file} had a type. it should have been nil"
     end
   end
-  
-  context "given a nil github username" do
-    setup do
-      @block = lambda { Jeweler::Generator.new(nil, 'the-perfect-gem', nil) }
-    end
 
-    should "raise an error" do
-      assert_raise Jeweler::NoGitHubUsernameGiven do
-        @block.call
-      end
-    end
-  end
-  
   context "given a nil github repo name" do
     setup do
-      @block = lambda { Jeweler::Generator.new('technicalpickles', nil, nil) }
+      @block = lambda { Jeweler::Generator.new(nil) }
     end
 
     should "raise an error" do
@@ -48,15 +36,15 @@ class JewelerTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   context "without git user's name set" do
     setup do
       Jeweler::Generator.any_instance.stubs(:read_git_config).returns({'user.email' => 'bar@example.com'})
     end
-    
+
     context "instantiating new generator" do
       setup do
-        @block = lambda { Jeweler::Generator.new('technicalpickles', 'the-perfect-gem')}
+        @block = lambda { Jeweler::Generator.new('the-perfect-gem')}
       end
 
       should "raise no git user name exception" do
@@ -66,7 +54,7 @@ class JewelerTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   context "without git user's email set" do
     setup do
       Jeweler::Generator.any_instance.stubs(:read_git_config).returns({'user.name' => 'foo'})
@@ -74,7 +62,7 @@ class JewelerTest < Test::Unit::TestCase
 
     context "instantiating new generator" do
       setup do
-        @block = lambda { Jeweler::Generator.new('technicalpickles', 'the-perfect-gem')}
+        @block = lambda { Jeweler::Generator.new('the-perfect-gem')}
       end
 
       should "raise no git user name exception" do
@@ -84,21 +72,41 @@ class JewelerTest < Test::Unit::TestCase
       end
     end
   end
-  
+
+  context "without github username set" do
+    setup do
+      Jeweler::Generator.any_instance.stubs(:read_git_config).
+        returns({'user.email' => 'bar@example.com', 'user.name' => 'foo'})
+    end
+
+    context "instantiating new generator" do
+      setup do
+        @block = lambda { Jeweler::Generator.new('the-perfect-gem')}
+      end
+
+      should "raise no github user exception" do
+        assert_raise Jeweler::NoGitHubUser do
+          @block.call
+        end
+      end
+    end
+  end
+
   context "with valid git user configuration" do
     setup do
-      Jeweler::Generator.any_instance.stubs(:read_git_config).returns({'user.name' => 'foo', 'user.email' => 'bar@example.com'})
+      Jeweler::Generator.any_instance.stubs(:read_git_config).
+        returns({'user.name' => 'foo', 'user.email' => 'bar@example.com', 'github.user' => 'technicalpickles'})
     end
-    
+
     context "for technicalpickle's the-perfect-gem repository" do
       setup do
-        @generator = Jeweler::Generator.new('technicalpickles', 'the-perfect-gem')
+        @generator = Jeweler::Generator.new('the-perfect-gem')
       end
-      
+
       should "assign 'foo' to user's name" do
         assert_equal 'foo', @generator.user_name
       end
-      
+
       should "assign 'bar@example.com to user's email" do
         assert_equal 'bar@example.com', @generator.user_email
       end
@@ -106,63 +114,63 @@ class JewelerTest < Test::Unit::TestCase
       should "assign github remote" do
         assert_equal 'git@github.com:technicalpickles/the-perfect-gem.git', @generator.github_remote
       end
-      
+
       should "determine github username as technicalpickles" do
         assert_equal 'technicalpickles', @generator.github_username
       end
-      
+
       should "determine github repository name as the-perfect-gem" do
         assert_equal 'the-perfect-gem', @generator.github_repo_name
       end
-      
+
       should "determine github url as http://github.com/technicalpickles/the-perfect-gem" do
         assert_equal 'http://github.com/technicalpickles/the-perfect-gem', @generator.github_url
       end
-      
+
       should "determine target directory as the same as the github repository name" do
         assert_equal @generator.github_repo_name, @generator.target_dir
       end
-      
+
       should "determine lib directory as being inside the target directory" do
         assert_equal File.join(@generator.target_dir, 'lib'), @generator.lib_dir
       end
-      
+
       should "determine test directory as being inside the target directory" do
         assert_equal File.join(@generator.target_dir, 'test'), @generator.test_dir
       end
-      
+
       should "determine constant name as ThePerfectGem" do
         assert_equal 'ThePerfectGem', @generator.constant_name
       end
-      
+
       should "determine file name prefix as the_perfect_gem" do
         assert_equal 'the_perfect_gem', @generator.file_name_prefix
       end
     end
-    
-    
+
+
     context "and cleaned out tmp directory" do
       setup do
         @tmp_dir = File.join(File.dirname(__FILE__), 'tmp')
         FileUtils.rm_rf(@tmp_dir)
-        
+
         assert ! File.exists?(@tmp_dir)
       end
 
       teardown do
         FileUtils.rm_rf(@tmp_dir)
       end
-      
+
       context "for technicalpickles's the-perfect-gem repo and working directory 'tmp'" do
         setup do
-          @generator = Jeweler::Generator.new('technicalpickles', 'the-perfect-gem', @tmp_dir)
+          @generator = Jeweler::Generator.new('the-perfect-gem', :directory => @tmp_dir)
         end
 
         should "use tmp for target directory" do
           assert_equal @tmp_dir, @generator.target_dir
         end
-        
-        context "running" do
+
+        context "running for spec = false" do
           setup do
             @generator.run
           end
@@ -170,17 +178,17 @@ class JewelerTest < Test::Unit::TestCase
           should 'create target directory' do
             assert File.exists?(@tmp_dir)
           end
-          
+
           should_create_directory 'lib'
           should_create_directory 'test'
-          
+
           should_create_file 'LICENSE'
           should_create_file 'README'
           should_create_file 'lib/the_perfect_gem.rb'
           should_create_file 'test/test_helper.rb'
           should_create_file 'test/the_perfect_gem_test.rb'
           should_create_file '.gitignore'
-          
+
           context "LICENSE" do
             setup do
               @content = File.read((File.join(@tmp_dir, 'LICENSE')))
@@ -190,25 +198,37 @@ class JewelerTest < Test::Unit::TestCase
               assert_match 'Copyright (c) 2008 foo', @content
             end
           end
-          
+
           context "Rakefile" do
             setup do
               @content = File.read((File.join(@tmp_dir, 'Rakefile')))
             end
-            
+
             should "include repo's name as the gem's name" do
               assert_match 's.name = "the-perfect-gem"', @content
             end
-            
+
             should "include the user's email as the gem's email" do
               assert_match 's.email = "bar@example.com"', @content
             end
-            
+
             should "include the github repo's url as the gem's url" do
               assert_match 's.homepage = "http://github.com/technicalpickles/the-perfect-gem"', @content
             end
+
+            should "include a glob to match test files in the TestTask" do
+              assert_match "t.pattern = 'test/**/*_test.rb'", @content
+            end
+
+            should "include a glob to match test files in the RcovTask" do
+              assert_match "t.test_files = FileList['test/**/*_test.rb']", @content
+            end
+
+            should "push test dir into RcovTask libs" do
+              assert_match 't.libs << "test"', @content
+            end
           end
-          
+
           context ".gitignore" do
             setup do
               @content = File.read((File.join(@tmp_dir, '.gitignore')))
@@ -217,17 +237,17 @@ class JewelerTest < Test::Unit::TestCase
             should "include vim swap files" do
               assert_match '*.sw?', @content
             end
-            
+
             should "include coverage" do
               assert_match 'coverage', @content
             end
-            
+
             should "include .DS_Store" do
               assert_match '.DS_Store', @content
             end
           end
-          
-          
+
+
           context "test/the_perfect_gem_test.rb" do
             setup do
               @content = File.read((File.join(@tmp_dir, 'test', 'the_perfect_gem_test.rb')))
@@ -237,8 +257,8 @@ class JewelerTest < Test::Unit::TestCase
               assert_match 'class ThePerfectGemTest < Test::Unit::TestCase', @content
             end
           end
-          
-          
+
+
           context "created git repo" do
             setup do
               @repo = Git.open(@tmp_dir)
@@ -247,12 +267,12 @@ class JewelerTest < Test::Unit::TestCase
             should 'have one commit log' do
               assert_equal 1, @repo.log.size
             end
-            
+
             should "have one commit log an initial commit message" do
               # TODO message seems to include leading whitespace, could probably fix that in ruby-git
               assert_match 'Initial commit to the-perfect-gem.', @repo.log.first.message
             end
-            
+
             should_be_checked_in 'README'
             should_be_checked_in 'Rakefile'
             should_be_checked_in 'LICENSE'
@@ -260,24 +280,162 @@ class JewelerTest < Test::Unit::TestCase
             should_be_checked_in 'test/test_helper.rb'
             should_be_checked_in 'test/the_perfect_gem_test.rb'
             should_be_checked_in '.gitignore'
-            
+
+            should "have no untracked files" do
+              assert_equal 0, @repo.status.untracked.size
+            end
+
+            should "have no changed files" do
+              assert_equal 0, @repo.status.changed.size
+            end
+
+            should "have no added files" do
+              assert_equal 0, @repo.status.added.size
+            end
+
+            should "have no deleted files" do
+              assert_equal 0, @repo.status.deleted.size
+            end
+
+
+            should "have git@github.com:technicalpickles/the-perfect-gem.git as origin remote" do
+              assert_equal 1, @repo.remotes.size
+              remote = @repo.remotes.first
+              assert_equal 'origin', remote.name
+              assert_equal 'git@github.com:technicalpickles/the-perfect-gem.git', remote.url
+            end
+          end
+        end
+
+        context "running bacon" do
+          setup do
+            @generator.test_style = :bacon
+            @generator.run
+          end
+
+          should 'create target directory' do
+            assert File.exists?(@tmp_dir)
+          end
+
+          should_create_directory 'lib'
+          should_create_directory 'spec'
+
+          should_create_file 'LICENSE'
+          should_create_file 'README'
+          should_create_file 'lib/the_perfect_gem.rb'
+          should_create_file 'spec/spec_helper.rb'
+          should_create_file 'spec/the_perfect_gem_spec.rb'
+          should_create_file '.gitignore'
+
+          context "LICENSE" do
+            setup do
+              @content = File.read((File.join(@tmp_dir, 'LICENSE')))
+            end
+
+            should "include copyright for this year with user's name" do
+              assert_match 'Copyright (c) 2008 foo', @content
+            end
+          end
+
+          context "Rakefile" do
+            setup do
+              @content = File.read((File.join(@tmp_dir, 'Rakefile')))
+            end
+
+            should "include repo's name as the gem's name" do
+              assert_match 's.name = "the-perfect-gem"', @content
+            end
+
+            should "include the user's email as the gem's email" do
+              assert_match 's.email = "bar@example.com"', @content
+            end
+
+            should "include the github repo's url as the gem's url" do
+              assert_match 's.homepage = "http://github.com/technicalpickles/the-perfect-gem"', @content
+            end
+
+            should "include a glob to match spec files in the TestTask" do
+              assert_match "t.pattern = 'spec/**/*_spec.rb'", @content
+            end
+
+            should "include a glob to match spec files in the RcovTask" do
+              assert_match "t.test_files = FileList['spec/**/*_spec.rb']", @content
+            end
+
+            should "push spec dir into RcovTask libs" do
+              assert_match 't.libs << "spec"', @content
+            end
+          end
+
+          context ".gitignore" do
+            setup do
+              @content = File.read((File.join(@tmp_dir, '.gitignore')))
+            end
+
+            should "include vim swap files" do
+              assert_match '*.sw?', @content
+            end
+
+            should "include coverage" do
+              assert_match 'coverage', @content
+            end
+
+            should "include .DS_Store" do
+              assert_match '.DS_Store', @content
+            end
+          end
+
+
+          context "spec/the_perfect_gem_spec.rb" do
+            setup do
+              @content = File.read((File.join(@tmp_dir, 'spec', 'the_perfect_gem_spec.rb')))
+            end
+
+            should "describe ThePerfectGem" do
+              assert_match 'describe "ThePerfectGem" do', @content
+            end
+          end
+
+
+          context "created git repo" do
+            setup do
+              @repo = Git.open(@tmp_dir)
+            end
+
+            should 'have one commit log' do
+              assert_equal 1, @repo.log.size
+            end
+
+            should "have one commit log an initial commit message" do
+              # TODO message seems to include leading whitespace, could probably fix that in ruby-git
+              assert_match 'Initial commit to the-perfect-gem.', @repo.log.first.message
+            end
+
+            should_be_checked_in 'README'
+            should_be_checked_in 'Rakefile'
+            should_be_checked_in 'LICENSE'
+            should_be_checked_in 'lib/the_perfect_gem.rb'
+            should_be_checked_in 'spec/spec_helper.rb'
+            should_be_checked_in 'spec/the_perfect_gem_spec.rb'
+            should_be_checked_in '.gitignore'
+
             should "have no untracked files" do
               assert_equal 0, @repo.status.untracked.size
             end
-            
+
             should "have no changed files" do
               assert_equal 0, @repo.status.changed.size
             end
-            
+
             should "have no added files" do
               assert_equal 0, @repo.status.added.size
             end
-            
+
             should "have no deleted files" do
               assert_equal 0, @repo.status.deleted.size
             end
 
-            
+
             should "have git@github.com:technicalpickles/the-perfect-gem.git as origin remote" do
               assert_equal 1, @repo.remotes.size
               remote = @repo.remotes.first
@@ -289,5 +447,5 @@ class JewelerTest < Test::Unit::TestCase
       end
     end
   end
-  
+
 end

data/test/jeweler_test.rb

@@ -1,16 +1,17 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 class JewelerTest < Test::Unit::TestCase
-  
+
   def setup
     @now = Time.now
     Time.stubs(:now).returns(@now)
+    FileUtils.rm_rf("#{File.dirname(__FILE__)}/tmp")
   end
-  
+
   def teardown
     FileUtils.rm_rf("#{File.dirname(__FILE__)}/tmp")
   end
-  
+
   def build_spec
     Gem::Specification.new do |s|
       s.name = "bar"
@@ -22,75 +23,38 @@ class JewelerTest < Test::Unit::TestCase
       s.files =  FileList["[A-Z]*", "{generators,lib,test}/**/*"]
     end
   end
-  
-  class << self
-    def should_have_major_version(version)
-      should "have major version of #{version}" do 
-        assert_equal version, @jeweler.major_version
-      end
-    end
-    
-    def should_have_minor_version(version)
-      should "have minor version of #{version}" do
-        assert_equal version, @jeweler.minor_version
-      end
-    end
-    
-    def should_have_patch_version(version)
-      should "have patch version of #{version}" do
-        assert_equal version, @jeweler.patch_version
-      end
-    end
-    
-    def should_be_version(version)
-      should "be version #{version}" do
-        assert_equal version, @jeweler.version
-      end
-    end
-    
-    def should_bump_version(major, minor, patch)
-      version = "#{major}.#{minor}.#{patch}"
-      should_have_major_version major
-      should_have_minor_version minor
-      should_have_patch_version patch
-      should_be_version version
-      should "output the new version, #{version}" do
-        assert_match version, @output
-      end
-    end
-  end
-  
+
   context "A jeweler without a VERSION.yml" do
     setup do
       FileUtils.mkdir_p(tmp_dir)
       @jeweler = Jeweler.new(build_spec, tmp_dir)
     end
-    
+
     should "not have VERSION.yml" do
       assert ! File.exists?(File.join(tmp_dir, 'bar.gemspec'))
     end
   end
-  
-  
+
+
   context "A Jeweler with a VERSION.yml" do
     setup do
       FileUtils.cp_r(fixture_dir, tmp_dir)
 
       @jeweler = Jeweler.new(build_spec, tmp_dir)
-    end  
-    
+    end
+
     should_have_major_version 1
     should_have_minor_version 5
     should_have_patch_version 2
     should_be_version '1.5.2'
-    
+
     context "bumping the patch version" do
       setup do
         @output = catch_out { @jeweler.bump_patch_version }
       end
       should_bump_version 1, 5, 3
     end
-    
+
     context "bumping the minor version" do
       setup do
         @output = catch_out { @jeweler.bump_minor_version }
@@ -98,7 +62,7 @@ class JewelerTest < Test::Unit::TestCase
 
       should_bump_version 1, 6, 0
     end
-    
+
     context "bumping the major version" do
       setup do
         @output = catch_out { @jeweler.bump_major_version}
@@ -106,12 +70,12 @@ class JewelerTest < Test::Unit::TestCase
 
       should_bump_version 2, 0, 0
     end
-    
+
     context "writing the gemspec" do
       setup do
         @output = catch_out { @jeweler.write_gemspec }
       end
-      
+
       should "create bar.gemspec" do
         assert File.exists?(File.join(tmp_dir, 'bar.gemspec'))
       end
@@ -119,12 +83,11 @@ class JewelerTest < Test::Unit::TestCase
       should "have created a valid gemspec" do
         assert @jeweler.valid_gemspec?
       end
-      
+
       should "output the name of the gemspec" do
         assert_match 'bar.gemspec', @output
       end
-    
-      
+
       context "re-reading the gemspec" do
         setup do
           gemspec_path = File.join(tmp_dir, 'bar.gemspec')
@@ -136,18 +99,18 @@ class JewelerTest < Test::Unit::TestCase
         should "have version 1.5.2" do
           assert_equal '1.5.2', @parsed_spec.version.version
         end
-        
+
         should "have date filled in" do
           assert_equal Time.local(@now.year, @now.month, @now.day), @parsed_spec.date
         end
       end
     end
   end
-  
+
   should "raise an exception when created with a nil gemspec" do
     assert_raises Jeweler::GemspecError do
       @jeweler = Jeweler.new(nil, tmp_dir)
     end
   end
-  
+
 end

data/test/shoulda_macros/jeweler_macros.rb

@@ -0,0 +1,38 @@
+class Test::Unit::TestCase
+  class << self
+    def should_have_major_version(version)
+      should "have major version of #{version}" do 
+        assert_equal version, @jeweler.major_version
+      end
+    end
+    
+    def should_have_minor_version(version)
+      should "have minor version of #{version}" do
+        assert_equal version, @jeweler.minor_version
+      end
+    end
+    
+    def should_have_patch_version(version)
+      should "have patch version of #{version}" do
+        assert_equal version, @jeweler.patch_version
+      end
+    end
+    
+    def should_be_version(version)
+      should "be version #{version}" do
+        assert_equal version, @jeweler.version
+      end
+    end
+    
+    def should_bump_version(major, minor, patch)
+      version = "#{major}.#{minor}.#{patch}"
+      should_have_major_version major
+      should_have_minor_version minor
+      should_have_patch_version patch
+      should_be_version version
+      should "output the new version, #{version}" do
+        assert_match version, @output
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -8,14 +8,16 @@ require 'ruby-debug'
 gem 'mocha'
 require 'mocha'
 
+require File.dirname(__FILE__) + '/shoulda_macros/jeweler_macros'
+
 # Use vendored gem because of limited gem availability on runcoderun
 # This is loosely based on 'vendor everything'.
-Dir[File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', '**')].each do |dir| 
+Dir[File.join(File.dirname(__FILE__), '..', 'vendor', 'gems', '**')].each do |dir|
   lib = "#{dir}/lib"
   $LOAD_PATH.unshift(lib) if File.directory?(lib)
 end
-require 'output_catcher'
 
+require 'output_catcher'
 require 'time'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
@@ -28,19 +30,21 @@ class FileList
   end
 end
 
+TMP_DIR = File.join(File.dirname(__FILE__), 'tmp')
+FileUtils.rm_f(TMP_DIR) # GAH, dirty hax. Somewhere isn't tearing up correctly, so do some cleanup first
+
 class Test::Unit::TestCase
-  
   def catch_out(&block)
      OutputCatcher.catch_out do
        block.call
      end
   end
-  
+
   def fixture_dir
     File.join(File.dirname(__FILE__), 'fixtures', 'bar')
   end
-  
+
   def tmp_dir
     File.join(File.dirname(__FILE__), 'tmp')
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: technicalpickles-jeweler
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Josh Nichols
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-03 00:00:00 -08:00
+date: 2008-11-18 00:00:00 -08:00
 default_executable: jeweler
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,6 +46,9 @@ files:
 - lib/jeweler/templates/LICENSE
 - lib/jeweler/templates/Rakefile
 - lib/jeweler/templates/README
+- lib/jeweler/templates/spec
+- lib/jeweler/templates/spec/flunking_spec.rb
+- lib/jeweler/templates/spec/spec_helper.rb
 - lib/jeweler/templates/test
 - lib/jeweler/templates/test/flunking_test.rb
 - lib/jeweler/templates/test/test_helper.rb
@@ -56,6 +59,8 @@ files:
 - test/fixtures/bar/VERSION.yml
 - test/jeweler_generator_test.rb
 - test/jeweler_test.rb
+- test/shoulda_macros
+- test/shoulda_macros/jeweler_macros.rb
 - test/test_helper.rb
 - lib/jeweler/templates/.gitignore
 has_rdoc: false