hoe 2.6.0 → 2.6.1

data/History.txt

@@ -1,3 +1,10 @@
+=== 2.6.1 / 2010-06-02
+
+* 2 bug fixes:
+
+  * Fix up hoe to be happy when rubyforge is missing or misconfigured
+  * Fixed dep tasks to deal with broken rubygems changes RF#27847 (mjwillson)
+
 === 2.6.0 / 2010-03-27
 
 * 6 minor enhancements:

data/lib/hoe.rb

@@ -58,7 +58,7 @@ require 'hoe/rake'
 
 class Hoe
   # duh
-  VERSION = '2.6.0'
+  VERSION = '2.6.1'
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :rcov, :rubyforge, :gemcutter, :signing, :test]
@@ -386,7 +386,7 @@ class Hoe
 
     unless self.version then
       version    = nil
-      version_re = /VERSION += +([\"\'])([\d][\d\w\.]+)\1/
+      version_re = /VERSION += +([\"\'])([\d][\w\.]+)\1/
 
       spec.files.each do |file|
         next unless File.exist? file

data/lib/hoe/deps.rb

@@ -34,7 +34,7 @@ module Hoe::Deps
         puts "  dependents:"
         unless deps.empty? then
           deps.sort_by { |spec| spec.full_name }.each do |spec|
-            vers = spec.dependencies.find {|s| s.name == name }.requirement_list
+            vers = spec.dependencies.find {|s| s.name == name}.requirements_list
             puts "    %-*s - %s" % [max, spec.full_name, vers.join(", ")]
           end
         else
@@ -50,8 +50,7 @@ module Hoe::Deps
         abort "Couldn't find gem: #{self.name}" unless gem
 
         deps = self.dependent_upon self.name
-
-        email = deps.map { |s| s.email }.flatten.sort.uniq
+        email = deps.map { |s| s.email }.compact.flatten.sort.uniq
         email = email.map { |s| s.split(/,\s*/) }.flatten.sort.uniq
 
         email.map! { |s| # don't you people realize how easy this is?
@@ -64,6 +63,8 @@ module Hoe::Deps
           bad.empty?
 
         puts good.join(", ")
+
+        warn "Warning: couldn't extract any email addresses" if good.empty?
       end
 
       desc "Fetch all the dependent gems of this gem into tarballs"
@@ -128,10 +129,22 @@ module Hoe::Deps
     return @@index if @@index
 
     dump = unless File.exist? '.source_index' then
+             warn "Fetching full index and caching. This can take a while."
              url = GEMURL + "Marshal.#{Gem.marshal_version}.Z"
              dump = Gem::RemoteFetcher.fetcher.fetch_path url
              dump = Gem.inflate dump
+
+             warn "stripping index to latest gems"
+             ary = Marshal.load dump
+
+             h = {}
+             Hash[ary].values.sort.each { |spec| h[spec.name] = spec }
+             ary = h.map { |k,v| [v.full_name, v] }
+
+             dump = Marshal.dump ary
+
              open '.source_index', 'wb' do |io| io.write dump end
+
              dump
            else
              open '.source_index', 'rb' do |io| io.read end
@@ -144,7 +157,7 @@ module Hoe::Deps
   # Return the latest rubygems.
 
   def get_latest_gems
-    @@cache ||= get_source_index.latest_specs
+    @@cache ||= Hash[*get_source_index.flatten].values
   end
 
   ##

data/lib/hoe/rubyforge.rb

@@ -41,11 +41,15 @@ module Hoe::RubyForge
 
     if Hoe.plugins.include? :publish then
       path   = File.expand_path("~/.rubyforge/user-config.yml")
-      config = YAML.load(File.read(path))
-      base   = "/var/www/gforge-projects"
-      dir    = "#{base}/#{rubyforge_name}/#{remote_rdoc_dir}"
-
-      rdoc_locations << "#{config["username"]}@rubyforge.org:#{dir}"
+      config = YAML.load(File.read(path)) rescue nil
+      if config then
+        base = "/var/www/gforge-projects"
+        dir  = "#{base}/#{rubyforge_name}/#{remote_rdoc_dir}"
+
+        rdoc_locations << "#{config["username"]}@rubyforge.org:#{dir}"
+      else
+        warn "Couldn't read #{path}. Run `rubyforge setup`."
+      end
     end
   end
 end

data/test/test_hoe.rb

@@ -53,8 +53,10 @@ class TestHoe < MiniTest::Unit::TestCase
 
     deps = spec.dependencies.sort_by { |dep| dep.name }
 
-    expected = [["hoe",       :development, ">= #{Hoe::VERSION}"],
-                ["rubyforge", :development, ">= #{::RubyForge::VERSION}"]]
+    expected = [["hoe",       :development, ">= #{Hoe::VERSION}"]]
+
+    expected << ["rubyforge", :development, ">= #{::RubyForge::VERSION}"] if
+      defined? ::RubyForge
 
     assert_equal expected, deps.map { |dep|
       [dep.name, dep.type, dep.requirement.to_s]

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoe
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 2
   - 6
-  - 0
-  version: 2.6.0
+  - 1
+  version: 2.6.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -35,30 +36,34 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2010-03-27 00:00:00 -07:00
+date: 2010-06-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 0
-        - 3
-        version: 2.0.3
+        - 4
+        version: 2.0.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 49
         segments: 
         - 0
         - 8
@@ -70,14 +75,16 @@ dependencies:
   name: minitest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
-        - 5
+        - 6
         - 0
-        version: 1.5.0
+        version: 1.6.0
   type: :development
   version_requirements: *id003
 description: |-
@@ -146,18 +153,22 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3
       - 6
       version: 1.3.6
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -166,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Hoe is a rake/rubygems helper for project Rakefiles