rake-delphi 0.0.18 → 0.0.19

data/lib/rake/delphi/dcc32.rb

@@ -22,7 +22,7 @@ module Rake
             :debuginfo, :localsymbols, :console, :warnings, :hints, :altercfg,
             :includepaths, :writeableconst,
             :map, :dcuoutput, :bploutput, :aliases, :platform, :namespaces,
-            :dcpoutput, :dcu, :uselibrarypath, :uselibrarypath, :usecfg, :dcc_options]
+            :dcpoutput, :dcu, :uselibrarypath, :usecfg, :dcc_options]
     public
         @@symbols.map do |sym|
             attr_accessor sym unless method_defined?(sym)
@@ -129,7 +129,7 @@ module Rake
 
         def implicitpaths
             ipaths = ['.', '..']
-            Logger.trace(Logger::TRACE, 'Using library paths? %s' + (@uselibrarypath ? 'YES' : 'NO'))
+            Logger.trace(Logger::TRACE, 'Using library paths? %s' % (@uselibrarypath ? 'YES' : 'NO'))
             ipaths |= delphilibs if @uselibrarypath
             _paths(ipaths)
         end

data/lib/rake/delphi/liblist.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'rake/helpers/filelist'
+require 'rake/common/logger'
 
 module Rake
   module Delphi
@@ -8,10 +9,17 @@ module Rake
             def read_ignored_libs
                 libs = []
                 file = (ENV['RAKE_DIR'] || Rake.original_dir) + '/.rake.ignored.libs'
-                return libs unless File.exists?(file)
+                unless File.exists?(file)
+                  Logger.trace(Logger::TRACE, "File #{file} not found")
+                  return libs
+                end
+                Logger.trace(Logger::TRACE, "Reading #{file}")
                 IO.readlines(file).each do |line|
                     # skip comment lines (started with # or ;)
-                    next if /^\s*[#;]/.match(line)
+                    if /^\s*[#;]/.match(line)
+                      Logger.trace(Logger::TRACE, "Line #{line} ignored as a comment")
+                      next
+                    end
                     libs << FileList.get_ignored_dir_pattern(line.chomp)
                 end
                 libs
@@ -21,8 +29,16 @@ module Rake
 
             def initialize(*patterns)
                 initialize_base(patterns)
-                @exclude_patterns |= read_ignored_libs
-                @exclude_procs << proc { |fn| File.file?(fn) }
+                @exclude_patterns_libs = read_ignored_libs
+                @exclude_procs << proc do |fn|
+                  ! File.directory?(fn)
+                end << proc do |fn|
+                  @exclude_patterns_libs.any? do |pat|
+                    match = fn =~ pat
+                    Logger.trace(Logger::TRACE, "Dir #{fn} match pattern /#{pat}/. Ignored") if match
+                    match
+                  end
+                end
             end
         end
   end

data/lib/rake/delphi/version.rb

@@ -2,6 +2,6 @@
 
 module Rake
   module Delphi
-    VERSION = '0.0.18'
+    VERSION = '0.0.19'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-delphi
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler