echoe 1.4 → 2

data/CHANGELOG

@@ -1,7 +1,12 @@
 
-1.4. auto-detect readme file; make rdoc default pattern compatible with manifest generator; fix publish_docs task; use env var for rdoc template if available
-1.3. avoid rubyforge gem multi-activation conflict
-1.2. build_manifest Rake task
-1.1. sane error messages on releasing new or duplicate gems; allow Manifest to not end in .txt
-1.0.0. fork from Hoe
+v2. support documentation hosts other than rubyforge, switch to Snax-style gem versioning; auto-load CHANGELOG contents; remove bin/echoe which doesn't work anyway
 
+v1.4. auto-detect readme file; make rdoc default pattern compatible with manifest generator; fix publish_docs task
+
+v1.3. avoid rubyforge gem multi-activation conflict
+
+v1.2. build_manifest Rake task
+
+v1.1. sane error messages on releasing new or duplicate gems; allow Manifest to not end in .txt
+
+v1.0.0. fork from Hoe

data/MIT-LICENSE

@@ -0,0 +1,21 @@
+
+Copyright (c) 2006 Ryan Davis, Zen Spider Software
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Manifest

@@ -1,8 +1,8 @@
-./CHANGELOG
-./LICENSE
-./README
-./Rakefile
-./bin/echoe
-./lib/echoe.rb
-./test/test_echoe.rb
-./Manifest
+test/test_echoe.rb
+lib/echoe.rb
+Rakefile
+README
+Manifest
+MIT-LICENSE
+LICENSE
+CHANGELOG

data/README

@@ -1,98 +1,74 @@
+
 echoe
-    http://rubyforge.org/projects/fauna/
-    Evan Weaver
-
-== DESCRIPTION:
-
-Echoe is a simple packaging tool for working with rubygems. It
-generates all the usual tasks for projects including rdoc generation,
-testing, packaging, and deployment.
-
-Tasks Provided:
-
-* announce         - Generate email announcement file and post to rubyforge.
-* audit            - Run ZenTest against the package
-* check_manifest   - Verify the manifest
-* clean            - Clean up all the extras
-* debug_gem        - Show information about the gem.
-* default          - Run the default tasks
-* docs             - Build the docs HTML Files
-* email            - Generate email announcement file.
-* install          - Install the package. Uses PREFIX and RUBYLIB
-* install_gem      - Install the package as a gem
-* multi            - Run the test suite using multiruby
-* package          - Build all the packages
-* post_news        - Post announcement to rubyforge.
-* publish_docs     - Publish RDoc to RubyForge
-* release          - Package and upload the release to rubyforge.
-* ridocs           - Generate ri locally for testing
-* test             - Run the test suite. Use FILTER to add to the command line.
-* test_deps        - Show which test files fail when run alone.
-* uninstall        - Uninstall the package.
-
-First, see the Rakefile used to distribute Echoe itself. Also see the class rdoc for 
-help.
-
-== DIFFERENCES FROM HOE:
-
-* Removes unnecessary meta-dependency on self in created gems
-* Better error reporting
-* Can auto-generate the Manifest
-
-== FEATURES/PROBLEMS:
-  
-* Provides 'echoe' command line tool for quick project directory creation.
-* Make making and maintaining Rakefiles fun and easy.
 
-== SYNOPSYS:
+Echoe is a simple tool for working with Rubygems. It generates Rake tasks for documentation, testing, packaging, and deployment.
+
+== License
+
+Copyright 2007 Cloudburst, LLC. See included LICENSE file. Portions copyright 2006 Ryan Davis, Zen Spider Software, and used with permission. See included MIT-LICENSE file.
 
-  % sow [group] project
+== Usage
 
-or
+First, organize your gem according to the usual structure:
 
-  require 'echoe'
+  lib/
+  bin/  
+  ext/
+  README
+  LICENSE
+  CHANGELOG
+  Rakefile
+
+Your <tt>CHANGELOG</tt> should be formatted as follows (including newlines):
+
+  v2.1. newest change
+  
+  v2. older change
   
-  Echoe.new(projectname, version) do |p|
-    # ... project specific data ...
-  end
+  v1.9. oldest change
+  
+This way Echoe can parse the latest version and changeset message automatically.
+
+Your <tt>Rakefile</tt> needs the following minimal contents:
+
+  require "rubygems"
+  require "echoe"  
+  Echoe.new("gem_name")
+  
+More advanced configuration is described in the Echoe class.
+
+== Deploying your gem
+
+Now, to build your documentation and deploy the gem:
 
-  # ... project specific tasks ...
+  rake build_manifest
+  rake publish_docs
+  rake release
 
-== REQUIREMENTS:
+== All Rake tasks
 
-* rake
-* rubyforge
-* rubygems
+The following tasks are made available to your gem.
 
-== INSTALL:
+Packaging:
 
-* sudo gem install echoe
+* <tt>build_manifest</tt> -  Build a Manifest list.
+* <tt>docs</tt> -  Build the documentation.
+* <tt>package</tt> -  Build all the packages.
 
-== LICENSE:
+Testing:
 
-Copyright 2007 Evan Weaver.
-Licensed under the Academic Free License 3.0. See LICENSE.txt, included. 
-The following license also applies to portions of the software:
+* <tt>test</tt> -  Run the test suite.
+* <tt>install</tt> -  Install the gem locally.
+* <tt>uninstall</tt> -  Uninstall the gem.
 
-(The MIT License)
+Upload:
 
-Copyright (c) 2006 Ryan Davis, Zen Spider Software
+* <tt>publish_docs</tt> -  Publish documentation to the web.
+* <tt>release</tt> -  Package and upload the latest release to Rubyforge.
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Cleaning:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+* <tt>clean</tt> -  Delete all the generated documentation and packages.
+* <tt>redocs</tt> -  Force a rebuild of the Rdoc files.
+* <tt>repackage</tt> -  Force a rebuild of the package files.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,15 +1,12 @@
 
 require 'lib/echoe'
 
-Echoe.new("echoe", `cat CHANGELOG`[/^([\d\.]+)\. /, 1]) do |p|
-  p.name = "echoe"
+Echoe.new('echoe') do |p|
   p.rubyforge_name = "fauna"
-  p.summary = "Echoe is a simple packaging tool for working with rubygems."
-  p.description = "Echoe is a simple packaging tool for working with rubygems. It
-generates all the usual tasks for projects including rdoc generation,
-testing, packaging, and deployment."
-  p.url = "http://blog.evanweaver.com/articles/2007/01/10/if-you-dont-want-to-hoe-echoe"
-  p.changes = `cat CHANGELOG`[/^([\d\.]+\. .*)/, 1]
-  p.extra_deps = [['rake'], ['rubyforge', '>= 0.4.0']]
+  p.author = "Evan Weaver"
+  p.summary = "Echoe is a simple packaging tool for Ruby gems."
+  p.url = "http://blog.evanweaver.com/pages/code#echoe"
+  p.docs_host = "blog.evanweaver.com:~/www/snax/public/files/doc/"
+  p.extra_deps = ['rake', 'rubyforge >= 0.4.0', 'highline']
 end
 

data/lib/echoe.rb

@@ -1,4 +1,3 @@
-# -*- ruby -*-
 
 require 'rubygems'
 require 'rake'
@@ -7,88 +6,59 @@ require 'rake/gempackagetask'
 require 'rake/rdoctask'
 require 'rake/testtask'
 require 'rbconfig'
+require 'highline/import'
+gem 'rubyforge', '>= 0.4.0'
+require 'rubyforge'
 
