hen 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 498ad06883b7b8ed922913e433a2b14686432080
-  data.tar.gz: a9009b33ac57e4695df6cf2fca97bc43628d4b9a
+  metadata.gz: 4072e13f1feb0d60af5d5cc34da7241534729021
+  data.tar.gz: f928a7f50cf2fa8792e21b74f5b89bc003d48ca4
 SHA512:
-  metadata.gz: dc962996c983173994195733d666dffa587f21a5b8f061244e677ff62eba928eab425fd43b4cdc1320a5c4f131780576ab394c43aacee2bf3f022988eb5f6862
-  data.tar.gz: aa2f6ca6d9635d68abcdf8e5522f455dd5f270357a7cc2eed60d646ecc643e77008bf7819e8ea635f998d2174a2a7d31088a496fd2daeaeb1c42cb744efba152
+  metadata.gz: 21ab42db487595edd0efac73bef24ac27b63839f7c4cec703552a850eb30d9bf7c05dfebaaabe2d8ec12c2e4675f6831f42c4ae73fe398151f6d75ec238a8dfa
+  data.tar.gz: 928c0691dfcd088104f2dc253b6939873b92477bdfa5e1ea105c3edb0910eb1eeb3c95d55439d5ee38fb6ffc4b937130f7d9139c7419bd0e3facec8d6e6b2516

data/ChangeLog

@@ -2,6 +2,12 @@
 
 = Revision history for hen
 
+== 0.8.0 [2014-10-31]
+
+* Removed support for legacy versions of RDoc, RSpec and RubyGems.
+* Included workaround to make RDoc labels cross-browser compatible (issue
+  330[https://github.com/rdoc/rdoc/pull/330]).
+
 == 0.7.1 [2014-10-17]
 
 * Specify default dependency for hen with pessimistic version constraint.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to hen version 0.7.1
+This documentation refers to hen version 0.8.0
 
 
 == DESCRIPTION

data/lib/hen/dsl.rb

@@ -152,12 +152,6 @@ class Hen
       end
     end
 
-    # DEPRECATED: Use #rubygems instead.
-    def gemcutter(&block)
-      warn "#{self}#gemcutter is deprecated; use `rubygems' instead."
-      rubygems(&block)
-    end
-
     # Encapsulates tasks targeting at Git, skipping those if the current
     # project is not controlled by Git. Yields a Git object via #init_git.
     def git
@@ -187,14 +181,8 @@ class Hen
     # Loads the RubyGems +push+ command, giving
     # a nicer error message if it's not found.
     def have_rubygems?
-      begin
-        require 'rubygems/command_manager'
-        require 'rubygems/commands/push_command'
-      rescue LoadError
-        # rubygems < 1.3.6, gemcutter < 0.4.0
-        require 'commands/abstract_command'
-        require 'commands/push'
-      end
+      require 'rubygems/command_manager'
+      require 'rubygems/commands/push_command'
 
       Gem::Commands::PushCommand
     rescue LoadError, NameError

data/lib/hen/version.rb

@@ -3,8 +3,8 @@ class Hen
   module Version
 
     MAJOR = 0
-    MINOR = 7
-    TINY  = 1
+    MINOR = 8
+    TINY  = 0
 
     class << self
 

data/lib/hens/gem.rake

@@ -20,20 +20,10 @@ Hen gem: :rdoc do
     require_path: 'lib'
   }.update(config[:gem])
 
-  gem_klass = begin
-    raise LoadError if gem_options.delete(:legacy)
-
-    require 'rubygems/package_task'
-    Gem::PackageTask
-  rescue LoadError
-    require 'rake/gempackagetask'
-    Rake::GemPackageTask
-  end
+  require 'rubygems/package_task'
 
   if Object.const_defined?(:RDOC_OPTIONS)
     rdoc_files = RDOC_OPTIONS[:rdoc_files]
-    gem_options[:has_rdoc] = !rdoc_files.empty? if Gem::VERSION < '1.7'
-
     gem_options[:rdoc_options] ||= RDOC_OPTIONS[:options]
   end
 
@@ -269,7 +259,7 @@ Hen gem: :rdoc do
 
   }
 
-  pkg_task = gem_klass.new(gem_spec) { |pkg|
+  pkg_task = Gem::PackageTask.new(gem_spec) { |pkg|
     pkg.need_tar_gz = true
     pkg.need_zip    = true
 
@@ -280,7 +270,7 @@ Hen gem: :rdoc do
 
   meta_gem_specs.each { |meta_gem_spec|
 
-    meta_pkg_task = gem_klass.new(meta_gem_spec)
+    meta_pkg_task = Gem::PackageTask.new(meta_gem_spec)
 
     taskname = meta_gem_spec.taskname
 

data/lib/hens/rdoc.rake

@@ -1,44 +1,25 @@
 Hen :rdoc do
 
   rdoc_options = {
-    rdoc_dir:       'doc',
-    rdoc_files:     %w[README COPYING ChangeLog lib/**/*.rb ext/**/*.c],
-    title:          '{name:%s }Application documentation{version: (v%s)}',
-    charset:        'UTF-8',
-    inline_source:  true,
-    line_numbers:   true,
-    all:            true
+    rdoc_dir:     'doc',
+    rdoc_files:   %w[README COPYING ChangeLog lib/**/*.rb ext/**/*.c],
+    title:        '{name:%s }Application documentation{version: (v%s)}',
+    charset:      'UTF-8',
+    line_numbers: true,
+    all:          true
   }.update(config[:rdoc])
 
-  rdoc_klass = begin
-    raise LoadError if rdoc_options.delete(:legacy)
-
-    require 'rdoc/task'
-
-    rdoc_options.delete(:inline_source)  # deprecated
-    RDoc::Task
-  rescue LoadError
-    begin
-      require 'rake/rdoctask'
-      Rake::RDocTask
-    rescue LoadError => err
-      load_error = err
-    end
-  end
-
   info = {
     'name'    => config[:gem][:name],
     'version' => config[:gem][:version],
     'date'    => Date.today.to_s
   }
 
-  rdoc_options[:title].gsub!(/\{(\w+):(.*?)\}/) { i = info[$1] and $2 % i }
-
   ### rdoc_dir
 
   rdoc_dir = rdoc_options.delete(:rdoc_dir)
 
-  ### rdoc_files, main
+  ### rdoc_files
 
   rdoc_files = FileList[[
     rdoc_options.delete(:rdoc_files),
@@ -55,6 +36,8 @@ Hen :rdoc do
     rdoc_files_local = []
   end
 
+  ### main
+
   rdoc_options.delete(:main) unless rdoc_files.include?(
     File.join(rdoc_options.values_at(:root, :main).compact))
 
@@ -63,6 +46,10 @@ Hen :rdoc do
     main_candidates.grep(%r{\Areadme[^/]*\z}i).first || main_candidates.first
   end
 
+  ### title
+
+  rdoc_options[:title].gsub!(/\{(\w+):(.*?)\}/) { i = info[$1] and $2 % i }
+
   ### rdoc_options
 
   rdoc_opts = map_options(rdoc_options)
@@ -74,24 +61,34 @@ Hen :rdoc do
     options:    rdoc_opts
   }
 
-  unless rdoc_files.empty?
-    raise load_error if load_error
+  unless rdoc_files.empty? && rdoc_files_local.empty?
+    require 'rdoc/task'
+
+    class RDoc::Markup::ToLabel
+
+      alias_method :_hen_original_convert, :convert
+
+      def convert(*args)
+        _hen_original_convert(*args).gsub('%', '-').sub(/^-/, '')
+      end
+
+    end if defined?(RDoc::Markup::ToLabel)
+  end
 
-    rdoc_task = rdoc_klass.new(:doc) { |rdoc|
+  unless rdoc_files.empty?
+    RDoc::Task.new(:doc) { |rdoc|
       rdoc.rdoc_dir   = rdoc_dir
       rdoc.rdoc_files = rdoc_files
       rdoc.options    = rdoc_opts
     }
   else
     task :doc do
-      warn 'No files to generate documentation for!'
+      warn 'No files to generate documentation for...'
     end
   end
 
   unless rdoc_files_local.empty?
-    raise load_error if load_error
-
-    rdoc_klass.new('doc:local') { |rdoc|
+    RDoc::Task.new('doc:local') { |rdoc|
       rdoc.rdoc_dir   = rdoc_dir + '.local'
       rdoc.rdoc_files = rdoc_files_local
       rdoc.options    = rdoc_opts
@@ -104,10 +101,12 @@ Hen :rdoc do
         def rerdoc_task_description;  local_description(super); end
       }
     }
+  else
+    task 'doc:local' do
+      warn 'No files to generate documentation for...'
+    end
   end
 
-  publish_desc = 'Publish RDoc documentation'
-
   git do |git|
 
     git_branch = 'gh-pages'
@@ -132,14 +131,14 @@ Hen :rdoc do
           git.checkout_fetched_branch pages_url, git_branch
 
           rm_r Dir['*']
-          cp_r Dir["../#{rdoc_task.rdoc_dir}/*"], '.'
+          cp_r Dir["../#{rdoc_dir}/*"], '.'
 
           git.add_and_commit 'Updated documentation.'
           git.push pages_url, git_branch
         }
       end
 
-      desc publish_desc; publish_desc = nil
+      desc 'Publish RDoc documentation'
       task 'doc:publish' => 'doc:publish:github'
 
     elsif clone_url  # still git repo, but no gh-pages branch

data/lib/hens/spec.rake

@@ -6,46 +6,19 @@ Hen :spec do
     options: 'spec/spec.opts'
   }.update(config[:spec])
 
-  spec_klass = begin
-    raise LoadError if spec_options.delete(:legacy)
-
-    require 'rspec/core/rake_task'
-    RSpec::Core::RakeTask
-  rescue LoadError
-    begin
-      require 'spec/rake/spectask'
-      Spec::Rake::SpecTask
-    rescue LoadError => err
-      load_error = err
-    end
-  end
-
   spec_files = spec_options.delete(:files) ||
       FileList[spec_options.delete(:pattern)].to_a
 
   mangle_files!(spec_files, managed: false)
 
   unless spec_files.empty?
-    raise load_error if load_error
+    require 'rspec/core/rake_task'
 
     spec_helper = spec_options.delete(:helper)
 
     if spec_helper && File.readable?(spec_helper)
       spec_files.delete(spec_helper)
-
-      begin
-        require 'rspec/core/version'
-
-        # RSpec began sorting test files in version 2.12.0 (c76c1e6)
-        curr_version = Gem::Version.new(RSpec::Core::Version::STRING)
-        sort_version = Gem::Version.new('2.12.0')
-
-        raise LoadError if curr_version < sort_version
-
-        (spec_options[:require] ||= []) << File.basename(spec_helper, '.rb')
-      rescue LoadError, NameError
-        spec_files.unshift(spec_helper)
-      end
+      (spec_options[:require] ||= []) << File.basename(spec_helper, '.rb')
     end
 
     opts_file = spec_options.delete(:options)
@@ -55,31 +28,9 @@ Hen :spec do
       File.readlines(opts_file).each { |line| spec_opts << line.chomp }
     end
 
-    spec_block = lambda { |t|
-      if t.respond_to?(:spec_files=)
-        t.spec_files = spec_files
-        t.spec_opts  = spec_opts
-      else
-        t.pattern    = spec_files
-        t.rspec_opts = spec_opts
-      end
-    }
-
-    spec_klass.new(&spec_block)
-
-    rcov_opts = ['--exclude', spec_files.join(',')]
-    rcov_file = File.join(spec_files.first[%r{[^/.]+}], 'rcov.opts')
-
-    if rcov_file && File.readable?(rcov_file)
-      File.readlines(rcov_file).each { |line| rcov_opts << line.chomp }
-    end
-
-    #desc "Run specs with RCov"
-    spec_klass.new('spec:rcov') { |t|
-      spec_block[t]
-
-      t.rcov = true
-      t.rcov_opts = rcov_opts
+    RSpec::Core::RakeTask.new { |t|
+      t.pattern    = spec_files
+      t.rspec_opts = spec_opts
     }
   end
 

data/lib/hens/test.rake

@@ -1,7 +1,5 @@
 Hen :test do
 
-  require 'rake/testtask'
-
   test_options = {
     pattern: 'test/**/*_test.rb'
   }.update(config[:test])
@@ -12,6 +10,8 @@ Hen :test do
   mangle_files!(test_files, managed: false)
 
   unless test_files.empty?
+    require 'rake/testtask'
+
     Rake::TestTask.new { |t|
       t.test_files = test_files
       set_options(t, test_options, 'Test')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hen
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Jens Wille
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -106,16 +106,15 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  hen-0.7.1 [2014-10-17]:
+  hen-0.8.0 [2014-10-31]:
 
-  * Specify default dependency for hen with pessimistic version constraint.
-  * Recognize +extra_files+ option for RDoc task.
-  * Respect RDoc option +root+ when looking for +main+ file.
-  * Prefer +README+ as +main+ file.
+  * Removed support for legacy versions of RDoc, RSpec and RubyGems.
+  * Included workaround to make RDoc labels cross-browser compatible (issue
+    330[https://github.com/rdoc/rdoc/pull/330]).
 
 rdoc_options:
 - "--title"
-- hen Application documentation (v0.7.1)
+- hen Application documentation (v0.8.0)
 - "--charset"
 - UTF-8
 - "--line-numbers"