echoe 2.6.4 → 2.7.0

data/CHANGELOG

@@ -1,4 +1,8 @@
 
+vSVN. support compiling without extension registration for win32 and java targets.
+
+v2.7.0. Add coverage task; change default test pattern; Rubygems 0.9.4.5 compatibility and requirement. Cross-packaging hacks for same. Add rubygems_version accessor. Manifest alerts about removed files now as well as added. Allow targeting of every platform on RubyGems 0.9.5.
+
 v2.6.4. Fix related issue.
 
 v2.6.3. Fix issue with shared object paths in :compile task.

data/Manifest

@@ -1,4 +1,5 @@
 CHANGELOG
+lib/echoe/platform.rb
 lib/echoe.rb
 LICENSE
 Manifest

data/README

@@ -70,13 +70,14 @@ The following tasks are made available to your gem.
 
 Packaging:
 
-* <tt>manifest</tt> -  Build a manifest list.
+* <tt>manifest</tt> -  Build a manifest list. Shows added and removed files.
 * <tt>docs</tt> -  Build the documentation.
 * <tt>package</tt> -  Build all the packages.
 
 Testing:
 
 * <tt>test</tt> -  Run the test suite.
+* <tt>coverage</tt> -  Generate a coverage report.
 * <tt>compile</tt> - Compile C extensions, if available.
 * <tt>clean</tt> - Clean up generated documentation, packaging, and build files.
 * <tt>install</tt> -  Install the gem locally.

data/Rakefile

@@ -7,8 +7,9 @@ Echoe.new('echoe') do |p|
   p.summary = 'A tool for packaging Ruby gems.'
   p.url = 'http://blog.evanweaver.com/files/doc/fauna/echoe/'
   p.docs_host = 'blog.evanweaver.com:~/www/bax/public/files/doc/'
-  p.dependencies = ['rake', 'rubyforge >=0.4.3', 'highline']
+  p.dependencies = ['rake', 'rubyforge >=0.4.3', 'highline', 'rcov']
   p.require_signed = true
+  p.rubygems_version = '>= 0.9.4.5'
 
   # Echoe is self-dependent
   p.include_gemspec = false

data/lib/echoe.rb

@@ -9,9 +9,14 @@ require 'rake/testtask'
 require 'rbconfig'
 require 'open-uri'
 require 'highline/import'
+require 'rcov/rcovtask'
+
 gem 'rubyforge', '>=0.4.0'
 require 'rubyforge'
 
+$LOAD_PATH << File.dirname(__FILE__)
+require 'echoe/platform'
+
 =begin rdoc
 
 Echoe includes some optional accessors for more advanced gem configuration.
@@ -56,6 +61,14 @@ Echoe does not force packages to depend on Echoe itself. Instead, it generates a
 
 If you do want metadependencies, add <tt>'echoe'</tt> to the <tt>p.dependencies</tt> array, and set <tt>p.include_rakefile = true</tt> and <tt>p.include_gemspec = false</tt>.
 
+== Cross-packaging
+
+Echoe supports platform Rake targets to allow you to cross-package your gems. Just write the spec assuming <tt>RUBY_PLATFORM</tt> will be what you need it to be for each architecture, and then invoke Rake with the platform name when you're cross-packaging. 
+
+For example, on JRuby, <tt>rake package</tt> will build a generic <tt>-ruby</tt> type gem. But if you want to include a Java-specific extension, you can do one of two things. You can package from within JRuby by checking if <tt>RUBY_PLATFORM =~ /java/</tt> and setting <tt>p.platform = jruby</tt>, or you can run <tt>rake java package</tt>, which will set <tt>RUBY_PLATFORM</tt> and <tt>p.platform</tt> for you.
+
+This way you can run <tt>rake java package</tt>, <tt>rake aix install</tt>, or whatever task you need and Echoe will behave just like you're packaging from within the target platform.
+
 == Accessor options
 
 Descriptive options:
@@ -76,8 +89,12 @@ Common packaging options:
 
 * <tt>dependencies</tt> - An array of dependencies for this gem. For example, <tt>['mongrel', 'rake >=0.7.1']</tt>.
 * <tt>extension_pattern</tt> - A filename array, glob array, or regex for extension files that need to be run at install time. Defaults to <tt>"ext/**/extconf.rb"</tt>.
+
+Testing options:
+
 * <tt>clean_pattern</tt> - A filename array, glob array, or regex for files that should be removed when <tt>rake clean</tt> is run.
 * <tt>test_pattern</tt> - A filename array, glob array, or regex for test runners. Overridden by <tt>"test/test_all.rb"</tt>, if it exists.
+* <tt>rcov_options</tt> - Any extra flags to pass to RCov when coverage reports are run.
 
 Uncommon packaging options:
 * <tt>platform</tt> - What platform this gem is for.
@@ -126,13 +143,12 @@ class Echoe
   RUBY_FLAGS = ENV['RUBY_FLAGS'] ||
     "-w -I#{%w(lib ext bin test).join(File::PATH_SEPARATOR)}" +
     (RUBY_DEBUG ? " #{RUBY_DEBUG}" : '')
-  FILTER = ENV['FILTER'] # for tests (eg FILTER="-n test_blah")
   
   # user-configurable
-  attr_accessor :author, :changes, :clean_pattern, :description, :email, :dependencies, :need_tgz, :need_tar_gz, :need_gem, :need_zip, :rdoc_pattern, :project, :summary, :test_pattern, :url, :version, :docs_host, :rdoc_template, :manifest_name, :install_message, :extension_pattern, :private_key, :certificate_chain, :require_signed, :ruby_version, :platform, :ignore_pattern, :executable_pattern, :changelog
+  attr_accessor :author, :changes, :clean_pattern, :description, :email, :dependencies, :need_tgz, :need_tar_gz, :need_gem, :need_zip, :rdoc_pattern, :project, :summary, :test_pattern, :url, :version, :docs_host, :rdoc_template, :manifest_name, :install_message, :extension_pattern, :private_key, :certificate_chain, :require_signed, :ruby_version, :platform, :ignore_pattern, :executable_pattern, :changelog, :rcov_options
   
   # best left alone
-  attr_accessor :name, :lib_files, :test_files, :bin_files, :spec, :rdoc_options, :rubyforge_name, :has_rdoc, :include_gemspec, :include_rakefile, :gemspec_name, :eval, :files, :changelog_patterns
+  attr_accessor :name, :lib_files, :test_files, :bin_files, :spec, :rdoc_options, :rubyforge_name, :has_rdoc, :include_gemspec, :include_rakefile, :gemspec_name, :eval, :files, :changelog_patterns, :rubygems_version
   
   # legacy
   attr_accessor :extra_deps, :rdoc_files, :extensions
@@ -147,8 +163,8 @@ class Echoe
     self.author = ""
     self.email = ""
     self.clean_pattern = ["pkg", "doc", 'build/*', '**/*.o', '**/*.so', '**/*.a', 'lib/*-*', '**/*.log', "{ext,lib}/*.{bundle,so,obj,pdb,lib,def,exp}", "ext/Makefile", "{ext,lib}/**/*.{bundle,so,obj,pdb,lib,def,exp}", "ext/**/Makefile", "pkg", "*.gem", ".config"]
-    self.test_pattern = ['test/**/test_*.rb']
-    self.ignore_pattern = /^(pkg|doc)|\.svn|CVS|\.bzr|\.DS|\.git/    
+    self.test_pattern = File.exist?("test/test_all.rb") ? "test/test_all.rb" : ['test/**/test_*.rb']
+    self.ignore_pattern = /^(pkg|doc)|\.svn|CVS|\.bzr|\.DS|\.git/ 
     
     self.changelog_patterns = {
         :version => [
@@ -164,9 +180,9 @@ class Echoe
     self.description = ""
     self.summary = ""
     self.install_message = nil
+    self.executable_pattern = /^bin\//
     self.has_rdoc = true
     self.rdoc_pattern = /^(lib|bin|tasks|ext)|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
-    self.executable_pattern = /^bin\//
     self.rdoc_options = ['--line-numbers', '--inline-source']
     self.dependencies = []
     self.manifest_name = "Manifest"
@@ -179,6 +195,7 @@ class Echoe
     self.need_tar_gz = true
     self.need_tgz = false    
     self.need_zip = false
+    self.platform = $platform
 
     self.include_rakefile = false
     self.include_gemspec = true    
@@ -279,7 +296,8 @@ class Echoe
       s.post_install_message = install_message if install_message
       s.description = description
       s.required_ruby_version = ruby_version
-      s.platform = platform if platform
+      s.required_rubygems_version = rubygems_version if rubygems_version
+      s.platform = platform
 
       if private_key and File.exist? private_key
         s.signing_key = private_key
@@ -370,11 +388,12 @@ class Echoe
       else
         raise "Key required, but not found. Maybe you forget to set ENV['GEM_PRIVATE_KEY']?" if require_signed
         puts "Private key not found; gem will not be signed."
-      end      
+      end
+      puts "Targeting \"#{platform}\" platform."
     end  
 
     desc 'Install the gem'
-    task :install => [:clean, :package] do
+    task :install => [:clean, :package, :uninstall] do
       system "sudo gem install pkg/*.gem -P MediumSecurity"
     end
 
@@ -445,6 +464,14 @@ class Echoe
       
     end
     
+    ### Cross-platform targets
+    
+    Gem::Specification::PLATFORM_CROSS_TARGETS.each do |target|
+      task target do 
+        reset_target target
+      end
+    end
+    
     ### Documentation
 
     Rake::RDocTask.new(:docs) do |rd|      
@@ -577,29 +604,40 @@ class Echoe
       files.uniq!
       
       File.open(manifest_name, 'w').puts(files)
-      puts(files.map do |file| 
-        (old_files.include?(file) ? " " : "+") + " " + file
-      end)
+      
+      (files | old_files).sort.each do |file|
+        sign = " "
+        if old_files.include?(file) and !files.include?(file)
+          sign = "-"
+        elsif files.include?(file) and !old_files.include?(file)
+          sign = "+"
+        end
+        puts "#{sign} #{file}"
+      end
     end
     
-    task :build_manifest => [:manifest]
+    task :build_manifest => :manifest
   
-    ### Tests
+    ### Testing
   
-    # XXX unreadable
     desc 'Run the test suite'
     task :test do
-      ruby(if File.exist? 'test/test_all.rb'
-        "#{RUBY_FLAGS} test/test_all.rb #{FILTER}"
-      else
-        tests = test_pattern << 'test/unit'
-        tests.map! {|f| %Q(require "#{f}")}
-        "#{RUBY_FLAGS} -e '#{tests.join("; ")}' #{FILTER}"
-      end)
+      tests = test_pattern.map do |file| 
+        "require \"#{file}\"; "
+      end
+      ruby "#{RUBY_FLAGS} -e '#{tests}'"      
     end
   
     task :default => :test
     
+    Rcov::RcovTask.new(:coverage) do |t|
+      t.test_files = test_pattern
+      t.rcov_options << rcov_options if rcov_options
+      t.verbose = true
+    end
+    
+    task :rcov => :coverage
+    
   end
 end
 

data/lib/echoe/platform.rb

@@ -0,0 +1,40 @@
+
+module Gem
+
+  # Overrides for cross packaging, which Rubygems 0.9.5 doesn't do
+  class Specification
+
+    alias :old_validate :validate    
+           
+    PLATFORM_CROSS_TARGETS = ["aix", "cygwin", "darwin", "freebsd", "hpux", "java", "linux", "mingw", "mswin", "netbsdelf", "openbsd", "solaris", "test", "_platform", "jruby"]
+    
+    def validate
+      begin
+        old_validate
+      rescue Gem::InvalidSpecificationException
+        if platform =~ /(#{PLATFORM_CROSS_TARGETS.join("|")})/i
+          true
+        else
+          raise Gem::InvalidSpecificationException, "Unknown package target \"#{platform}\"."
+        end
+      end
+    end
+    
+  end
+end
+
+$platform = "ruby"
+
+def reset_target target #:nodoc:
+  $platform = target
+  Object.send(:remove_const, "RUBY_PLATFORM")
+  Object.send(:const_set, "RUBY_PLATFORM", target)
+end
+
+if target = ARGV.detect do |arg| 
+  # Hack to get the platform set before the Rakefile evaluates
+    Gem::Specification::PLATFORM_CROSS_TARGETS.include? arg
+  end
+  reset_target target
+end
+

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
+rubygems_version: 0.9.4.5
+specification_version: 2
 name: echoe
 version: !ruby/object:Gem::Version 
-  version: 2.6.4
-date: 2007-10-11 00:00:00 -04:00
+  version: 2.7.0
+date: 2007-10-25 00:00:00 -04:00
 summary: A tool for packaging Ruby gems.
 require_paths: 
 - lib
@@ -16,11 +16,17 @@ autorequire:
 default_executable: 
 bindir: bin
 has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 0.0.0
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 0.9.4.5
   version: 
 platform: ruby
 signing_key: 
@@ -52,6 +58,7 @@ authors:
 - Evan Weaver
 files: 
 - CHANGELOG
+- lib/echoe/platform.rb
 - lib/echoe.rb
 - LICENSE
 - Manifest
@@ -75,16 +82,16 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   name: rake
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -93,9 +100,18 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   name: highline
   version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.0
+        version: "0"
     version: