jeweler 1.4.0 → 1.5.0.pre2

data/lib/jeweler/generator/options.rb

@@ -1,4 +1,3 @@
-
 class Jeweler
   class Generator
     class Options < Hash
@@ -10,11 +9,15 @@ class Jeweler
         @orig_args = args.clone
         self[:testing_framework]       = :shoulda
         self[:documentation_framework] = :rdoc
-        self[:gemcutter]               = true
-
-        git_config = Git.global_config
-        self[:user_name]       = git_config['user.name']
-        self[:user_email]      = git_config['user.email']
+        self[:use_bundler]             = true
+
+        git_config =  if Pathname.new("~/.gitconfig").expand_path.exist?
+                        Git.global_config
+                      else
+                        {}
+                      end
+        self[:user_name]       = ENV['GIT_AUTHOR_NAME']  || ENV['GIT_COMMITTER_NAME']  || git_config['user.name']
+        self[:user_email]      = ENV['GIT_AUTHOR_EMAIL'] || ENV['GIT_COMMITTER_EMAIL'] || git_config['user.email']
         self[:github_username] = git_config['github.user']
         self[:github_token]    = git_config['github.token']
 
@@ -60,8 +63,16 @@ class Jeweler
             self[:testing_framework] = :riot
           end
 
+          o.on('--shindo', 'generate shindo tests') do
+            self[:testing_framework] = :shindo
+          end
+
           o.separator ""
 
+          o.on('--[no-]bundler', 'use bundler for managing dependencies') do |v|
+            self[:use_bundler] = v
+          end
+
           o.on('--cucumber', 'generate cucumber stories in addition to the other tests') do
             self[:use_cucumber] = true
           end
@@ -78,14 +89,6 @@ class Jeweler
 
           o.separator ""
 
-          o.on('--[no-]gemcutter', 'setup project for gemcutter') do |v|
-            self[:gemcutter] = v
-          end
-
-          o.on('--rubyforge', 'setup project for rubyforge') do
-            self[:rubyforge] = true
-          end
-
           o.on('--summary [SUMMARY]', 'specify the summary of the project') do |summary|
             self[:summary] = summary
           end

data/lib/jeweler/generator/rspec_mixin.rb

@@ -2,7 +2,7 @@ class Jeweler
   class Generator
     module RspecMixin
       def self.extended(generator)
-        generator.development_dependencies << ["rspec", ">= 1.2.9"]
+        generator.development_dependencies << ["rspec", ">= 2.0.0.beta.19"]
       end
 
       def default_task

data/lib/jeweler/generator/shindo_mixin.rb

@@ -0,0 +1,44 @@
+class Jeweler
+  class Generator
+    module ShindoMixin
+      def self.extended(generator)
+        generator.development_dependencies << ["shindo", ">= 0"]
+      end
+
+      def default_task
+        'tests'
+      end
+
+      def feature_support_require
+        # 'test/unit/assertions'
+        nil
+      end
+
+      def feature_support_extend
+        # 'Test::Unit::Assertions'
+        nil
+      end
+
+      def test_dir
+        'tests'
+      end
+
+      def test_task
+        'tests'
+      end
+
+      def test_pattern
+        'tests/**/*_tests.rb'
+      end
+
+      def test_filename
+        "#{require_name}_tests.rb"
+      end
+
+      def test_helper_filename
+        "tests_helper.rb"
+      end
+
+    end
+  end
+end

data/lib/jeweler/generator/shoulda_mixin.rb

@@ -2,7 +2,7 @@ class Jeweler
   class Generator
     module ShouldaMixin
       def self.extended(generator)
-        generator.development_dependencies << ["thoughtbot-shoulda", ">= 0"]
+        generator.development_dependencies << ["shoulda", ">= 0"]
       end
 
       def default_task

data/lib/jeweler/rubyforge_tasks.rb

@@ -31,7 +31,7 @@ class Jeweler
     def initialize
       yield self if block_given?
 
-      self.doc_task = :rdoc if self.doc_task == nil # be sure to allow it to be set to false, to allow disabling
+      $stderr.puts "Releasing gems to Rubyforge is deprecated. See details at http://wiki.github.com/technicalpickles/jeweler/migrating-from-releasing-gems-to-rubyforge"
 
       define
     end
@@ -50,20 +50,10 @@ class Jeweler
 
     def define
       namespace :rubyforge do
-
         namespace :release do
           desc "Release the current gem version to RubyForge."
-          task :gem => [:gemspec, :build] do
+          task :gem do
             $stderr.puts "DEPRECATION: Releasing gems to RubyForge is deprecated. You should see about releasing to Gemcutter instead: http://wiki.github.com/technicalpickles/jeweler/gemcutter"
-            begin
-              jeweler.release_gem_to_rubyforge
-            rescue NoRubyForgeProjectInGemspecError => e
-              abort "Setting up RubyForge requires that you specify a 'rubyforge_project' in your Jeweler::Tasks declaration"
-            rescue MissingRubyForgePackageError => e
-              abort "Rubyforge reported that the #{e.message} package isn't setup. Run rake rubyforge:setup to do so."
-            rescue RubyForgeProjectNotConfiguredError => e
-              abort "RubyForge reported that #{e.message} wasn't configured. This means you need to run 'rubyforge setup', 'rubyforge login', and 'rubyforge configure', or maybe the project doesn't exist on RubyForge"
-            end
           end
 
           if publish_documentation?
