jeweler 0.11.0 → 0.11.1

data/ChangeLog.markdown

@@ -1,3 +1,11 @@
+# jeweler 0.11.1
+
+ * Lots of internal refactorings to how project generation happens
+ * Fixed missing dependency on rubyforge
+ * Depend on a recent version of schacon-git which works on ruby 1.9
+ * Updated cucumber support for 0.3.x
+ * Tested on Ruby 1.9
+
 # jeweler 0.11.0 2009-04-05
 
  * generator will respect JEWELER_OPTS, as a way to provide default options

data/README.markdown

@@ -7,10 +7,8 @@ Jeweler provides two things:
 
 ## Installing
 
-    # Run the following if you haven't done so before:
-    gem sources -a http://gems.github.com
     # Install the gem:
-    sudo gem install technicalpickles-jeweler
+    sudo gem install jeweler
     
 ## Using in an existing project
 
@@ -119,7 +117,7 @@ With this in place, you now update your Jeweler::Tasks to setup `rubyforge_proje
         s.rubyforge_project = 'the-perfect-gem' # This line would be new
       end
     rescue LoadError
-      puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+      puts "Jeweler not available. Install it with: sudo gem install jeweler"
     end
 
     # These are new tasks

data/Rakefile

@@ -2,6 +2,9 @@ require 'rake'
 
 $LOAD_PATH.unshift('lib')
 
+gem 'schacon-git'
+require 'git'
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -12,19 +15,21 @@ begin
     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 "peterwald-git"
+    gem.add_dependency "schacon-git", ">= 1.1.1"
+    gem.add_dependency "rubyforge"
     gem.rubyforge_project = "pickles"
   end
 rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"
 end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.pattern = 'test/**/test_*.rb'
+  test.test_files = FileList.new('test/**/test_*.rb') do |list|
+    list.exclude 'test/test_helper.rb'
+  end
   test.libs << 'test'
   test.verbose = true
-  #test.ruby_opts << '-rtest_helper'
 end
 
 require 'rake/rdoctask'

data/VERSION.yml

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

data/lib/jeweler/generator.rb

@@ -4,6 +4,13 @@ require 'erb'
 require 'net/http'
 require 'uri'
 
+require 'jeweler/generator/bacon_mixin'
+require 'jeweler/generator/micronaut_mixin'
+require 'jeweler/generator/minitest_mixin'
+require 'jeweler/generator/rspec_mixin'
+require 'jeweler/generator/shoulda_mixin'
+require 'jeweler/generator/testunit_mixin'
+
 class Jeweler
   class NoGitUserName < StandardError
   end
@@ -22,28 +29,33 @@ class Jeweler
 
   class Generator    
     attr_accessor :target_dir, :user_name, :user_email, :summary, :testing_framework,
-                  :github_repo_name, :github_username, :github_token,
+                  :project_name, :github_username, :github_token,
                   :repo, :should_create_repo, :should_use_cucumber, :should_setup_rubyforge
 
-    SUPPORTED_TESTING_FRAMEWORKS = [:shoulda, :testunit, :bacon, :rspec, :micronaut, :minitest]
+    DEFAULT_TESTING_FRAMEWORK = :shoulda
 
-    def initialize(github_repo_name, options = {})
-      if github_repo_name.nil? || github_repo_name.squeeze.strip == ""
+    def initialize(project_name, options = {})
+      if project_name.nil? || project_name.squeeze.strip == ""
         raise NoGitHubRepoNameGiven
       end
 
-      self.github_repo_name   = github_repo_name
+      self.project_name   = project_name
 
-      self.testing_framework  = (options[:testing_framework] || :shoulda).to_sym
-      unless SUPPORTED_TESTING_FRAMEWORKS.include? self.testing_framework
+      self.testing_framework  = (options[:testing_framework] || DEFAULT_TESTING_FRAMEWORK).to_sym
+      begin
+        generator_mixin_name = "#{self.testing_framework.to_s.capitalize}Mixin"
+        generator_mixin = self.class.const_get(generator_mixin_name)
+        extend generator_mixin
+      rescue NameError => e
         raise ArgumentError, "Unsupported testing framework (#{testing_framework})"
       end
 
-      self.target_dir         = options[:directory] || self.github_repo_name
 
-      self.should_create_repo = options[:create_repo]
-      self.summary            = options[:summary] || 'TODO'
-      self.should_use_cucumber= options[:use_cucumber]
+      self.target_dir             = options[:directory] || self.project_name
+
+      self.should_create_repo     = options[:create_repo]
+      self.summary                = options[:summary] || 'TODO'
+      self.should_use_cucumber    = options[:use_cucumber]
       self.should_setup_rubyforge = options[:rubyforge]
 
       use_user_git_config
@@ -53,106 +65,39 @@ class Jeweler
     def run
       create_files
       gitify
-      $stdout.puts "Jeweler has prepared your gem in #{github_repo_name}"
+      $stdout.puts "Jeweler has prepared your gem in #{target_dir}"
       if should_create_repo
         create_and_push_repo
-        $stdout.puts "Jeweler has pushed your repo to #{github_url}"
+        $stdout.puts "Jeweler has pushed your repo to #{project_homepage}"
         enable_gem_for_repo
         $stdout.puts "Jeweler has enabled gem building for your repo"
       end
     end
 
-    # Directory where 'tests' live
-    def test_dir
-      test_or_spec
-    end
-
-    # Default rake task to use
-    def default_task
-      case testing_framework.to_sym
-      when :shoulda, :testunit, :minitest
-        'test'
-      when :bacon, :rspec
-        'spec'
-      when :micronaut
-        'examples'
-      else
-        raise ArgumentError, "Don't know default task for #{testing_framework}"
-      end
-    end
-
-    def feature_support_require
-      case testing_framework.to_sym
-      when :testunit, :shoulda, :bacon # NOTE bacon doesn't really work inside of cucumber
-        'test/unit/assertions'
-      when :minitest
-        'mini/test'
-      when :rspec
-        'spec/expectations'
-      when :micronaut
-        'micronaut/expectations'
-      else
-        raise "Don't know what to require for #{testing_framework}"
-      end
-    end
-
-    def feature_support_extend
-      case testing_framework.to_sym
-      when :testunit, :shoulda, :bacon # NOTE bacon doesn't really work inside of cucumber
-        'Test::Unit::Assertions'
-      when :minitest
-        'Mini::Test::Assertions'
-      when :rspec
-        nil
-      when :micronaut
-        'Micronaut::Matchers'
-      else
-        raise "Don't know what to extend for #{testing_framework}"
-      end
-    end
-
-    def github_remote
-      "git@github.com:#{github_username}/#{github_repo_name}.git"
+    def git_remote
+      "git@github.com:#{github_username}/#{project_name}.git"
     end
 
-    def github_url
-      "http://github.com/#{github_username}/#{github_repo_name}"
+    def project_homepage
+      "http://github.com/#{github_username}/#{project_name}"
     end
-
     
     def constant_name
-      self.github_repo_name.split(/[-_]/).collect{|each| each.capitalize }.join
+      self.project_name.split(/[-_]/).collect{|each| each.capitalize }.join
+    end
+
+    def require_name
+      self.project_name.gsub('-', '_')
     end
 
     def file_name_prefix
-      self.github_repo_name.gsub('-', '_')
+      self.project_name.gsub('-', '_')
     end
 
     def lib_dir
       'lib'
     end
 
-    def test_dir
-      case testing_framework.to_sym
-      when :shoulda, :testunit, :minitest
-        'test'
-      when :bacon, :rspec
-        'spec'
-      when :micronaut
-        'examples'
-      else
-        raise ArgumentError, "Don't know test dir for #{testing_framework.inspect}"
-      end
-    end
-
-    def test_filename
-      "#{file_name_prefix}_#{test_or_spec}.rb"
-    end
-
-    def test_helper_filename
-      "#{test_or_spec}_helper.rb"
-    end
-
     def feature_filename
       "#{file_name_prefix}.feature"
     end
@@ -173,20 +118,6 @@ class Jeweler
       File.join(features_dir, 'step_definitions')
     end
 
-    def test_or_spec
-      case testing_framework.to_sym
-      when :shoulda, :testunit, :minitest
-        'test'
-      when :bacon, :rspec
-        'spec'
-      when :micronaut
-        'example'
-      else
-        raise ArgumentError, "Unknown test style: #{testing_framework}"
-      end
-    end
-
-
   protected
 
     # This is in a separate method so we can stub it out during testing
@@ -306,13 +237,13 @@ class Jeweler
         end
 
         begin
-          @repo.commit "Initial commit to #{github_repo_name}."
+          @repo.commit "Initial commit to #{project_name}."
         rescue Git::GitExecuteError => e
           raise
         end
 
         begin
-          @repo.add_remote('origin', github_remote)
+          @repo.add_remote('origin', git_remote)
         rescue Git::GitExecuteError => e
           puts "Encountered an error while adding origin remote. Maybe you have some weird settings in ~/.gitconfig?"
           raise
@@ -327,13 +258,13 @@ class Jeweler
                                 'login' => github_username,
                                 'token' => github_token,
                                 'repository[description]' => summary,
-                                'repository[name]' => github_repo_name
+                                'repository[name]' => project_name
       # TODO do a HEAD request to see when it's ready
       @repo.push('origin')
     end
 
     def enable_gem_for_repo
-      url = "https://github.com/#{github_username}/#{github_repo_name}/update"
+      url = "https://github.com/#{github_username}/#{project_name}/update"
       `curl -F 'login=#{github_username}' -F 'token=#{github_token}' -F 'field=repository_rubygem' -F 'value=1' #{url} 2>/dev/null`
       # FIXME use NET::HTTP instead of curl
       #Net::HTTP.post_form URI.parse(url),

data/lib/jeweler/generator/application.rb

@@ -9,6 +9,11 @@ class Jeweler
           options = Jeweler::Generator::Options.new(arguments)
           options = options.merge(env_opts) if env_opts
 
+          if options[:invalid_argument]
+            $stderr.puts options[:invalid_argument]
+            options[:show_help] = true
+          end
+
           if options[:show_help]
             $stderr.puts options.opts
             return 1
@@ -19,10 +24,10 @@ class Jeweler
             return 1
           end
 
-          github_repo_name = arguments.first
+          project_name = arguments.first
 
           begin
-            generator = Jeweler::Generator.new(github_repo_name, options)
+            generator = Jeweler::Generator.new(project_name, options)
             generator.run
             return 0
           rescue Jeweler::NoGitUserName
@@ -38,7 +43,7 @@ class Jeweler
             $stderr.puts %Q{No github.token found in ~/.gitconfig. Please tell git about your GitHub account (see http://github.com/blog/180-local-github-config for details). For example: git config --global github.token 6ef8395fecf207165f1a82178ae1b984}
             return 1
           rescue Jeweler::FileInTheWay
-            $stderr.puts "The directory #{github_repo_name} already exists. Maybe move it out of the way before continuing?"
+            $stderr.puts "The directory #{project_name} already exists. Maybe move it out of the way before continuing?"
             return 1
           end
         end

data/lib/jeweler/generator/bacon_mixin.rb

@@ -0,0 +1,39 @@
+class Jeweler
+  class Generator
+    module BaconMixin
+
+      def default_task
+        'spec'
+      end
+
+      def feature_support_require
+        'test/unit/assertions'
+      end
+
+      def feature_support_extend
+        'Test::Unit::Assertions' # NOTE can't use bacon inside of cucumber actually
+      end
+
+      def test_dir
+        'spec'
+      end
+
+      def test_task
+        'spec'
+      end
+
+      def test_pattern
+        'spec/**/*_spec.rb'
+      end
+
+      def test_filename
+        "#{require_name}_spec.rb"
+      end
+
+      def test_helper_filename
+        "spec_helper.rb"
+      end
+
+    end
+  end
+end

data/lib/jeweler/generator/micronaut_mixin.rb

@@ -0,0 +1,38 @@
+class Jeweler
+  class Generator
+    module MicronautMixin
+      
+      def default_task
+        'examples'
+      end
+
+      def feature_support_require
+        'micronaut/expectations'
+      end
+
+      def feature_support_extend
+        'Micronaut::Matchers'
+      end
+
+      def test_dir
+        'examples'
+      end
+
+      def test_task
+        'examples'
+      end
+
+      def test_pattern
+        'examples/**/*_example.rb'
+      end
+
+      def test_filename
+        "#{require_name}_example.rb"
+      end
+
+      def test_helper_filename
+        "example_helper.rb"
+      end
+    end
+  end
+end

data/lib/jeweler/generator/minitest_mixin.rb

@@ -0,0 +1,39 @@
+class Jeweler
+  class Generator
+    module MinitestMixin
+
+      def default_task
+        'test'
+      end
+
+      def feature_support_require
+        'mini/test'
+      end
+
+      def feature_support_extend
+        'Mini::Test::Assertions'
+      end
+
+      def test_dir
+        'test'
+      end
+
+      def test_task
+        'test'
+      end
+
+      def test_pattern
+        'test/**/*_test.rb'
+      end
+
+      def test_filename
+        "#{require_name}_test.rb"
+      end
+
+      def test_helper_filename
+        "test_helper.rb"
+      end
+
+    end
+  end
+end