echoe 4.0 → 4.1

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v4.1. Remove prompts until I can find a cursor library that's not GPL. Restore Rubyforge gem dependency, for the announce method.
+
 v4.0. Use gemcutter. Dump Rubyforge.
 
 v3.2. Sort 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 = ['gemcutter', 'highline']
+  p.runtime_dependencies = ['gemcutter', 'rubyforge']
   p.development_dependencies = []
   p.retain_gemspec = true
 end

data/echoe.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{echoe}
-  s.version = "4.0"
+  s.version = "4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
@@ -26,13 +26,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<gemcutter>, [">= 0"])
-      s.add_runtime_dependency(%q<highline>, [">= 0"])
+      s.add_runtime_dependency(%q<rubyforge>, [">= 0"])
     else
       s.add_dependency(%q<gemcutter>, [">= 0"])
-      s.add_dependency(%q<highline>, [">= 0"])
+      s.add_dependency(%q<rubyforge>, [">= 0"])
     end
   else
     s.add_dependency(%q<gemcutter>, [">= 0"])
-    s.add_dependency(%q<highline>, [">= 0"])
+    s.add_dependency(%q<rubyforge>, [">= 0"])
   end
 end

data/lib/echoe.rb

@@ -18,12 +18,11 @@ require 'open-uri'
 require "#{$HERE}/echoe/extensions"
 
 require 'rubygems'
+require 'rubyforge'
 require 'rubygems/specification'
 require "#{$HERE}/echoe/rubygems"
 require 'rubygems_plugin'
 
-require 'highline/import'
-
 begin; require 'rcov/rcovtask'; rescue LoadError; end
 begin; require 'load_multi_rails_rake_tasks'; rescue LoadError; end
 
@@ -462,18 +461,14 @@ class Echoe
 
     desc 'Package and upload the release to Gemcutter'
     task :release => [:clean, :package] do |t|
-
-      say "\n"
-      if agree "Release #{name}-#{version} to Gemcutter? "
-        pkg = "pkg/#{name}-#{version}"
-        pkg_gem = pkg + ".gem"
-        pkg_tar = pkg + ".tgz"
-        pkg_tar_gz = pkg + ".tar.gz"
-        pkg_zip = pkg + ".zip"
-        
-        puts "Releasing #{name} v. #{version}"
-        Gem::Commands::PushCommand.new.invoke(pkg_gem)
-      end
+      pkg = "pkg/#{name}-#{version}"
+      pkg_gem = pkg + ".gem"
+      pkg_tar = pkg + ".tgz"
+      pkg_tar_gz = pkg + ".tar.gz"
+      pkg_zip = pkg + ".zip"
+      
+      puts "Releasing #{name} v. #{version}  to Gemcutter."
+      Gem::Commands::PushCommand.new.invoke(pkg_gem)
     end
 
     ### Extension building
@@ -579,41 +574,40 @@ class Echoe
 
       filename = "/tmp/#{name}_#{version}_announcement.txt"
 
-      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"
-          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")
+      if File.exist?(filename) 
+        puts "Announcement file already exists. Please delete #{filename.inspect} first."        
+        exit(1)
+      end
+      
+      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"
+        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 "More information is available at #{url} .\n\n" unless url.empty?
+          f.write("\n\n")
         end
+        f.write "More information is available at #{url} .\n\n" unless url.empty?
       end
 
-      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? "
+      editor = ENV['EDITOR'] || 'nano'
+      system("#{editor} #{filename}") or raise "Editor '#{editor}' failed to start"
+      puts File.open(filename).read
 
-      if agree "Publish announcement to Rubyforge? "
-        File.open(filename).readlines.detect { |line| line =~ /Subject: (.*)/ }
-        subject = $1 or raise "Subject line seems to have disappeared"
+      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")
+      body = File.open(filename).readlines.reject { |line| line =~ /Subject: / }.join.gsub("\n\n\n", "\n\n")
 
-        rf = RubyForge.new.configure
-        rf.login
-        rf.post_news(project, subject, body)
-        puts "Published."
-        File.delete filename
-      end
+      rf = RubyForge.new.configure
+      rf.login
+      rf.post_news(project, subject, body)
+      puts "Published announcement to Rubyforge."
+      File.delete filename
     end
 
     ### Clean
@@ -719,7 +713,6 @@ class Echoe
       end
       task :rcov => :coverage
     end
-
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: echoe
 version: !ruby/object:Gem::Version 
-  version: "4.0"
+  version: "4.1"
 platform: ruby
 authors: 
 - Evan Weaver
@@ -44,7 +44,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: highline
+  name: rubyforge
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement