hoe 3.6.0 → 3.6.1

data.tar.gz.sig

@@ -1 +1,2 @@
-dAQ��o�H׀��N%��ч�\&�8�x��2.���j��T�
+-ܦ�6VFټ��?�^�N�_�7f�/�	�gqyY����~�SĨ���@�jSr��y�����n��J%Ahf���ƨ�1�N�%��x��
+^6.wp�0eU|�X�V��>,¡���>��(HK��J>��
���3

data/History.txt

@@ -1,3 +1,10 @@
+=== 3.6.1 / 2013-05-10
+
+* 2 bug fixes:
+
+  * Define a blank test task just in case nothing is found
+  * Fixed an ancient test to use capture_subprocess_io. More reliable.
+
 === 3.6.0 / 2013-04-18
 
 * 5 minor enhancements:

data/lib/hoe.rb

@@ -91,7 +91,7 @@ class Hoe
   include Rake::DSL if defined?(Rake::DSL)
 
   # duh
-  VERSION = "3.6.0"
+  VERSION = "3.6.1"
 
   @@plugins = [:clean, :debug, :deps, :flay, :flog, :newb, :package,
                :publish, :gemcutter, :signing, :test]
@@ -555,6 +555,14 @@ class Hoe
       s.extra_rdoc_files += @extra_rdoc_files
     end
 
+    check_for_version
+
+    spec.licenses = licenses unless licenses.empty?
+
+    run_spec_extras
+  end
+
+  def check_for_version # :nodoc:
     unless self.version then
       version    = nil
       version_re = /VERSION += +([\"\'])([\d][\w\.]+)\1/
@@ -574,11 +582,11 @@ class Hoe
         warn "   or fix your Manifest.txt"
       end
     end
+  end
 
-    spec.licenses = licenses unless licenses.empty?
-
+  def run_spec_extras # :nodoc:
     # Do any extra stuff the user wants
-    spec_extras.each do |msg, val|
+    self.spec_extras.each do |msg, val|
       case val
       when Proc
         val.call spec.send(msg)

data/lib/hoe/deps.rb

@@ -24,106 +24,122 @@ module Hoe::Deps
     namespace :deps do
       desc "List all the dependent gems of this gem"
       task :list do
-        gems = self.get_gems_by_name
-        gem  = gems[self.name]
-
-        abort "Couldn't find gem: #{self.name}" unless gem
-
-        deps = self.dependent_upon self.name
-        max  = deps.map { |s| s.full_name.size }.max
-
-        puts "  dependents:"
-        unless deps.empty? then
-          deps.sort_by { |spec| spec.full_name }.each do |spec|
-            vers = spec.dependencies.find {|s| s.name == name}.requirements_list
-            puts "    %-*s - %s" % [max, spec.full_name, vers.join(", ")]
-          end
-        else
-          puts "    none"
-        end
+        deps_list_task
       end
 
       desc "Print a contact list for gems dependent on this gem"
       task :email do
-        gems = self.get_gems_by_name
-        gem  = gems[self.name]
+        deps_email_task
+      end
 
-        abort "Couldn't find gem: #{self.name}" unless gem
+      desc "Fetch all the dependent gems of this gem into tarballs"
+      task :fetch do
+        deps_fetch_task
+      end
+    end
 
-        deps = self.dependent_upon self.name
-        email = deps.map { |s| s.email }.compact.flatten.sort.uniq
-        email = email.map { |s| s.split(/,\s*/) }.flatten.sort.uniq
+    desc 'Install missing dependencies.'
+    task :check_extra_deps do
+      check_extra_deps_task
+    end
 
-        email.map! { |s| # don't you people realize how easy this is?
-          s.gsub(/ at | _at_ |\s*(atmark|@nospam@|-at?-|@at?@|<at?>|\[at?\]|\(at?\))\s*/i, '@').gsub(/\s*(dot|\[d(ot)?\]|\.dot\.)\s*/i, '.').gsub(/\s+com$/, '.com')
-        }
+    desc 'Install missing plugins.'
+    task :install_plugins do
+      install_missing_plugins
+    end
+  end
+
+  def check_extra_deps_task # :nodoc:
+    # extra_deps = [["rubyforge", ">= 1.0.0"], ["rake", ">= 0.8.1"]]
+    (extra_deps + extra_dev_deps).each do |dep|
+      begin
+        gem(*dep)
+      rescue Gem::LoadError
+        name, req, = dep
 
-        bad, good = email.partition { |e| e !~ /^[\w.+-]+\@[\w.+-]+$/ }
+        install_gem name, req, false
+      end
+    end
+  end
 
-        warn "Rejecting #{bad.size} email. I couldn't unmunge them." unless
-          bad.empty?
+  def deps_list_task # :nodoc:
+    gems = self.get_gems_by_name
+    gem  = gems[self.name]
 
-        puts good.join(", ")
+    abort "Couldn't find gem: #{self.name}" unless gem
 
-        warn "Warning: couldn't extract any email addresses" if good.empty?
+    deps = self.dependent_upon self.name
+    max  = deps.map { |s| s.full_name.size }.max
+
+    puts "  dependents:"
+    unless deps.empty? then
+      deps.sort_by { |spec| spec.full_name }.each do |spec|
+        vers = spec.dependencies.find {|s| s.name == name}.requirements_list
+        puts "    %-*s - %s" % [max, spec.full_name, vers.join(", ")]
       end
+    else
+      puts "    none"
+    end
+  end
 
-      desc "Fetch all the dependent gems of this gem into tarballs"
-      task :fetch do
-        deps = self.dependent_upon self.name
+  def deps_email_task # :nodoc:
+    gems = self.get_gems_by_name
+    gem  = gems[self.name]
+
+    abort "Couldn't find gem: #{self.name}" unless gem
+
+    deps = self.dependent_upon self.name
+    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?
+      s.gsub(/ at | _at_ |\s*(atmark|@nospam@|-at?-|@at?@|<at?>|\[at?\]|\(at?\))\s*/i, '@').gsub(/\s*(dot|\[d(ot)?\]|\.dot\.)\s*/i, '.').gsub(/\s+com$/, '.com')
+    }
+
+    bad, good = email.partition { |e| e !~ /^[\w.+-]+\@[\w.+-]+$/ }
+
+    warn "Rejecting #{bad.size} email. I couldn't unmunge them." unless
+      bad.empty?
+
+    puts good.join(", ")
+
+    warn "Warning: couldn't extract any email addresses" if good.empty?
+  end
+
+  def deps_fetch_task # :nodoc:
+    deps = self.dependent_upon self.name
+
+    mkdir "deps" unless File.directory? "deps"
+    Dir.chdir "deps" do
+      begin
+        deps.sort_by { |spec| spec.full_name }.each do |spec|
+          full_name = spec.full_name
+          tgz_name  = "#{full_name}.tgz"
+          gem_name  = "#{full_name}.gem"
+
+          next if File.exist? tgz_name
+          FileUtils.rm_rf [full_name, gem_name]
 
-        mkdir "deps" unless File.directory? "deps"
-        Dir.chdir "deps" do
           begin
-            deps.sort_by { |spec| spec.full_name }.each do |spec|
-              full_name = spec.full_name
-              tgz_name  = "#{full_name}.tgz"
-              gem_name  = "#{full_name}.gem"
-
-              next if File.exist? tgz_name
-              FileUtils.rm_rf [full_name, gem_name]
-
-              begin
-                warn "downloading #{full_name}"
-                Gem::RemoteFetcher.fetcher.download(spec, GEMURL, Dir.pwd)
-                FileUtils.mv "cache/#{gem_name}", '.'
-              rescue Gem::RemoteFetcher::FetchError
-                warn "  failed"
-                next
-              end
-
-              warn "converting #{gem_name} to tarball"
-
-              system "gem unpack #{gem_name} 2> /dev/null"
-              system "gem spec -l #{gem_name} > #{full_name}/gemspec.rb"
-              system "tar zmcf #{tgz_name} #{full_name}"
-              FileUtils.rm_rf [full_name, gem_name, "cache"]
-            end
-          ensure
-            FileUtils.rm_rf "cache"
+            warn "downloading #{full_name}"
+            Gem::RemoteFetcher.fetcher.download(spec, GEMURL, Dir.pwd)
+            FileUtils.mv "cache/#{gem_name}", '.'
+          rescue Gem::RemoteFetcher::FetchError
+            warn "  failed"
+            next
           end
-        end
-      end
-    end
 
-    desc 'Install missing dependencies.'
-    task :check_extra_deps do
-      # extra_deps = [["rubyforge", ">= 1.0.0"], ["rake", ">= 0.8.1"]]
-      (extra_deps + extra_dev_deps).each do |dep|
-        begin
-          gem(*dep)
-        rescue Gem::LoadError
-          name, req, = dep
-
-          install_gem name, req, false
+          warn "converting #{gem_name} to tarball"
+
+          system "gem unpack #{gem_name} 2> /dev/null"
+          system "gem spec -l #{gem_name} > #{full_name}/gemspec.rb"
+          system "tar zmcf #{tgz_name} #{full_name}"
+          FileUtils.rm_rf [full_name, gem_name, "cache"]
         end
+      ensure
+        FileUtils.rm_rf "cache"
       end
     end
-
-    desc 'Install missing plugins.'
-    task :install_plugins do
-      install_missing_plugins
-    end
   end
 
   ##

data/lib/hoe/publish.rb

@@ -136,17 +136,12 @@ module Hoe::Publish
 
     desc "Publish RDoc to wherever you want."
     task :publish_docs => [:clean, :docs] do
-      warn "no rdoc_location values" if rdoc_locations.empty?
-      self.rdoc_locations.each do |dest|
-        sh %{rsync #{rsync_args} #{local_rdoc_dir}/ #{dest}}
-      end
+      publish_docs_task
     end
 
     # no doco for this one
     task :publish_on_announce do
-      with_config do |config, _|
-        Rake::Task['publish_docs'].invoke if config["publish_on_announce"]
-      end
+      publish_on_announce_task
     end
 
     desc 'Generate email announcement file.'
@@ -156,40 +151,57 @@ module Hoe::Publish
 
     desc 'Post announcement to blog. Uses the "blogs" array in your hoerc.'
     task :post_blog do
-      with_config do |config, path|
-        break unless config['blogs']
-
-        config['blogs'].each do |site|
-          if site['path'] then
-            msg = "post_blog_#{site['type']}"
-            send msg, site
-            system site["cmd"] if site["cmd"]
-          else
-            require 'xmlrpc/client'
-
-            _, title, body, urls = announcement
-            body += "\n\n#{urls}"
-
-            server = XMLRPC::Client.new2(site['url'])
-            content = site['extra_headers'].merge(:title => title,
-                                                  :description => body,
-                                                  :categories => blog_categories)
-
-            server.call('metaWeblog.newPost',
-                        site['blog_id'],
-                        site['user'],
-                        site['password'],
-                        content,
-                        true)
-          end
-        end
-      end
+      post_blog_task
     end
 
     desc 'Announce your release.'
     task :announce => [:post_blog, :publish_on_announce ]
   end
 
+  def publish_docs_task # :nodoc:
+    warn "no rdoc_location values" if rdoc_locations.empty?
+    self.rdoc_locations.each do |dest|
+      sh %{rsync #{rsync_args} #{local_rdoc_dir}/ #{dest}}
+    end
+  end
+
+  def publish_on_announce_task # :nodoc:
+    with_config do |config, _|
+      Rake::Task['publish_docs'].invoke if config["publish_on_announce"]
+    end
+  end
+
+  def post_blog_task # :nodoc:
+    with_config do |config, path|
+      break unless config['blogs']
+
+      config['blogs'].each do |site|
+        if site['path'] then
+          msg = "post_blog_#{site['type']}"
+          send msg, site
+          system site["cmd"] if site["cmd"]
+        else
+          require 'xmlrpc/client'
+
+          _, title, body, urls = announcement
+          body += "\n\n#{urls}"
+
+          server = XMLRPC::Client.new2(site['url'])
+          content = site['extra_headers'].merge(:title => title,
+                                                :description => body,
+                                                :categories => blog_categories)
+
+          server.call('metaWeblog.newPost',
+                      site['blog_id'],
+                      site['user'],
+                      site['password'],
+                      content,
+                      true)
+        end
+      end
+    end
+  end
+
   def make_rdoc_cmd(*extra_args) # :nodoc:
     title = "#{name}-#{version} Documentation"
     title = "#{group_name}'s #{title}" if group_name != name

data/lib/hoe/signing.rb

@@ -44,6 +44,15 @@ module Hoe::Signing
   # Define tasks for plugin.
 
   def define_signing_tasks
+    set_up_signing
+
+    desc 'Generate a key for signing your gems.'
+    task :generate_key do
+      generate_key_task
+    end
+  end
+
+  def set_up_signing # :nodoc:
     signing_key = nil
     cert_chain = []
 
@@ -60,60 +69,59 @@ module Hoe::Signing
       spec.signing_key = signing_key
       spec.cert_chain = cert_chain
     end
+  end
 
-    desc 'Generate a key for signing your gems.'
-    task :generate_key do
-      email = Array(spec.email)
-      abort "No email in your gemspec" if email.nil? or email.empty?
+  def generate_key_task # :nodoc:
+    email = Array(spec.email)
+    abort "No email in your gemspec" if email.nil? or email.empty?
 
-      key_file = with_config { |config, _| config['signing_key_file'] }
-      cert_file = with_config { |config, _| config['signing_cert_file'] }
+    key_file = with_config { |config, _| config['signing_key_file'] }
+    cert_file = with_config { |config, _| config['signing_cert_file'] }
 
-      if key_file.nil? or cert_file.nil? then
-        ENV['SHOW_EDITOR'] ||= 'no'
-        Rake::Task['config_hoe'].invoke
+    if key_file.nil? or cert_file.nil? then
+      ENV['SHOW_EDITOR'] ||= 'no'
+      Rake::Task['config_hoe'].invoke
 
-        key_file = with_config { |config, _| config['signing_key_file'] }
-        cert_file = with_config { |config, _| config['signing_cert_file'] }
-      end
+      key_file = with_config { |config, _| config['signing_key_file'] }
+      cert_file = with_config { |config, _| config['signing_cert_file'] }
+    end
 
-      key_file = File.expand_path key_file
-      cert_file = File.expand_path cert_file
+    key_file = File.expand_path key_file
+    cert_file = File.expand_path cert_file
 
-      unless File.exist? key_file then
-        puts "Generating certificate"
+    unless File.exist? key_file then
+      puts "Generating certificate"
 
-        if File.exist? key_file then
-          abort "Have #{key_file} but no #{cert_file}, aborting as a precaution"
-        end
+      if File.exist? key_file then
+        abort "Have #{key_file} but no #{cert_file}, aborting as a precaution"
+      end
 
-        warn "NOTICE: using #{email.first} for certificate" if email.size > 1
+      warn "NOTICE: using #{email.first} for certificate" if email.size > 1
 
-        sh "gem cert --build #{email.first}"
-        mv "gem-private_key.pem", key_file, :verbose => true
-        mv "gem-public_cert.pem", cert_file, :verbose => true
+      sh "gem cert --build #{email.first}"
+      mv "gem-private_key.pem", key_file, :verbose => true
+      mv "gem-public_cert.pem", cert_file, :verbose => true
 
-        puts "Installed key and certificate."
-      end
+      puts "Installed key and certificate."
+    end
 
-      rf = RubyForge.new.configure
-      rf.login
+    rf = RubyForge.new.configure
+    rf.login
 
-      cert_package = "#{rubyforge_name}-certificates"
+    cert_package = "#{rubyforge_name}-certificates"
 
-      begin
-        rf.lookup 'package', cert_package
-      rescue
-        rf.create_package rubyforge_name, cert_package
-      end
+    begin
+      rf.lookup 'package', cert_package
+    rescue
+      rf.create_package rubyforge_name, cert_package
+    end
 
-      unless rf.lookup('release', cert_package)['certificates'] then
-        rf.add_release rubyforge_name, cert_package, 'certificates', cert_file
-        puts "Uploaded certificates to release \"certificates\" in package #{cert_package}"
-      else
-        puts '"certificates" release exists, adding file anyway (will not overwrite)'
-        rf.add_file rubyforge_name, cert_package, 'certificates', cert_file
-      end
+    unless rf.lookup('release', cert_package)['certificates'] then
+      rf.add_release rubyforge_name, cert_package, 'certificates', cert_file
+      puts "Uploaded certificates to release \"certificates\" in package #{cert_package}"
+    else
+      puts '"certificates" release exists, adding file anyway (will not overwrite)'
+      rf.add_file rubyforge_name, cert_package, 'certificates', cert_file
     end
   end
 end

data/lib/hoe/test.rb

@@ -69,6 +69,8 @@ module Hoe::Test
   def define_test_tasks
     default_tasks = []
 
+    task :test
+
     if File.directory? "test" then
       desc 'Run the test suite. Use FILTER or TESTOPTS to add flags/args.'
       task :test do

data/test/test_hoe.rb

@@ -78,9 +78,7 @@ class TestHoe < MiniTest::Unit::TestCase
         EOM
       end
 
-      open File.join(path, '.hoerc'), 'w' do |io|
-        io.write YAML.dump('plugins' => %w[hoerc])
-      end
+      write_hoerc path, 'plugins' => %w[hoerc]
 
       methods = hoe.methods.grep(/^initialize/).map { |s| s.to_s }
 
@@ -88,40 +86,7 @@ class TestHoe < MiniTest::Unit::TestCase
       assert_includes Hoe.plugins, :hoerc
     end
   ensure
-    Hoe.instance_variable_get(:@loaded).delete :hoerc
-    Hoe.plugins.delete :hoerc
-    Hoe.send :remove_const, :Hoerc
-    $LOAD_PATH.replace load_path
-    ENV['HOME'] = home
-  end
-
-  def test_perproject_hoerc
-    overrides = {
-      'exclude' => Regexp.union( Hoe::DEFAULT_CONFIG["exclude"], /\.hg/ ),
-      'plugins' => ['tweedledee', 'tweedledum']
-    }
-    overrides_rcfile = File.join(Dir.pwd, '.hoerc')
-
-    home = ENV['HOME']
-    Hoe.files = nil
-
-    Dir.mktmpdir do |path|
-      ENV['HOME'] = path
-
-      open File.join(path, '.hoerc'), 'w' do |io|
-        io.write YAML.dump( Hoe::DEFAULT_CONFIG )
-      end
-      open overrides_rcfile, File::CREAT|File::EXCL|File::WRONLY do |io|
-        io.write YAML.dump( overrides )
-      end
-
-      hoeconfig = hoe.with_config {|config, _| config }
-
-      assert_equal Hoe::DEFAULT_CONFIG.merge(overrides), hoeconfig
-    end
-  ensure
-    File.delete overrides_rcfile if File.exist?( overrides_rcfile )
-    ENV['HOME'] = home
+    reset_hoe load_path, home
   end
 
   def test_have_gem_eh
@@ -148,9 +113,7 @@ class TestHoe < MiniTest::Unit::TestCase
         EOM
       end
 
-      open File.join(path, '.hoerc'), 'w' do |io|
-        io.write YAML.dump('plugins' => %w[hoerc])
-      end
+      write_hoerc path, 'plugins' => %w[hoerc]
 
       methods = hoe.instance_variables.map(&:to_s)
       assert_includes(methods, '@hoerc_plugin_initialized',
@@ -158,6 +121,16 @@ class TestHoe < MiniTest::Unit::TestCase
       assert_includes Hoe.plugins, :hoerc
     end
   ensure
+    reset_hoe load_path, home
+  end
+
+  def write_hoerc path, data
+    open File.join(path, '.hoerc'), 'w' do |io|
+      io.write YAML.dump data
+    end
+  end
+
+  def reset_hoe load_path, home
     Hoe.instance_variable_get(:@loaded).delete :hoerc
     Hoe.plugins.delete :hoerc
     Hoe.send :remove_const, :Hoerc
@@ -443,9 +416,8 @@ class TestHoe < MiniTest::Unit::TestCase
     Dir.mktmpdir do |path|
       ENV['HOME'] = path
 
-      open File.join(path, '.hoerc'), 'w' do |io|
-        io.write YAML.dump( Hoe::DEFAULT_CONFIG )
-      end
+      write_hoerc path, Hoe::DEFAULT_CONFIG
+
       open overrides_rcfile, File::CREAT|File::EXCL|File::WRONLY do |io|
         io.write YAML.dump( overrides )
       end

data/test/test_hoe_debug.rb

@@ -19,11 +19,20 @@ class TestHoeDebug < MiniTest::Unit::TestCase
     @generated_files = []
   end
 
+  def assert_subprocess_silent
+    out, err = capture_subprocess_io do
+      yield
+    end
+
+    assert_equal "", out
+    assert_equal "", err
+  end
+
   def test_check_manifest
     in_tmpdir do
       manifest
 
-      assert_silent do
+      assert_subprocess_silent do
         check_manifest
       end
     end
@@ -35,7 +44,7 @@ class TestHoeDebug < MiniTest::Unit::TestCase
 
       open 'generated.rb', 'w' do |io| io.puts 'generated = true' end
 
-      assert_silent do
+      assert_subprocess_silent do
         check_manifest
       end
     end
@@ -51,34 +60,18 @@ class TestHoeDebug < MiniTest::Unit::TestCase
 
       e = nil
 
-      out = capture_STDOUT do
+      out, err = capture_subprocess_io do
         e = assert_raises RuntimeError do
           check_manifest
         end
       end
 
       assert_match %r%^Command failed with status%, e.message
-
       assert_match %r%^\+missing.rb%, out
+      assert_equal "", err
     end
   end
 
-  def capture_STDOUT
-    orig_STDOUT = STDOUT.dup
-
-    Tempfile.open __name__ do |io|
-      STDOUT.reopen io
-
-      yield
-
-      io.flush
-
-      return File.read io.path
-    end
-  ensure
-    STDOUT.reopen orig_STDOUT
-  end
-
   def in_tmpdir
     old_LOAD_PATH = $LOAD_PATH.dup
     $LOAD_PATH.map! { |path| File.expand_path path }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hoe
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 3
   - 6
-  - 0
-  version: 3.6.0
+  - 1
+  version: 3.6.1
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2013-04-18 00:00:00 Z
+date: 2013-05-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -68,11 +68,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 31
         segments: 
-        - 4
-        - 7
-        version: "4.7"
+        - 5
+        - 0
+        version: "5.0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency