elliottcable-echoe 3.1.2 → 3.1.3

data/CHANGELOG

@@ -1,6 +1,8 @@
+v3.1.3. Removing Evan's keychain so GitHub can build the gem. Version bump to force GitHub to re-generate gem.
+
 v3.1.2. Small bugfix. Version bump to force GitHub to re-generate gem.
 
-v3.1.1. Remove Rake from the requirements and vendor it (due to Ruby 1.9.1's odd handling of Rake)
+v3.1.1. Remove Rake/contrib from the gem requirements and vendor it. Fix some load paths on Ruby 1.9.
 
 v3.1. Fix some bugs; become Ruby 1.9 compatible.
 

data/Manifest

@@ -2,6 +2,7 @@ CHANGELOG
 echoe.gemspec
 lib/echoe/client.rb
 lib/echoe/extensions.rb
+lib/echoe/net.rb
 lib/echoe/platform.rb
 lib/echoe/rubygems.rb
 lib/echoe.rb
@@ -11,103 +12,10 @@ MIT-LICENSE
 Rakefile
 README
 TODO
-vendor/rake/bin/rake
-vendor/rake/CHANGES
-vendor/rake/doc/example/a.c
-vendor/rake/doc/example/b.c
-vendor/rake/doc/example/main.c
-vendor/rake/doc/example/Rakefile1
-vendor/rake/doc/example/Rakefile2
-vendor/rake/doc/glossary.rdoc
-vendor/rake/doc/jamis.rb
-vendor/rake/doc/proto_rake.rdoc
-vendor/rake/doc/rake.1.gz
-vendor/rake/doc/rakefile.rdoc
-vendor/rake/doc/rational.rdoc
-vendor/rake/doc/release_notes/rake-0.4.14.rdoc
-vendor/rake/doc/release_notes/rake-0.4.15.rdoc
-vendor/rake/doc/release_notes/rake-0.5.0.rdoc
-vendor/rake/doc/release_notes/rake-0.5.3.rdoc
-vendor/rake/doc/release_notes/rake-0.5.4.rdoc
-vendor/rake/doc/release_notes/rake-0.6.0.rdoc
-vendor/rake/doc/release_notes/rake-0.7.0.rdoc
-vendor/rake/doc/release_notes/rake-0.7.1.rdoc
-vendor/rake/doc/release_notes/rake-0.7.2.rdoc
-vendor/rake/doc/release_notes/rake-0.7.3.rdoc
-vendor/rake/doc/release_notes/rake-0.8.0.rdoc
-vendor/rake/doc/release_notes/rake-0.8.2.rdoc
-vendor/rake/doc/release_notes/rake-0.8.3.rdoc
-vendor/rake/install.rb
-vendor/rake/lib/rake/classic_namespace.rb
-vendor/rake/lib/rake/clean.rb
 vendor/rake/lib/rake/contrib/compositepublisher.rb
 vendor/rake/lib/rake/contrib/ftptools.rb
 vendor/rake/lib/rake/contrib/publisher.rb
 vendor/rake/lib/rake/contrib/rubyforgepublisher.rb
 vendor/rake/lib/rake/contrib/sshpublisher.rb
 vendor/rake/lib/rake/contrib/sys.rb
-vendor/rake/lib/rake/gempackagetask.rb
-vendor/rake/lib/rake/loaders/makefile.rb
-vendor/rake/lib/rake/packagetask.rb
-vendor/rake/lib/rake/rake_test_loader.rb
-vendor/rake/lib/rake/rdoctask.rb
-vendor/rake/lib/rake/ruby182_test_unit_fix.rb
-vendor/rake/lib/rake/runtest.rb
-vendor/rake/lib/rake/tasklib.rb
-vendor/rake/lib/rake/testtask.rb
-vendor/rake/lib/rake/win32.rb
-vendor/rake/lib/rake.rb
 vendor/rake/MIT-LICENSE
-vendor/rake/Rakefile
-vendor/rake/README
-vendor/rake/test/capture_stdout.rb
-vendor/rake/test/check_expansion.rb
-vendor/rake/test/contrib/test_sys.rb
-vendor/rake/test/data/chains/Rakefile
-vendor/rake/test/data/default/Rakefile
-vendor/rake/test/data/dryrun/Rakefile
-vendor/rake/test/data/file_creation_task/Rakefile
-vendor/rake/test/data/imports/deps.mf
-vendor/rake/test/data/imports/Rakefile
-vendor/rake/test/data/multidesc/Rakefile
-vendor/rake/test/data/namespace/Rakefile
-vendor/rake/test/data/rakelib/test1.rb
-vendor/rake/test/data/rbext/rakefile.rb
-vendor/rake/test/data/sample.mf
-vendor/rake/test/data/statusreturn/Rakefile
-vendor/rake/test/data/unittest/Rakefile
-vendor/rake/test/filecreation.rb
-vendor/rake/test/functional.rb
-vendor/rake/test/in_environment.rb
-vendor/rake/test/rake_test_setup.rb
-vendor/rake/test/reqfile.rb
-vendor/rake/test/reqfile2.rb
-vendor/rake/test/session_functional.rb
-vendor/rake/test/shellcommand.rb
-vendor/rake/test/test_application.rb
-vendor/rake/test/test_clean.rb
-vendor/rake/test/test_definitions.rb
-vendor/rake/test/test_earlytime.rb
-vendor/rake/test/test_extension.rb
-vendor/rake/test/test_file_creation_task.rb
-vendor/rake/test/test_file_task.rb
-vendor/rake/test/test_filelist.rb
-vendor/rake/test/test_fileutils.rb
-vendor/rake/test/test_ftp.rb
-vendor/rake/test/test_invocation_chain.rb
-vendor/rake/test/test_makefile_loader.rb
-vendor/rake/test/test_multitask.rb
-vendor/rake/test/test_namespace.rb
-vendor/rake/test/test_package_task.rb
-vendor/rake/test/test_pathmap.rb
-vendor/rake/test/test_rake.rb
-vendor/rake/test/test_require.rb
-vendor/rake/test/test_rules.rb
-vendor/rake/test/test_task_arguments.rb
-vendor/rake/test/test_task_manager.rb
-vendor/rake/test/test_tasklib.rb
-vendor/rake/test/test_tasks.rb
-vendor/rake/test/test_test_task.rb
-vendor/rake/test/test_top_level_functions.rb
-vendor/rake/test/test_win32.rb
-vendor/rake/TODO

data/Rakefile

@@ -7,9 +7,8 @@ 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 = ['rubyforge >=1.0.0', 'highline']
+  p.runtime_dependencies = ['rubyforge >=1.0.2', 'highline']
   p.development_dependencies = []
   p.retain_gemspec = true
-  p.require_signed = true
 end
 

data/echoe.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{echoe}
-  s.version = "3.1.2"
+  s.version = "3.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
-  s.date = %q{2009-02-11}
+  s.date = %q{2009-06-16}
   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/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", "vendor/rake/bin/rake", "vendor/rake/CHANGES", "vendor/rake/doc/example/a.c", "vendor/rake/doc/example/b.c", "vendor/rake/doc/example/main.c", "vendor/rake/doc/example/Rakefile1", "vendor/rake/doc/example/Rakefile2", "vendor/rake/doc/glossary.rdoc", "vendor/rake/doc/jamis.rb", "vendor/rake/doc/proto_rake.rdoc", "vendor/rake/doc/rake.1.gz", "vendor/rake/doc/rakefile.rdoc", "vendor/rake/doc/rational.rdoc", "vendor/rake/doc/release_notes/rake-0.4.14.rdoc", "vendor/rake/doc/release_notes/rake-0.4.15.rdoc", "vendor/rake/doc/release_notes/rake-0.5.0.rdoc", "vendor/rake/doc/release_notes/rake-0.5.3.rdoc", "vendor/rake/doc/release_notes/rake-0.5.4.rdoc", "vendor/rake/doc/release_notes/rake-0.6.0.rdoc", "vendor/rake/doc/release_notes/rake-0.7.0.rdoc", "vendor/rake/doc/release_notes/rake-0.7.1.rdoc", "vendor/rake/doc/release_notes/rake-0.7.2.rdoc", "vendor/rake/doc/release_notes/rake-0.7.3.rdoc", "vendor/rake/doc/release_notes/rake-0.8.0.rdoc", "vendor/rake/doc/release_notes/rake-0.8.2.rdoc", "vendor/rake/doc/release_notes/rake-0.8.3.rdoc", "vendor/rake/install.rb", "vendor/rake/lib/rake/classic_namespace.rb", "vendor/rake/lib/rake/clean.rb", "vendor/rake/lib/rake/contrib/compositepublisher.rb", "vendor/rake/lib/rake/contrib/ftptools.rb", "vendor/rake/lib/rake/contrib/publisher.rb", "vendor/rake/lib/rake/contrib/rubyforgepublisher.rb", "vendor/rake/lib/rake/contrib/sshpublisher.rb", "vendor/rake/lib/rake/contrib/sys.rb", "vendor/rake/lib/rake/gempackagetask.rb", "vendor/rake/lib/rake/loaders/makefile.rb", "vendor/rake/lib/rake/packagetask.rb", "vendor/rake/lib/rake/rake_test_loader.rb", "vendor/rake/lib/rake/rdoctask.rb", "vendor/rake/lib/rake/ruby182_test_unit_fix.rb", "vendor/rake/lib/rake/runtest.rb", "vendor/rake/lib/rake/tasklib.rb", "vendor/rake/lib/rake/testtask.rb", "vendor/rake/lib/rake/win32.rb", "vendor/rake/lib/rake.rb", "vendor/rake/MIT-LICENSE", "vendor/rake/Rakefile", "vendor/rake/README", "vendor/rake/test/capture_stdout.rb", "vendor/rake/test/check_expansion.rb", "vendor/rake/test/contrib/test_sys.rb", "vendor/rake/test/data/chains/Rakefile", "vendor/rake/test/data/default/Rakefile", "vendor/rake/test/data/dryrun/Rakefile", "vendor/rake/test/data/file_creation_task/Rakefile", "vendor/rake/test/data/imports/deps.mf", "vendor/rake/test/data/imports/Rakefile", "vendor/rake/test/data/multidesc/Rakefile", "vendor/rake/test/data/namespace/Rakefile", "vendor/rake/test/data/rakelib/test1.rb", "vendor/rake/test/data/rbext/rakefile.rb", "vendor/rake/test/data/sample.mf", "vendor/rake/test/data/statusreturn/Rakefile", "vendor/rake/test/data/unittest/Rakefile", "vendor/rake/test/filecreation.rb", "vendor/rake/test/functional.rb", "vendor/rake/test/in_environment.rb", "vendor/rake/test/rake_test_setup.rb", "vendor/rake/test/reqfile.rb", "vendor/rake/test/reqfile2.rb", "vendor/rake/test/session_functional.rb", "vendor/rake/test/shellcommand.rb", "vendor/rake/test/test_application.rb", "vendor/rake/test/test_clean.rb", "vendor/rake/test/test_definitions.rb", "vendor/rake/test/test_earlytime.rb", "vendor/rake/test/test_extension.rb", "vendor/rake/test/test_file_creation_task.rb", "vendor/rake/test/test_file_task.rb", "vendor/rake/test/test_filelist.rb", "vendor/rake/test/test_fileutils.rb", "vendor/rake/test/test_ftp.rb", "vendor/rake/test/test_invocation_chain.rb", "vendor/rake/test/test_makefile_loader.rb", "vendor/rake/test/test_multitask.rb", "vendor/rake/test/test_namespace.rb", "vendor/rake/test/test_package_task.rb", "vendor/rake/test/test_pathmap.rb", "vendor/rake/test/test_rake.rb", "vendor/rake/test/test_require.rb", "vendor/rake/test/test_rules.rb", "vendor/rake/test/test_task_arguments.rb", "vendor/rake/test/test_task_manager.rb", "vendor/rake/test/test_tasklib.rb", "vendor/rake/test/test_tasks.rb", "vendor/rake/test/test_test_task.rb", "vendor/rake/test/test_top_level_functions.rb", "vendor/rake/test/test_win32.rb", "vendor/rake/TODO"]
+  s.extra_rdoc_files = ["CHANGELOG", "lib/echoe/client.rb", "lib/echoe/extensions.rb", "lib/echoe/net.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/net.rb", "lib/echoe/platform.rb", "lib/echoe/rubygems.rb", "lib/echoe.rb", "LICENSE", "Manifest", "MIT-LICENSE", "Rakefile", "README", "TODO", "vendor/rake/lib/rake/contrib/compositepublisher.rb", "vendor/rake/lib/rake/contrib/ftptools.rb", "vendor/rake/lib/rake/contrib/publisher.rb", "vendor/rake/lib/rake/contrib/rubyforgepublisher.rb", "vendor/rake/lib/rake/contrib/sshpublisher.rb", "vendor/rake/lib/rake/contrib/sys.rb", "vendor/rake/MIT-LICENSE"]
   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"]
@@ -24,14 +24,14 @@ 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<rubyforge>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<rubyforge>, [">= 1.0.2"])
       s.add_runtime_dependency(%q<highline>, [">= 0"])
     else
-      s.add_dependency(%q<rubyforge>, [">= 1.0.0"])
+      s.add_dependency(%q<rubyforge>, [">= 1.0.2"])
       s.add_dependency(%q<highline>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rubyforge>, [">= 1.0.0"])
+    s.add_dependency(%q<rubyforge>, [">= 1.0.2"])
     s.add_dependency(%q<highline>, [">= 0"])
   end
 end

data/lib/echoe.rb

@@ -1,27 +1,29 @@
-Dir[File.join(File.expand_path(File.join( File.dirname(__FILE__), '..', 'vendor' )), '*')].each do |gem|
-  if File.directory? gem
-    ($:.unshift File.join(gem, 'lib')).uniq!
-  end
-end
 
 $HERE = File.dirname(__FILE__)
 require "#{$HERE}/echoe/platform"
 
 require 'rake'
 require 'rake/clean'
-require 'rake/contrib/sshpublisher'
+require "#{$HERE}/../vendor/rake/lib/rake/contrib/compositepublisher"
+require "#{$HERE}/../vendor/rake/lib/rake/contrib/sshpublisher"
 require 'rake/gempackagetask'
 require 'rake/rdoctask'
 require 'rake/testtask'
+begin
+require 'spec/rake/spectask'
+rescue LoadError
+end
 require 'rbconfig'
 require 'open-uri'
 
 require "#{$HERE}/echoe/extensions"
 
 require 'rubygems'
