jeweler 1.3.0 → 1.4.0

data/lib/jeweler/generator/options.rb

@@ -10,6 +10,7 @@ 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']
@@ -77,8 +78,8 @@ class Jeweler
 
           o.separator ""
 
-          o.on('--gemcutter', 'setup project for gemcutter') do
-            self[:gemcutter] = true
+          o.on('--[no-]gemcutter', 'setup project for gemcutter') do |v|
+            self[:gemcutter] = v
           end
 
           o.on('--rubyforge', 'setup project for rubyforge') do

data/lib/jeweler/rubyforge_tasks.rb

@@ -54,6 +54,7 @@ class Jeweler
         namespace :release do
           desc "Release the current gem version to RubyForge."
           task :gem => [:gemspec, :build] 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
@@ -95,6 +96,7 @@ class Jeweler
 
         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

data/lib/jeweler/specification.rb

@@ -7,12 +7,15 @@ class Jeweler
   # [files] a Rake::FileList of anything that is in git and not gitignored. You can include/exclude this default set, or override it entirely
   # [test_files] Similar to gem.files, except it's only things under the spec, test, or examples directory.
   # [extra_rdoc_files] a Rake::FileList including files like README*, ChangeLog*, and LICENSE*
-  # [executables] uses anything found in the bin/ directory. You can override this.
+  # [executables] uses anything found in the bin/ directory.
   module Specification
 
     def self.filelist_attribute(name)
       code = %{
         def #{name}
+          if @#{name} && @#{name}.class != FileList
+            @#{name} = FileList[@#{name}]
+          end
           @#{name} ||= FileList[]
         end
         def #{name}=(value)
@@ -29,28 +32,47 @@ class Jeweler
 
     # Assigns the Jeweler defaults to the Gem::Specification
     def set_jeweler_defaults(base_dir, git_base_dir = nil)
-      Dir.chdir(base_dir) do
-        require 'git'
-        if blank?(files) && git_base_dir
-          git_subdir = File.expand_path(base_dir).sub(File.join(File.expand_path(git_base_dir), ""), "")          
-          repo = Git.open(git_base_dir)
-          self.files = (repo.ls_files.keys - repo.lib.ignored_files).map {|fn| fn.sub(File.join(git_subdir, ""), "")}
+      base_dir = File.expand_path(base_dir)
+      #breakpoint
+      git_base_dir = if git_base_dir
+                       File.expand_path(git_base_dir)
+                     else
+                       base_dir
+                     end
+      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
+
+        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
+            File.expand_path(file).sub(base_dir_with_trailing_separator, "")
+          end
         end
 
-        if blank?(test_files) && File.directory?(File.join(base_dir, '.git'))
-          repo = Git.open(base_dir)
+        if blank?(test_files) && repo
           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) }
+          self.executables = Dir['bin/*'].map { |f| File.basename(f) }
+        end
+
+        if blank?(extensions)
+          self.extensions = FileList['ext/**/extconf.rb']
         end
 
         self.has_rdoc = true
         rdoc_options << '--charset=UTF-8'
 
         if blank?(extra_rdoc_files)
-          self.extra_rdoc_files = FileList["README*", "ChangeLog*", "LICENSE*"]
+          self.extra_rdoc_files = FileList['README*', 'ChangeLog*', 'LICENSE*', 'TODO']
         end
       end
     end
@@ -58,7 +80,7 @@ class Jeweler
     # Used by Specification#to_ruby to generate a ruby-respresentation of a Gem::Specification
     def ruby_code(obj)
       case obj
-      when Rake::FileList then obj.to_a.inspect
+      when Rake::FileList then obj.uniq.to_a.inspect
       else super
       end
     end

data/lib/jeweler/tasks.rb

@@ -68,12 +68,12 @@ class Jeweler
       end
 
       desc "Build gem"
-      task :build do
+      task :build => :gemspec do
         jeweler.build_gem
       end
 
       desc "Install gem using sudo"
-      task :install => ['check_dependencies:runtime', :build] do
+      task :install => [:build] do
         jeweler.install_gem
       end
 
@@ -133,7 +133,12 @@ class Jeweler
         end
       end
 
+      desc "Release gem"
+      task :release do
+      end
+
       namespace :github do
