jeweler 1.2.1 → 1.3.0

data/lib/jeweler/generator/application.rb

@@ -19,22 +19,20 @@ class Jeweler
             return 1
           end
 
-          unless arguments.size == 1
+          if options[:project_name].nil? || options[:project_name].squeeze.strip == ""
             $stderr.puts options.opts
             return 1
           end
 
-          project_name = arguments.first
-
           begin
-            generator = Jeweler::Generator.new(project_name, options)
+            generator = Jeweler::Generator.new(options)
             generator.run
             return 0
           rescue Jeweler::NoGitUserName
-            $stderr.puts %Q{No user.name found in ~/.gitconfig. Please tell git about yourself (see http://github.com/guides/tell-git-your-user-name-and-email-address for details). For example: git config --global user.name "mad voo"}
+            $stderr.puts %Q{No user.name found in ~/.gitconfig. Please tell git about yourself (see http://help.github.com/git-email-settings/ for details). For example: git config --global user.name "mad voo"}
             return 1
           rescue Jeweler::NoGitUserEmail
-            $stderr.puts %Q{No user.email found in ~/.gitconfig. Please tell git about yourself (see http://github.com/guides/tell-git-your-user-name-and-email-address for details). For example: git config --global user.email mad.vooo@gmail.com}
+            $stderr.puts %Q{No user.email found in ~/.gitconfig. Please tell git about yourself (see http://help.github.com/git-email-settings/ for details). For example: git config --global user.email mad.vooo@gmail.com}
             return 1
           rescue Jeweler::NoGitHubUser
             $stderr.puts %Q{No github.user 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.user defunkt}
@@ -43,7 +41,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 #{project_name} already exists. Maybe move it out of the way before continuing?"
+            $stderr.puts "The directory #{options[:project_name]} already exists. Maybe move it out of the way before continuing?"
             return 1
           end
         end

data/lib/jeweler/generator/bacon_mixin.rb

@@ -3,7 +3,7 @@ class Jeweler
     module BaconMixin
 
       def self.extended(generator)
-        generator.development_dependencies << "bacon"
+        generator.development_dependencies << ["bacon", ">= 0"]
       end
 
       def default_task

data/lib/jeweler/generator/github_mixin.rb

@@ -0,0 +1,29 @@
+class Jeweler
+  class Generator
+    module GithubMixin
+      def self.extended(generator)
+        generator.github_username           = generator.options[:github_username]
+        generator.github_token              = generator.options[:github_token]
+        generator.should_create_remote_repo = generator.options[:create_repo]
+
+        unless generator.github_username
+          raise NoGitHubUser
+        end
+        
+        if generator.should_create_remote_repo
+          unless generator.github_token
+            raise NoGitHubToken
+          end
+        end
+      end
+
+      def git_remote
+        @git_remote ||= "git@github.com:#{github_username}/#{project_name}.git"
+      end
+
+      def homepage
+        @homepage ||= "http://github.com/#{github_username}/#{project_name}"
+      end
+    end
+  end
+end

data/lib/jeweler/generator/micronaut_mixin.rb

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

data/lib/jeweler/generator/minitest_mixin.rb

@@ -2,7 +2,7 @@ class Jeweler
   class Generator
     module MinitestMixin
       def self.extended(generator)
-        generator.development_dependencies << "minitest"
+        generator.development_dependencies << ["minitest", ">= 0"]
       end
 
       def default_task
@@ -10,11 +10,11 @@ class Jeweler
       end
 
       def feature_support_require
-        'mini/test'
+        'minitest/unit'
       end
 
       def feature_support_extend
-        'Mini::Test::Assertions'
+        'MiniTest::Assertions'
       end
 
       def test_dir
@@ -26,15 +26,15 @@ class Jeweler
       end
 
       def test_pattern
-        'test/**/*_test.rb'
+        'test/**/test_*.rb'
       end
 
       def test_filename
-        "#{require_name}_test.rb"
+        "test_#{require_name}.rb"
       end
 
       def test_helper_filename
-        "test_helper.rb"
+        "helper.rb"
       end
 
     end

data/lib/jeweler/generator/options.rb

@@ -1,3 +1,4 @@
+
 class Jeweler
   class Generator
     class Options < Hash
@@ -10,11 +11,24 @@ class Jeweler
         self[:testing_framework]       = :shoulda
         self[:documentation_framework] = :rdoc
 
+        git_config = Git.global_config
+        self[:user_name]       = git_config['user.name']
+        self[:user_email]      = git_config['user.email']
+        self[:github_username] = git_config['github.user']
+        self[:github_token]    = git_config['github.token']
+
+        require 'optparse'
         @opts = OptionParser.new do |o|
           o.banner = "Usage: #{File.basename($0)} [options] reponame\ne.g. #{File.basename($0)} the-perfect-gem"
 
-          o.on('--bacon', 'generate bacon specifications') do
-            self[:testing_framework] = :bacon
+          o.on('--directory [DIRECTORY]', 'specify the directory to generate into') do |directory|
+            self[:directory] = directory
+          end
+
+          o.separator ""
+
+          o.on('--rspec', 'generate rspec code examples') do
+            self[:testing_framework] = :rspec
           end
 
           o.on('--shoulda', 'generate shoulda tests') do
@@ -25,22 +39,34 @@ class Jeweler
             self[:testing_framework] = :testunit
           end
 
-          o.on('--minitest', 'generate minitest tests') do
-            self[:testing_framework] = :minitest
+          o.on('--bacon', 'generate bacon specifications') do
+            self[:testing_framework] = :bacon
           end
 
-          o.on('--rspec', 'generate rspec code examples') do
-            self[:testing_framework] = :rspec
+          o.on('--testspec', 'generate test/spec tests') do
+            self[:testing_framework] = :testspec
+          end
+
+          o.on('--minitest', 'generate minitest tests') do
+            self[:testing_framework] = :minitest
           end
 
           o.on('--micronaut', 'generate micronaut examples') do
             self[:testing_framework] = :micronaut
           end
 
+          o.on('--riot', 'generate riot tests') do
+            self[:testing_framework] = :riot
+          end
+
+          o.separator ""
+
           o.on('--cucumber', 'generate cucumber stories in addition to the other tests') do
             self[:use_cucumber] = true
           end
 
+          o.separator ""
+
           o.on('--reek', 'generate rake task for reek') do
             self[:use_reek] = true
           end
@@ -49,9 +75,7 @@ class Jeweler
             self[:use_roodi] = true
           end
 
-          o.on('--create-repo', 'create the repository on GitHub') do
-            self[:create_repo] = true
-          end
+          o.separator ""
 
           o.on('--gemcutter', 'setup project for gemcutter') do
             self[:gemcutter] = true
@@ -69,10 +93,41 @@ class Jeweler
             self[:description] = description
           end
 
-          o.on('--directory [DIRECTORY]', 'specify the directory to generate into') do |directory|
-            self[:directory] = directory
+          o.separator ""
+
+          o.on('--user-name [USER_NAME]', "the user's name, ie that is credited in the LICENSE") do |user_name|
+            self[:user_name] = user_name
+          end
+
+          o.on('--user-email [USER_EMAIL]', "the user's email, ie that is credited in the Gem specification") do |user_email|
+            self[:user_email] = user_email
+          end
+
+          o.separator ""
+
+          o.on('--github-username [GITHUB_USERNAME]', "name of the user on GitHub to set the project up under") do |github_username|
+            self[:github_username] = github_username
           end
 
+          o.on('--github-token [GITHUB_TOKEN]', "GitHub token to use for interacting with the GitHub API") do |github_token|
+            self[:github_token] = github_token
+          end
+
+          o.on('--git-remote [GIT_REMOTE]', 'URI to set the git origin remote to') do |git_remote|
+            self[:git_remote] = git_remote
+          end
+
+          o.on('--homepage [HOMEPAGE]', "the homepage for your project (defaults to the GitHub repo)") do |homepage|
+            self[:homepage] = homepage
+          end
+
+          o.on('--create-repo', 'create the repository on GitHub') do
+            self[:create_repo] = true
+          end
+
+
+          o.separator ""
+
           o.on('--yard', 'use yard for documentation') do
             self[:documentation_framework] = :yard
           end
@@ -88,6 +143,7 @@ class Jeweler
 
         begin
           @opts.parse!(args)
+          self[:project_name] = args.shift
         rescue OptionParser::InvalidOption => e
           self[:invalid_argument] = e.message
         end

data/lib/jeweler/generator/riot_mixin.rb

@@ -0,0 +1,42 @@
+class Jeweler
+  class Generator
+    module RiotMixin
+      def self.extended(generator)
+        generator.development_dependencies << ["riot", ">= 0"]
+      end
+
+      def default_task
+        'test'
+      end
+
+      def feature_support_require
+        'riot/context'
+      end
+
+      def feature_support_extend
+        'Riot::Context'
+      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
+        "teststrap.rb"
+      end
+
+    end
+  end
+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"
+        generator.development_dependencies << ["rspec", ">= 1.2.9"]
       end
 
       def default_task

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"
+        generator.development_dependencies << ["thoughtbot-shoulda", ">= 0"]
       end
 
       def default_task
@@ -26,15 +26,15 @@ class Jeweler
       end
 
       def test_pattern
-        'test/**/*_test.rb'
+        'test/**/test_*.rb'
       end
 
       def test_filename
-        "#{require_name}_test.rb"
+        "test_#{require_name}.rb"
       end
 
       def test_helper_filename
-        "test_helper.rb"
+        "helper.rb"
       end
 
     end

data/lib/jeweler/generator/testspec_mixin.rb

@@ -0,0 +1,42 @@
+class Jeweler
+  class Generator
+    module TestspecMixin
+      def self.extended(generator)
+        generator.development_dependencies << ["test-spec", ">= 0"]
+      end
+
+      def default_task
+        'test'
+      end
+
+      def feature_support_require
+        'test/unit/assertions'
+      end
+
+      def feature_support_extend
+        'Test::Unit::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

data/lib/jeweler/generator/testunit_mixin.rb

@@ -23,15 +23,15 @@ class Jeweler
       end
 
       def test_pattern
-        'test/**/*_test.rb'
+        'test/**/test_*.rb'
       end
 
       def test_filename
-        "#{require_name}_test.rb"
+        "test_#{require_name}.rb"
       end
 
       def test_helper_filename
-        "test_helper.rb"
+        "helper.rb"
       end
 
     end

data/lib/jeweler/generator/yard_mixin.rb

@@ -2,7 +2,7 @@ class Jeweler
   class Generator
     module YardMixin
       def self.extended(generator)
-        generator.development_dependencies << "yard"
+        generator.development_dependencies << ["yard", ">= 0"]
       end
       
       def doc_task

data/lib/jeweler/rubyforge_tasks.rb

@@ -1,7 +1,5 @@
 require 'rake'
 require 'rake/tasklib'
-require 'rake/contrib/sshpublisher'
-
 
 class Jeweler
   # Rake tasks for putting a Jeweler gem on Rubyforge.
@@ -19,6 +17,7 @@ class Jeweler
   #  * 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}/
   #
+  # See also http://wiki.github.com/technicalpickles/jeweler/rubyforge
   class RubyforgeTasks < ::Rake::TaskLib
     # The RubyForge project to interact with. Defaults to whatever is in your jeweler gemspec.
     attr_accessor :project
@@ -32,21 +31,26 @@ class Jeweler
     def initialize
       yield self if block_given?
 
-      self.jeweler = Rake.application.jeweler
-
-      self.remote_doc_path ||= jeweler.gemspec.name
-      self.project ||= jeweler.gemspec.rubyforge_project
-      self.doc_task ||= :rdoc
+      self.doc_task = :rdoc if self.doc_task == nil # be sure to allow it to be set to false, to allow disabling
 
       define
     end
 
+    def jeweler
+      @jeweler ||= Rake.application.jeweler
+    end
+
+    def remote_doc_path
+      @remote_doc_path ||= jeweler.gemspec.name
+    end
+
+    def project
+      @project ||= jeweler.gemspec.rubyforge_project
+    end
+
     def define
       namespace :rubyforge do
 
-        desc "Release gem and RDoc documentation to RubyForge"
-        task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-
         namespace :release do
           desc "Release the current gem version to RubyForge."
           task :gem => [:gemspec, :build] do
@@ -61,26 +65,34 @@ class Jeweler
             end
           end
 
-          desc "Publish docs to RubyForge."
-          task :docs => doc_task do
-            config = YAML.load(
-              File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-            )
+          if publish_documentation?
+            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}"
+              host = "#{config['username']}@rubyforge.org"
+              remote_dir = "/var/www/gforge-projects/#{project}/#{remote_doc_path}"
 
-            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
+              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}}
+              sh %{rsync --archive --verbose --delete #{local_dir}/ #{host}:#{remote_dir}}
+            end
           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
           begin 
@@ -93,6 +105,12 @@ class Jeweler
         end
 
       end
+
+      task :release => 'rubyforge:release'
+    end
+
+    def publish_documentation?
+      ! (doc_task == false || doc_task == :none)
     end
   end
 end