echoe 2.6.2 → 2.6.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data.tar.gz.sig +0 -0
  2. data/CHANGELOG +2 -0
  3. data/lib/echoe.rb +21 -14
  4. metadata +2 -2
  5. metadata.gz.sig +0 -0
data.tar.gz.sig CHANGED
Binary file
data/CHANGELOG CHANGED
@@ -1,4 +1,6 @@
1
1
 
2
+ v2.6.3. Fix issue with shared object paths in :compile task.
3
+
2
4
  v2.6.2. Fix executable pattern bug; use a better default clean pattern.
3
5
 
4
6
  v2.6. Unify pattern handling; changelog accessor, version accessor, expand paths of keys and certificates; support verbose (Rails-style) changelogs.
@@ -148,6 +148,7 @@ class Echoe
148
148
  self.email = ""
149
149
  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"]
150
150
  self.test_pattern = ['test/**/test_*.rb']
151
+ self.ignore_pattern = /^(pkg|doc)|\.svn|CVS|\.bzr|\.DS|\.git/
151
152
 
152
153
  self.changelog_patterns = {
153
154
  :version => [
@@ -211,7 +212,9 @@ class Echoe
211
212
  unless version
212
213
  if File.exist? changelog
213
214
  parsed = Array(changelog_patterns[:version]).map do |pattern|
214
- open(changelog).read[pattern, 1]
215
+ open(changelog) do |log|
216
+ log.read[pattern, 1]
217
+ end
215
218
  end.compact.first
216
219
  raise "Could not parse version from #{changelog}" unless parsed
217
220
  self.version = parsed.chomp(".").strip
@@ -222,7 +225,9 @@ class Echoe
222
225
 
223
226
  self.changes = if File.exist? changelog
224
227
  Array(changelog_patterns[:changes]).map do |pattern|
225
- open(changelog).read[pattern, 1]
228
+ open(changelog) do |log|
229
+ log.read[pattern, 1]
230
+ end
226
231
  end.compact.first or ""
227
232
  else
228
233
  ""
@@ -238,7 +243,7 @@ class Echoe
238
243
  self.ignore_pattern = apply_pattern(ignore_pattern)
239
244
  self.rdoc_pattern = apply_pattern(rdoc_pattern, files)
240
245
  self.executable_pattern = apply_pattern(executable_pattern, files)
241
-
246
+ self.test_pattern = apply_pattern(test_pattern)
242
247
 
243
248
  define_tasks
244
249
  end
@@ -306,7 +311,7 @@ class Echoe
306
311
  if File.exist? "test/test_all.rb"
307
312
  s.test_file = "test/test_all.rb"
308
313
  else
309
- s.test_files = Dir[*test_pattern]
314
+ s.test_files = test_pattern
310
315
  end
311
316
 
312
317
  if eval
@@ -420,14 +425,18 @@ class Echoe
420
425
  if extension_pattern.any?
421
426
 
422
427
  task :compile => [:lib] do
423
- extension_pattern.each do |extension|
424
- directory = File.dirname(extension)
425
- Dir.chdir(directory) do
428
+ extension_pattern.each do |extension|
429
+ ext_dir = File.dirname(extension)
430
+ lib_target = nil
431
+ Dir.chdir(ext_dir) do
426
432
  ruby File.basename(extension)
427
433
  system(PLATFORM =~ /win32/ ? 'nmake' : 'make')
434
+ lib_target = open('Makefile').readlines.grep(/target_prefix = /).first.split('=').last.chomp("\n").strip
428
435
  end
429
- Dir["#{directory}/*.#{Config::CONFIG['DLEXT']}"].each do |file|
430
- cp file, "lib/#{directory.split('/')[1..-1].join('/')}/"
436
+ Dir["#{ext_dir}/*.#{Config::CONFIG['DLEXT']}"].each do |file|
437
+ dir = "lib/#{lib_target}/".gsub('//', '/')
438
+ mkdir_p dir
439
+ cp file, dir
431
440
  end
432
441
  end
433
442
  end
@@ -555,11 +564,9 @@ class Echoe
555
564
  puts "Building Manifest"
556
565
  old_files = files
557
566
  files = []
558
- Find.find '.' do |file|
559
- file = file[2..-1]
567
+ Dir['**/**'].each do |file|
560
568
  next unless file
561
- next if file =~ /^(pkg|doc)|\.svn|CVS|\.bzr|\.DS|\.git/
562
- next if file =~ ignore_pattern and ignore_pattern
569
+ next if ignore_pattern.include?(file)
563
570
  next if File.directory?(file)
564
571
  next if !include_rakefile and file == "Rakefile"
565
572
  files << file
@@ -585,7 +592,7 @@ class Echoe
585
592
  ruby(if File.exist? 'test/test_all.rb'
586
593
  "#{RUBY_FLAGS} test/test_all.rb #{FILTER}"
587
594
  else
588
- tests = apply_pattern(test_pattern) << 'test/unit'
595
+ tests = test_pattern << 'test/unit'
589
596
  tests.map! {|f| %Q(require "#{f}")}
590
597
  "#{RUBY_FLAGS} -e '#{tests.join("; ")}' #{FILTER}"
591
598
  end)
metadata CHANGED
@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
3
3
  specification_version: 1
4
4
  name: echoe
5
5
  version: !ruby/object:Gem::Version
6
- version: 2.6.2
7
- date: 2007-09-25 00:00:00 -04:00
6
+ version: 2.6.3
7
+ date: 2007-09-26 00:00:00 -04:00
8
8
  summary: A tool for packaging Ruby gems.
9
9
  require_paths:
10
10
  - lib
metadata.gz.sig CHANGED
Binary file