technicalpickles-jeweler 1.0.2 → 1.1.0

data/.gitignore

@@ -5,3 +5,4 @@ tags
 test/tmp
 test/version_tmp
 tmp
+.yardoc

data/Rakefile

@@ -15,14 +15,27 @@ 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 "git", ">= 1.1.1"
+
+    gem.add_dependency "git", ">= 1.2.1"
     gem.add_dependency "rubyforge"
+
     gem.rubyforge_project = "pickles"
+
+    gem.add_development_dependency "thoughtbot-shoulda"
+    gem.add_development_dependency "mhennemeyer-output_catcher"
+    gem.add_development_dependency "rr"
+    gem.add_development_dependency "mocha"
+    gem.add_development_dependency "redgreen"
+  end
+
+  Jeweler::RubyforgeTasks.new do |t|
+    t.doc_task = :yardoc
   end
 rescue LoadError
   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.test_files = FileList.new('test/**/test_*.rb') do |list|
@@ -32,14 +45,18 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'jeweler'
-  rdoc.rdoc_files.include('README.markdown')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+begin
+  require 'yard'
+  YARD::Rake::YardocTask.new(:yardoc) do |t|
+    t.files   = FileList['lib/**/*.rb'].exclude('lib/jeweler/templates/**/*.rb')
+  end
+rescue LoadError
+  task :yardoc do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
 end
 
+
 begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new(:rcov) do |rcov|
@@ -104,3 +121,32 @@ if ENV["RUN_CODE_RUN"] == "true"
 else
   task :default => :test
 end
+
+namespace :development_dependencies do
+  task :check do
+    missing_dependencies = Rake.application.jeweler.gemspec.development_dependencies.select do |dependency|
+      begin
+        Gem.activate dependency.name, dependency.version_requirements.to_s
+        false
+      rescue LoadError => e
+        true
+      end
+    end
+
+    #require 'ruby-debug'; breakpoint
+
+    if missing_dependencies.empty?
+      puts "Development dependencies seem to be installed."
+    else
+      puts "Missing some dependencies. Install them with the following commands:"
+      missing_dependencies.each do |dependency|
+        puts %Q{\tgem install #{dependency.name} --version "#{dependency.version_requirements}"}
+      end
+      abort "Run the specified gem commands before trying to run this again: #{$0} #{ARGV.join(' ')}"
+    end
+
+  end
+end
+
+task :test => 'development_dependencies:check'
+task :features => 'development_dependencies:check'

data/VERSION.yml

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

data/features/generator/rakefile.feature

@@ -3,9 +3,11 @@ Feature: generated Rakefile
   A user should be able to
   generate a Rakefile
 
-  Scenario: shared
+  Background:
     Given a working directory
     And I have configured git sanely
+
+  Scenario: shared
     When I generate a project named 'the-perfect-gem' that is 'zomg, so good' and described as 'Descriptive'
 
     Then 'Rakefile' requires 'rubygems'
@@ -18,8 +20,6 @@ Feature: generated Rakefile
     And Rakefile has 'http://github.com/technicalpickles/the-perfect-gem' for the Jeweler::Tasks homepage
 
   Scenario: bacon
-    Given a working directory
-    And I have configured git sanely
     When I generate a bacon project named 'the-perfect-gem' that is 'zomg, so good'
 
     
@@ -30,8 +30,6 @@ Feature: generated Rakefile
     And Rakefile has "spec" as the default task
 
   Scenario: minitest
-    Given a working directory
-    And I have configured git sanely
     When I generate a minitest project named 'the-perfect-gem' that is 'zomg, so good'
 
     Then 'Rakefile' requires 'rcov/rcovtask'
@@ -41,8 +39,6 @@ Feature: generated Rakefile
     And Rakefile has "test" as the default task
 
   Scenario: rspec
-    Given a working directory
-    And I have configured git sanely
     When I generate a rspec project named 'the-perfect-gem' that is 'zomg, so good'
 
     Then 'Rakefile' requires 'spec/rake/spectask'
@@ -50,8 +46,6 @@ Feature: generated Rakefile
     And Rakefile has "spec" as the default task
 
   Scenario: shoulda
-    Given a working directory
-    And I have configured git sanely
     When I generate a shoulda project named 'the-perfect-gem' that is 'zomg, so good'
 
     Then 'Rakefile' requires 'rcov/rcovtask'
@@ -61,8 +55,6 @@ Feature: generated Rakefile
     And Rakefile has "test" as the default task
 
   Scenario: micronaut
-    Given a working directory
-    And I have configured git sanely
     When I generate a micronaut project named 'the-perfect-gem' that is 'zomg, so good'
 
     Then 'Rakefile' requires 'micronaut/rake_task'
@@ -70,8 +62,6 @@ Feature: generated Rakefile
     And Rakefile has "examples" as the default task
 
   Scenario: testunit
-    Given a working directory
-    And I have configured git sanely
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
 
     Then 'Rakefile' requires 'rcov/rcovtask'
@@ -81,65 +71,81 @@ Feature: generated Rakefile
     And Rakefile has "test" as the default task
 
   Scenario: no cucumber
-    Given a working directory
-    And I have configured git sanely
-    And I do not want cucumber stories
+    Given I do not want cucumber stories
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
     Then Rakefile does not require 'cucumber/rake/task' 
     And Rakefile does not instantiate a Cucumber::Rake::Task
 
   Scenario: cucumber
-    Given a working directory
-    And I have configured git sanely
-    And I want cucumber stories
+    Given I want cucumber stories
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
     Then Rakefile requires 'cucumber/rake/task' 
     And Rakefile instantiates a Cucumber::Rake::Task
 
   Scenario: no reek
-    Given a working directory
-    And I have configured git sanely
-    And I do not want reek
+    Given I do not want reek
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
     Then Rakefile does not require 'reek/rake_task' 
     And Rakefile does not instantiate a Reek::RakeTask
 
   Scenario: reek
-    Given a working directory
-    And I have configured git sanely
-    And I want reek
+    Given I want reek
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
     Then Rakefile requires 'reek/rake_task' 
     And Rakefile instantiates a Reek::RakeTask
 
   Scenario: no roodi
-    Given a working directory
-    And I have configured git sanely
-    And I do not want roodi
+    Given I do not want roodi
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
     Then Rakefile does not require 'roodi' 
     And Rakefile does not require 'roodi_task' 
     And Rakefile does not instantiate a RoodiTask
 
   Scenario: roodi
-    Given a working directory
-    And I have configured git sanely
-    And I want roodi
+    Given I want roodi
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
     Then Rakefile requires 'roodi' 
     And Rakefile requires 'roodi_task' 
     And Rakefile instantiates a RoodiTask
 
   Scenario: no rubyforge
-    Given a working directory
-    And I have configured git sanely
-    And I do not want rubyforge setup
+    Given I do not want rubyforge setup
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
     Then Rakefile does not instantiate a Jeweler::RubyforgeTasks
 
   Scenario: rubyforge
-    Given a working directory
-    And I have configured git sanely
+    Given I want rubyforge setup
+    When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
+    Then Rakefile instantiates a Jeweler::RubyforgeTasks
+
+  Scenario: yard
+    Given I want to use yard instead of rdoc
+    When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
+    
+    Then 'Rakefile' does not require 'rake/rdoctask'
+    And 'Rakefile' requires 'yard'
+    And Rakefile instantiates a YARD::Rake::YardocTask
+
+  Scenario: rdoc
+    Given I want to use rdoc instead of yard
+    When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
+    
+    Then 'Rakefile' does not require 'yard'
+    And 'Rakefile' requires 'rake/rdoctask'
+    And Rakefile does not instantiate a YARD::Rake::YardocTask
+    And Rakefile instantiates a Rake::RDocTask.new
+
+  Scenario: rubyforge and yard
+    Given I want to use yard instead of rdoc
+    And I want rubyforge setup
+    When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
+    Then Rakefile instantiates a Jeweler::RubyforgeTasks
+    And Rakefile has 'yardoc' for the Jeweler::RubyforgeTasks doc_task
+
+  Scenario: rubyfoge and doc
+    Given I want to use rdoc instead of yard
+    And I want rubyforge setup
     And I want rubyforge setup
     When I generate a testunit project named 'the-perfect-gem' that is 'zomg, so good'
     Then Rakefile instantiates a Jeweler::RubyforgeTasks
+    And Rakefile has 'rdoc' for the Jeweler::RubyforgeTasks doc_task

data/features/step_definitions/filesystem_steps.rb

@@ -25,6 +25,9 @@ end
 When /^I run "([^"]+)" in "([^"]+)"$/ do |command, directory|
   full_path = File.join(@working_dir, directory)
 
+  lib_path = File.expand_path 'lib'
+  command.gsub!(/^rake /, "rake -I#{lib_path} ")
+
   assert File.directory?(full_path), "#{full_path} is not a directory"
 
   @stdout = `cd #{full_path} && #{command}`

data/features/step_definitions/generator_steps.rb

@@ -30,6 +30,14 @@ And /^I want rubyforge setup$/ do
   @use_rubyforge = true
 end
 
+Given /^I want to use yard instead of rdoc$/ do
+  @documentation_framework = "yard"
+end
+
+Given /^I want to use rdoc instead of yard$/ do
+  @documentation_framework = "rdoc"
+end
+
 
 Given /^I intend to test with (\w+)$/ do |testing_framework|
   @testing_framework = testing_framework.to_sym
@@ -77,6 +85,7 @@ When /^I generate a (.*)project named '((?:\w|-|_)+)' that is '([^']*)' and desc
                 @use_rubyforge ? '--rubyforge' : nil,
                 @use_roodi ? '--roodi' : nil,
                 @use_reek ? '--reek' : nil,
+                @documentation_framework ? "--#{@documentation_framework}" : nil,
                 @name].compact
 
   @stdout = OutputCatcher.catch_out do

data/features/support/env.rb

@@ -1,8 +1,18 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'jeweler'
 
-require 'mocha'
-require 'output_catcher'
+begin
+  require 'mocha'
+  require 'output_catcher'
+rescue LoadError => e
+  puts "*" * 80
+  puts "Some dependencies needed to run tests were missing. Run the following command to find them:"
+  puts
+  puts "\trake development_dependencies:check"
+  puts "*" * 80
+  exit 1
+end
+
 
 require 'test/unit/assertions'
 

data/jeweler.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{jeweler}
-  s.version = "1.0.2"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Nichols"]
-  s.date = %q{2009-07-29}
+  s.date = %q{2009-08-05}
   s.default_executable = %q{jeweler}
   s.description = %q{Simple and opinionated helper for creating Rubygem projects on GitHub}
   s.email = %q{josh@technicalpickles.com}
@@ -150,7 +153,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{pickles}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Simple and opinionated helper for creating Rubygem projects on GitHub}
   s.test_files = [
     "test/fixtures/bar/lib/foo_the_ultimate_lib.rb",
@@ -191,14 +194,29 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<git>, [">= 1.1.1"])
+      s.add_runtime_dependency(%q<git>, [">= 1.2.1"])
       s.add_runtime_dependency(%q<rubyforge>, [">= 0"])
+      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_development_dependency(%q<mhennemeyer-output_catcher>, [">= 0"])
+      s.add_development_dependency(%q<rr>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<redgreen>, [">= 0"])
     else
-      s.add_dependency(%q<git>, [">= 1.1.1"])
+      s.add_dependency(%q<git>, [">= 1.2.1"])
       s.add_dependency(%q<rubyforge>, [">= 0"])
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<mhennemeyer-output_catcher>, [">= 0"])
+      s.add_dependency(%q<rr>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<redgreen>, [">= 0"])
     end
   else
-    s.add_dependency(%q<git>, [">= 1.1.1"])
+    s.add_dependency(%q<git>, [">= 1.2.1"])
     s.add_dependency(%q<rubyforge>, [">= 0"])
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<mhennemeyer-output_catcher>, [">= 0"])
+    s.add_dependency(%q<rr>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<redgreen>, [">= 0"])
   end
 end

data/lib/jeweler/commands/install_gem.rb

@@ -1,3 +1,5 @@
+require 'rbconfig'
+
 class Jeweler
   module Commands
     class InstallGem
@@ -9,10 +11,22 @@ class Jeweler
 
 
       def run
-        command = "sudo gem install #{gemspec_helper.gem_path}"
+        command = "gem install #{gemspec_helper.gem_path}"
         output.puts "Executing #{command.inspect}:"
 
-        sh command # TODO where does sh actually come from!?
+        sh sudo_wrapper(command) # TODO where does sh actually come from!? - rake, apparently
+      end
+
+      def sudo_wrapper(command)
+        use_sudo? ? "sudo #{command}" : command
+      end
+
+      def use_sudo?
+        host_os !~ /mswin|windows|cygwin/i
+      end
+
+      def host_os
+        Config::CONFIG['host_os']
       end
 
       def self.build_for(jeweler)

data/lib/jeweler/commands/release.rb

@@ -12,7 +12,7 @@ class Jeweler
       end
 
       def run
-        raise "Hey buddy, try committing them files first" if any_pending_changes?
+        raise "Hey buddy, try committing them files first" unless clean_staging_area?
 
         repo.checkout('master')
 
@@ -22,11 +22,12 @@ class Jeweler
         output.puts "Pushing master to origin"
         repo.push
 
-        tag_release! unless release_tagged?
+        tag_release! if release_not_tagged?
       end
       
-      def any_pending_changes?
-        !(@repo.status.added.empty? && @repo.status.deleted.empty? && @repo.status.changed.empty?)
+      def clean_staging_area?
+        status = repo.status
+        status.added.empty? && status.deleted.empty? && status.changed.empty?
       end
 
       def tag_release!
@@ -52,13 +53,15 @@ class Jeweler
         "v#{version}"
       end
 
-      def release_tagged?
+      def release_not_tagged?
         tag = repo.tag(release_tag) rescue nil
-        ! tag.nil?
+        tag.nil?
       end
 
       def gemspec_changed?
-        any_pending_changes?
+        `git status` # OMGHAX. status always ends up being 'M' unless this runs
+        status = repo.status[gemspec_helper.path]
+        ! status.type.nil?
       end
 
       def gemspec_helper

data/lib/jeweler/commands/setup_rubyforge.rb

@@ -11,7 +11,26 @@ class Jeweler
         output.puts "Logging into rubyforge"
         @rubyforge.login
 
+        if package_exists?
+          output.puts "#{@gemspec.name} package already exists in the #{@gemspec.rubyforge_project} project"
+          return
+        end
+
         output.puts "Creating #{@gemspec.name} package in the #{@gemspec.rubyforge_project} project"
+        create_package
+      end
+
+      def package_exists?
+        begin
+          @rubyforge.lookup 'package', @gemspec.name
+          true
+        rescue RuntimeError => e
+          raise unless e.message == "no <package_id> configured for <#{@gemspec.name}>"
+          false
+        end
+      end
+
+      def create_package
         begin
           @rubyforge.create_package(@gemspec.rubyforge_project, @gemspec.name)
         rescue StandardError => e

data/lib/jeweler/gemspec_helper.rb

@@ -30,6 +30,9 @@ class Jeweler
         gemspec_ruby = prettyify_array(gemspec_ruby, :files)
         gemspec_ruby = prettyify_array(gemspec_ruby, :test_files)
         gemspec_ruby = prettyify_array(gemspec_ruby, :extra_rdoc_files)
+        f.puts "# Generated by jeweler"
+        f.puts "# DO NOT EDIT THIS FILE"
+        f.puts "# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`"
         f.write gemspec_ruby
       end 
     end

data/lib/jeweler/generator/options.rb

@@ -7,7 +7,8 @@ class Jeweler
         super()
 
         @orig_args = args.clone
-        self[:testing_framework] = :shoulda
+        self[:testing_framework]       = :shoulda
+        self[:documentation_framework] = :rdoc
 
         @opts = OptionParser.new do |o|
           o.banner = "Usage: #{File.basename($0)} [options] reponame\ne.g. #{File.basename($0)} the-perfect-gem"
@@ -68,6 +69,14 @@ class Jeweler
             self[:directory] = directory
           end
 
+          o.on('--yard', 'use yard for documentation') do
+            self[:documentation_framework] = :yard
+          end
+
+          o.on('--rdoc', 'use rdoc for documentation') do
+            self[:documentation_framework] = :rdoc
+          end
+
           o.on_tail('-h', '--help', 'display this help and exit') do
             self[:show_help] = true
           end

data/lib/jeweler/generator.rb

@@ -28,13 +28,16 @@ class Jeweler
   end    
 
   class Generator    
-    attr_accessor :target_dir, :user_name, :user_email, :summary, :testing_framework,
+    attr_accessor :target_dir, :user_name, :user_email, :summary,
                   :project_name, :github_username, :github_token,