@@ -88,24 +78,10 @@ class Jeweler
           end
         end
 
-
-        desc "Release gem and RDoc documentation to RubyForge"
-        task :release => "rubyforge:release:gem"
-        task :release => "rubyforge:release:docs" if publish_documentation?
-          
-
-        desc "Setup a rubyforge project for this gem"
-        task :setup do
-          $stderr.puts "DEPRECATION: Releasing gems to RubyForge is deprecated. You should see about releasing to Gemcutter instead: http://wiki.github.com/technicalpickles/jeweler/gemcutter"
-          begin 
-            jeweler.setup_rubyforge
-          rescue NoRubyForgeProjectInGemspecError => e
-            abort "Setting up RubyForge requires that you specify a 'rubyforge_project' in your Jeweler::Tasks declaration"
-          rescue RubyForgeProjectNotConfiguredError => e
-            abort "The RubyForge reported that #{e.message} wasn't configured. This means you need to run 'rubyforge setup', 'rubyforge login', and 'rubyforge configure', or maybe the project doesn't exist on RubyForge"
-          end
+        if publish_documentation?
+          desc "Release RDoc documentation to RubyForge"
+          task :release => "rubyforge:release:docs"
         end
-
       end
 
       task :release => 'rubyforge:release'

data/lib/jeweler/rubygems_dot_org_tasks.rb

@@ -0,0 +1,38 @@
+require 'rake'
+require 'rake/tasklib'
+
+class Jeweler
+  # Rake tasks for putting a Jeweler gem on Gemcutter.
+  #
+  # Jeweler::Tasks.new needs to be used before this.
+  #
+  # Basic usage:
+  #
+  #     Jeweler::RubygemsDotOrgTasks.new
+  #
+  # Easy enough, right?
+  class RubygemsDotOrgTasks < ::Rake::TaskLib
+    attr_accessor :jeweler
+
+    def initialize
+      yield self if block_given?
+
+      define
+    end
+
+    def jeweler
+      @jeweler ||= Rake.application.jeweler
+    end
+
+    def define
+      namespace :gemcutter do
+        desc "Release gem to Gemcutter"
+        task :release => [:gemspec, :build] do
+          jeweler.release_gem_to_rubygems
+        end
+      end
+
+      task :release => 'gemcutter:release'
+    end
+  end
+end

data/lib/jeweler/rubygems_tasks.rb

@@ -0,0 +1,38 @@
+require 'rake'
+require 'rake/tasklib'
+
+class Jeweler
+  # Rake tasks for putting a Jeweler gem on Gemcutter.
+  #
+  # Jeweler::Tasks.new needs to be used before this.
+  #
+  # Basic usage:
+  #
+  #     Jeweler::RubygemsDotOrgTasks.new
+  #
+  # Easy enough, right?
+  class RubygemsDotOrgTasks < ::Rake::TaskLib
+    attr_accessor :jeweler
+
+    def initialize
+      yield self if block_given?
+
+      define
+    end
+
+    def jeweler
+      @jeweler ||= Rake.application.jeweler
+    end
+
+    def define
+      namespace :rubygems do
+        desc "Release gem to Gemcutter"
+        task :release => [:gemspec, :build] do
+          jeweler.release_gem_to_rubygems
+        end
+      end
+
+      task :release => 'rubygems:release'
+    end
+  end
+end

data/lib/jeweler/specification.rb

@@ -1,3 +1,4 @@
+
 require 'rubygems/specification'
 
 class Jeweler
@@ -9,7 +10,6 @@ class Jeweler
   # [extra_rdoc_files] a Rake::FileList including files like README*, ChangeLog*, and LICENSE*
   # [executables] uses anything found in the bin/ directory.
   module Specification