+require 'rubygems/specification'
 require "#{$HERE}/echoe/rubygems"
 
 require 'rubyforge'
+require "#{$HERE}/echoe/net"
 require "#{$HERE}/echoe/client"
 
 require 'highline/import'
@@ -71,8 +73,6 @@ Note that you can also set the key and certificate locations in the Rakefile its
 
 Echoe does not force packages to depend on Echoe itself. Instead, it generates a <tt>gemspec</tt> from your <tt>Rakefile</tt> and includes that. Downstream repackagers can use the <tt>gemspec</tt> as-is to build new versions of your gem even without Echoe.
 
-However, Echoe is added to the <tt>development_dependencies</tt> array so that users can automatically install it via <tt>gem install --development</tt> if they prefer. You can override this behavior by setting <tt>p.development_dependencies = []</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.
@@ -113,6 +113,8 @@ 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>spec_pattern</tt> - A filename array, glob array, or regex for test runners.
 * <tt>rcov_options</tt> - Any extra flags to pass to RCov when coverage reports are run.
 
 Uncommon packaging options:
@@ -150,7 +152,7 @@ Documentation options:
 class Echoe
 
   # user-configurable
-  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
+  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, :spec_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, :gem_bin
@@ -169,6 +171,7 @@ class Echoe
     self.email = ""
     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.spec_pattern = "spec/**/*_spec.rb"
     self.ignore_pattern = /^(pkg|doc)|\.svn|CVS|\.bzr|\.DS|\.git/
 
     self.changelog_patterns = {
@@ -232,7 +235,7 @@ class Echoe
 
     # read manifest
     begin
-      self.files = File.read(manifest_name).split +
+      self.files = File.readlines(manifest_name).map { |x| x.strip } +
         [(gemspec_name if include_gemspec)] +
         [(rakefile_name if include_rakefile)]
       self.files = files.compact.uniq
@@ -261,14 +264,16 @@ class Echoe
       end
     end
 
-    self.changes = if File.exist? changelog
-      Array(changelog_patterns[:changes]).map do |pattern|
-        open(changelog) do |log|
-          log.read[pattern, 1]
-        end
-      end.compact.first or ""
-    else
-      ""
+    unless self.changes
+      self.changes = if File.exist? changelog
+        Array(changelog_patterns[:changes]).map do |pattern|
+          open(changelog) do |log|
+            log.read[pattern, 1]
+          end
+        end.compact.first or ""
+      else
+        ""
+      end
     end
 
     # set some post-defaults
@@ -282,6 +287,7 @@ class Echoe
     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)
