jeweler 1.4.0 → 1.5.0.pre2

data/lib/jeweler.rb

@@ -1,4 +1,6 @@
+require 'pathname'
 require 'date'
+require 'jeweler/version'
 
 # A Jeweler helps you craft the perfect Rubygem. Give him a gemspec, and he takes care of the rest.
 #
@@ -18,6 +20,7 @@ class Jeweler
   autoload :GemSpecHelper,  'jeweler/gemspec_helper'
 
   autoload :Tasks,          'jeweler/tasks'
+  autoload :RubygemsDotOrgTasks,  'jeweler/rubygems_dot_org_tasks'
   autoload :GemcutterTasks, 'jeweler/gemcutter_tasks'
   autoload :RubyforgeTasks, 'jeweler/rubyforge_tasks'
   autoload :Specification,  'jeweler/specification'
@@ -129,16 +132,16 @@ class Jeweler
     Jeweler::Commands::ReleaseToGit.build_for(self).run
   end
 
-  def release_gem_to_gemcutter
-    Jeweler::Commands::ReleaseToGemcutter.build_for(self).run
+  def release_gem_to_rubygems
+    Jeweler::Commands::ReleaseToRubygems.build_for(self).run
   end
 
   def release_gem_to_rubyforge
-    Jeweler::Commands::ReleaseToRubyforge.build_for(self).run
+    # no-op
   end
 
   def setup_rubyforge
-    Jeweler::Commands::SetupRubyforge.build_for(self).run
+    # no-op
   end
 
   def check_dependencies(type = nil)
@@ -172,4 +175,3 @@ class Jeweler
   end
 
 end
-

data/lib/jeweler/commands.rb

@@ -5,9 +5,7 @@ class Jeweler
     autoload :CheckDependencies, 'jeweler/commands/check_dependencies'
     autoload :ReleaseToGit, 'jeweler/commands/release_to_git'
     autoload :ReleaseToGithub, 'jeweler/commands/release_to_github'
-    autoload :ReleaseToGemcutter, 'jeweler/commands/release_to_gemcutter'
-    autoload :ReleaseToRubyforge, 'jeweler/commands/release_to_rubyforge'
-    autoload :SetupRubyforge, 'jeweler/commands/setup_rubyforge'
+    autoload :ReleaseToRubygems, 'jeweler/commands/release_to_rubygems'
     autoload :ValidateGemspec, 'jeweler/commands/validate_gemspec'
     autoload :WriteGemspec, 'jeweler/commands/write_gemspec'
 

data/lib/jeweler/commands/check_dependencies.rb

@@ -10,7 +10,7 @@ class Jeweler
       def run
         missing_dependencies = dependencies.select do |dependency|
           begin
-            Gem.activate dependency.name, dependency.version_requirements.to_s
+            Gem.activate dependency.name, dependency.requirements.to_s
             false
           rescue LoadError => e
             true
@@ -22,12 +22,11 @@ class Jeweler
         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}"}
+            puts %Q{\tgem install #{dependency.name} --version "#{dependency.requirements.to_s}"}
           end
-          
+
           abort "Run the specified gem commands before trying to run this again: #{$0} #{ARGV.join(' ')}"
         end
-        
       end
 
       def dependencies
@@ -37,7 +36,6 @@ class Jeweler
         else
           gemspec.dependencies
         end
-        
       end
 
       def self.build_for(jeweler)

data/lib/jeweler/commands/install_gem.rb

@@ -7,7 +7,6 @@ class Jeweler
         self.output = $stdout
       end
 
-
       def run
         command = "#{gem_command} install #{gemspec_helper.gem_path}"
         output.puts "Executing #{command.inspect}:"
@@ -16,7 +15,7 @@ class Jeweler
       end
 
       def gem_command
-        Config::CONFIG['RUBY_INSTALL_NAME'].sub('ruby', 'gem')
+        "#{Config::CONFIG['RUBY_INSTALL_NAME']} -S gem"
       end
 
       def self.build_for(jeweler)

data/lib/jeweler/commands/release_to_git.rb

@@ -12,7 +12,10 @@ class Jeweler
       end
 
       def run
-        raise "Hey buddy, try committing them files first" unless clean_staging_area?
+        unless clean_staging_area?
+          system "git status"
+          raise "Unclean staging area! Be sure to commit or .gitignore everything first." 
+        end
 
         repo.checkout('master')
         repo.push
@@ -27,8 +30,7 @@ class Jeweler
       end
 
       def clean_staging_area?
-        status = repo.status
-        status.added.empty? && status.deleted.empty? && status.changed.empty?
+        `git ls-files --deleted --modified --others --exclude-standard` == ""
       end
 
       def release_tag

data/lib/jeweler/commands/release_to_github.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 class Jeweler
   module Commands
     class ReleaseToGithub
@@ -12,7 +14,10 @@ class Jeweler
       end
 
       def run
-        raise "Hey buddy, try committing them files first" unless clean_staging_area?
+        unless clean_staging_area?
+          system "git status"
+          raise "Unclean staging area! Be sure to commit or .gitignore everything first." 
+        end
 
         repo.checkout('master')
 
@@ -24,13 +29,14 @@ class Jeweler
       end
 
       def clean_staging_area?
-        status = repo.status
-        status.added.empty? && status.deleted.empty? && status.changed.empty?
+        # surprisingly simpler than ruby-git
+        `git ls-files --deleted --modified --others --exclude-standard` == ""
       end
 
       def commit_gemspec!
-        repo.add(gemspec_helper.path)
-        output.puts "Committing #{gemspec_helper.path}"
+        gemspec_gitpath = working_subdir.join(gemspec_helper.path)
+        repo.add(gemspec_gitpath.to_s)
+        output.puts "Committing #{gemspec_gitpath}"
         repo.commit "Regenerated gemspec for version #{version}"
       end
 
@@ -40,15 +46,25 @@ class Jeweler
       end
 
       def gemspec_changed?
-        `git status` # OMGHAX. status always ends up being 'M' unless this runs
-        status = repo.status[gemspec_helper.path]
-        ! status.type.nil?
+        # OMGHAX. ruby-git status always ends up being 'M', so let's do it a crazy way
+        system "git status -s #{working_subdir.join(gemspec_helper.path)} | grep  #{working_subdir.join(gemspec_helper.path)} > /dev/null 2>/dev/null"
       end
 
       def gemspec_helper
         @gemspec_helper ||= Jeweler::GemSpecHelper.new(self.gemspec, self.base_dir)
       end
 
+      def working_subdir
+        return @working_subdir if @working_subdir
+        cwd = base_dir_path
+        @working_subdir = cwd.relative_path_from(Pathname.new(repo.dir.path))
+        @working_subdir
+      end
+
+      def base_dir_path
+        Pathname.new(base_dir).realpath
+      end
+
       def self.build_for(jeweler)
         command = self.new
 

data/lib/jeweler/commands/{release_to_gemcutter.rb → release_to_rubygems.rb}

@@ -1,6 +1,6 @@
 class Jeweler
   module Commands
-    class ReleaseToGemcutter
+    class ReleaseToRubygems
       attr_accessor :gemspec, :version, :output, :gemspec_helper
 
       def initialize
@@ -21,7 +21,6 @@ class Jeweler
         command.output         = jeweler.output
         command
       end
-      
     end
   end
 end

data/lib/jeweler/commands/version/base.rb

@@ -1,9 +1,11 @@
+require 'pathname'
+
 class Jeweler
   module Commands
     module Version
       class Base
 
-        attr_accessor :repo, :version_helper, :gemspec, :commit
+        attr_accessor :repo, :version_helper, :gemspec, :commit, :base_dir
 
         def run
           update_version
@@ -20,11 +22,22 @@ class Jeweler
 
         def commit_version
           if self.repo
-            self.repo.add(version_helper.path)
+            self.repo.add(working_subdir.join(version_helper.path))
             self.repo.commit("Version bump to #{self.version_helper.to_s}")
           end
         end
 
+        def working_subdir
+          return @working_subdir if @working_subdir
+          cwd = base_dir_path
+          @working_subdir = cwd.relative_path_from(Pathname.new(repo.dir.path))
+          @working_subdir
+        end
+
+        def base_dir_path
+          Pathname.new(base_dir).realpath
+        end
+
 
         def self.build_for(jeweler)
           command = new
@@ -32,6 +45,7 @@ class Jeweler
           command.version_helper = jeweler.version_helper
           command.gemspec = jeweler.gemspec
           command.commit = jeweler.commit
+          command.base_dir = jeweler.base_dir
 
           command
         end

data/lib/jeweler/commands/write_gemspec.rb

@@ -35,7 +35,6 @@ class Jeweler
 
         command
       end
-
     end
   end
 end

data/lib/jeweler/errors.rb

@@ -1,20 +1,8 @@
 class Jeweler
   # Gemspec related error
-   class GemspecError < StandardError
-   end
+  class GemspecError < StandardError
+  end
 
-   class VersionYmlError < StandardError
-   end
-
-   # Occurs when interacting with RubyForge, and an expected project isn't available on RubyForge.
-   class MissingRubyForgePackageError < StandardError
-   end
-
-   # Occurs when interacting with RubyForge, and 'rubyforge_project' isn't set on the Gem::Specification
-   class NoRubyForgeProjectInGemspecError < StandardError
-   end
-
-   # Occurs when interacting with RubyForge, and the 'rubyforge_project' isn't setup in ~/.rubyforge/autoconfig.yml or it doesn't exist on RubyForge
-   class RubyForgeProjectNotConfiguredError < StandardError
-   end
+  class VersionYmlError < StandardError
+  end
 end

data/lib/jeweler/gemcutter_tasks.rb

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

data/lib/jeweler/gemspec_helper.rb

@@ -1,7 +1,5 @@
 class Jeweler
-
   class GemSpecHelper
-
     attr_accessor :spec, :base_dir
 
     def initialize(spec, base_dir = nil)
@@ -21,7 +19,6 @@ class Jeweler
     end
 
     def write
-
       File.open(path, 'w') do |f|
         f.write self.to_ruby
       end 
@@ -29,7 +26,7 @@ class Jeweler
 
     def to_ruby
       normalize_files(:files)
-      normalize_files(:files)
+      normalize_files(:test_files)
       normalize_files(:extra_rdoc_files)
 
       gemspec_ruby = @spec.to_ruby
@@ -71,7 +68,8 @@ class Jeweler
     def prettyify_array(gemspec_ruby, array_name)
       gemspec_ruby.gsub(/s\.#{array_name.to_s} = \[.+?\]/) do |match|
         leadin, files = match[0..-2].split("[")
-        leadin + "[\n    #{files.split(",").join(",\n    ")}\n  ]"
+        
+        leadin + "[\n    #{files.gsub(%|", "|, %|",\n    "|)}\n  ]"
       end
     end
 
@@ -87,6 +85,5 @@ class Jeweler
     def has_version?
       !@spec.version.nil?
     end
-
   end
 end

data/lib/jeweler/generator.rb

@@ -4,6 +4,10 @@ require 'erb'
 require 'net/http'
 require 'uri'
 
+require 'fileutils'
+require 'pathname'
+
+require 'jeweler/version'
 
 class Jeweler
   class NoGitUserName < StandardError
@@ -36,6 +40,7 @@ class Jeweler
     require 'jeweler/generator/testspec_mixin'
     require 'jeweler/generator/testunit_mixin'
     require 'jeweler/generator/riot_mixin'
+    require 'jeweler/generator/shindo_mixin'
 
     require 'jeweler/generator/rdoc_mixin'
     require 'jeweler/generator/yard_mixin'
@@ -44,10 +49,11 @@ class Jeweler
                   :description, :project_name, :github_username, :github_token,
                   :repo, :should_create_remote_repo, 
                   :testing_framework, :documentation_framework,
-                  :should_use_cucumber, :should_setup_gemcutter,
+                  :should_use_cucumber, :should_use_bundler,
                   :should_setup_rubyforge, :should_use_reek, :should_use_roodi,
                   :development_dependencies,
-                  :options
+                  :options,
+                  :git_remote
 
     def initialize(options = {})
       self.options = options
@@ -83,14 +89,24 @@ class Jeweler
       self.should_use_cucumber    = options[:use_cucumber]
       self.should_use_reek        = options[:use_reek]
       self.should_use_roodi       = options[:use_roodi]
-      self.should_setup_gemcutter = options[:gemcutter]
       self.should_setup_rubyforge = options[:rubyforge]
+      self.should_use_bundler     = options[:use_bundler]
 
       development_dependencies << ["cucumber", ">= 0"] if should_use_cucumber
 
+      # TODO make bundler optional?
+      development_dependencies << ["bundler", ">= 1.0.0.rc.5"]
+      development_dependencies << ["jeweler", "~> #{Jeweler::Version::STRING}"]
+      development_dependencies << ["rcov", ">= 0"]
+
+      development_dependencies << ["reek", "~> 1.2.8"] if should_use_reek
+      development_dependencies << ["roodi", "~> 2.1.0"] if should_use_roodi
+
       self.user_name       = options[:user_name]
       self.user_email      = options[:user_email]
       self.homepage        = options[:homepage]
+      
+      self.git_remote      = options[:git_remote]
 
       raise NoGitUserName unless self.user_name
       raise NoGitUserEmail unless self.user_email
@@ -149,6 +165,7 @@ class Jeweler
     end
 
   private
+
     def create_files
       unless File.exists?(target_dir) || File.directory?(target_dir)
         FileUtils.mkdir target_dir
@@ -159,6 +176,7 @@ class Jeweler
 
       output_template_in_target '.gitignore'
       output_template_in_target 'Rakefile'
+      output_template_in_target 'Gemfile' if should_use_bundler
       output_template_in_target 'LICENSE'
       output_template_in_target 'README.rdoc'
       output_template_in_target '.document'
@@ -174,8 +192,8 @@ class Jeweler
 
 
       if testing_framework == :rspec
-        output_template_in_target File.join(testing_framework.to_s, 'spec.opts'),
-                                  File.join(test_dir, 'spec.opts')
+        output_template_in_target File.join(testing_framework.to_s, '.rspec'),
+                                  File.join(test_dir, '.rspec')
 
       end
 
@@ -189,7 +207,6 @@ class Jeweler
         mkdir_in_target           features_steps_dir
         touch_in_target           File.join(features_steps_dir, steps_filename)
       end
-
     end
 
     def render_template(source)