echoe 3.0.2 → 3.1

data/CHANGELOG

@@ -1,3 +1,6 @@
+
+v3.1. Fix some bugs; become Ruby 1.9 compatible.
+
 v3.0.2. Support for alternative Rakefile naming.
 
 v3.0.1. Compatibility with Rubygems 1.3.

data/Manifest

@@ -3,6 +3,7 @@ echoe.gemspec
 lib/echoe/client.rb
 lib/echoe/extensions.rb
 lib/echoe/platform.rb
+lib/echoe/rubygems.rb
 lib/echoe.rb
 LICENSE
 Manifest

data/Rakefile

@@ -7,7 +7,7 @@ Echoe.new('echoe') do |p|
   p.summary = 'A Rubygems packaging tool that provides Rake tasks for documentation, extension compiling, testing, and deployment.'
   p.url = 'http://blog.evanweaver.com/files/doc/fauna/echoe/'
   p.docs_host = 'blog.evanweaver.com:~/www/bax/public/files/doc/'
-  p.runtime_dependencies = ['rake', 'rubyforge >=1.0.0', 'highline']
+  p.runtime_dependencies = ['rubyforge >=1.0.0', 'highline']
   p.development_dependencies = []
   p.retain_gemspec = true
   p.require_signed = true

data/echoe.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{echoe}
-  s.version = "3.0.2"
+  s.version = "3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
   s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2008-10-26}
+  s.date = %q{2009-02-03}
   s.description = %q{A Rubygems packaging tool that provides Rake tasks for documentation, extension compiling, testing, and deployment.}
   s.email = %q{}
-  s.extra_rdoc_files = ["CHANGELOG", "lib/echoe/client.rb", "lib/echoe/extensions.rb", "lib/echoe/platform.rb", "lib/echoe.rb", "LICENSE", "README", "TODO"]
-  s.files = ["CHANGELOG", "echoe.gemspec", "lib/echoe/client.rb", "lib/echoe/extensions.rb", "lib/echoe/platform.rb", "lib/echoe.rb", "LICENSE", "Manifest", "MIT-LICENSE", "Rakefile", "README", "TODO"]
+  s.extra_rdoc_files = ["CHANGELOG", "lib/echoe/client.rb", "lib/echoe/extensions.rb", "lib/echoe/platform.rb", "lib/echoe/rubygems.rb", "lib/echoe.rb", "LICENSE", "README", "TODO"]
+  s.files = ["CHANGELOG", "echoe.gemspec", "lib/echoe/client.rb", "lib/echoe/extensions.rb", "lib/echoe/platform.rb", "lib/echoe/rubygems.rb", "lib/echoe.rb", "LICENSE", "Manifest", "MIT-LICENSE", "Rakefile", "README", "TODO"]
   s.has_rdoc = true
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/echoe/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Echoe", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{fauna}
-  s.rubygems_version = %q{1.3.0}
+  s.rubygems_version = %q{1.3.1}
   s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
   s.summary = %q{A Rubygems packaging tool that provides Rake tasks for documentation, extension compiling, testing, and deployment.}
 
@@ -26,16 +26,13 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rake>, [">= 0"])
       s.add_runtime_dependency(%q<rubyforge>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<highline>, [">= 0"])
     else
-      s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rubyforge>, [">= 1.0.0"])
       s.add_dependency(%q<highline>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rubyforge>, [">= 1.0.0"])
     s.add_dependency(%q<highline>, [">= 0"])
   end

data/lib/echoe.rb

@@ -1,6 +1,7 @@
-require 'rubygems'
 
-require 'rubyforge'
+$HERE = File.dirname(__FILE__)
+require "#{$HERE}/echoe/platform"
+require "#{$HERE}/echoe/extensions"
 
 require 'rake'
 require 'rake/clean'
@@ -10,22 +11,17 @@ require 'rake/rdoctask'
 require 'rake/testtask'
 require 'rbconfig'
 require 'open-uri'
-require 'highline/import'
 
-begin
-  require 'rcov/rcovtask'
-rescue LoadError
-end
+require 'rubygems'
+require "#{$HERE}/echoe/rubygems"
 
-begin
-  require 'load_multi_rails_rake_tasks'
-rescue LoadError
-end
+require 'rubyforge'
+require "#{$HERE}/echoe/client"
+
+require 'highline/import'
 
-$LOAD_PATH << File.dirname(__FILE__)
-require 'echoe/platform'
-require 'echoe/extensions'
-require 'echoe/client'
+begin; require 'rcov/rcovtask'; rescue LoadError; end
+begin; require 'load_multi_rails_rake_tasks'; rescue LoadError; end
 
 =begin rdoc
 
@@ -37,7 +33,7 @@ For example, a simple <tt>Rakefile</tt> might look like this:
 
   Echoe.new("uncapitalizer") do |p|
     p.author = "Evan Weaver"
-    p.summary = "A library that uncapitalizes strings. It's awesome."
+    p.summary = "A library that uncapitalizes strings."
     p.url = "http://www.uncapitalizer.com"
     p.docs_host = "uncapitalizer.com:~/www/files/doc/"
     p.runtime_dependencies = ["string_tools >=1.4.0"]
@@ -151,7 +147,7 @@ class Echoe
   attr_accessor :author, :changes, :clean_pattern, :description, :email, :runtime_dependencies, :development_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, :gemspec_format
 
   # 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, :retain_gemspec, :rakefile_name, :eval, :files, :changelog_patterns, :rubygems_version, :use_sudo
+  attr_accessor :name, :lib_files, :test_files, :bin_files, :spec, :rdoc_options, :rubyforge_name, :has_rdoc, :include_gemspec, :include_rakefile, :gemspec_name, :retain_gemspec, :rakefile_name, :eval, :files, :changelog_patterns, :rubygems_version, :use_sudo, :gem_bin
 
   # legacy
   attr_accessor :extra_deps, :rdoc_files, :extensions, :dependencies
@@ -165,7 +161,7 @@ class Echoe
     self.url = ""
     self.author = ""
     self.email = ""
-    self.clean_pattern = ["pkg", "doc", 'build/*', '**/coverage', '**/*.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.clean_pattern = ["pkg", "doc", 'build/*', '**/coverage', '**/*.o', '**/*.so', '**/*.a', '**/*.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 = File.exist?("test/test_all.rb") ? "test/test_all.rb" : ['test/**/test_*.rb', 'test/**/*_test.rb']
     self.ignore_pattern = /^(pkg|doc)|\.svn|CVS|\.bzr|\.DS|\.git/
 
@@ -185,7 +181,8 @@ class Echoe
     self.install_message = nil
     self.executable_pattern = /^bin\//
     self.has_rdoc = true
-    self.use_sudo = RUBY_PLATFORM !~ /mswin32|cygwin/
+    self.use_sudo = !Platform.windows?
+    self.gem_bin = "gem#{Platform.suffix}"
     self.rcov_options = []
     self.rdoc_pattern = /^(lib|bin|tasks|ext)|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
 
@@ -198,7 +195,7 @@ class Echoe
     self.rdoc_options += ['--main', readme] if readme
 
     self.runtime_dependencies = []
-    self.development_dependencies = ["echoe"]
+    self.development_dependencies = [] # These appear to not work at all
     self.manifest_name = "Manifest"
     self.extension_pattern = ["ext/**/extconf.rb", "ext/extconf.rb"]
     self.private_key = ENV['GEM_PRIVATE_KEY']
@@ -381,6 +378,13 @@ class Echoe
       pkg.need_tar_gz = @need_tar_gz
       pkg.need_zip = @need_zip
     end
+    
+    desc "Display Echoe's knowledge of your system"
+    task :details do
+      (self.instance_variables.sort - ['@spec']).each do |var|
+        puts "#{var}: #{instance_variable_get(var).inspect}"
+      end
+    end
 
     task :build_gemspec do
       # Construct the gemspec file, if needed.
@@ -428,19 +432,19 @@ class Echoe
 
     desc 'Install the gem'
     task :install => [:clean, :package, :uninstall] do
-      system "#{'sudo' if use_sudo} gem install pkg/*.gem -P MediumSecurity --no-update-sources"
+      system "#{'sudo' if use_sudo} #{gem_bin} install pkg/*.gem -P MediumSecurity --no-update-sources"
     end
 
     namespace :install do
       desc 'Install the gem including development dependencies'
       task :development => [:clean, :package, :uninstall] do
-        system "#{'sudo' if use_sudo} gem install pkg/*.gem -P MediumSecurity --no-update-sources --development"
+        system "#{'sudo' if use_sudo} #{gem_bin} install pkg/*.gem -P MediumSecurity --no-update-sources --development"
       end
     end
 
     desc 'Uninstall the gem'
     task :uninstall do
-      system "#{'sudo' if use_sudo} gem uninstall #{name} -a -I -x"
+      system "#{'sudo' if use_sudo} #{gem_bin} uninstall #{name} -a -I -x"
     end
 
     desc 'Package and upload the release to Rubyforge'
@@ -469,7 +473,7 @@ class Echoe
                   (@need_gem ? pkg_gem : nil)].compact
 
         puts "Releasing #{name} v. #{version}"
-        self.version = self.version.ljust(3)
+        self.version = self.version.to_s.ljust(3)
 
         rf.add_release project, name, version, *files
       end
@@ -491,7 +495,7 @@ class Echoe
           lib_target = nil
           Dir.chdir(ext_dir) do
             ruby File.basename(extension)
-            system(PLATFORM =~ /win32/ ? 'nmake' : 'make')
+            system(RUBY_PLATFORM =~ /win32/ ? 'nmake' : 'make')
             lib_target = open('Makefile').readlines.grep(/target_prefix = /).first.split('=').last.chomp("\n").strip
           end
           Dir["#{ext_dir}/*.#{Config::CONFIG['DLEXT']}"].each do |file|

data/lib/echoe/platform.rb

@@ -22,53 +22,15 @@ module Platform
     !@java.nil?
   end
   
+  def self.suffix
+    @suffix ||= Gem.default_exec_format[2..-1]
+  end
+  
   def self.rake
-    windows? ? 'rake.bat' : 'rake'
+    windows? ? "rake#{suffix}.bat" : "rake#{suffix}"
   end
   
   def self.make
     msvc? ? 'nmake' : 'make'
   end
 end
-
-### Overrides for cross packaging, which Rubygems 0.9.5 doesn't do
-
-module Gem
-  class Specification
-
-    alias :old_validate :validate    
-           
-    PLATFORM_CROSS_TARGETS = ["aix", "cygwin", "darwin", "freebsd", "hpux", "java", "linux", "mingw", "mswin", "netbsdelf", "openbsd", "solaris", "_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
-
-### Some runtime Echoe hacks
-
-$platform = "ruby" # or Gem::PLATFORM::RUBY maybe
-
-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
-

data/lib/echoe/rubygems.rb

@@ -0,0 +1,41 @@
+### Overrides for cross packaging, which Rubygems 0.9.5 doesn't do
+
+module Gem
+  class Specification
+
+    alias :old_validate :validate    
+           
+    PLATFORM_CROSS_TARGETS = ["aix", "cygwin", "darwin", "freebsd", "hpux", "java", "linux", "mingw", "mswin", "netbsdelf", "openbsd", "solaris", "_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
+
+### Some runtime Echoe hacks
+
+$platform = "ruby" # or Gem::PLATFORM::RUBY maybe
+
+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,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: echoe
 version: !ruby/object:Gem::Version 
-  version: 3.0.2
+  version: "3.1"
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,19 +30,9 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2008-10-26 00:00:00 -07:00
+date: 2009-02-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
   type: :runtime
@@ -74,6 +64,7 @@ extra_rdoc_files:
 - lib/echoe/client.rb
 - lib/echoe/extensions.rb
 - lib/echoe/platform.rb
+- lib/echoe/rubygems.rb
 - lib/echoe.rb
 - LICENSE
 - README
@@ -84,6 +75,7 @@ files:
 - lib/echoe/client.rb
 - lib/echoe/extensions.rb
 - lib/echoe/platform.rb
+- lib/echoe/rubygems.rb
 - lib/echoe.rb
 - LICENSE
 - Manifest
@@ -118,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A Rubygems packaging tool that provides Rake tasks for documentation, extension compiling, testing, and deployment.