dima-jeweler 0.9.2 → 1.2.0

data/lib/jeweler.rb

@@ -1,10 +1,11 @@
 require 'date'
+require 'rubygems/user_interaction'
 require 'rubygems/builder'
 require 'rubyforge'
 
+require 'jeweler/errors'
 require 'jeweler/version_helper'
 require 'jeweler/gemspec_helper'
-require 'jeweler/errors'
 require 'jeweler/generator'
 require 'jeweler/generator/options'
 require 'jeweler/generator/application'
@@ -12,22 +13,30 @@ require 'jeweler/generator/application'
 require 'jeweler/commands'
 
 require 'jeweler/tasks'
+require 'jeweler/rubyforge_tasks'
+
+require 'jeweler/specification'
 
 # A Jeweler helps you craft the perfect Rubygem. Give him a gemspec, and he takes care of the rest.
 class Jeweler
 
-  attr_reader :gemspec, :gemspec_helper
-  attr_accessor :base_dir, :output
+  attr_reader :gemspec, :gemspec_helper, :version_helper
+  attr_accessor :base_dir, :output, :repo, :commit, :rubyforge
 
   def initialize(gemspec, base_dir = '.')
     raise(GemspecError, "Can't create a Jeweler with a nil gemspec") if gemspec.nil?
 
+    @gemspec = gemspec
+    @gemspec.extend(Specification)
+    @gemspec.set_jeweler_defaults(base_dir)
+
     @base_dir       = base_dir
-    @gemspec        = fill_in_gemspec_defaults(gemspec)
     @repo           = Git.open(base_dir) if in_git_repo?
-    @version_helper        = Jeweler::VersionHelper.new(@base_dir)
+    @version_helper = Jeweler::VersionHelper.new(base_dir)
     @output         = $stdout
-    @gemspec_helper = GemSpecHelper.new(@gemspec,base_dir)
+    @commit         = true
+    @gemspec_helper = GemSpecHelper.new(gemspec, base_dir)
+    @rubyforge      = RubyForge.new
   end
 
   # Major version, as defined by the gemspec's Version module.
@@ -55,13 +64,13 @@ class Jeweler
 
   # Writes out the gemspec
   def write_gemspec
-    build_command(Jeweler::Commands::WriteGemspec).run
+    Jeweler::Commands::WriteGemspec.build_for(self).run
   end
 
   # Validates the project's gemspec from disk in an environment similar to how 
   # GitHub would build from it. See http://gist.github.com/16215
   def validate_gemspec
-    build_command(Jeweler::Commands::ValidateGemspec).run
+    Jeweler::Commands::ValidateGemspec.build_for(self).run
   end
 
   # is the project's gemspec from disk valid?
@@ -70,37 +79,37 @@ class Jeweler
   end
 
   def build_gem
-    build_command(Jeweler::Commands::BuildGem).run
+    Jeweler::Commands::BuildGem.build_for(self).run
   end
 
   def install_gem
-    build_command(Jeweler::Commands::InstallGem).run
+    Jeweler::Commands::InstallGem.build_for(self).run
   end
 
   # Bumps the patch version.
   #
   # 1.5.1 -> 1.5.2
-  def bump_patch_version(options = {})
-    build_command(Jeweler::Commands::Version::BumpPatch).run
+  def bump_patch_version()
+    Jeweler::Commands::Version::BumpPatch.build_for(self).run
   end
 
   # Bumps the minor version.
   #
   # 1.5.1 -> 1.6.0
-  def bump_minor_version(options = {})
-    build_command(Jeweler::Commands::Version::BumpMinor).run
+  def bump_minor_version()
+    Jeweler::Commands::Version::BumpMinor.build_for(self).run
   end
 
   # Bumps the major version.
   #
   # 1.5.1 -> 2.0.0
-  def bump_major_version(options = {})
-    build_command(Jeweler::Commands::Version::BumpMajor).run
+  def bump_major_version()
+    Jeweler::Commands::Version::BumpMajor.build_for(self).run
   end
 
   # Bumps the version, to the specific major/minor/patch version, writing out the appropriate version.rb, and then reloads it.
   def write_version(major, minor, patch, options = {})
-    command = build_command(Jeweler::Commands::Version::Write)
+    command = Jeweler::Commands::Version::Write.build_for(self)
     command.major = major
     command.minor = minor
     command.patch = patch
@@ -109,53 +118,31 @@ class Jeweler
   end
 
   def release
-    build_command(Jeweler::Commands::Release).run
+    Jeweler::Commands::Release.build_for(self).run
   end
   
   def release_gem_to_rubyforge
-    build_command(Jeweler::Commands::ReleaseToRubyforge).run
+    Jeweler::Commands::ReleaseToRubyforge.build_for(self).run
+  end
+
+  def setup_rubyforge
+    Jeweler::Commands::SetupRubyforge.build_for(self).run
   end
 
-  protected
+  def check_dependencies(type = nil)
+    command = Jeweler::Commands::CheckDependencies.build_for(self)
+    command.type = type
 
-  def build_command(command_class)
-    command = command_class.new
-    command.repo = @repo if command.respond_to?(:repo=)
-    command.version_helper = @version_helper if command.respond_to?(:version_helper=)
-    command.gemspec = @gemspec if command.respond_to?(:gemspec=)
-    command.commit = true if command.respond_to?(:commit=)
-    command.version = self.version if command.respond_to?(:version=)
-    command.output = output if command.respond_to?(:output=)
-    command.base_dir = @base_dir if command.respond_to?(:base_dir=)
-    command.gemspec_helper = GemSpecHelper.new(@gemspec, @base_dir) if command.respond_to?(:gemspec_helper)
-    command.ruby_forge = RubyForge.new if command.respond_to?(:ruby_forge=)
-    
-    command
+    command.run
   end
 
   def in_git_repo?
     File.exists?(File.join(self.base_dir, '.git'))
   end
 
-  def fill_in_gemspec_defaults(gemspec)
-    if gemspec.files.nil? || gemspec.files.empty?
-      gemspec.files = FileList["[A-Z]*.*", "{bin,generators,lib,test,spec}/**/*"]
-    end
-
-    if gemspec.executables.nil? || gemspec.executables.empty?
-      gemspec.executables = Dir["#{@base_dir}/bin/*"].map do |f|
-        File.basename(f)
-      end
-    end
-
-    gemspec.has_rdoc = true
-    gemspec.rdoc_options << '--inline-source' << '--charset=UTF-8'
-
-    if gemspec.extra_rdoc_files.nil? || gemspec.extra_rdoc_files.empty?
-      gemspec.extra_rdoc_files = FileList["README*", "ChangeLog*", "LICENSE*"]
-    end
-
-    gemspec
+  def version_exists?
+    File.exists?(@version_helper.plaintext_path) || File.exists?(@version_helper.yaml_path)
   end
+
 end
 

data/lib/jeweler/commands.rb

@@ -1,7 +1,9 @@
 require 'jeweler/commands/build_gem'
 require 'jeweler/commands/install_gem'
+require 'jeweler/commands/check_dependencies'
 require 'jeweler/commands/release'
 require 'jeweler/commands/release_to_rubyforge'
+require 'jeweler/commands/setup_rubyforge'
 require 'jeweler/commands/validate_gemspec'
 require 'jeweler/commands/write_gemspec'
 require 'jeweler/commands/version/base'

data/lib/jeweler/commands/build_gem.rb

@@ -17,6 +17,15 @@ class Jeweler
         gem_file_name = File.join(base_dir, gem_file_name)
         file_utils.mv gem_file_name, pkg_dir
       end
+
+      def self.build_for(jeweler)
+        command = new
+
+        command.base_dir = jeweler.base_dir
+        command.gemspec_helper = jeweler.gemspec_helper
+
+        command
+      end
     end
   end
 end

data/lib/jeweler/commands/check_dependencies.rb

@@ -0,0 +1,52 @@
+class Jeweler
+  module Commands
+    class CheckDependencies
+      class MissingDependenciesError < RuntimeError
+        attr_accessor :dependencies, :type
+      end
+
+      attr_accessor :gemspec, :type
+
+      def run
+        missing_dependencies = dependencies.select do |dependency|
+          begin
+            Gem.activate dependency.name, dependency.version_requirements.to_s
+            false
+          rescue LoadError => e
+            true
+          end
+        end
+
+        if missing_dependencies.empty?
+          puts "#{type || 'All'} 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
+
+      def dependencies
+        case type
+        when :runtime, :development
+          gemspec.send("#{type}_dependencies")
+        else
+          gemspec.dependencies
+        end
+        
+      end
+
+      def self.build_for(jeweler)
+        command = new
+
+        command.gemspec = jeweler.gemspec
+
+        command
+      end
+    end
+  end
+end

data/lib/jeweler/commands/install_gem.rb

@@ -1,3 +1,5 @@
+require 'rbconfig'
+
 class Jeweler
   module Commands
     class InstallGem
@@ -9,10 +11,29 @@ 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)
+        command = new
+        command.output = jeweler.output
+        command.gemspec_helper = jeweler.gemspec_helper
+        command
       end
     end
   end

data/lib/jeweler/commands/release.rb

@@ -3,44 +3,84 @@ class Jeweler
     class Release
       attr_accessor :gemspec, :version, :repo, :output, :gemspec_helper, :base_dir
 
-      def initialize
+      def initialize(attributes = {})
         self.output = $stdout
+
+        attributes.each_pair do |key, value|
+          send("#{key}=", value)
+        end
       end
 
       def run
-        repo.checkout('master')
+        raise "Hey buddy, try committing them files first" unless clean_staging_area?
 
-        raise "Hey buddy, try committing them files first" if any_pending_changes?
-
-        gemspec_helper.update_version(version)
-        gemspec_helper.write
+        repo.checkout('master')
 
-        repo.add(gemspec_helper.path)
-        output.puts "Committing #{gemspec_helper.path}"
-        repo.commit("Regenerated gemspec for version #{version}")
+        regenerate_gemspec!
+        commit_gemspec! if gemspec_changed?
 
         output.puts "Pushing master to origin"
         repo.push
 
+        tag_release! if release_not_tagged?
+      end
+      
+      def clean_staging_area?
+        status = repo.status
+        status.added.empty? && status.deleted.empty? && status.changed.empty?
+      end
+
+      def tag_release!
         output.puts "Tagging #{release_tag}"
         repo.add_tag(release_tag)
 
         output.puts "Pushing #{release_tag} to origin"
         repo.push('origin', release_tag)
       end
-      
-      def any_pending_changes?
-        !(@repo.status.added.empty? && @repo.status.deleted.empty? && @repo.status.changed.empty?)
+
+      def commit_gemspec!
+        repo.add(gemspec_helper.path)
+        output.puts "Committing #{gemspec_helper.path}"
+        repo.commit "Regenerated gemspec for version #{version}"
+      end
+
+      def regenerate_gemspec!
+        gemspec_helper.update_version(version)
+        gemspec_helper.write
       end
 
       def release_tag
         "v#{version}"
       end
 
+      def release_not_tagged?
+        tag = repo.tag(release_tag) rescue nil
+        tag.nil?
+      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?
+      end
+
       def gemspec_helper
         @gemspec_helper ||= Jeweler::GemSpecHelper.new(self.gemspec, self.base_dir)
       end
 
+      def self.build_for(jeweler)
+        command = self.new
+
+        command.base_dir = jeweler.base_dir
+        command.gemspec = jeweler.gemspec
+        command.version = jeweler.version
+        command.repo = jeweler.repo
+        command.output = jeweler.output
+        command.gemspec_helper = jeweler.gemspec_helper
+
+        command
+      end
+
     end
   end
 end

data/lib/jeweler/commands/release_to_rubyforge.rb

@@ -3,24 +3,47 @@ require 'rubyforge'
 class Jeweler
   module Commands
     class ReleaseToRubyforge
-      attr_accessor :gemspec, :version, :repo, :output, :gemspec_helper, :ruby_forge
+      attr_accessor :gemspec, :version, :output, :gemspec_helper, :rubyforge
 
       def initialize
         self.output = $stdout
       end
 
       def run
-        raise "rubyforge_project not configured.  Add this to the Jeweler::Tasks block in your Rakefile." if @gemspec.rubyforge_project.nil?
+        raise NoRubyForgeProjectInGemspecError unless @gemspec.rubyforge_project
         
-        @ruby_forge.configure rescue nil
-        output.puts 'Logging in'
-        @ruby_forge.login
+        @rubyforge.configure rescue nil
 
-        @ruby_forge.userconfig['release_notes'] = @gemspec.description if @gemspec.description
-        @ruby_forge.userconfig['preformatted'] = true
+        output.puts 'Logging in rubyforge'
+        @rubyforge.login
 
-        output.puts "Releasing #{@gemspec.name} v. #{@version} as #{@gemspec.rubyforge_project}"
-        @ruby_forge.add_release(@gemspec.rubyforge_project, @gemspec.name, @version.to_s, @gemspec_helper.gem_path)
+        @rubyforge.userconfig['release_notes'] = @gemspec.description if @gemspec.description
+        @rubyforge.userconfig['preformatted'] = true
+
+        output.puts "Releasing #{@gemspec.name}-#{@version} to #{@gemspec.rubyforge_project}"
+        begin
+          @rubyforge.add_release(@gemspec.rubyforge_project, @gemspec.name, @version.to_s, @gemspec_helper.gem_path)
+        rescue StandardError => e
+          case e.message
+          when /no <group_id> configured for <#{Regexp.escape @gemspec.rubyforge_project}>/
+            raise RubyForgeProjectNotConfiguredError, @gemspec.rubyforge_project
+          when /no <package_id> configured for <#{Regexp.escape @gemspec.name}>/i
+            raise MissingRubyForgePackageError, @gemspec.name
+          else
+            raise
+          end
+        end
+      end
+
+      def self.build_for(jeweler)
+        command = new
+        command.gemspec = jeweler.gemspec
+        command.gemspec_helper = jeweler.gemspec_helper
+        command.version = jeweler.version
+        command.rubyforge = jeweler.rubyforge
+        command.output = jeweler.output
+
+        command
       end
       
     end