+        desc "Release Gem to GitHub"
         task :release do
           jeweler.release_gem_to_github
         end
@@ -142,6 +147,7 @@ class Jeweler
       task :release => 'github:release'
 
       namespace :git do
+        desc "Tag a release in Git"
         task :release do
           jeweler.release_to_git
         end

data/lib/jeweler/templates/README.rdoc

@@ -9,8 +9,7 @@ Description goes here.
 * Add tests for it. This is important so I don't break it in a
   future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but
-   bump version in a commit by itself I can ignore when I pull)
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 == Copyright

data/lib/jeweler/templates/Rakefile

@@ -1,149 +1,6 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "<%= project_name %>"
-    gem.summary = %Q{<%= summary %>}
-    gem.description = %Q{<%= description %>}
-    gem.email = "<%= user_email %>"
-    gem.homepage = "<%= homepage %>"
-    gem.authors = ["<%= user_name %>"]
-<% if should_setup_rubyforge %>
-    gem.rubyforge_project = "<%= project_name %>"
-<% end %>
-<% development_dependencies.each do |name, version| %>
-    gem.add_development_dependency "<%= name %>", "<%= version %>"
-<% end %>
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-<% if should_setup_gemcutter %>
-  Jeweler::GemcutterTasks.new
-<% end %>
-<% if should_setup_rubyforge %>
-  Jeweler::RubyforgeTasks.new do |rubyforge|
-    rubyforge.doc_task = "<%= doc_task %>"
-  end
-<% end %>
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+<%= render_template 'jeweler_tasks.erb' %>
 
-<% case testing_framework %>
-<% when :rspec %>
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:<%= test_task %>) do |<%= test_task %>|
-  <%= test_task %>.libs << 'lib' << '<%= test_dir %>'
-  <%= test_task %>.spec_files = FileList['<%= test_pattern %>']
-end
-<% when :micronaut %>
-require 'micronaut/rake_task'
-Micronaut::RakeTask.new(<%= test_task %>) do |<%= test_task %>|
-  <%= test_task %>.pattern = '<%= test_pattern %>'
-  <%= test_task %>.ruby_opts << '-Ilib -I<%= test_dir %>'
-end
-<% else %>
-require 'rake/testtask'
-Rake::TestTask.new(:<%= test_task %>) do |<%= test_task %>|
-  <%= test_task %>.libs << 'lib' << '<%= test_dir %>'
-  <%= test_task %>.pattern = '<%= test_pattern %>'
-  <%= test_task %>.verbose = true
-end
-<% end %>
-
-<% case testing_framework %>
-<% when :rspec %>
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = '<%= test_pattern %>'
-  spec.rcov = true
-end
-<% when :micronaut %>
-Micronaut::RakeTask.new(:rcov) do |examples|
-  examples.pattern = '<%= test_pattern %>'
-  examples.rcov_opts = '-Ilib -I<%= test_dir %>'
-  examples.rcov = true
-end
-<% else %>
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |<%= test_task %>|
-    <%= test_task %>.libs << '<%= test_dir %>'
-    <%= test_task %>.pattern = '<%= test_pattern %>'
-    <%= test_task %>.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-<% end %>
-
-task :<%= test_task %> => :check_dependencies
-
-<% if should_use_cucumber %>
-begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
-
-  task :features => :check_dependencies
-rescue LoadError
-  task :features do
-    abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
-  end
-end
-<% end %>
-
-<% if should_use_reek %>
-begin
-  require 'reek/rake_task'
-  Reek::RakeTask.new do |t|
-    t.fail_on_error = true
-    t.verbose = false
-    t.source_files = 'lib/**/*.rb'
-  end
-rescue LoadError
-  task :reek do
-    abort "Reek is not available. In order to run reek, you must: sudo gem install reek"
-  end
-end
-<% end %>
-
-<% if should_use_roodi %>
-begin
-  require 'roodi'
-  require 'roodi_task'
-  RoodiTask.new do |t|
-    t.verbose = false
-  end
-rescue LoadError
-  task :roodi do
-    abort "Roodi is not available. In order to run roodi, you must: sudo gem install roodi"
-  end
-end
-<% end %>
-
-task :default => :<%= default_task %>
-
-<% case documentation_framework %>
-<% when :rdoc %>
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "<%= project_name %> #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-<% when :yard %>
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
-  end
-end
-<% end %>
+<%= render_template 'other_tasks.erb' %>

data/lib/jeweler/templates/jeweler_tasks.erb

@@ -0,0 +1,29 @@
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "<%= project_name %>"
+    gem.summary = %Q{<%= summary %>}
+    gem.description = %Q{<%= description %>}
+    gem.email = "<%= user_email %>"
+    gem.homepage = "<%= homepage %>"
+    gem.authors = ["<%= user_name %>"]
+<% if should_setup_rubyforge %>
+    gem.rubyforge_project = "<%= project_name %>"
+<% end %>
+<% development_dependencies.each do |name, version| %>
+    gem.add_development_dependency "<%= name %>", "<%= version %>"
+<% end %>
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+<% if should_setup_gemcutter %>
+  Jeweler::GemcutterTasks.new
+<% end %>
+<% if should_setup_rubyforge %>
+  Jeweler::RubyforgeTasks.new do |rubyforge|
+    rubyforge.doc_task = "<%= doc_task %>"
+  end
+<% end %>
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+

data/lib/jeweler/templates/other_tasks.erb

@@ -0,0 +1,117 @@
+<% case testing_framework %>
+<% when :rspec %>
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:<%= test_task %>) do |<%= test_task %>|
+  <%= test_task %>.libs << 'lib' << '<%= test_dir %>'
+  <%= test_task %>.spec_files = FileList['<%= test_pattern %>']
+end
+<% when :micronaut %>
+require 'micronaut/rake_task'
+Micronaut::RakeTask.new(<%= test_task %>) do |<%= test_task %>|
+  <%= test_task %>.pattern = '<%= test_pattern %>'
+  <%= test_task %>.ruby_opts << '-Ilib -I<%= test_dir %>'
+end
+<% else %>
+require 'rake/testtask'
+Rake::TestTask.new(:<%= test_task %>) do |<%= test_task %>|
+  <%= test_task %>.libs << 'lib' << '<%= test_dir %>'
+  <%= test_task %>.pattern = '<%= test_pattern %>'
+  <%= test_task %>.verbose = true
+end
+<% end %>
+
+<% case testing_framework %>
+<% when :rspec %>
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = '<%= test_pattern %>'
+  spec.rcov = true
+end
+<% when :micronaut %>
+Micronaut::RakeTask.new(:rcov) do |examples|
+  examples.pattern = '<%= test_pattern %>'
+  examples.rcov_opts = '-Ilib -I<%= test_dir %>'
+  examples.rcov = true
+end
+<% else %>
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |<%= test_task %>|
+    <%= test_task %>.libs << '<%= test_dir %>'
+    <%= test_task %>.pattern = '<%= test_pattern %>'
+    <%= test_task %>.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+<% end %>
+
+task :<%= test_task %> => :check_dependencies
+
+<% if should_use_cucumber %>
+begin
+  require 'cucumber/rake/task'
+  Cucumber::Rake::Task.new(:features)
+
+  task :features => :check_dependencies
+rescue LoadError
+  task :features do
+    abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
+  end
+end
+<% end %>
+
+<% if should_use_reek %>
+begin
+  require 'reek/adapters/rake_task'
+  Reek::RakeTask.new do |t|
+    t.fail_on_error = true
+    t.verbose = false
+    t.source_files = 'lib/**/*.rb'
+  end
+rescue LoadError
+  task :reek do
+    abort "Reek is not available. In order to run reek, you must: sudo gem install reek"
+  end
+end
+<% end %>
+
+<% if should_use_roodi %>
+begin
+  require 'roodi'
+  require 'roodi_task'
+  RoodiTask.new do |t|
+    t.verbose = false
+  end
+rescue LoadError
+  task :roodi do
+    abort "Roodi is not available. In order to run roodi, you must: sudo gem install roodi"
+  end
+end
+<% end %>
+
+task :default => :<%= default_task %>
+
+<% case documentation_framework %>
+<% when :rdoc %>
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "<%= project_name %> #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+<% when :yard %>
+begin
+  require 'yard'
+  YARD::Rake::YardocTask.new
+rescue LoadError
+  task :yardoc do
+    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
+  end
+end
+<% end %>