echoe 4.1 → 4.2

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v4.2. Allow custom requirements (TylerRick); take advantage of .git_ignore (greatseth); only use -P MediumSecurity on install if it is the packaging machine.
+
 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.

data/echoe.gemspec

@@ -2,12 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{echoe}
-  s.version = "4.1"
+  s.version = "4.2"
 
   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-12-22}
+  s.date = %q{2010-02-18}
   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/extensions.rb", "lib/echoe/platform.rb", "lib/echoe/rubygems.rb"]

data/lib/echoe.rb

@@ -124,6 +124,7 @@ Uncommon packaging options:
 * <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.
 * <tt>ignore_pattern</tt> - A filename array, glob array, or regex for pathnames that should be ignored when building the manifest.
+* <tt>require_paths</tt> - Non-standard requirement paths to add to the gem definition.
 * <tt>executable_pattern</tt> - A filename array, glob array, or regex for files that should be installed as wrapped executables.
 
 Security options:
@@ -147,7 +148,7 @@ 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, :spec_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
+  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, :spec_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, :require_paths, :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, :retain_gemspec, :rakefile_name, :eval, :files, :changelog_patterns, :rubygems_version, :use_sudo, :gem_bin
@@ -167,8 +168,9 @@ class Echoe
     self.clean_pattern = ["pkg", "doc", 'build/*', '**/coverage', '**/*.o', '**/*.so', '**/*.a', '**/*.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.spec_pattern = "spec/**/*_spec.rb"
+    
     self.ignore_pattern = /^(pkg|doc)|\.svn|CVS|\.bzr|\.DS|\.git/
-
+    
     self.changelog_patterns = {
         :version => [
             /^\s*v([\d\.]+)(\.|\s|$)/,
@@ -184,6 +186,7 @@ class Echoe
     self.summary = ""
     self.install_message = nil
     self.executable_pattern = /^bin\//
+    self.require_paths = nil
     self.has_rdoc = true
     self.use_sudo = !Platform.windows?
     self.gem_bin = "gem#{Platform.suffix}"
@@ -278,7 +281,10 @@ class Echoe
     self.summary = description if summary.empty?
     self.clean_pattern = apply_pattern(clean_pattern)
     self.extension_pattern = apply_pattern(extension_pattern, files)
+    
     self.ignore_pattern = apply_pattern(ignore_pattern)
+    honor_gitignore! if File.exist?(".git")
+    
     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)
@@ -286,7 +292,22 @@ class Echoe
 
     define_tasks
   end
-
+  
+private
+  def honor_gitignore!
+    self.ignore_pattern += \
+      Dir["**/.gitignore"].inject([]) do |pattern,gitignore| 
+        pattern.concat \
+          File.readlines(gitignore).
+            map    { |line| line.strip }.
+            reject { |line| "" == line }.
+            map    { |glob| 
+              d = File.dirname(gitignore)
+              d == "." ? glob : File.join(d, glob)
+            }
+      end.flatten.uniq
+  end
+  
   def apply_pattern(pattern, files = nil)
     files ||= Dir['**/**']
     case pattern
@@ -361,7 +382,11 @@ class Echoe
 
       dirs = Dir['{lib,ext}']
       s.extensions = extension_pattern if extension_pattern.any?
-      s.require_paths = dirs unless dirs.empty?
+      if require_paths
+        s.require_paths = require_paths
+      else
+        s.require_paths = dirs unless dirs.empty?
+      end
       s.has_rdoc = has_rdoc
 
       if File.exist? "test/test_all.rb"
@@ -444,7 +469,7 @@ class Echoe
 
     desc 'Install the gem'
     task :install => [:clean, :package, :uninstall] do
-      system "#{'sudo' if use_sudo} #{gem_bin} install pkg/*.gem -P MediumSecurity --no-update-sources"
+      system "#{'sudo' if use_sudo} #{gem_bin} install pkg/*.gem --no-update-sources #{'-P MediumSecurity' if private_key and File.exist?(private_key)}"
     end
 
     namespace :install do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: echoe
 version: !ruby/object:Gem::Version 
-  version: "4.1"
+  version: "4.2"
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2009-12-22 00:00:00 -05:00
+date: 2010-02-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency