fpm 0.4.12 → 0.4.13

data/CHANGELIST

@@ -1,3 +1,8 @@
+0.4.13 (August 14, 2012)
+  - Make --exclude accept path prefixes as well. If you have a files in
+    'usr/share/man' in your package, you can now exclude all of a subdir
+    by doing '--exclude usr/share/man'
+
 0.4.12 (August 10, 2012)
   - Fix a major bug introduced in 0.4.11 that caused all deb packages to
     contain empty maintainer scripts if not otherwise specified, which made

data/lib/fpm/package.rb

@@ -343,23 +343,43 @@ class FPM::Package
       installdir = staging_path
     end
 
+    exclude_path = proc do |file|
+      FileUtils.remove_entry_secure(staging_path(file))
+      Pathname.new(staging_path(file)).parent.ascend do |d|
+        if (::Dir.entries(d) - %w[ . .. ]).empty?
+          ::Dir.rmdir(d)
+          @logger.info("Deleting empty directory left by removing exluded file", :path => d)
+        else
+          break
+        end
+      end
+    end # exclude_path
+
     attributes[:excludes].each do |wildcard|
       @logger.debug("Checking for things to exclude", :wildcard => wildcard)
       files.each do |file|
+        @logger.debug("Checking path against wildcard", :path => file, :wildcard => wildcard)
         if File.fnmatch(wildcard, file)
           @logger.info("Removing excluded file", :path => file, :matches => wildcard)
-          FileUtils.remove_entry_secure(staging_path(file))
-          Pathname.new(staging_path(file)).parent.ascend do |d|
-            if (::Dir.entries(d) - %w[ . .. ]).empty?
-              ::Dir.rmdir(d)
-              @logger.info("Deleting empty directory left by removing exluded file", :path => d)
-            else
-              break
-            end
+          exclude_path.call(file)
+          next
+        end
+
+        @logger.debug("Checking if path is a child of an excluded directory",
+                      :path => file, :wildcard => wildcard,
+                      :directory? => File.directory?(staging_path(wildcard)))
+        if File.directory?(staging_path(wildcard))
+          # issue #248, if the excludes entry is a directory, ignore that
+          # directory and anything inside it.
+          exclude_re = Regexp.new("^#{Regexp.escape(wildcard)}($|/)")
+          if exclude_re.match(file)
+            @logger.info("Removing excluded file which has a parent excluded directory",
+                         :path => file, :excluded => wildcard)
+            exclude_path.call(file)
           end
         end
-      end
-    end
+      end 
+    end # files.each
   end # def exclude
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.4.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json