z_build 1.1.1 → 1.1.2

data/lib/z_build.rb

@@ -7,10 +7,11 @@ require 'tempfile'
 # light-weight build processes, written in Ruby. This library was authored in my spare time
 # for {https://zoosk.com Zoosk} with a desire for more easily maintainable build processes, 
 # with a love for Ruby, and with a strong dislike for PHING/ANT and XML builds systems. 
-# At it's core the Z'Build suite is intended to be minimal, sufficient, and transparent. 
-# If there is some aspect of your existing build that cannot be translated or mimicked 
-# with a series of Z'Build functions, then there may well be a missing feature, or 
-# otherwise there might be an opportunity to simplify your processes. However, it is 
+# Z'Build mostly concerns itself with directory creation, file copying, token replacement, 
+# and relative path management. At it's core the Z'Build suite is intended to be minimal, 
+# sufficient, and transparent. If there is some aspect of your existing build that cannot 
+# be translated or mimicked with a series of Z'Build functions, then there may well be a missing
+# feature, or otherwise there might be an opportunity to simplify your processes. However, it is 
 # expected that custom needs will require specialized code and as a library Z'Build is 
 # designed to be easily extended and works very well in conjuncation with build tools 
 # such as Ruby Rake.  It is not meant to be a stand-alone build replacement - Rake/Thor/etc 
@@ -211,10 +212,30 @@ module ZBuild
     queued_dirs           = []
     queued_files          = {}
     working_exclude       = opts[:exclude] ? opts[:exclude].to_a : []
+    
+    # normalize excluded file relative path notations
+    working_exclude = working_exclude.collect do |e|
+      p = e.clone
+      p = p.sub('./', '')
+      
+      # when working path is relative to root, walk path will return paths relative to root as well
+      # so ensure all exclusion paths are also relative to root
+      if from.start_with?('/') && !p.start_with?('/')
+        p = File.join('/', p)
+      elsif from.start_with?('./') && !p.start_with?('./')
+        p = File.join('./', p)
+      end
+
+      if p.end_with? '/'
+        p = p[0, p.size - 1]
+      end
+      
+      p
+    end
          
     if opts[:recurse]
       
-      if !File.directory? from
+      if !File.directory? working_path_given
         raise "Working path must be a directory when :recurse => true, given: #{working_path_given}"
       end
       
@@ -233,9 +254,16 @@ module ZBuild
       
       # from - the directory relative to working dir
       # deploy_path_given - the directory relative to the deploy dir
-    
       self.walk_path(from) do |f_path, is_dir|
-        if working_exclude.include? f_path.sub('./','') # glob prefixes ./ relative to root
+        should_exclude = false
+        working_exclude.each do |e|
+          if f_path.start_with? e
+            should_exclude = true
+            break
+          end
+        end
+        
+        if should_exclude 
           # ignore files or directories marked for exclusion
           next
         end
@@ -265,10 +293,23 @@ module ZBuild
       end
     
       self.glob(from) do |f_path, is_dir|
-        if working_exclude.include? f_path.sub('./','') # glob prefixes ./ relative to root
-          # ignore files or directories marked for exclusion
-          next
-        end
+        should_exclude = false
+         working_exclude.each do |e|
+           f_path_normalized = e
+           if f_path_normalized.start_with?('./') && !e.start_with?('./')
+             f_path_normalized = f_path_normalized.sub('./', '')
+           end
+           
+           if f_path_normalized.start_with? e
+             should_exclude = true
+             break
+           end
+         end
+
+         if should_exclude 
+           # ignore files or directories marked for exclusion
+           next
+         end
         
         if File.directory? deploy_path_given
           # given dir, so retain name of original file
@@ -277,7 +318,7 @@ module ZBuild
           # deploy_path given is an actual file target
           dest_path = deploy_path_given
         end 
-        
+
         # f_path provided is relative to working dir - dest is absolute to deploy target
         queued_files[f_path] = dest_path
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Shaun Bruno
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-31 00:00:00 -07:00
+date: 2013-04-15 00:00:00 -07:00
 default_executable: 
 dependencies: []