echoe 2.6.2 → 2.6.3

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v2.6.3. Fix issue with shared object paths in :compile task.
+
 v2.6.2. Fix executable pattern bug; use a better default clean pattern.
 
 v2.6. Unify pattern handling; changelog accessor, version accessor, expand paths of keys and certificates; support verbose (Rails-style) changelogs.

data/lib/echoe.rb

@@ -148,6 +148,7 @@ class Echoe
     self.email = ""
     self.clean_pattern = ["pkg", "doc", 'build/*', '**/*.o', '**/*.so', '**/*.a', 'lib/*-*', '**/*.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 = ['test/**/test_*.rb']
+    self.ignore_pattern = /^(pkg|doc)|\.svn|CVS|\.bzr|\.DS|\.git/    
     
     self.changelog_patterns = {
         :version => [
@@ -211,7 +212,9 @@ class Echoe
     unless version
       if File.exist? changelog
         parsed = Array(changelog_patterns[:version]).map do |pattern|
-          open(changelog).read[pattern, 1]
+          open(changelog) do |log|
+            log.read[pattern, 1]
+          end
         end.compact.first
         raise "Could not parse version from #{changelog}" unless parsed
         self.version = parsed.chomp(".").strip
@@ -222,7 +225,9 @@ class Echoe
 
     self.changes = if File.exist? changelog
       Array(changelog_patterns[:changes]).map do |pattern|
-        open(changelog).read[pattern, 1]
+        open(changelog) do |log|
+          log.read[pattern, 1]
+        end
       end.compact.first or ""
     else
       ""
@@ -238,7 +243,7 @@ class Echoe
     self.ignore_pattern = apply_pattern(ignore_pattern)
     self.rdoc_pattern = apply_pattern(rdoc_pattern, files)
     self.executable_pattern = apply_pattern(executable_pattern, files)
-      
+    self.test_pattern = apply_pattern(test_pattern)      
 
     define_tasks
   end
@@ -306,7 +311,7 @@ class Echoe
       if File.exist? "test/test_all.rb"
         s.test_file = "test/test_all.rb"
       else
-        s.test_files = Dir[*test_pattern]
+        s.test_files = test_pattern
       end
       
       if eval
@@ -420,14 +425,18 @@ class Echoe
     if extension_pattern.any?
     
       task :compile => [:lib] do    
-        extension_pattern.each do |extension|
-          directory = File.dirname(extension)
-          Dir.chdir(directory) do 
+        extension_pattern.each do |extension|          
+          ext_dir = File.dirname(extension)
+          lib_target = nil
+          Dir.chdir(ext_dir) do 
             ruby File.basename(extension)
             system(PLATFORM =~ /win32/ ? 'nmake' : 'make')
+            lib_target = open('Makefile').readlines.grep(/target_prefix = /).first.split('=').last.chomp("\n").strip
           end
-          Dir["#{directory}/*.#{Config::CONFIG['DLEXT']}"].each do |file|
-            cp file, "lib/#{directory.split('/')[1..-1].join('/')}/"
+          Dir["#{ext_dir}/*.#{Config::CONFIG['DLEXT']}"].each do |file|
+            dir = "lib/#{lib_target}/".gsub('//', '/')
+            mkdir_p dir
+            cp file, dir
           end
         end
       end
@@ -555,11 +564,9 @@ class Echoe
       puts "Building Manifest"
       old_files = files
       files = []
-      Find.find '.' do |file|
-        file = file[2..-1]
+      Dir['**/**'].each do |file|
         next unless file
-        next if file =~ /^(pkg|doc)|\.svn|CVS|\.bzr|\.DS|\.git/
-        next if file =~ ignore_pattern and ignore_pattern
+        next if ignore_pattern.include?(file)
         next if File.directory?(file)
         next if !include_rakefile and file == "Rakefile"
         files << file
@@ -585,7 +592,7 @@ class Echoe
       ruby(if File.exist? 'test/test_all.rb'
         "#{RUBY_FLAGS} test/test_all.rb #{FILTER}"
       else
-        tests = apply_pattern(test_pattern) << 'test/unit'
+        tests = test_pattern << 'test/unit'
         tests.map! {|f| %Q(require "#{f}")}
         "#{RUBY_FLAGS} -e '#{tests.join("; ")}' #{FILTER}"
       end)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: echoe
 version: !ruby/object:Gem::Version 
-  version: 2.6.2
-date: 2007-09-25 00:00:00 -04:00
+  version: 2.6.3
+date: 2007-09-26 00:00:00 -04:00
 summary: A tool for packaging Ruby gems.
 require_paths: 
 - lib