echoe 2.7.13 → 3

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v3. Compatibility with Rubyforge 1.0.0 and Rubygems 1.2.
+
 v2.7.13. Avoid Rubyforge 1.0.0 which seems broken.
 
 v2.7.12. Respect system EDITOR setting (osteele).

data/Manifest

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

data/README

@@ -24,7 +24,12 @@ If you use this software, please {make a donation}[http://blog.evanweaver.com/do
 
 == Installation
 
+Install the gem:
   sudo gem install echoe
+  
+If you haven't already, make sure Rubyforge is configured locally and your password is correctly set:
+  rubyforge setup
+  rubyforge config
 
 == Project configuration
 
@@ -57,9 +62,7 @@ More advanced configuration is described in the Echoe class.
 
 == Deploying your gem
 
-First, run <tt>rubyforge setup</tt> and <tt>rubyforge config</tt> if you haven't already. Make sure your Rubyforge password is correctly set.
-
-Now, to deploy the gem and documentation:
+To deploy the gem and documentation:
 
   rake manifest
   rake release

data/Rakefile

@@ -7,12 +7,8 @@ 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.dependencies = ['rake', 'rubyforge =0.4.5', 'highline']
+  p.runtime_dependencies = ['rake', 'rubyforge >=1.0.0', 'highline']
+  p.development_dependencies = []
   p.require_signed = true
-  p.rubygems_version = '>= 0.9.4.5'
-
-  # Echoe is self-dependent
-  p.include_gemspec = false
-  p.include_rakefile = true    
 end
 

data/echoe.gemspec

@@ -0,0 +1,105 @@
+
+# Gem::Specification for Echoe-3
+# Originally generated by Echoe
+
+--- !ruby/object:Gem::Specification 
+name: echoe
+version: !ruby/object:Gem::Version 
+  version: "3"
+platform: ruby
+authors: 
+- Evan Weaver
+autorequire: 
+bindir: bin
+date: 2008-06-23 00:00:00 -04: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: []
+
+extensions: []
+
+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.2.0
+specification_version: 2
+summary: A Rubygems packaging tool that provides Rake tasks for documentation, extension compiling, testing, and deployment.
+test_files: []

data/lib/echoe.rb

@@ -1,7 +1,6 @@
 
 require 'rubygems'
 
-gem 'rubyforge', '=0.4.5'
 require 'rubyforge'
 
 require 'rake'
@@ -20,7 +19,6 @@ rescue LoadError
 end
 
 begin
-  gem 'hoe', '<= 1.5.0'
   require 'load_multi_rails_rake_tasks'
 rescue LoadError
 end
@@ -28,6 +26,7 @@ end
 $LOAD_PATH << File.dirname(__FILE__)
 require 'echoe/platform'
 require 'echoe/extensions'
+require 'echoe/client'
 
 =begin rdoc
 
@@ -42,7 +41,7 @@ For example, a simple <tt>Rakefile</tt> might look like this:
     p.summary = "A library that uncapitalizes strings. It's awesome."
     p.url = "http://www.uncapitalizer.com"
     p.docs_host = "uncapitalizer.com:~/www/files/doc/"
-    p.dependencies = ["string_tools >=1.4.0"]
+    p.runtime_dependencies = ["string_tools >=1.4.0"]
   end
   
 See below for the full list.
@@ -69,9 +68,9 @@ Note that you can also set the key and certificate locations in the Rakefile its
   
 == 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, along with a comment containing the original <tt>Rakefile</tt> source. Downstream repackagers can use the <tt>gemspec</tt> as-is to build new versions of your gem. This way no dependencies are added, but no contents are lost.
+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. 
 
-If you do want metadependencies, add <tt>'echoe'</tt> to the <tt>p.dependencies</tt> array, and set <tt>p.include_rakefile = true</tt> and <tt>p.include_gemspec = false</tt>.
+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
 
@@ -105,7 +104,8 @@ Versioning options:
 
 Common packaging options:
 
-* <tt>dependencies</tt> - An array of dependencies for this gem. For example, <tt>['mongrel', 'rake >=0.7.1']</tt>.
+* <tt>runtime_dependencies</tt> - An array of runtime dependencies for this gem. For example, <tt>['mongrel', 'activesupport >= 2.0.2']</tt>.
+* <tt>development_dependencies</tt> - An array of development dependencies for this gem. For example, <tt>['rake >=0.7.1']</tt>.
 * <tt>extension_pattern</tt> - A filename array, glob array, or regex for extension files that need to be run at install time. Defaults to <tt>"ext/**/extconf.rb"</tt>.
 
 Testing options:
@@ -121,7 +121,7 @@ Uncommon packaging options:
 * <tt>need_tar_gz</tt> - Whether to generate a <tt>.tar.gz</tt> package. Defaults to <tt>true</tt>.
 * <tt>need_tgz</tt> - Whether to generate a <tt>.tgz</tt> package. Defaults to <tt>false</tt>.
 * <tt>need_zip</tt> - Whether to generate a <tt>.zip</tt> package. Defaults to <tt>false</tt>.
-* <tt>include_rakefile</tt> - Include the Rakefile directly within the package. Defaults to <tt>false</tt>.
+* <tt>include_rakefile</tt> - Include the Rakefile directly within the package. Defaults to <tt>true</tt>.
 * <tt>include_gemspec</tt> - Include the generated gemspec file within the package. Defaults to <tt>true</tt>.
 * <tt>ruby_version</tt> - Version string for which Ruby to require (for example, <tt>'>= 1.8.4'</tt>.
 * <tt>eval</tt> - Accepts a proc to be evaluated in the context of the Gem::Specification object. This allows you to set more unusual gemspec options.
@@ -149,13 +149,13 @@ Documentation options:
 class Echoe
 
   # user-configurable
-  attr_accessor :author, :changes, :clean_pattern, :description, :email, :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
   
   # 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
   
   # legacy
-  attr_accessor :extra_deps, :rdoc_files, :extensions
+  attr_accessor :extra_deps, :rdoc_files, :extensions, :dependencies
   
   def initialize(name, _version = nil)
     # Defaults
@@ -196,7 +196,8 @@ class Echoe
     readme = Dir['*'].detect { |filename| filename =~ /^readme/i }
     self.rdoc_options += ['--main', readme] if readme
       
-    self.dependencies = []
+    self.runtime_dependencies = []
+    self.development_dependencies = ["echoe"]
     self.manifest_name = "Manifest"
     self.extension_pattern = ["ext/**/extconf.rb", "ext/extconf.rb"]
     self.private_key = ENV['GEM_PRIVATE_KEY']
@@ -209,14 +210,16 @@ class Echoe
     self.need_zip = false
     self.platform = $platform
 
-    self.include_rakefile = false
+    self.include_rakefile = true
     self.include_gemspec = true    
     self.gemspec_name = "#{name}.gemspec"
+    self.rubygems_version = "1.2"
 
     yield self if block_given?
 
     # legacy compatibility
-    self.dependencies = extra_deps if extra_deps and dependencies.empty?
+    self.runtime_dependencies = dependencies if dependencies and runtime_dependencies.empty?
+    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    
@@ -300,6 +303,7 @@ class Echoe
     self.spec = Gem::Specification.new do |s|
       s.name = name
       s.version = version
+      # s.specification_version = 3
       s.summary = summary
       s.author = Array(author).join(", ")
       s.email = email
@@ -318,9 +322,14 @@ class Echoe
         s.cert_chain = certificate_chain
       end
 
-      dependencies.each do |dep|
+      runtime_dependencies.each do |dep|
         dep = dep.split(" ") if dep.is_a? String
-        s.add_dependency(*dep)
+        s.add_runtime_dependency(*dep)
+      end
+
+      development_dependencies.each do |dep|
+        dep = dep.split(" ") if dep.is_a? String
+        s.add_development_dependency(*dep)
       end
 
       s.files = files
@@ -367,16 +376,10 @@ class Echoe
       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_ruby.split("\n").each do |line|
+          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
-          
-          f.puts "\n\n# # Original Rakefile source (requires the Echoe gem):\n# \n"
-          File.open("Rakefile").readlines.each do |line|
-            # Ditto
-            f.write "# #{line}" unless line =~ /private_key|certificate_chain|\.pem/        
-          end                    
+          end          
         end
       end      
     end
@@ -410,6 +413,13 @@ class Echoe
     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
+        system "#{'sudo' if use_sudo} gem install pkg/*.gem -P MediumSecurity --no-update-sources --development"
+      end
+    end
 
     desc 'Uninstall the gem'
     task :uninstall do
@@ -427,7 +437,7 @@ class Echoe
         pkg_tar_gz = pkg + ".tar.gz"
         pkg_zip = pkg + ".zip" 
         
-        rf = RubyForge.new
+        rf = RubyForge.new.configure        
         puts "Logging in"
         rf.login
   
@@ -572,7 +582,7 @@ class Echoe
         
         body = File.open(filename).readlines.reject { |line| line =~ /Subject: / }.join.gsub("\n\n\n", "\n\n")
         
-        rf = RubyForge.new
+        rf = RubyForge.new.configure        
         rf.login
         rf.post_news(project, subject, body)
         puts "Published."
@@ -615,6 +625,7 @@ class Echoe
       File.open(manifest_name, 'w').puts(files)
       
       (files | old_files).sort.each do |file|
+        next if file == gemspec_name
         sign = " "
         if old_files.include?(file) and !files.include?(file)
           sign = "-"

data/lib/echoe/client.rb

@@ -0,0 +1,25 @@
+# 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: echoe
 version: !ruby/object:Gem::Version 
-  version: 2.7.13
+  version: "3"
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,11 +30,12 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2008-05-26 00:00:00 -04:00
+date: 2008-06-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -44,15 +45,17 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.5
+        version: 1.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: highline
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -68,6 +71,7 @@ extensions: []
 
 extra_rdoc_files: 
 - CHANGELOG
+- lib/echoe/client.rb
 - lib/echoe/extensions.rb
 - lib/echoe/platform.rb
 - lib/echoe.rb
@@ -76,6 +80,7 @@ extra_rdoc_files:
 - TODO
 files: 
 - CHANGELOG
+- lib/echoe/client.rb
 - lib/echoe/extensions.rb
 - lib/echoe/platform.rb
 - lib/echoe.rb
@@ -85,6 +90,7 @@ files:
 - Rakefile
 - README
 - TODO
+- echoe.gemspec
 has_rdoc: true
 homepage: http://blog.evanweaver.com/files/doc/fauna/echoe/
 post_install_message: 
@@ -105,14 +111,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - "="
     - !ruby/object:Gem::Version 
-      version: 0.9.4.5
+      version: "1.2"
   version: 
 requirements: []
 
 rubyforge_project: fauna
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A Rubygems packaging tool that provides Rake tasks for documentation, extension compiling, testing, and deployment.