echoe 1.0.0 → 1.1

data/lib/echoe.rb

@@ -89,7 +89,7 @@ require 'rbconfig'
 # * RUBY_FLAGS - Used to specify flags to ruby [has smart default].
 
 class Echoe
-  VERSION = '1.0.0'
+  VERSION = '1.1'
 
   rubyprefix = Config::CONFIG['prefix']
   sitelibdir = Config::CONFIG['sitelibdir']
@@ -106,7 +106,7 @@ class Echoe
     (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_zip, :rdoc_pattern, :rubyforge_name, :spec, :spec_extras, :summary, :test_files, :test_globs, :url, :version
+  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 #, :tar_separator, :zip_separator
 
   def initialize(name, version)
     self.name = name
@@ -126,7 +126,10 @@ class Echoe
     self.extra_deps = []
     self.spec_extras = {}
     self.need_tar = true
+    self.need_tar_gz = false
     self.need_zip = false
+#    self.tar_separator = "." # separator choice is buried in rake/packagetask, bah
+#    self.zip_separator = "."
 
     if name == 'echoe' then
       extra_deps << ['rake']
@@ -188,7 +191,9 @@ class Echoe
         s.add_dependency(*dep)
       end
 
-      s.files = File.read("Manifest.txt").split
+      manifest = "Manifest"
+      manifest += ".txt" if File.exist? "Manifest.txt"
+      s.files = File.read(manifest).split
       s.executables = s.files.grep(/bin/) { |f| File.basename(f) }
 
       s.bindir = "bin"
@@ -224,6 +229,7 @@ class Echoe
 
     Rake::GemPackageTask.new spec do |pkg|
       pkg.need_tar = @need_tar
+      pkg.need_tar_gz = @need_tar_gz
       pkg.need_zip = @need_zip
     end
 
@@ -259,12 +265,19 @@ class Echoe
     task :release => [:clean, :package] do |t|
       v = ENV["VERSION"] or abort "Must supply VERSION=x.y.z"
       abort "Versions don't match #{v} vs #{version}" if v != version
+
+      gem 'rubyforge', '= 0.4.0'
       require 'rubyforge'
-      pkg = "pkg/#{name}-#{version}"
 
+      pkg = "pkg/#{name}-#{version}"
+      pkg_gem = pkg + ".gem"
+      pkg_tar = pkg + ".tgz"
+      pkg_tar_gz = pkg + ".tar.gz"
+      pkg_zip = pkg + ".zip" 
+      
       if $DEBUG then
-        puts "release_id = rf.add_release #{rubyforge_name.inspect}, #{name.inspect}, #{version.inspect}, \"#{pkg}.tgz\""
-        puts "rf.add_file #{rubyforge_name.inspect}, #{name.inspect}, release_id, \"#{pkg}.gem\""
+        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
@@ -276,12 +289,19 @@ class Echoe
       c["release_changes"] = changes if changes
       c["preformatted"] = true
 
-      files = [(@need_tar ? "#{pkg}.tgz" : nil),
-               (@need_zip ? "#{pkg}.zip" : nil),
-               "#{pkg}.gem"].compact
+      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}"
-      rf.add_release rubyforge_name, name, version, *files
+      self.version = self.version.ljust(3)
+
+      begin
+        rf.add_release rubyforge_name, name, version, *files
+      rescue NoMethodError => boom
+        puts "If you are releasing a package for the first time, don't panic.\nOtherwise, it seems that this release already exists."
+      end
     end
 
     ############################################################
@@ -292,7 +312,7 @@ class Echoe
       rd.options << '-d' if RUBY_PLATFORM !~ /win32/ and `which dot` =~ /\/dot/
       rd.rdoc_dir = 'doc'
       files = spec.files.grep(rdoc_pattern)
-      files -= ['Manifest.txt']
+      files -= ['Manifest.txt', 'Manifest']
       rd.rdoc_files.push(*files)
 
       title = "#{name}-#{version} Documentation"
@@ -389,7 +409,11 @@ class Echoe
       end
       files = files.sort.join "\n"
       File.open f, 'w' do |fp| fp.puts files end
-      system "diff -du Manifest.txt #{f}"
+
+      manifest = "Manifest"
+      manifest += ".txt" if File.exist? "Manifest.txt"
+
+      system "diff -du #{manifest}.txt #{f}"
       rm f
     end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0.9
+rubygems_version: 0.9.2
 specification_version: 1
 name: echoe
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
-date: 2007-01-10 00:00:00 -05:00
+  version: "1.1"
+date: 2007-02-06 00:00:00 -05:00
 summary: Echoe makes gem creation easy.
 require_paths: 
 - lib