+    self.spec_pattern = apply_pattern(spec_pattern)
 
     define_tasks
   end
@@ -391,7 +397,8 @@ class Echoe
         puts "#{var}: #{instance_variable_get(var).inspect}"
       end
     end
-
+    
+    desc "Builds the .gemspec"
     task :build_gemspec do
       # Construct the gemspec file, if needed.
       if include_gemspec
@@ -409,11 +416,15 @@ class Echoe
           end
         end
       end
+      puts "Gemspec generated"
     end
 
     # Chain it to the gemspec task prerequisite
     task gemspec_name.to_sym => [:build_gemspec]
 
+    desc "Generates manifest & gemspec in one go"
+    task :build => [:manifest, :build_gemspec]
+
     task :package do
       # Chain some cleanup tasks to the default :package task.
       # Remove the gemfile if it wasn't actually requested.
@@ -512,7 +523,8 @@ class Echoe
         end
       end
 
-      task :test => [:compile]
+      task :test => [:compile] if test_pattern.any?
+      task :spec => :compile if spec_pattern.any?
 
     end
 
@@ -592,7 +604,15 @@ class Echoe
         File.open(filename, 'w') do |f|
           f.write "Subject: #{name.capitalize} #{version}\n\n"
           f.write "#{name.capitalize} has been updated to #{version}. #{name.capitalize} is #{summary.uncapitalize}\n\n"
-          f.write "Changes in this version: #{changes.sub(/^\s*[\w\d\.]+\s+/, '').uncapitalize}\n\n" unless changes.empty?
+          unless changes.empty?
+            f.write "Changes in this version: "
+            if changes.include?("\n")
+              f.write(changes)
+            else
+              f.write(changes.sub(/^\s*[\w\d\.]+\s+/, '').uncapitalize)
+            end
+            f.write("\n\n")
+          end
           f.write "More information is available at #{url} .\n\n" unless url.empty?
         end
       end
@@ -700,9 +720,17 @@ class Echoe
         end
       end
 
+      task :default => :test
     end
 
-    task :default => :test
+    if spec_pattern.any?
+      desc "Run the spec suite"
+      Spec::Rake::SpecTask.new('spec') do |t|
+        t.spec_files = spec_pattern
+      end
+
+      task :default => :spec
+    end
 
     if defined? Rcov
       Rcov::RcovTask.new(:coverage) do |t|

data/lib/echoe/net.rb

@@ -0,0 +1,7 @@
+
+require 'net/https'
+
+# Unbreak Rubyforge 1.0.2 on Ruby1.9
+class Net::HTTP
+  alias :use_ssl= :old_use_ssl=
+end

data/lib/echoe/platform.rb

@@ -1,36 +1,38 @@
 
 ### Platform check regexes
 
-module Platform
-  def self.windows?
-    @windows ||= RUBY_PLATFORM =~ /djgpp|(cyg|ms|bcc)win|mingw/
-    !@windows.nil?
-  end
+class Echoe
+  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.gcc?
+      @gcc ||= RUBY_PLATFORM =~ /mingw/
+      !@gcc.nil?
+    end
 
