echoe 2.7.9 → 2.7.11

data/CHANGELOG

@@ -1,4 +1,8 @@
 
+v2.7.11. Include Platform module for abstracting RUBY_PLATFORM regex checks (luislavena).
+
+v2.7.10. Include RDoc options in generated gemspec (Rob McKinnon).
+
 v2.7.9. Fix redefine task helper for new Rake.
 
 v2.7.8. Better default test pattern.

data/lib/echoe.rb

@@ -181,7 +181,13 @@ class Echoe
     self.use_sudo = RUBY_PLATFORM !~ /mswin32|cygwin/
     self.rcov_options = []
     self.rdoc_pattern = /^(lib|bin|tasks|ext)|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
-    self.rdoc_options = ['--line-numbers', '--inline-source']
+
+    title = (name.downcase == name ? name.capitalize : name)
+    self.rdoc_options = ['--line-numbers', '--inline-source', '--title', title]
+    
+    readme = Dir['*'].detect { |filename| filename =~ /^readme/i }
+    self.rdoc_options += ['--main', readme] if readme
+      
     self.dependencies = []
     self.manifest_name = "Manifest"
     self.extension_pattern = ["ext/**/extconf.rb", "ext/extconf.rb"]
@@ -256,7 +262,7 @@ class Echoe
     self.clean_pattern = apply_pattern(clean_pattern)
     self.extension_pattern = apply_pattern(extension_pattern, files)
     self.ignore_pattern = apply_pattern(ignore_pattern)
-    self.rdoc_pattern = apply_pattern(rdoc_pattern, files)
+    self.rdoc_pattern = apply_pattern(rdoc_pattern, files) - [manifest_name]
     self.executable_pattern = apply_pattern(executable_pattern, files)
     self.test_pattern = apply_pattern(test_pattern)      
 
@@ -296,6 +302,8 @@ class Echoe
       s.required_ruby_version = ruby_version
       s.required_rubygems_version = rubygems_version if rubygems_version
       s.platform = platform
+      s.rdoc_options = rdoc_options
+      s.extra_rdoc_files = rdoc_pattern
 
       if private_key and File.exist? private_key
         s.signing_key = private_key
@@ -473,24 +481,17 @@ class Echoe
     ### Documentation
 
     Rake::RDocTask.new(:docs) do |rd|      
-      rd.main = Dir['*'].detect {|f| f =~ /^readme/i}
+      # rd.main = Dir['*'].detect {|f| f =~ /^readme/i}
       rd.options += Array(rdoc_options)
       
-      rd.rdoc_dir = 'doc'
-      
-      files = rdoc_pattern
-      files -= [manifest_name]
-      
-      rd.rdoc_files.push(*files)
+      rd.rdoc_dir = 'doc'      
+      rd.rdoc_files.push(*rdoc_pattern)
 
       if rdoc_template
         rd.template = rdoc_template 
       elsif ENV['RDOC_TEMPLATE']
         rd.template = ENV['RDOC_TEMPLATE']
       end      
-
-      title = name.downcase == name ? name.capitalize : name
-      rd.options << "-t #{title}"
     end
         
     task :doc => [:redocs]

data/lib/echoe/platform.rb

@@ -1,7 +1,39 @@
 
-module Gem
+### Platform check regexes
+
+module Platform
+  def self.windows?
+    @windows ||= RUBY_PLATFORM =~ /djgpp|(cyg|ms|bcc)win|mingw/
+    !@windows.nil?
+  end
+
+  def self.gcc?
+    @gcc ||= RUBY_PLATFORM =~ /mingw/
+    !@gcc.nil?
+  end
+
+  def self.msvc?
+    @msvc ||= RUBY_PLATFORM =~ /mswin/
+    !@msvc.nil?
+  end
+  
+  def self.java?
+    @java ||= RUBY_PLATFORM =~ /java/
+    !@java.nil?
+  end
+  
+  def self.rake
+    windows? ? 'rake.bat' : 'rake'
+  end
+  
+  def self.make
+    msvc? ? 'nmake' : 'make'
+  end
+end
 
-  # Overrides for cross packaging, which Rubygems 0.9.5 doesn't do
+### Overrides for cross packaging, which Rubygems 0.9.5 doesn't do
+
+module Gem
   class Specification
 
     alias :old_validate :validate    
@@ -23,6 +55,8 @@ module Gem
   end
 end
 
+### Some runtime Echoe hacks
+
 $platform = "ruby" # or Gem::PLATFORM::RUBY maybe
 
 def reset_target target #:nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: echoe
 version: !ruby/object:Gem::Version 
-  version: 2.7.9
+  version: 2.7.11
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2008-03-24 00:00:00 -04:00
+date: 2008-03-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,8 +66,14 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- CHANGELOG
+- lib/echoe/extensions.rb
+- lib/echoe/platform.rb
+- lib/echoe.rb
+- LICENSE
+- README
+- TODO
 files: 
 - CHANGELOG
 - lib/echoe/extensions.rb
@@ -82,8 +88,13 @@ files:
 has_rdoc: true
 homepage: http://blog.evanweaver.com/files/doc/fauna/echoe/
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- Echoe
+- --main
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement