echoe 3.0.1 → 3.0.2

data/CHANGELOG

@@ -1,3 +1,4 @@
+v3.0.2. Support for alternative Rakefile naming.
 
 v3.0.1. Compatibility with Rubygems 1.3.
 

data/Manifest

@@ -1,4 +1,5 @@
 CHANGELOG
+echoe.gemspec
 lib/echoe/client.rb
 lib/echoe/extensions.rb
 lib/echoe/platform.rb

data/Rakefile

@@ -9,6 +9,7 @@ Echoe.new('echoe') do |p|
   p.docs_host = 'blog.evanweaver.com:~/www/bax/public/files/doc/'
   p.runtime_dependencies = ['rake', 'rubyforge >=1.0.0', 'highline']
   p.development_dependencies = []
+  p.retain_gemspec = true
   p.require_signed = true
 end
 

data/echoe.gemspec

@@ -1,105 +1,42 @@
+# -*- encoding: utf-8 -*-
 
-# Gem::Specification for Echoe-3.0.1
-# Originally generated by Echoe
+Gem::Specification.new do |s|
+  s.name = %q{echoe}
+  s.version = "3.0.2"
 
---- !ruby/object:Gem::Specification 
-name: echoe
-version: !ruby/object:Gem::Version 
-  version: 3.0.1
-platform: ruby
-authors: 
-- Evan Weaver
-autorequire: 
-bindir: bin
-date: 2008-09-28 00:00:00 -07: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
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: highline
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: A Rubygems packaging tool that provides Rake tasks for documentation, extension compiling, testing, and deployment.
-email: ""
-executables: []
+  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.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.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.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.}
 
-extensions: []
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
 
-extra_rdoc_files: 
-- CHANGELOG
-- lib/echoe/client.rb
-- lib/echoe/extensions.rb
-- lib/echoe/platform.rb
-- lib/echoe.rb
-- LICENSE
-- README
-- TODO
-files: 
-- CHANGELOG
-- lib/echoe/client.rb
-- lib/echoe/extensions.rb
-- lib/echoe/platform.rb
-- lib/echoe.rb
-- LICENSE
-- Manifest
-- MIT-LICENSE
-- Rakefile
-- README
-- TODO
-- echoe.gemspec
-has_rdoc: true
-homepage: http://blog.evanweaver.com/files/doc/fauna/echoe/
-post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --title
-- Echoe
-- --main
-- README
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.2"
-  version: 
-requirements: []
-
-rubyforge_project: fauna
-rubygems_version: 1.3.0
-specification_version: 2
-summary: A Rubygems packaging tool that provides Rake tasks for documentation, extension compiling, testing, and deployment.
-test_files: []
+    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
+end

data/lib/echoe.rb

@@ -1,4 +1,3 @@
-
 require 'rubygems'
 
 require 'rubyforge'
@@ -14,7 +13,7 @@ require 'open-uri'
 require 'highline/import'
 
 begin
-  require 'rcov/rcovtask' 
+  require 'rcov/rcovtask'
 rescue LoadError
 end
 
@@ -35,7 +34,7 @@ Echoe includes some optional accessors for more advanced gem configuration.
 For example, a simple <tt>Rakefile</tt> might look like this:
 
   require 'echoe'
-  
+
   Echoe.new("uncapitalizer") do |p|
     p.author = "Evan Weaver"
     p.summary = "A library that uncapitalizes strings. It's awesome."
@@ -43,7 +42,7 @@ For example, a simple <tt>Rakefile</tt> might look like this:
     p.docs_host = "uncapitalizer.com:~/www/files/doc/"
     p.runtime_dependencies = ["string_tools >=1.4.0"]
   end
-  
+
 See below for the full list.
 
 == Signing gems
@@ -60,21 +59,21 @@ Make sure your environment is up-to-date:
 
 Upload your <tt>public_cert.pem</tt> file to your website or Rubyforge project, and tell your users to add that certificate to their system via:
   gem cert --add /path/to/public_cert.pem
-  
+
 Finally, package and release your project as normal. Now users can install your gem via:
   sudo gem install gemname -P HighSecurity
 
 Note that you can also set the key and certificate locations in the Rakefile itself. Finally, you can add <tt>p.require_signed = true</tt> to your <tt>Rakefile</tt> so that you don't accidentally release an unsigned gem if your key is missing.
-  
+
 == Metadependencies
 
-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. 
+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. 
+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.
 
@@ -149,14 +148,14 @@ 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
-  
+  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, :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
+
   # legacy
   attr_accessor :extra_deps, :rdoc_files, :extensions, :dependencies
-  
+
   def initialize(name, _version = nil)
     # Defaults
 
@@ -168,19 +167,19 @@ class Echoe
     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.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/ 
-    
+    self.ignore_pattern = /^(pkg|doc)|\.svn|CVS|\.bzr|\.DS|\.git/
+
     self.changelog_patterns = {
         :version => [
-            /^\s*v([\d\.]+)(\.|\s|$)/, 
+            /^\s*v([\d\.]+)(\.|\s|$)/,
             /\s*\*\s*([\d\.]+)\s*\*\s*$/
           ],
         :changes => [
-          /^\s*v([\d\.]+\. .*)/, 
+          /^\s*v([\d\.]+\. .*)/,
           /\*\s*[\d\.]+\s*\*\s*(.*)\*\s*[\d\.]+\s*\*$/m
         ]
       }
-      
+
     self.description = ""
     self.summary = ""
     self.install_message = nil
@@ -190,12 +189,14 @@ class Echoe
     self.rcov_options = []
     self.rdoc_pattern = /^(lib|bin|tasks|ext)|^README|^CHANGELOG|^TODO|^LICENSE|^COPYING$/
 
+    self.gemspec_format = :ruby
+
     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.runtime_dependencies = []
     self.development_dependencies = ["echoe"]
     self.manifest_name = "Manifest"
@@ -206,13 +207,15 @@ class Echoe
 
     self.need_gem = true
     self.need_tar_gz = true
-    self.need_tgz = false    
+    self.need_tgz = false
     self.need_zip = false
     self.platform = $platform
 
     self.include_rakefile = true
-    self.include_gemspec = true    
+    self.include_gemspec = true
     self.gemspec_name = "#{name}.gemspec"
+    self.retain_gemspec = false
+    self.rakefile_name = "Rakefile"
     self.rubygems_version = ">= 1.2"
 
     yield self if block_given?
@@ -222,25 +225,25 @@ class Echoe
     self.runtime_dependencies = extra_deps if extra_deps and runtime_dependencies.empty?
     self.project = rubyforge_name if rubyforge_name
     self.rdoc_pattern = rdoc_files if rdoc_files
-    self.extension_pattern = extensions if extensions    
+    self.extension_pattern = extensions if extensions
 
     # read manifest
     begin
-      self.files = File.read(manifest_name).split + 
-        [(gemspec_name if include_gemspec)] + 
-        [("Rakefile" if include_rakefile)]
+      self.files = File.read(manifest_name).split +
+        [(gemspec_name if include_gemspec)] +
+        [(rakefile_name if include_rakefile)]
       self.files = files.compact.uniq
     rescue Errno::ENOENT
       unless ARGV.include? "manifest"
         puts "Missing manifest. You can build one with 'rake manifest'."
-        exit 
+        exit 1
       else
         self.files = []
       end
-    end  
-    
+    end
+
     # snag version and changeset
-    self.version ||= _version    
+    self.version ||= _version
     unless version
       if File.exist? changelog
         parsed = Array(changelog_patterns[:version]).map do |pattern|
@@ -263,8 +266,8 @@ class Echoe
       end.compact.first or ""
     else
       ""
-    end      
-    
+    end
+
     # set some post-defaults
     self.certificate_chain = Array(certificate_chain).map {|file| File.expand_path(file)}
     self.private_key = File.expand_path(private_key) if private_key
@@ -275,11 +278,11 @@ class Echoe
     self.ignore_pattern = apply_pattern(ignore_pattern)
     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.test_pattern = apply_pattern(test_pattern)
 
     define_tasks
   end
-  
+
   def apply_pattern(pattern, files = nil)
     files ||= Dir['**/**']
     case pattern
@@ -288,9 +291,17 @@ class Echoe
           Dir.glob(p)
         end.flatten)
       when Regexp
-        files.select do |file| 
+        files.select do |file|
           file =~ pattern
         end
+      when FileList
+        pattern.each do |ignorefile|
+          ignorefiles = File.open(ignorefile).to_a.map(&:chomp)
+          files = files.select do |file|
+            ignorefiles.map { |i| File.fnmatch(i, file) }.include?(true)
+          end
+        end
+        files
       else
         []
     end
@@ -299,7 +310,7 @@ class Echoe
   def define_tasks
 
     ### Packaging and Installing
-    
+
     self.spec = Gem::Specification.new do |s|
       s.name = name
       s.version = version
@@ -333,17 +344,17 @@ class Echoe
       end
 
       s.files = files
-      
+
       s.bindir = if executable_pattern.any?
         executable_pattern[0].split("/")[0]
       else
         "bin"
       end
-      
+
       s.executables = executable_pattern.map do |file|
         file[(s.bindir.length + 1)..-1]
       end
-      
+
       dirs = Dir['{lib,ext}']
       s.extensions = extension_pattern if extension_pattern.any?
       s.require_paths = dirs unless dirs.empty?
@@ -354,11 +365,11 @@ class Echoe
       else
         s.test_files = test_pattern
       end
-      
+
       if eval
         s.instance_eval &eval
       end
-      
+
     end
 
     self.lib_files = spec.files.grep(/^lib/)
@@ -370,35 +381,41 @@ class Echoe
       pkg.need_tar_gz = @need_tar_gz
       pkg.need_zip = @need_zip
     end
-        
+
     task :build_gemspec do
       # Construct the gemspec file, if needed.
       if include_gemspec
         File.open(gemspec_name, 'w') do |f|          
-          f.puts "\n# Gem::Specification for #{name.capitalize}-#{version}\n# Originally generated by Echoe\n\n"
-          spec.to_yaml.split("\n").each do |line|
-            # Don't publish any information about the private key or certificate chain
-            f.puts line unless line =~ /signing_key|cert_chain|\.pem/
-          end          
+          case gemspec_format
+          when :yaml
+            spec.to_yaml.split("\n").each do |line|
+              # Don't publish any information about the private key or certificate chain
+              f.puts line unless line =~ /signing_key|cert_chain|\.pem/
+            end          
+          when :ruby
+            f.puts spec.to_ruby
+          else
+            raise "Unknown gemspec format #{gemspec_format.inspect}. Supported formats: :ruby and :yaml"
+          end
         end
-      end      
+      end
     end
-    
+
     # Chain it to the gemspec task prerequisite
-    task gemspec_name.to_sym => [:build_gemspec] 
-        
+    task gemspec_name.to_sym => [:build_gemspec]
+
     task :package do
       # Chain some cleanup tasks to the default :package task.
-      # Remove the gemfile if it wasn't actually requested. 
+      # Remove the gemfile if it wasn't actually requested.
       unless @need_gem
         puts "  Gem file not requested. Removed."
         system "rm pkg/*.gem"
       end
       # Remove the generated gemspec once the packaging is done, to discourage people from modifying it by hand.
-      if include_gemspec and File.exist? gemspec_name
+      if include_gemspec and File.exist? gemspec_name and not retain_gemspec
         File.delete gemspec_name
       end
-      
+
       # Test signing status
       if private_key and File.exist? private_key
         puts "Signing gem."
@@ -407,13 +424,13 @@ class Echoe
         puts "Private key not found; gem will not be signed."
       end
       puts "Targeting \"#{platform}\" platform."
-    end  
+    end
 
     desc 'Install the gem'
     task :install => [:clean, :package, :uninstall] do
       system "#{'sudo' if use_sudo} gem 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
@@ -427,52 +444,52 @@ class Echoe
     end
 
     desc 'Package and upload the release to Rubyforge'
-    task :release => [:clean, :package] do |t|      
-      
+    task :release => [:clean, :package] do |t|
+
       say "\n"
-      if agree "Release #{name}-#{version} to Rubyforge? "      
+      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.configure        
+        pkg_zip = pkg + ".zip"
+
+        rf = RubyForge.new.configure
         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_tgz ? pkg_tar : nil),
                   (@need_tar_gz ? pkg_tar_gz : nil),
                   (@need_zip ? pkg_zip : nil),
                   (@need_gem ? pkg_gem : nil)].compact
-  
+
         puts "Releasing #{name} v. #{version}"
         self.version = self.version.ljust(3)
-          
+
         rf.add_release project, name, version, *files
       end
-      
+
     end
-    
+
     ### Extension building
 
     task :lib do
       directory "lib"
     end
-    
+
     if extension_pattern.any?
-    
+
       desc "Compile the binary extension module"
-      task :compile => [:lib] do    
-        extension_pattern.each do |extension|          
+      task :compile => [:lib] do
+        extension_pattern.each do |extension|
           ext_dir = File.dirname(extension)
           lib_target = nil
-          Dir.chdir(ext_dir) do 
+          Dir.chdir(ext_dir) do
             ruby File.basename(extension)
             system(PLATFORM =~ /win32/ ? 'nmake' : 'make')
             lib_target = open('Makefile').readlines.grep(/target_prefix = /).first.split('=').last.chomp("\n").strip
@@ -484,35 +501,35 @@ class Echoe
           end
         end
       end
-      
+
       task :test => [:compile]
-      
+
     end
-    
+
     ### Cross-platform targets
-    
+
     Gem::Specification::PLATFORM_CROSS_TARGETS.each do |target|
-      task target do 
+      task target do
         reset_target target
       end
     end
-    
+
     ### Documentation
 
-    Rake::RDocTask.new(:docs) do |rd|      
+    Rake::RDocTask.new(:docs) do |rd|
       # rd.main = Dir['*'].detect {|f| f =~ /^readme/i}
       rd.options += Array(rdoc_options)
-      
-      rd.rdoc_dir = 'doc'      
+
+      rd.rdoc_dir = 'doc'
       rd.rdoc_files.push(*rdoc_pattern)
 
       if rdoc_template
-        rd.template = rdoc_template 
+        rd.template = rdoc_template
       elsif ENV['RDOC_TEMPLATE']
         rd.template = ENV['RDOC_TEMPLATE']
-      end      
+      end
     end
-        
+
     task :doc => [:redocs]
 
     desc "Publish documentation to #{docs_host ? "'#{docs_host}'" : "rubyforge"}"
@@ -522,10 +539,10 @@ class Echoe
       remote_dir_name = project
       remote_dir_name += "/#{name}" if project != name
 
-      unless docs_host  
+      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}", 
+        pub = Rake::SshDirPublisher.new "#{config["username"]}@rubyforge.org",
+          "/var/www/gforge-projects/#{remote_dir_name}",
           local_dir
         if project != name then
           def pub.upload
@@ -539,29 +556,29 @@ class Echoe
             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!("/")
-        
+
         # XXX too dangerous?
         cmd = "ssh #{host} 'rm -rf #{dir}/#{remote_dir_name}'"
         puts "Deleting existing docs: #{cmd}"
-        system(cmd) 
-        
+        system(cmd)
+
         cmd = "scp -qr #{local_dir} #{host}:#{dir}/#{remote_dir_name}"
         puts "Uploading: #{cmd}"
         system(cmd)
-      end      
+      end
     end
-        
+
     desc 'Generate a release announcement, edit it, and post it to Rubyforge.'
     task :announce do
-      
+
       filename = "/tmp/#{name}_#{version}_announcement.txt"
-      
-      if !File.exist?(filename) or agree "Overwrite existing announcement file? "        
+
+      if !File.exist?(filename) or agree "Overwrite existing announcement file? "
         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"
@@ -569,27 +586,27 @@ class Echoe
           f.write "More information is available at #{url} .\n\n" unless url.empty?
         end
       end
-      
-      begin      
-        editor = ENV['EDITOR'] || 'nano'  
+
+      begin
+        editor = ENV['EDITOR'] || 'nano'
         system("#{editor} #{filename}") or raise "Editor '#{editor}' failed to start"
         puts File.open(filename).read
       end while !agree "Done editing? "
-      
+
       if agree "Publish announcement to Rubyforge? "
         File.open(filename).readlines.detect { |line| line =~ /Subject: (.*)/ }
         subject = $1 or raise "Subject line seems to have disappeared"
-        
+
         body = File.open(filename).readlines.reject { |line| line =~ /Subject: / }.join.gsub("\n\n\n", "\n\n")
-        
-        rf = RubyForge.new.configure        
+
+        rf = RubyForge.new.configure
         rf.login
         rf.post_news(project, subject, body)
         puts "Published."
         File.delete filename
       end
-    end    
-    
+    end
+
     ### Clean
 
     desc 'Clean up auto-generated files'
@@ -602,7 +619,7 @@ class Echoe
         end
       end
     end
-    
+
     ### Manifest
 
     desc "Build a Manifest list"
@@ -614,16 +631,16 @@ class Echoe
         next unless file
         next if ignore_pattern.include?(file)
         next if File.directory?(file)
-        next if !include_rakefile and file == "Rakefile"
+        next if !include_rakefile and file == rakefile_name
         files << file
       end
 
-      files << "Rakefile" if include_rakefile
+      files << rakefile_name if include_rakefile
       files << manifest_name
       files.uniq!
-      
+
       File.open(manifest_name, 'w').puts(files)
-      
+
       (files | old_files).sort.each do |file|
         next if file == gemspec_name
         sign = " "
@@ -635,57 +652,57 @@ class Echoe
         puts "#{sign} #{file}"
       end
     end
-    
+
     task :build_manifest => :manifest
-  
+
     ### Testing
-    
+
     if test_pattern.any?
-  
+
       Rake::TestTask.new(:test_inner) do |t|
         t.libs = ['lib', 'ext', 'bin', 'test']
         t.test_files = test_pattern
         t.verbose = true
       end
-    
+
       desc "Run the test suite"
       task :test do
-        if File.exist? 'test/setup.rb'  
+        if File.exist? 'test/setup.rb'
           Echoe.silence do
             puts "Setting up test environment"
             system("ruby test/setup.rb")
           end
         end
         begin
-          test = Rake::Task[:test_inner]        
+          test = Rake::Task[:test_inner]
           if test.respond_to? :already_invoked=
             # Method provided by MultiRails
             test.already_invoked = false
           end
           test.invoke
-        ensure        
-          if File.exist? 'test/teardown.rb'        
-            Echoe.silence do 
+        ensure
+          if File.exist? 'test/teardown.rb'
+            Echoe.silence do
               puts "Tearing down test environment"
               system("ruby test/teardown.rb")
             end
           end
-        end      
+        end
       end
-      
+
     end
-  
+
     task :default => :test
-    
-    if defined? Rcov      
+
+    if defined? Rcov
       Rcov::RcovTask.new(:coverage) do |t|
         t.test_files = test_pattern
         t.rcov_opts << rcov_options if rcov_options
         t.verbose = true
-      end      
+      end
       task :rcov => :coverage
     end
-    
+
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: echoe
 version: !ruby/object:Gem::Version 
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2008-09-28 00:00:00 -07:00
+date: 2008-10-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,6 +80,7 @@ extra_rdoc_files:
 - TODO
 files: 
 - CHANGELOG
+- echoe.gemspec
 - lib/echoe/client.rb
 - lib/echoe/extensions.rb
 - lib/echoe/platform.rb
@@ -90,7 +91,6 @@ files:
 - Rakefile
 - README
 - TODO
-- echoe.gemspec
 has_rdoc: true
 homepage: http://blog.evanweaver.com/files/doc/fauna/echoe/
 post_install_message: