hoe 3.13.0 → 3.13.1

data/lib/hoe/debug.rb

@@ -16,12 +16,12 @@ module Hoe::Debug
   # :stopdoc:
 
   DIFF = if Hoe::WINDOZE
-           'diff.exe'
+           "diff.exe"
          else
            if system("gdiff", __FILE__, __FILE__)
-             'gdiff' # solaris and kin suck
+             "gdiff" # solaris and kin suck
            else
-             'diff'
+             "diff"
            end
          end unless defined? DIFF
 
@@ -31,31 +31,31 @@ module Hoe::Debug
   # Define tasks for plugin.
 
   def define_debug_tasks
-    desc 'Create a fresh ~/.hoerc file.'
+    desc "Create a fresh ~/.hoerc file."
     task :config_hoe do
       with_config do |config, path|
         File.open(path, "w") do |f|
           YAML.dump(Hoe::DEFAULT_CONFIG.merge(config), f)
         end
 
-        editor = ENV['EDITOR'] || 'vi'
-        system "#{editor} #{path}" if ENV['SHOW_EDITOR'] != 'no'
+        editor = ENV["EDITOR"] || "vi"
+        system "#{editor} #{path}" if ENV["SHOW_EDITOR"] != "no"
       end
     end
 
-    desc 'Verify the manifest.'
+    desc "Verify the manifest."
     task :check_manifest => :clean do
       check_manifest
     end
 
-    desc 'Show information about the gem.'
+    desc "Show information about the gem."
     task :debug_gem do
       puts spec.to_ruby
     end
 
     task :isolate # stub
     task :irb => :isolate do
-      name = spec.name.gsub("-", '/')
+      name = spec.name.gsub("-", "/")
       file = (spec.files.grep(/^lib\/#{name}\.rb$/).first ||
               spec.files.grep(/^lib\/[^\/]*\.rb$/).first)
 
@@ -71,12 +71,12 @@ module Hoe::Debug
 
   def check_manifest
     f = "Manifest.tmp"
-    require 'find'
+    require "find"
     files = []
     with_config do |config, _|
       exclusions = config["exclude"]
 
-      Find.find '.' do |path|
+      Find.find "." do |path|
         next unless File.file? path
         next if path =~ exclusions
         files << path[2..-1]
@@ -84,7 +84,7 @@ module Hoe::Debug
 
       files = files.sort.join "\n"
 
-      File.open f, 'w' do |fp| fp.puts files end
+      File.open f, "w" do |fp| fp.puts files end
 
       verbose = { :verbose => Rake.application.options.verbose }
 

data/lib/hoe/deps.rb

@@ -1,5 +1,5 @@
-require 'rubygems/remote_fetcher'
-require 'uri'
+require "rubygems/remote_fetcher"
+require "uri"
 
 ##
 # Deps plugin for hoe.
@@ -15,7 +15,7 @@ module Hoe::Deps
   ##
   # The main rubygems repository.
 
-  GEMURL = URI.parse 'http://rubygems.org'
+  GEMURL = URI.parse "http://rubygems.org"
 
   ##
   # Define tasks for plugin.
@@ -38,12 +38,12 @@ module Hoe::Deps
       end
     end
 
-    desc 'Install missing dependencies.'
+    desc "Install missing dependencies."
     task :check_extra_deps do
       check_extra_deps_task
     end
 
-    desc 'Install missing plugins.'
+    desc "Install missing plugins."
     task :install_plugins do
       install_missing_plugins
     end
@@ -72,8 +72,8 @@ 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}.requirements_list
+      deps.sort_by(&: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
@@ -88,11 +88,11 @@ module Hoe::Deps
     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 = deps.map(&: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')
+      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.+-]+$/ }
@@ -111,7 +111,7 @@ module Hoe::Deps
     mkdir "deps" unless File.directory? "deps"
     Dir.chdir "deps" do
       begin
-        deps.sort_by { |spec| spec.full_name }.each do |spec|
+        deps.sort_by(&:full_name).each do |spec|
           full_name = spec.full_name
           tgz_name  = "#{full_name}.tgz"
           gem_name  = "#{full_name}.gem"
@@ -122,7 +122,7 @@ module Hoe::Deps
           begin
             warn "downloading #{full_name}"
             Gem::RemoteFetcher.fetcher.download(spec, GEMURL, Dir.pwd)
-            FileUtils.mv "cache/#{gem_name}", '.'
+            FileUtils.mv "cache/#{gem_name}", "."
           rescue Gem::RemoteFetcher::FetchError
             warn "  failed"
             next
@@ -149,7 +149,7 @@ module Hoe::Deps
 
     return @@index if @@index
 
-    dump = unless File.exist? '.source_index' then
+    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
@@ -160,15 +160,15 @@ module Hoe::Deps
 
              h = {}
              Hash[ary].values.sort.each { |spec| h[spec.name] = spec }
-             ary = h.map { |k,v| [v.full_name, v] }
+             ary = h.map { |_, v| [v.full_name, v] }
 
              dump = Marshal.dump ary
 
-             open '.source_index', 'wb' do |io| io.write dump end
+             open ".source_index", "wb" do |io| io.write dump end
 
              dump
            else
-             open '.source_index', 'rb' do |io| io.read end
+             open ".source_index", "rb" do |io| io.read end
            end
 
     @@index = Marshal.load dump
@@ -194,10 +194,10 @@ module Hoe::Deps
   # Installs plugins that aren't currently installed
 
   def install_missing_plugins plugins = Hoe.bad_plugins
-    version = '>= 0'
+    version = ">= 0"
 
     plugins.each do |name|
-      dash_name = name.to_s.gsub '_', '-'
+      dash_name = name.to_s.gsub "_", "-"
 
       next if have_gem?("hoe-#{name}") or
                 have_gem?(name) or

data/lib/hoe/flay.rb

@@ -22,11 +22,9 @@ module Hoe::Flay
   # Define tasks for plugin.
 
   def define_flay_tasks
-    begin
-      require 'flay_task'
-      FlayTask.new :flay, self.flay_threshold
-    rescue Exception
-      # skip
-    end
+    require "flay_task"
+    FlayTask.new :flay, self.flay_threshold
+  rescue Exception
+    # skip
   end
 end

data/lib/hoe/flog.rb

@@ -28,11 +28,9 @@ module Hoe::Flog
   # Define tasks for plugin.
 
   def define_flog_tasks
-    begin
-      require 'flog_task'
-      FlogTask.new :flog, self.flog_threshold, nil, self.flog_method
-    rescue LoadError
-      # skip
-    end
+    require "flog_task"
+    FlogTask.new :flog, self.flog_threshold, nil, self.flog_method
+  rescue LoadError
+    # skip
   end
 end

data/lib/hoe/gemcutter.rb

@@ -1,4 +1,4 @@
-require 'rake'
+require "rake"
 
 module Hoe::Gemcutter
   include Rake::DSL if defined?(Rake::DSL)

data/lib/hoe/inline.rb

@@ -1,4 +1,4 @@
-require 'rbconfig'
+require "rbconfig"
 
 ##
 # Hoe allows bundling of pre-compiled extensions in the +package+ task.
@@ -35,36 +35,36 @@ module Hoe::Inline
   def define_inline_tasks
     task :test => :clean
 
-    if ENV['INLINE'] then
-      s.platform = ENV['FORCE_PLATFORM'] || Gem::Platform::CURRENT
+    return unless ENV["INLINE"]
 
-      # Try collecting Inline extensions for +name+
-      if defined?(Inline) then
-        directory 'lib/inline'
+    s.platform = ENV["FORCE_PLATFORM"] || Gem::Platform::CURRENT
 
-        dlext = RbConfig::CONFIG['DLEXT']
+    return unless defined? Inline
 
-        Inline.registered_inline_classes.each do |cls|
-          name = cls.name.gsub(/::/, '')
-          # name of the extension is CamelCase
-          alternate_name = if name =~ /[A-Z]/ then
-                             name.gsub(/([A-Z])/, '_\1').downcase.sub(/^_/, '')
-                           elsif name =~ /_/ then
-                             name.capitalize.gsub(/_([a-z])/) { $1.upcase }
-                           end
-          extensions = Dir.chdir(Inline::directory) {
-            Dir["Inline_{#{name},#{alternate_name}}_*.#{dlext}"]
-          }
+    # Try collecting Inline extensions for +name+
+    directory "lib/inline"
 
-          extensions.each do |ext|
-            # add the inlined extension to the spec files
-            s.files += ["lib/inline/#{ext}"]
+    dlext = RbConfig::CONFIG["DLEXT"]
 
-            # include the file in the tasks
-            file "lib/inline/#{ext}" => ["lib/inline"] do
-              cp File.join(Inline::directory, ext), "lib/inline"
-            end
-          end
+    Inline.registered_inline_classes.each do |cls|
+      name = cls.name.gsub(/::/, "")
+      # name of the extension is CamelCase
+      alternate_name = if name =~ /[A-Z]/ then
+                         name.gsub(/([A-Z])/, '_\1').downcase.sub(/^_/, "")
+                       elsif name =~ /_/ then
+                         name.capitalize.gsub(/_([a-z])/) { $1.upcase }
+                       end
+      extensions = Dir.chdir(Inline.directory) {
+        Dir["Inline_{#{name},#{alternate_name}}_*.#{dlext}"]
+      }
+
+      extensions.each do |ext|
+        # add the inlined extension to the spec files
+        s.files += ["lib/inline/#{ext}"]
+
+        # include the file in the tasks
+        file "lib/inline/#{ext}" => ["lib/inline"] do
+          cp File.join(Inline.directory, ext), "lib/inline"
         end
       end
     end

data/lib/hoe/newb.rb

@@ -9,7 +9,7 @@ module Hoe::Newb
   # define tasks for the newb plugin
   def define_newb_tasks
     desc "Install deps, generate docs, run tests/specs."
-    task :newb => %w(check_extra_deps install_plugins docs default) do
+    task :newb => %w[check_extra_deps install_plugins docs default] do
       puts <<-END
 
         GOOD TO GO! Tests are passing, docs are generated,

data/lib/hoe/package.rb

@@ -1,8 +1,8 @@
 begin
-  require 'rubygems/package_task'
+  require "rubygems/package_task"
 rescue LoadError
   # rake/gempackagetask will go away some day
-  require 'rake/gempackagetask'
+  require "rake/gempackagetask"
   Gem::PackageTask = Rake::GemPackageTask
 end
 
@@ -46,12 +46,12 @@ module Hoe::Package
       pkg.need_zip = @need_zip
     end
 
-    desc 'Install the package as a gem. (opt. NOSUDO=1)'
+    desc "Install the package as a gem. (opt. NOSUDO=1)"
     task :install_gem => [:clean, :package, :check_extra_deps] do
-      install_gem Dir['pkg/*.gem'].first
+      install_gem Dir["pkg/*.gem"].first
     end
 
-    desc 'Package and upload; Requires VERSION=x.y.z (optional PRE=a.1)'
+    desc "Package and upload; Requires VERSION=x.y.z (optional PRE=a.1)"
     task :release => [:prerelease, :release_to, :postrelease]
 
     # no doco, invisible hook
@@ -69,7 +69,7 @@ module Hoe::Package
     task :release_sanity do
       v = ENV["VERSION"] or abort "Must supply VERSION=x.y.z"
 
-      pre = ENV['PRERELEASE'] || ENV['PRE']
+      pre = ENV["PRERELEASE"] || ENV["PRE"]
       v += ".#{pre}" if pre
 
       abort "Versions don't match #{v} vs #{version}" if v != version
@@ -87,13 +87,13 @@ module Hoe::Package
   ##
   # Install the named gem.
 
-  def install_gem name, version = nil, rdoc=true
+  def install_gem name, version = nil, rdoc = true
     should_not_sudo = Hoe::WINDOZE || ENV["NOSUDO"] || File.writable?(Gem.dir)
-    null_dev = Hoe::WINDOZE ? '> NUL 2>&1' : '> /dev/null 2>&1'
+    null_dev = Hoe::WINDOZE ? "> NUL 2>&1" : "> /dev/null 2>&1"
 
-    gem_cmd = Gem.default_exec_format % 'gem'
-    sudo    = 'sudo '                  unless should_not_sudo
-    local   = '--local'                unless version
+    gem_cmd = Gem.default_exec_format % "gem"
+    sudo    = "sudo "                  unless should_not_sudo
+    local   = "--local"                unless version
     version = "--version '#{version}'" if     version
 
     cmd  = "#{sudo}#{gem_cmd} install #{local} #{name} #{version}"
@@ -105,13 +105,14 @@ module Hoe::Package
   end
 
   def prerelease_version # :nodoc:
-    pre = ENV['PRERELEASE'] || ENV['PRE']
-    if pre then
-      spec.version.version << "." << pre if pre
+    pre = ENV["PRERELEASE"] || ENV["PRE"]
 
-      abort "ERROR: You should format PRE like pre or alpha.1 or something" if
-        (Gem::VERSION < "1.4"  and pre !~ /^[a-z]+(\.\d+)?$/) or
-        (Gem::VERSION >= "1.4" and pre !~ /^[a-z]+(\.?\d+)?$/)
-    end
+    return unless pre
+
+    spec.version.version << "." << pre if pre
+
+    abort "ERROR: You should format PRE like pre or alpha.1 or something" if
+      (Gem::VERSION < "1.4"  and pre !~ /^[a-z]+(\.\d+)?$/) or
+      (Gem::VERSION >= "1.4" and pre !~ /^[a-z]+(\.?\d+)?$/)
   end
 end

data/lib/hoe/publish.rb

@@ -79,9 +79,9 @@ module Hoe::Publish
                                     "url"      => "url",
                                     "blog_id"  => "blog_id",
                                     "extra_headers" => {
-                                      "mt_convert_breaks" => "markdown"
+                                      "mt_convert_breaks" => "markdown",
                                     },
-                                  }
+                                  },
                                  ]
 
   ##
@@ -89,11 +89,11 @@ module Hoe::Publish
 
   def initialize_publish
     self.blog_categories ||= [self.name]
-    self.local_rdoc_dir  ||= 'doc'
+    self.local_rdoc_dir  ||= "doc"
     self.need_rdoc       ||= true
     self.rdoc_locations  ||= []
     self.remote_rdoc_dir ||= self.name
-    self.rsync_args      ||= '-av -O --delete'
+    self.rsync_args      ||= "-av -O --delete"
   end
 
   ##
@@ -117,7 +117,7 @@ module Hoe::Publish
 
       desc "Generate rdoc coverage report"
       task :dcov => :isolate do
-        sh(*make_rdoc_cmd('-C'))
+        sh(*make_rdoc_cmd("-C"))
       end
 
       desc "Remove RDoc files"
@@ -127,9 +127,9 @@ module Hoe::Publish
 
       task :clobber => :clobber_docs
 
-      desc 'Generate ri locally for testing.'
+      desc "Generate ri locally for testing."
       task :ridocs => [:clean, :isolate] do
-        ruby(*make_rdoc_cmd('--ri', '-o', 'ri'))
+        ruby(*make_rdoc_cmd("--ri", "-o", "ri"))
       end
     end
 
@@ -143,7 +143,7 @@ module Hoe::Publish
       publish_on_announce_task
     end
 
-    desc 'Generate email announcement file.'
+    desc "Generate email announcement file."
     task :debug_email do
       puts generate_email
     end
@@ -153,47 +153,47 @@ module Hoe::Publish
       post_blog_task
     end
 
-    desc 'Announce your release.'
+    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}}
+      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"]
+      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']
+    with_config do |config, _path|
+      break unless config["blogs"]
 
-      config['blogs'].each do |site|
-        if site['path'] then
-          msg = "post_blog_#{site['type']}"
+      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'
+          require "xmlrpc/client"
 
           _, title, body, urls = announcement
           body += "\n\n#{urls}"
 
-          server = XMLRPC::Client.new2(site['url'])
-          content = site['extra_headers'].merge(:title => title,
+          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'],
+          server.call("metaWeblog.newPost",
+                      site["blog_id"],
+                      site["user"],
+                      site["password"],
                       content,
                       true)
         end
@@ -225,7 +225,7 @@ module Hoe::Publish
     Dir.chdir File.expand_path dir do
       time = Time.at Time.now.to_i # nukes fractions
       path = [time.strftime("%Y-%m-%d-"),
-              title.sub(/\W+$/, '').gsub(/\W+/, '-'),
+              title.sub(/\W+$/, "").gsub(/\W+/, "-"),
               ".html.md"].join
 
       header = {
@@ -235,7 +235,7 @@ module Hoe::Publish
       }
 
       File.open path, "w" do |f|
-        f.puts header.to_yaml.gsub(/\s$/, '')
+        f.puts header.to_yaml.gsub(/\s$/, "")
         f.puts "..."
         f.puts
         f.puts body
@@ -244,7 +244,7 @@ module Hoe::Publish
   end
 
   def generate_email full = nil # :nodoc:
-    require 'time'
+    require "time"
 
     abort "No email 'to' entry. Run `rake config_hoe` to fix." unless
       !full || email_to
@@ -257,9 +257,12 @@ module Hoe::Publish
      full && "To: #{email_to.join(", ")}",
      full && "Date: #{Time.now.rfc2822}",
      "Subject: [ANN] #{subject}",
-     "", title,
-     "", urls,
-     "", body,
+     "",
+     title,
+     "",
+     urls,
+     "",
+     body,
     ].compact.join("\n")
   end
 
@@ -272,14 +275,13 @@ module Hoe::Publish
     urls =
       case self.urls
       when Hash then
-        self.urls.map { |k,v| "* #{k}: <#{v.strip.rdoc_to_markdown}>" }
+        self.urls.map { |k, v| "* #{k}: <#{v.strip.rdoc_to_markdown}>" }
       when Array then
         self.urls.map { |s| "* <#{s.strip.rdoc_to_markdown}>" }
       else
         raise "unknown urls format: #{urls.inspect}"
       end
 
-
     return subject, title, body, urls.join("\n")
   end
 end
@@ -293,6 +295,6 @@ class String
   # Very basic munge from rdoc to markdown format.
 
   def rdoc_to_markdown
-    self.gsub(/^mailto:/, '').gsub(/^(=+)/) { "#" * $1.size }
+    self.gsub(/^mailto:/, "").gsub(/^(=+)/) { "#" * $1.size }
   end
 end