-                  :repo, :should_create_repo, :should_use_cucumber, :should_setup_rubyforge,
+                  :repo, :should_create_repo, 
+                  :testing_framework, :documentation_framework,
+                  :should_use_cucumber, :should_setup_rubyforge,
                   :should_use_reek, :should_use_roodi,
                   :description
 
     DEFAULT_TESTING_FRAMEWORK = :shoulda
+    DEFAULT_DOCUMENTATION_FRAMEWORK = :rdoc
 
     def initialize(project_name, options = {})
       if project_name.nil? || project_name.squeeze.strip == ""
@@ -44,6 +47,7 @@ class Jeweler
       self.project_name   = project_name
 
       self.testing_framework  = (options[:testing_framework] || DEFAULT_TESTING_FRAMEWORK).to_sym
+      self.documentation_framework = options[:documentation_framework] || DEFAULT_DOCUMENTATION_FRAMEWORK
       begin
         generator_mixin_name = "#{self.testing_framework.to_s.capitalize}Mixin"
         generator_mixin = self.class.const_get(generator_mixin_name)
@@ -127,14 +131,19 @@ class Jeweler
       File.join(features_dir, 'step_definitions')
     end
 
+    def doc_task
+      case documentation_framework
+      when :yard then "yardoc"
+      else
+        documentation_framework.to_s
+      end
+    end
+
   protected
 
     # This is in a separate method so we can stub it out during testing
     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
-      lib = Git::Lib.new(nil, nil)
-      config = lib.parse_config '~/.gitconfig'
+      Git.global_config
     end
 
   private

data/lib/jeweler/rubyforge_tasks.rb

@@ -4,8 +4,29 @@ require 'rake/contrib/sshpublisher'
 
 
 class Jeweler
+  # Rake tasks for putting a Jeweler gem on Rubyforge.
+  #
+  # Jeweler::Tasks.new needs to be used before this.
+  #
+  # Basic usage:
+  #
+  #     Jeweler::RubyforgeTasks.new
+  #
+  # Easy enough, right?
+  # 
+  # There are a few options you can tweak:
+  #
+  #  * project: the rubyforge project to operate on. This defaults to whatever you specified in your gemspec. Defaults to your gem name.
+  #  * remote_doc_path: the place to upload docs to on Rubyforge under /var/www/gforge-projects/#{project}/
+  #
   class RubyforgeTasks < ::Rake::TaskLib
-    attr_accessor :project, :remote_doc_path
+    # The RubyForge project to interact with. Defaults to whatever is in your jeweler gemspec.
+    attr_accessor :project
+    # The path to upload docs to. It is relative to /var/www/gforge-projects/#{project}/, and defaults to your gemspec's name
+    attr_accessor :remote_doc_path
+    # Task to be used for generating documentation, before they are uploaded. Defaults to rdoc.
+    attr_accessor :doc_task
+
     attr_accessor :jeweler
 
     def initialize
@@ -15,6 +36,7 @@ class Jeweler
 
       self.remote_doc_path ||= jeweler.gemspec.name
       self.project ||= jeweler.gemspec.rubyforge_project
+      self.doc_task ||= :rdoc
 
       define
     end
@@ -26,21 +48,51 @@ class Jeweler
         task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
 
         namespace :release do
-          desc "Publish RDoc to RubyForge."
-          task :docs => [:rdoc] do
+          desc "Release the current gem version to RubyForge."
+          task :gem => [:gemspec, :build] do
+            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
+
+          desc "Publish docs to RubyForge."
+          task :docs => doc_task do
             config = YAML.load(
               File.read(File.expand_path('~/.rubyforge/user-config.yml'))
             )
 
             host = "#{config['username']}@rubyforge.org"
             remote_dir = "/var/www/gforge-projects/#{project}/#{remote_doc_path}"
-            local_dir = 'rdoc'
+
+            local_dir = case self.doc_task.to_sym
+                        when :rdoc then 'rdoc'
+                        when :yardoc then 'doc'
+                        else
+                          raise "Unsure what to run to generate documentation. Please set doc_task and re-run."
+                        end
 
             sh %{rsync -av --delete #{local_dir}/ #{host}:#{remote_dir}}
           end
         end
+
+        desc "Setup a rubyforge project for this gem"
+        task :setup do
+          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
+        end
+
       end
-      
     end
   end
 end