-##
-# echoe - a tool to help rake
-#
-# echoe is a simple rake/rubygems helper for project Rakefiles. It
-# generates all the usual tasks for projects including rdoc generation,
-# testing, packaging, and deployment.
-#
-# == Using echoe
-#
-# === Basics
-#
-# Use this as a minimal starting point:
-#
-#   require 'echoe'
-# 
-#   Echoe.new("project_name", '1.0.0') do |p|
-#     p.rubyforge_name = "rf_project"
-#     # add other details here
-#   end
-#
-#   # add other tasks here
-#
-# === Tasks Provided:
-# 
-# * announce         - Generate email announcement file and post to rubyforge.
-# * audit            - Run ZenTest against the package
-# * check_manifest   - Verify the manifest
-# * build_manifest   - Build a manifest from your current tree
-# * clean            - Clean up all the extras
-# * debug_gem        - Show information about the gem.
-# * default          - Run the default tasks
-# * docs             - Build the docs HTML Files
-# * email            - Generate email announcement file.
-# * install          - Install the package. Uses PREFIX and RUBYLIB
-# * install_gem      - Install the package as a gem
-# * multi            - Run the test suite using multiruby
-# * package          - Build all the packages
-# * post_news        - Post announcement to rubyforge.
-# * publish_docs     - Publish RDoc to RubyForge
-# * release          - Package and upload the release to rubyforge.
-# * ridocs           - Generate ri locally for testing
-# * test             - Run the test suite. Use FILTER to add to the command line.
-# * test_deps        - Show which test files fail when run alone.
-# * uninstall        - Uninstall the package.
-#
-# === Attributes
-#
-# The attributes that you can provide inside the new block above are:
-#
-# ==== Mandatory
-#
-# * name        - The name of the release.
-# * version     - The version. Don't hardcode! use a constant in the project.
-#
-# ==== Good to Set
-#
-# * author      - The author of the package.
-# * changes     - A description of the release's latest changes.
-# * description - A description of the project.
-# * email       - The author's email address.
-# * summary     - A short summary of the project.
-# * url         - The url of the project.
-#
-# ==== Optional
-#
-# * clean_globs    - An array of file patterns to delete on clean.
-# * extra_deps     - An array of rubygem dependencies.
-# * need_tar       - Should package create a tarball? [default: true]
-# * need_zip       - Should package create a zipfile? [default: false]
-# * rdoc_pattern   - A regexp to match documentation files against the manifest.
-# * rdoc_template  - Path to an external rdoc template file
-# * rubyforge_name - The name of the rubyforge project. [default: name.downcase]
-# * spec_extras    - A hash of extra values to set in the gemspec.
-# * test_globs     - An array of test file patterns [default: test/**/test_*.rb]
-#
-# === Environment Variables
-#
-# * FILTER     - Used to add flags to test_unit (e.g., -n test_borked)
-# * PREFIX     - Used to specify a custom install location (for rake install).
-# * RUBY_DEBUG - Used to add extra flags to RUBY_FLAGS.
-# * RUBY_FLAGS - Used to specify flags to ruby [has smart default].
+=begin rdoc
+
+Echoe includes some optional accessors for more advanced gem configuration.
+
+For example, Echoe's own <tt>Rakefile</tt> looks like this:
+
+  Echoe.new('echoe') do |p|
+    p.rubyforge_name = "fauna"
+    p.author = "Evan Weaver"
+    p.summary = "Echoe is a simple tool for packaging Rubygems."
+    p.url = "http://blog.evanweaver.com/pages/code#echoe"
+    p.docs_host = "blog.evanweaver.com:~/www/snax/public/files/doc/"
+    p.extra_deps = ['rake', 'rubyforge >= 0.4.0', 'highline']
+  end
+
+== Available options
+
+Descriptive options:
+
+* <tt>author</tt> - Your name.
+* <tt>email</tt> - Your email address.
+* <tt>description</tt> - A more detailed description of the library.
+* <tt>summary</tt> - A shorter description of the library.
+* <tt>url</tt> - A url for the library.
+
+Version options:
+
+* <tt>version</tt> - A string for the version number. Parsed from CHANGELOG otherwise.
+* <tt>changes</tt> - A string describing the most recent changes. Parsed from CHANGELOG otherwise.
+
+Packaging options:
+
+* <tt>extra_deps</tt> - An array of dependencies for this gem, in 'gem_name [= version]' format.
+* <tt>manifest_name</tt> - The name of the manifest file (defaults to <tt>Manifest</tt>).
+* <tt>need_tar</tt> - Whether to generate a <tt>.tgz</tt> package (default <tt>false</tt>).
+* <tt>need_tar_gz</tt> - Whether to generate a <tt>.tar.gz</tt> package (default <tt>true</tt>).
+* <tt>need_zip</tt> - Whether to generate a <tt>.zip</tt> package (default <tt>false</tt>).
+
+Publishing options:
+
+* <tt>rubyforge_name</tt> - The name of the Rubyforge project to upload to (defaults to the name of the gem).
+* <tt>docs_host</tt> - A host and path to publish the documentation to (defaults to the Rubyforge project).
+
+Documentation options:
+
+* <tt>rdoc_pattern</tt> - A regex for filenames that should be passed to RDoc.
+* <tt>rdoc_template</tt> - A path to an RDoc template (defaults to the generic template).
+
+=end
 
 class Echoe
 
@@ -106,30 +76,47 @@ class Echoe
     "-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")
-  attr_accessor :author, :bin_files, :changes, :clean_globs, :description, :email, :extra_deps, :lib_files, :name, :need_tar, :need_tar_gz, :need_zip, :rdoc_pattern, :rubyforge_name, :spec, :spec_extras, :summary, :test_files, :test_globs, :url, :version, :tar_extension, :rdoc_template #, :tar_separator, :zip_separator
+  
+  # user-configurable
+  attr_accessor :author, :changes, :clean_pattern, :description, :email, :extra_deps, :name, :need_tar, :need_tar_gz, :need_zip, :rdoc_pattern, :rubyforge_name, :summary, :test_patterns, :url, :version, :docs_host, :rdoc_template, :manifest_name
+  
+  # best left alone
+  attr_accessor :lib_files, :test_files, :bin_files, :spec
+  
+  def initialize(name, version = nil)
+    # Defaults
 
-  def initialize(name, version)
     self.name = name
-    self.version = version
-
-    # Defaults
     self.rubyforge_name = name.downcase
     self.url = ""
     self.author = ""
     self.email = ""
-    self.clean_globs = %w(diff diff.txt email.txt ri *.gem **/*~)
-    self.test_globs = ['test/**/test_*.rb']
-    self.changes = ""
+    self.clean_pattern = %w(diff diff.txt email.txt ri *.gem **/*~)
+    self.test_patterns = ['test/**/test_*.rb']
+    
+    self.version = if version
+      version
+    elsif File.exist? "CHANGELOG"
+      open("CHANGELOG").read[/^\s*v([\d\.]+)\. /, 1]
+    else
+      raise "No version supplied in Rakefile"
+    end
+
+    self.changes = if File.exist? "CHANGELOG"
+      open("CHANGELOG").read[/^\s*v([\d\.]+\. .*)/, 1]
+    else
+      ""
+    end
+        
     self.description = ""
     self.summary = ""
-    self.rdoc_pattern = /^(\.\/|)(lib|bin|tasks)|README|CHANGELOG|LICENSE|txt$/
+    self.rdoc_pattern = /^(lib|bin|tasks)|README|CHANGELOG|LICENSE|txt$/
     self.extra_deps = []
-    self.spec_extras = {}
-    self.need_tar = true
-    self.need_tar_gz = false
+    self.manifest_name = "Manifest"
+
+    self.need_tar = false    
+    self.need_tar_gz = true
     self.need_zip = false
-#    self.tar_separator = "." # separator choice is buried in rake/packagetask, bah
-#    self.zip_separator = "."
 
     yield self if block_given?
 
@@ -137,30 +124,13 @@ class Echoe
   end
 
   def define_tasks
-    desc 'Run the default tasks'
     task :default => :test
 
-    desc 'Run the test suite. Use FILTER to add to the command line.'
+    desc 'Run the test suite'
     task :test do
       run_tests
     end
 
-    desc 'Show which test files fail when run alone.'
-    task :test_deps do
-      tests = Dir["test/**/test_*.rb"]  +  Dir["test/**/*_test.rb"]
-
-      tests.each do |test|
-        if not system "ruby -Ibin:lib:test #{test} &> /dev/null" then
-          puts "Dependency Issues: #{test}"
-        end
-      end
-    end
-
-    desc 'Run the test suite using multiruby'
-    task :multi do
-      run_tests :multi
-    end
-
     ############################################################
     # Packaging and Installing
 
@@ -170,20 +140,20 @@ class Echoe
       s.summary = summary
       s.author = Array(author).join(", ")
       s.email = email
-      s.homepage = Array(url).first
+      s.homepage = url
       s.rubyforge_project = rubyforge_name
 
       s.description = description
 
       extra_deps.each do |dep|
+        dep = dep.split(" ") if dep.is_a? String
         s.add_dependency(*dep)
       end
 
-      manifest = File.exist?('Manifest.txt') ? 'Manifest.txt' : 'Manifest'
       begin
-        s.files = File.read(manifest).split
+        s.files = File.read(manifest_name).split
       rescue Errno::ENOENT
-        $stderr.puts "Missing Manifest. You can build one with\n$ rake build_manifest"
+        $stderr.puts "Missing Manifest. You can build one with\n$ rake build_manifest."
       end
       s.executables = s.files.grep(/bin/) { |f| File.basename(f) }
 
@@ -195,23 +165,9 @@ class Echoe
       if File.exist? "test/test_all.rb"
         s.test_file = "test/test_all.rb"
       else
-        s.test_files = Dir[*test_globs]
+        s.test_files = Dir[*test_patterns]
       end
 
-      # Do any extra stuff the user wants
-      spec_extras.each do |msg, val|
-        case val
-        when Proc
-          val.call(s.send(msg))
-        else
-          s.send "#{msg}=", val
-        end
-      end
-    end
-
-    desc 'Show information about the gem.'
-    task :debug_gem do
-      puts spec.to_ruby
     end
 
     self.lib_files = spec.files.grep(/^lib/)
@@ -224,74 +180,58 @@ class Echoe
       pkg.need_zip = @need_zip
     end
 
-    desc 'Install the package as a gem'
+    desc 'Install the gem'
     task :install => [:clean, :package] do
       sh "sudo gem install pkg/*.gem"
     end
 
-    desc 'Uninstall the package.'
+    desc 'Uninstall the gem'
     task :uninstall do
-      Dir.chdir RUBYLIB do
-        rm_f((lib_files + test_files).map { |f| File.basename f })
-      end
-      Dir.chdir File.join(PREFIX, 'bin') do
-        rm_f bin_files.map { |f| File.basename f }
-      end
+      sh "sudo gem uninstall #{name}"
     end
 
-    desc 'Package and upload the release to rubyforge.'
-    task :release => [:clean, :package] do |t|
-      v = ENV["VERSION"] or abort "Must supply VERSION=x"
-      abort "Versions don't match #{v} vs #{version}" if v != version
-
-      gem 'rubyforge', '>= 0.4.0'
-      require 'rubyforge'
-
-      pkg = "pkg/#{name}-#{version}"
-      pkg_gem = pkg + ".gem"
-      pkg_tar = pkg + ".tgz"
-      pkg_tar_gz = pkg + ".tar.gz"
-      pkg_zip = pkg + ".zip" 
+    desc 'Package and upload the release to Rubyforge'
+    task :release => [:clean, :package] do |t|      
       
-      if $DEBUG then
-        puts "release_id = rf.add_release #{rubyforge_name.inspect}, #{name.inspect}, #{version.inspect}, \"#{pkg_tar}\""
-        puts "rf.add_file #{rubyforge_name.inspect}, #{name.inspect}, release_id, \"#{pkg_gem}\""
-      end
-
-      rf = RubyForge.new
-      puts "Logging in"
-      rf.login
-
-      c = rf.userconfig
-      c["release_notes"] = description if description
-      c["release_changes"] = changes if changes
-      c["preformatted"] = false
-
-      files = [(@need_tar ? pkg_tar : nil),
-                (@need_tar_gz ? pkg_tar_gz : nil),
-               (@need_zip ? pkg_zip : nil),
-               pkg_gem].compact
-
-      puts "Releasing #{name} v. #{version}"
-      self.version = self.version.ljust(3)
-
-      begin
-        rf.add_release rubyforge_name, name, version, *files
-      rescue NoMethodError => boom
-       # be silent
+      say "\n"
+      if agree "Release #{name}-#{version} to Rubyforge? "      
+        pkg = "pkg/#{name}-#{version}"
+        pkg_gem = pkg + ".gem"
+        pkg_tar = pkg + ".tgz"
+        pkg_tar_gz = pkg + ".tar.gz"
+        pkg_zip = pkg + ".zip" 
+        
+        rf = RubyForge.new
+        puts "Logging in"
+        rf.login
+  
+        c = rf.userconfig
+        c["release_notes"] = description if description
+        c["release_changes"] = changes if changes
+        c["preformatted"] = false
+  
+        files = [(@need_tar ? pkg_tar : nil),
+                  (@need_tar_gz ? pkg_tar_gz : nil),
+                 (@need_zip ? pkg_zip : nil),
+                 pkg_gem].compact
+  
+        puts "Releasing #{name} v. #{version}"
+        self.version = self.version.ljust(3)
+  
+        begin
+          rf.add_release rubyforge_name, name, version, *files
+        rescue NoMethodError
+        end
       end
+      
     end
 
-    ############################################################
-    # Doco
-
     Rake::RDocTask.new(:docs) do |rd|      
       rd.main = Dir['*'].detect {|f| f =~ /^readme/i}
-      rd.options << '-d' if RUBY_PLATFORM !~ /win32/ and `which dot` =~ /\/dot/
       rd.options << '--line-numbers' << '--inline-source'
       rd.rdoc_dir = 'doc'
-      files = spec.files.grep(rdoc_pattern)
-      files -= ['Manifest.txt', 'Manifest']
+
+      files = (spec.files.grep(rdoc_pattern) - [manifest_name]).uniq
       rd.rdoc_files.push *files
 
       if rdoc_template
@@ -300,96 +240,75 @@ class Echoe
         rd.template = ENV['RDOC_TEMPLATE']
       end      
 
-      title = name.capitalize if name.downcase == name
+      title = name.downcase == name ? name.capitalize : name
       rd.options << "-t #{title}"
     end
 
-    desc "Generate ri locally for testing"
-    task :ridocs => :clean do
-      sh %q{ rdoc --ri -o ri . }
-    end
-
-    desc 'Publish RDoc to RubyForge'
+    desc "Publish documentation to #{docs_host ? "'#{docs_host}'" : "rubyforge"}"
     task :publish_docs => [:clean, :docs] do
-      config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
-      user = "#{config["username"]}@rubyforge.org"
-      project = "/var/www/gforge-projects/#{rubyforge_name}"
-      project += "/#{name}" if rubyforge_name != name
+
       local_dir = 'doc'
-      pub = Rake::SshDirPublisher.new user, project, local_dir
-      if rubyforge_name != name then
-        def pub.upload
-          begin
-            super
-          rescue
-            # project directory probably doesn't exist, transfer as a whole
-            sh %{scp -qr #{local_dir} #{host}:#{remote_dir}}
+      remote_dir_name = rubyforge_name
+      remote_dir_name += "/#{name}" if rubyforge_name != name
+
+      unless docs_host  
+        config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
+        pub = Rake::SshDirPublisher.new "#{config["username"]}@rubyforge.org", 
+          "/var/www/gforge-projects/#{remote_dir_name}", 
+          local_dir
+        if rubyforge_name != name then
+          def pub.upload
+            begin
+              super
+            rescue
+              # project directory probably doesn't exist, transfer as a whole
+              sh("scp -qr #{local_dir} #{host}:#{remote_dir}")
+            end
           end
         end
-      end
-      pub.upload
+        pub.upload        
+      else
+        # you may need ssh keys configured for this to work
+        host, dir = docs_host.split(":")
+        dir.chomp!("/")
+        sh("ssh #{host} 'rm -rf #{dir}/#{remote_dir_name}'") # XXX too dangerous?
+        sh("scp -qr #{local_dir} #{host}:#{dir}/#{remote_dir_name}")
+      end      
     end
-    
-    task :doc => [:docs]
+        
+    task :doc => [:redocs]
 
-    ############################################################
-    # Misc/Maintenance:
- 
-    desc 'Clean up all the extras'
+    desc 'Delete the generated documentation and packages'
     task :clean => [ :clobber_docs, :clobber_package ] do
-      clean_globs.each do |pattern|
+      clean_pattern.each do |pattern|
         files = Dir[pattern]
         rm_rf files unless files.empty?
       end
     end
 
-    desc "Verify the manifest"
-    task :check_manifest => :clean do
-      f = "Manifest.tmp"
-      require 'find'
-      files = []
-      Find.find '.' do |path|
-        next unless File.file? path
-        next if path =~ /svn|tmp$/
-        files << path[2..-1]
-      end
-      files = files.sort.join "\n"
-      File.open f, 'w' do |fp| fp.puts files end
-
-      manifest = "Manifest"
-      manifest += ".txt" if File.exist? "Manifest.txt"
-
-      system "diff -du #{manifest}.txt #{f}"
-      rm f
-    end
-
-    desc "Build a Manifest from your current tree"
+    desc "Build a Manifest list"
     task :build_manifest do
       files = []
-      find_files = proc { |dir| 
-        Dir["#{dir}/**"].each do |file|
-          File.directory?(file) ? find_files[file] : files << file
+      Find.find '.' do |file|
+        file = file[2..-1]
+        unless !file or file =~ /^(pkg|doc)|\.svn|CVS|\.bzr/ or File.directory? file
+          files << file
         end
-      }
-      manifest = File.exist?("./Manifest.txt") ? "./Manifest.txt" : "./Manifest"
-      find_files['.'] 
-      files = (files << manifest).uniq
-      File.open(manifest, 'w').puts files
+      end
+      files = (files << manifest_name).uniq
+      File.open(manifest_name, 'w').puts files
       puts files
     end
-  end # end define
-
-  def run_tests(multi=false) # :nodoc:
-    msg = multi ? :sh : :ruby
-    cmd = if test ?f, 'test/test_all.rb' then
-            "#{RUBY_FLAGS} test/test_all.rb #{FILTER}"
-          else
-            tests = test_globs.map { |g| Dir.glob(g) }.flatten << 'test/unit'
-            tests.map! {|f| %Q(require "#{f}")}
-            "#{RUBY_FLAGS} -e '#{tests.join("; ")}' #{FILTER}"
-          end
-    cmd = "multiruby #{cmd}" if multi
-    send msg, cmd
+  end
+
+  def run_tests # :nodoc:
+    ruby(if File.exist? 'test/test_all.rb'
+      "#{RUBY_FLAGS} test/test_all.rb #{FILTER}"
+    else
+      tests = test_patterns.map { |g| Dir.glob(g) }.flatten << 'test/unit'
+      tests.map! {|f| %Q(require "#{f}")}
+      "#{RUBY_FLAGS} -e '#{tests.join("; ")}' #{FILTER}"
+    end)
   end
 
 end
@@ -397,8 +316,3 @@ end
 class ::Rake::SshDirPublisher # :nodoc:
   attr_reader :host, :remote_dir, :local_dir
 end
-
-if $0 == __FILE__ then
-  out = `rake -T | egrep -v "redocs|repackage|clobber|trunk"`
-  puts out.gsub(/\#/, '-').gsub(/^rake /, '# * ')
-end

metadata

@@ -3,15 +3,15 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: echoe
 version: !ruby/object:Gem::Version 
-  version: "1.4"
-date: 2007-08-02 00:00:00 -04:00
-summary: Echoe is a simple packaging tool for working with rubygems.
+  version: "2"
+date: 2007-08-03 00:00:00 -04:00
+summary: Echoe is a simple packaging tool for Ruby gems.
 require_paths: 
 - lib
 email: ""
-homepage: http://blog.evanweaver.com/articles/2007/01/10/if-you-dont-want-to-hoe-echoe
+homepage: http://blog.evanweaver.com/pages/code#echoe
 rubyforge_project: fauna
-description: Echoe is a simple packaging tool for working with rubygems. It generates all the usual tasks for projects including rdoc generation, testing, packaging, and deployment.
+description: ""
 autorequire: 
 default_executable: 
 bindir: bin
@@ -27,24 +27,24 @@ signing_key:
 cert_chain: 
 post_install_message: 
 authors: 
-- ""
+- Evan Weaver
 files: 
-- ./CHANGELOG
-- ./LICENSE
-- ./README
-- ./Rakefile
-- ./bin/echoe
-- ./lib/echoe.rb
-- ./test/test_echoe.rb
-- ./Manifest
+- test/test_echoe.rb
+- lib/echoe.rb
+- Rakefile
+- README
+- Manifest
+- MIT-LICENSE
+- LICENSE
+- CHANGELOG
 test_files: 
 - test/test_echoe.rb
 rdoc_options: []
 
 extra_rdoc_files: []
 
-executables: 
-- echoe
+executables: []
+
 extensions: []
 
 requirements: []
@@ -65,6 +65,18 @@ dependencies:
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
     - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    - - "="
       - !ruby/object:Gem::Version 
         version: 0.4.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: highline
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 

data/bin/echoe

@@ -1,71 +0,0 @@
-#!/usr/bin/env ruby -ws
-
-$t ||= false
-$d ||= false
-
-if defined? $h then
-  puts "usage: #{File.dirname($0)} [-d|-t] [group] project"
-  puts "  -t = add project to subdir under 'trunk'"
-  puts "  -d = add project to subdir under 'dev'"
-end
-
-abort "You must specify only one of -t or -d" if $t and $d
-
-group = ARGV.shift
-project = ARGV.shift
-
-project ||= group
-
-# prevents false positives on my tag reporter
-X = 'FI' + 'X'
-
-abort "You must supply a project name on the commandline" unless project
-abort "Project #{project} seems to exist" if test ?d, project
-puts "creating project #{project}"
-
-case project
-when /_/ then
-  file_name = project
-  project = project.capitalize.gsub(/_([a-z])/) {$1.upcase}
-  klass = project
-else
-  file_name = project.gsub(/([A-Z])/, '_\1').downcase.sub(/^_/, '')
-  klass = project.capitalize.gsub(/_([a-z])/) {$1.upcase}
-end
-
-Dir.mkdir project
-Dir.chdir project do
-
-  if $d then
-    Dir.mkdir "dev"
-    Dir.chdir "dev"
-  elsif $t then
-    Dir.mkdir "trunk"
-    Dir.chdir "trunk"
-  end
-
-  %w(bin lib test).each do |path|
-    Dir.mkdir path
-  end
-
-  files = {
-    "History.txt" => "== 1.0.0 / #{Time.new.strftime("%Y-%m-%d")}\n\n* 1 major enhancement\n  * Birthday!\n\n",
-    "README.txt" => "#{project}\n    by #{X} (your name)\n    #{X} (url)\n\n== DESCRIPTION:\n  \n#{X} (describe your package)\n\n== FEATURES/PROBLEMS:\n  \n* #{X} (list of features or problems)\n\n== SYNOPSYS:\n\n  #{X} (code sample of usage)\n\n== REQUIREMENTS:\n\n* #{X} (list of requirements)\n\n== INSTALL:\n\n* #{X} (sudo gem install, anything else)\n\n== LICENSE:\n\n(The MIT License)\n\nCopyright (c) #{Time.new.strftime("%Y")} #{X}\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n",
-    "Manifest.txt" => "",
-    "bin/#{file_name}" => "",
-    "lib/#{file_name}.rb" => "class #{klass}\n  VERSION = '1.0.0'\nend",
-    "test/test_#{file_name}.rb" => "",
-    "Rakefile" => "# -*- ruby -*-\n\nrequire 'rubygems'\nrequire 'echoe'\nrequire './lib/#{file_name}.rb'\n\nechoe.new('#{project}', #{klass}::VERSION) do |p|\n  p.rubyforge_name = \'#{group}\'\n  # p.summary = '#{X}'\n  # p.description = p.paragraphs_of('README.txt', 2..5).join(\"\\n\\n\")\n  # p.url = p.paragraphs_of('README.txt', 0).first.split(/\\n/)[1..-1]\n  p.changes = p.paragraphs_of('History.txt', 0..1).join(\"\\n\\n\")\nend\n\n# vim: syntax=Ruby\n"
-  }
-
-  files["Manifest.txt"] = files.keys.sort.join("\n")
-
-  files.each do |file, content|
-    File.open(file, "w") do |f|
-      f.write content
-    end
-  end
-end
-
-puts "... done, now go fix all occurances of '#{X}'"
-puts `find #{project} -type f | xargs grep -n #{X}`.gsub(/\A|\n/, "\n  ")