namelessjon-jeweler 0.5.1 → 0.6.1

data/README.markdown

@@ -75,14 +75,15 @@ Here's a rundown of what's happening:
 
 ## Bootstrap a new project
 
-Before proceeding, take a minute to setup your git environment, specifically your name and email address:
+Before proceeding, take a minute to setup your git environment, specifically your name, email address, and GitHub username
 
     $ git config --global user.email johndoe@example.com
     $ git config --global user.name 'John Doe'
+    $ git config --global github.user johndoe
 
-Jeweler provides a generator of sorts, `jeweler`. It takes two arguments: your GitHub username and a repository name.
+Jeweler provides a generator of sorts, `jeweler`. It requires only argument, the name of a repo you want to create. It also takes a few options: --[shoulda](http://github.com/thoughtbot/shoulda) and --[bacon](http://github.com/chneukirchen/bacon/tree/master). These control what type of tests are created, with the default being shoulda.
 
-    $ jeweler technicalpickles the-perfect-gem
+    $ jeweler the-perfect-gem
 
 Basically, this does:
 
@@ -96,7 +97,7 @@ Basically, this does:
   * `test/the_perfect_gem.rb`, placeholder failing test
   * `lib/the_perfect_gem.rb`, placeholder library file
  * Makes it a git repo
- * Sets up `git@github.com:technicalpickles/jeweler.git` as the `origin` git remote
+ * Sets up `git@github.com:johndoe/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.

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: 5
+minor: 6

data/bin/jeweler

@@ -7,31 +7,40 @@ require 'jeweler'
 
 class JewelerOpts < Hash
   attr_reader :opts
+  
   def initialize(args)
     super()
-    self[:spec] = false
+    
+    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('-s','--spec', 'use bacon to generate specs') do
-        self[:spec] = true
+      
+      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
 
-o = JewelerOpts.new(ARGV)
+options = JewelerOpts.new(ARGV)
 
 unless ARGV.size == 1
-  puts o.opts
+  puts options.opts
   exit 1
 end
 
 github_repo_name = ARGV.first
-generator = Jeweler::Generator.new github_repo_name
-generator.spec = o[:spec]
+generator = Jeweler::Generator.new github_repo_name, options
 generator.run

data/lib/jeweler/generator.rb

@@ -12,15 +12,18 @@ class Jeweler
   end
   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, :constant_name, :file_name_prefix, :config, :spec
+                  :lib_dir, :constant_name, :file_name_prefix, :config, :test_style
 
-    def initialize(github_repo_name, dir = nil)
+    def initialize(github_repo_name, options = {})
       check_user_git_config()
-
+      
       if github_repo_name.nil?
         raise NoGitHubRepoNameGiven
       end
@@ -29,8 +32,8 @@ class Jeweler
       self.github_remote = "git@github.com:#{github_username}/#{github_repo_name}.git"
       self.github_url = "http://github.com/#{github_username}/#{github_repo_name}"
 
-
-      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.constant_name = self.github_repo_name.split(/[-_]/).collect{|each| each.capitalize }.join
       self.file_name_prefix = self.github_repo_name.gsub('-', '_')
@@ -42,10 +45,11 @@ class Jeweler
     end
 
     def testspec
-      if self.spec
-        'spec'
-      else
+      case test_style
+      when :shoulda
         'test'
+      when :bacon
+        'spec'
       end
     end
 
@@ -56,11 +60,10 @@ class Jeweler
 
   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
@@ -78,12 +81,15 @@ class Jeweler
 
     def check_user_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
@@ -95,6 +101,7 @@ class Jeweler
 
     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
 
@@ -102,16 +109,34 @@ 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

data/lib/jeweler/release.rb

@@ -22,7 +22,10 @@ class Jeweler
 
   protected
     def any_pending_changes?
-      @repo.status.added.empty? && @repo.status.deleted.empty? && @repo.status.changed.empty? && @repo.status.untracked.empty?
+      unless ENV['JEWELER_DEBUG'].nil? || ENV['JEWELER_DEBUG'].squeeze == ''
+        require 'ruby-debug'; breakpoint
+      end
+      !(@repo.status.added.empty? && @repo.status.deleted.empty? && @repo.status.changed.empty?)
     end
   end
 end

data/test/jeweler_generator_test.rb

@@ -27,7 +27,7 @@ class JewelerTest < Test::Unit::TestCase
 
   context "given a nil github repo name" do
     setup do
-      @block = lambda { Jeweler::Generator.new(nil, nil) }
+      @block = lambda { Jeweler::Generator.new(nil) }
     end
 
     should "raise an error" do
@@ -163,7 +163,7 @@ class JewelerTest < Test::Unit::TestCase
 
       context "for technicalpickles's the-perfect-gem repo and working directory 'tmp'" do
         setup do
-          @generator = Jeweler::Generator.new('the-perfect-gem', @tmp_dir)
+          @generator = Jeweler::Generator.new('the-perfect-gem', :directory => @tmp_dir)
         end
 
         should "use tmp for target directory" do
@@ -307,9 +307,9 @@ class JewelerTest < Test::Unit::TestCase
           end
         end
 
-        context "running for spec = true" do
+        context "running bacon" do
           setup do
-            @generator.spec = true
+            @generator.test_style = :bacon
             @generator.run
           end
 

data/test/jeweler_test.rb

@@ -5,6 +5,7 @@ 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
@@ -23,43 +24,6 @@ class JewelerTest < Test::Unit::TestCase
     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)
@@ -124,7 +88,6 @@ class JewelerTest < Test::Unit::TestCase
         assert_match 'bar.gemspec', @output
       end
 
-
       context "re-reading the gemspec" do
         setup do
           gemspec_path = File.join(tmp_dir, 'bar.gemspec')

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|
   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,8 +30,10 @@ class FileList
   end
 end
 
-class Test::Unit::TestCase
+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
@@ -43,4 +47,4 @@ class Test::Unit::TestCase
   def tmp_dir
     File.join(File.dirname(__FILE__), 'tmp')
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: namelessjon-jeweler
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Josh Nichols
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-15 00:00:00 -08:00
+date: 2008-11-18 00:00:00 -08:00
 default_executable: jeweler
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,36 +30,38 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- README.markdown
 - Rakefile
+- README.markdown
 - TODO
 - VERSION.yml
 - bin/jeweler
-- lib/jeweler.rb
 - lib/jeweler
 - lib/jeweler/bumping.rb
 - lib/jeweler/errors.rb
 - lib/jeweler/gemspec.rb
+- lib/jeweler/generator.rb
 - lib/jeweler/release.rb
+- lib/jeweler/tasks.rb
 - lib/jeweler/templates
 - 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
-- lib/jeweler/templates/spec
-- lib/jeweler/templates/spec/spec_helper.rb
-- lib/jeweler/templates/spec/flunking_spec.rb
-- lib/jeweler/templates/Rakefile
 - lib/jeweler/versioning.rb
-- lib/jeweler/generator.rb
-- lib/jeweler/tasks.rb
+- lib/jeweler.rb
 - test/fixtures
 - test/fixtures/bar
 - 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
-- test/jeweler_generator_test.rb
 - lib/jeweler/templates/.gitignore
 has_rdoc: false
 homepage: http://github.com/technicalpickles/jeweler