-
     def self.filelist_attribute(name)
       code = %{
         def #{name}
@@ -33,7 +33,6 @@ class Jeweler
     # Assigns the Jeweler defaults to the Gem::Specification
     def set_jeweler_defaults(base_dir, git_base_dir = nil)
       base_dir = File.expand_path(base_dir)
-      #breakpoint
       git_base_dir = if git_base_dir
                        File.expand_path(git_base_dir)
                      else
@@ -42,16 +41,15 @@ class Jeweler
       can_git = git_base_dir && base_dir.include?(git_base_dir) && File.directory?(File.join(git_base_dir, '.git'))
 
       Dir.chdir(git_base_dir) do
-        if can_git
-          require 'git'
-          repo = Git.open(git_base_dir) if can_git
-        end
+        repo = if can_git
+                 require 'git'
+                 Git.open(git_base_dir)
+               end
 
         if blank?(files) && repo
           base_dir_with_trailing_separator = File.join(base_dir, "")
 
-          self.files = (repo.ls_files(base_dir).keys - repo.lib.ignored_files).map do |file|
-            #breakpoint
+          self.files = (repo.ls_files(base_dir).keys - repo.lib.ignored_files).compact.map do |file|
             File.expand_path(file).sub(base_dir_with_trailing_separator, "")
           end
         end
@@ -60,8 +58,10 @@ class Jeweler
           self.test_files = FileList['{spec,test,examples}/**/*.rb'] - repo.lib.ignored_files
         end
 
-        if blank?(executables)
-          self.executables = Dir['bin/*'].map { |f| File.basename(f) }
+        if blank?(executables) && repo
+          self.executables = (repo.ls_files(File.join(base_dir, 'bin')).keys - repo.lib.ignored_files).map do |file|
+            File.basename(file)
+          end
         end
 
         if blank?(extensions)
@@ -69,11 +69,22 @@ class Jeweler
         end
 
         self.has_rdoc = true
-        rdoc_options << '--charset=UTF-8'
 
         if blank?(extra_rdoc_files)
           self.extra_rdoc_files = FileList['README*', 'ChangeLog*', 'LICENSE*', 'TODO']
         end
+
+        if File.exist?('Gemfile')
+          require 'bundler'
+          bundler = Bundler.load
+          bundler.dependencies_for(:default).each do |dependency|
+            self.add_dependency dependency.name, dependency.requirement.to_s
+          end
+          bundler.dependencies_for(:development).each do |dependency|
+            self.add_development_dependency dependency.name, dependency.requirement.to_s
+          end
+        end
+        
       end
     end
 
@@ -85,10 +96,23 @@ class Jeweler
       end
     end
 
-    private
+  private
 
     def blank?(value)
       value.nil? || value.empty?
     end
   end
 end
+
+
+# Workaround for cloning/duping a Gem::Specification
+# documented in http://github.com/technicalpickles/jeweler/issues#issue/73
+Gem::Specification.class_eval do
+  def initialize_copy(original)
+    super
+
+    self.files = original.files.to_a
+    self.test_files = original.test_files.to_a
+    self.extra_rdoc_files = original.extra_rdoc_files.to_a
+  end
+end

data/lib/jeweler/tasks.rb

@@ -63,16 +63,23 @@ class Jeweler
     def define
       task :version_required do
         if jeweler.expects_version_file? && !jeweler.version_file_exists?
-          abort "Expected VERSION or VERSION.yml to exist. See version:write to create an initial one."
+          abort "Expected VERSION or VERSION.yml to exist. Use 'rake version:write' to create an initial one."
         end
       end
 
+      task :gemspec_required do
+        if ! File.exist?(jeweler.gemspec_helper.path)
+          abort "Expected #{jeweler.gemspec_helper.path} to exist. See 'rake gemspec:write' to create it"
+        end
+      end
+      
+
       desc "Build gem"
-      task :build => :gemspec do
+      task :build do
         jeweler.build_gem
       end
 
-      desc "Install gem using sudo"
+      desc "Install gem"
       task :install => [:build] do
         jeweler.install_gem
       end
@@ -82,7 +89,7 @@ class Jeweler
 
       namespace :gemspec do
         desc "Validates the gemspec"
-        task :validate => :version_required do
+        task :validate => :gemspec_required do
           jeweler.validate_gemspec
         end
 
@@ -91,10 +98,20 @@ class Jeweler
           jeweler.write_gemspec
         end
 
-        desc "Display the gemspec for debugging purposes"
+        desc "Display the gemspec for debugging purposes, as jeweler knows it (not from disk)"
         task :debug do
+          jeweler.gemspec_helper.spec.version ||= begin
+                                                    jeweler.version_helper.refresh
+                                                    jeweler.version_helper.to_s
+                                                  end
+          
           puts jeweler.gemspec_helper.to_ruby
         end
+
+        desc "Release Gemspec"
+        task :release do
+          jeweler.release_gem_to_github
+        end
       end
 
       desc "Displays the current version"
@@ -137,14 +154,7 @@ class Jeweler
       task :release do
       end
 
-      namespace :github do
-        desc "Release Gem to GitHub"
-        task :release do
-          jeweler.release_gem_to_github
-        end
-      end
-
-      task :release => 'github:release'
+      task :release => 'gemspec:release'
 
       namespace :git do
         desc "Tag a release in Git"
@@ -170,7 +180,33 @@ class Jeweler
         task :development do
           jeweler.check_dependencies(:development)
         end
+      end
+
+      desc "Start IRB with all runtime dependencies loaded"
+      task :console, [:script] do |t,args|
+        dirs = ['ext', 'lib'].select { |dir| File.directory?(dir) }
+
+        original_load_path = $LOAD_PATH
+
+        cmd = if File.exist?('Gemfile')
+                require 'bundler'
+                Bundler.setup(:default)
+              end
+
+        # add the project code directories
+        $LOAD_PATH.unshift(*dirs)
+
+        # clear ARGV so IRB is not confused
+        ARGV.clear
+
+        require 'irb'
+
+        # set the optional script to run
+        IRB.conf[:SCRIPT] = args.script
+        IRB.start
 
+        # return the $LOAD_PATH to it's original state
+        $LOAD_PATH.reject! { |path| !(original_load_path.include?(path)) }
       end
       
     end