echoe 3.2 → 4.0

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v4.0. Use gemcutter. Dump Rubyforge.
+
 v3.2. Sort manifest.
 
 v3.1.3. Removing Evan's keychain so GitHub can build the gem. Version bump to force GitHub to re-generate gem.

data/Manifest

@@ -7,9 +7,7 @@ Rakefile
 TODO
 echoe.gemspec
 lib/echoe.rb
-lib/echoe/client.rb
 lib/echoe/extensions.rb
-lib/echoe/net.rb
 lib/echoe/platform.rb
 lib/echoe/rubygems.rb
 vendor/rake/MIT-LICENSE

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

data/echoe.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{echoe}
-  s.version = "3.2"
+  s.version = "4.0"
 
   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{2009-11-18}
+  s.date = %q{2009-12-22}
   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", "LICENSE", "README", "TODO", "lib/echoe.rb", "lib/echoe/client.rb", "lib/echoe/extensions.rb", "lib/echoe/net.rb", "lib/echoe/platform.rb", "lib/echoe/rubygems.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "MIT-LICENSE", "Manifest", "README", "Rakefile", "TODO", "echoe.gemspec", "lib/echoe.rb", "lib/echoe/client.rb", "lib/echoe/extensions.rb", "lib/echoe/net.rb", "lib/echoe/platform.rb", "lib/echoe/rubygems.rb", "vendor/rake/MIT-LICENSE", "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"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "TODO", "lib/echoe.rb", "lib/echoe/extensions.rb", "lib/echoe/platform.rb", "lib/echoe/rubygems.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "MIT-LICENSE", "Manifest", "README", "Rakefile", "TODO", "echoe.gemspec", "lib/echoe.rb", "lib/echoe/extensions.rb", "lib/echoe/platform.rb", "lib/echoe/rubygems.rb", "vendor/rake/MIT-LICENSE", "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"]
   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"]
@@ -25,14 +25,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rubyforge>, [">= 1.0.2"])
+      s.add_runtime_dependency(%q<gemcutter>, [">= 0"])
       s.add_runtime_dependency(%q<highline>, [">= 0"])
     else
-      s.add_dependency(%q<rubyforge>, [">= 1.0.2"])
+      s.add_dependency(%q<gemcutter>, [">= 0"])
       s.add_dependency(%q<highline>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rubyforge>, [">= 1.0.2"])
+    s.add_dependency(%q<gemcutter>, [">= 0"])
     s.add_dependency(%q<highline>, [">= 0"])
   end
 end

data/lib/echoe.rb

@@ -1,6 +1,5 @@
 
 $HERE = File.dirname(__FILE__)
-require "#{$HERE}/echoe/platform"
 
 require 'rake'
 require 'rake/clean'
@@ -21,10 +20,7 @@ require "#{$HERE}/echoe/extensions"
 require 'rubygems'
 require 'rubygems/specification'
 require "#{$HERE}/echoe/rubygems"
-
-require 'rubyforge'
-require "#{$HERE}/echoe/net"
-require "#{$HERE}/echoe/client"
+require 'rubygems_plugin'
 
 require 'highline/import'
 
@@ -139,7 +135,7 @@ Security options:
 
 Publishing options:
 
-* <tt>project</tt> - The name of the Rubyforge project to upload to. Defaults to the name of the gem.
+* <tt>project</tt> - The name of the Rubyforge project. Defaults to the name of the gem.
 * <tt>docs_host</tt> - A host and filesystem path to publish the documentation to. Defaults to the Rubyforge project.
 
 Documentation options:
@@ -464,37 +460,20 @@ class Echoe
       system "#{'sudo' if use_sudo} #{gem_bin} uninstall #{name} -a -I -x"
     end
 
-    desc 'Package and upload the release to Rubyforge'
+    desc 'Package and upload the release to Gemcutter'
     task :release => [:clean, :package] do |t|
 
       say "\n"
-      if agree "Release #{name}-#{version} to Rubyforge? "
+      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"
-
-        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.to_s.ljust(3)
-
-        rf.add_release project, name, version, *files
+        Gem::Commands::PushCommand.new.invoke(pkg_gem)
       end
-
     end
 
     ### Extension building
@@ -744,3 +723,4 @@ class Echoe
   end
 end
 
+require "#{$HERE}/echoe/platform"

data/lib/echoe/platform.rb

@@ -1,38 +1,36 @@
 
 ### Platform check regexes
 
-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.msvc?
-      @msvc ||= RUBY_PLATFORM =~ /mswin/
-      !@msvc.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.rake
-      windows? ? "rake#{suffix}.bat" : "rake#{suffix}"
-    end
-  
-    def self.make
-      msvc? ? 'nmake' : 'make'
-    end
+module Echoe::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.msvc?
+    @msvc ||= RUBY_PLATFORM =~ /mswin/
+    !@msvc.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.rake
+    windows? ? "rake#{suffix}.bat" : "rake#{suffix}"
+  end
+
+  def self.make
+    msvc? ? 'nmake' : 'make'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: echoe
 version: !ruby/object:Gem::Version 
-  version: "3.2"
+  version: "4.0"
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,18 +30,18 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2009-11-18 00:00:00 -08:00
+date: 2009-12-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: gemcutter
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.2
+        version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: highline
@@ -65,9 +65,7 @@ extra_rdoc_files:
 - README
 - TODO
 - lib/echoe.rb
-- lib/echoe/client.rb
 - lib/echoe/extensions.rb
-- lib/echoe/net.rb
 - lib/echoe/platform.rb
 - lib/echoe/rubygems.rb
 files: 
@@ -80,9 +78,7 @@ files:
 - TODO
 - echoe.gemspec
 - lib/echoe.rb
-- lib/echoe/client.rb
 - lib/echoe/extensions.rb
-- lib/echoe/net.rb
 - lib/echoe/platform.rb
 - lib/echoe/rubygems.rb
 - vendor/rake/MIT-LICENSE

data/lib/echoe/client.rb

@@ -1,25 +0,0 @@
-# Fixes for Rubyforge 1.0.0 client.rb
-
-class RubyForge::Client
-  def boundary_data_for(boundary, parameters)
-    parameters.sort_by {|k,v| k.to_s }.map { |k,v|
-      parameter = "--#{boundary}\r\nContent-Disposition: form-data; name=\"" +
-          WEBrick::HTTPUtils.escape_form(k.to_s) + "\""
-
-      if v.respond_to?(:path)
-        parameter += "; filename=\"#{File.basename(v.path)}\"\r\n"
-        parameter += "Content-Transfer-Encoding: binary\r\n"
-        parameter += "Content-Type: text/plain"
-      end
-      parameter += "\r\n\r\n"
-
-      if v.respond_to?(:path)
-        parameter += v.read
-      elsif 
-        parameter += v.to_s
-      end
-
-      parameter
-    }.join("\r\n") + "\r\n--#{boundary}--\r\n"
-  end  
-end

data/lib/echoe/net.rb

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