-  def self.msvc?
-    @msvc ||= RUBY_PLATFORM =~ /mswin/
-    !@msvc.nil?
-  end
+    def self.msvc?
+      @msvc ||= RUBY_PLATFORM =~ /mswin/
+      !@msvc.nil?
+    end
   
-  def self.java?
-    @java ||= RUBY_PLATFORM =~ /java/
-    !@java.nil?
-  end
+    def self.java?
+      @java ||= RUBY_PLATFORM =~ /java/
+      !@java.nil?
+    end
   
-  def self.suffix
-    @suffix ||= Gem.default_exec_format[2..-1]
-  end
+    def self.suffix
+      @suffix ||= Gem.default_exec_format[2..-1]
+    end
   
-  def self.rake
-    windows? ? "rake#{suffix}.bat" : "rake#{suffix}"
-  end
+    def self.rake
+      windows? ? "rake#{suffix}.bat" : "rake#{suffix}"
+    end
   
-  def self.make
-    msvc? ? 'nmake' : 'make'
+    def self.make
+      msvc? ? 'nmake' : 'make'
+    end
   end
 end

data/vendor/rake/lib/rake/contrib/sshpublisher.rb

@@ -1,7 +1,3 @@
-#!/usr/bin/env ruby
-
-require 'rake/contrib/compositepublisher'
-
 module Rake
 
   # Publish an entire directory to an existing remote directory using

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: elliottcable-echoe
 version: !ruby/object:Gem::Version 
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors: 
 - Evan Weaver
@@ -9,20 +9,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-11 00:00:00 -08:00
+date: 2009-06-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 1.0.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: highline
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -40,6 +42,7 @@ extra_rdoc_files:
 - CHANGELOG
 - lib/echoe/client.rb
 - lib/echoe/extensions.rb
+- lib/echoe/net.rb
 - lib/echoe/platform.rb
 - lib/echoe/rubygems.rb
 - lib/echoe.rb
@@ -51,6 +54,7 @@ files:
 - echoe.gemspec
 - lib/echoe/client.rb
 - lib/echoe/extensions.rb
+- lib/echoe/net.rb
 - lib/echoe/platform.rb
 - lib/echoe/rubygems.rb
 - lib/echoe.rb
@@ -60,106 +64,13 @@ files:
 - Rakefile
 - README
 - TODO
-- vendor/rake/bin/rake
-- vendor/rake/CHANGES
-- vendor/rake/doc/example/a.c
-- vendor/rake/doc/example/b.c
-- vendor/rake/doc/example/main.c
-- vendor/rake/doc/example/Rakefile1
-- vendor/rake/doc/example/Rakefile2
-- vendor/rake/doc/glossary.rdoc
-- vendor/rake/doc/jamis.rb
-- vendor/rake/doc/proto_rake.rdoc
-- vendor/rake/doc/rake.1.gz
-- vendor/rake/doc/rakefile.rdoc
-- vendor/rake/doc/rational.rdoc
-- vendor/rake/doc/release_notes/rake-0.4.14.rdoc
-- vendor/rake/doc/release_notes/rake-0.4.15.rdoc
-- vendor/rake/doc/release_notes/rake-0.5.0.rdoc
-- vendor/rake/doc/release_notes/rake-0.5.3.rdoc
-- vendor/rake/doc/release_notes/rake-0.5.4.rdoc
-- vendor/rake/doc/release_notes/rake-0.6.0.rdoc
-- vendor/rake/doc/release_notes/rake-0.7.0.rdoc
-- vendor/rake/doc/release_notes/rake-0.7.1.rdoc
-- vendor/rake/doc/release_notes/rake-0.7.2.rdoc
-- vendor/rake/doc/release_notes/rake-0.7.3.rdoc
-- vendor/rake/doc/release_notes/rake-0.8.0.rdoc
-- vendor/rake/doc/release_notes/rake-0.8.2.rdoc
-- vendor/rake/doc/release_notes/rake-0.8.3.rdoc
-- vendor/rake/install.rb
-- vendor/rake/lib/rake/classic_namespace.rb
-- vendor/rake/lib/rake/clean.rb
 - vendor/rake/lib/rake/contrib/compositepublisher.rb
 - vendor/rake/lib/rake/contrib/ftptools.rb
 - vendor/rake/lib/rake/contrib/publisher.rb
 - vendor/rake/lib/rake/contrib/rubyforgepublisher.rb
 - vendor/rake/lib/rake/contrib/sshpublisher.rb
 - vendor/rake/lib/rake/contrib/sys.rb
-- vendor/rake/lib/rake/gempackagetask.rb
-- vendor/rake/lib/rake/loaders/makefile.rb
-- vendor/rake/lib/rake/packagetask.rb
-- vendor/rake/lib/rake/rake_test_loader.rb
-- vendor/rake/lib/rake/rdoctask.rb
-- vendor/rake/lib/rake/ruby182_test_unit_fix.rb
-- vendor/rake/lib/rake/runtest.rb
-- vendor/rake/lib/rake/tasklib.rb
-- vendor/rake/lib/rake/testtask.rb
-- vendor/rake/lib/rake/win32.rb
-- vendor/rake/lib/rake.rb
 - vendor/rake/MIT-LICENSE
-- vendor/rake/Rakefile
-- vendor/rake/README
-- vendor/rake/test/capture_stdout.rb
-- vendor/rake/test/check_expansion.rb
-- vendor/rake/test/contrib/test_sys.rb
-- vendor/rake/test/data/chains/Rakefile
-- vendor/rake/test/data/default/Rakefile
-- vendor/rake/test/data/dryrun/Rakefile
-- vendor/rake/test/data/file_creation_task/Rakefile
-- vendor/rake/test/data/imports/deps.mf
-- vendor/rake/test/data/imports/Rakefile
-- vendor/rake/test/data/multidesc/Rakefile
-- vendor/rake/test/data/namespace/Rakefile
-- vendor/rake/test/data/rakelib/test1.rb
-- vendor/rake/test/data/rbext/rakefile.rb
-- vendor/rake/test/data/sample.mf
-- vendor/rake/test/data/statusreturn/Rakefile
-- vendor/rake/test/data/unittest/Rakefile
-- vendor/rake/test/filecreation.rb
-- vendor/rake/test/functional.rb
-- vendor/rake/test/in_environment.rb
-- vendor/rake/test/rake_test_setup.rb
-- vendor/rake/test/reqfile.rb
-- vendor/rake/test/reqfile2.rb
-- vendor/rake/test/session_functional.rb
-- vendor/rake/test/shellcommand.rb
-- vendor/rake/test/test_application.rb
-- vendor/rake/test/test_clean.rb
-- vendor/rake/test/test_definitions.rb
-- vendor/rake/test/test_earlytime.rb
-- vendor/rake/test/test_extension.rb
-- vendor/rake/test/test_file_creation_task.rb
-- vendor/rake/test/test_file_task.rb
-- vendor/rake/test/test_filelist.rb
-- vendor/rake/test/test_fileutils.rb
-- vendor/rake/test/test_ftp.rb
-- vendor/rake/test/test_invocation_chain.rb
-- vendor/rake/test/test_makefile_loader.rb
-- vendor/rake/test/test_multitask.rb
-- vendor/rake/test/test_namespace.rb
-- vendor/rake/test/test_package_task.rb
-- vendor/rake/test/test_pathmap.rb
-- vendor/rake/test/test_rake.rb
-- vendor/rake/test/test_require.rb
-- vendor/rake/test/test_rules.rb
-- vendor/rake/test/test_task_arguments.rb
-- vendor/rake/test/test_task_manager.rb
-- vendor/rake/test/test_tasklib.rb
-- vendor/rake/test/test_tasks.rb
-- vendor/rake/test/test_test_task.rb
-- vendor/rake/test/test_top_level_functions.rb
-- vendor/rake/test/test_win32.rb
-- vendor/rake/TODO
 has_rdoc: true
 homepage: http://blog.evanweaver.com/files/doc/fauna/echoe/
 post_install_message: