fpm 0.4.30 → 0.4.31

data/CHANGELIST

@@ -1,3 +1,10 @@
+0.4.31 (March 21, 2013)
+  - rpm: new flag --rpm-use-file-permissions which try to create an rpm
+    that has file ownership/modes that exactly mirror how they are on 
+    the filesystem at package time. (#377, patch by Paul Rhodes)
+  - general: remove empty directories only when they match the exclude 
+    pattern (#323, patch by Pranay Kanwar)
+
 0.4.30 (March 21, 2013)
   - Solaris: --solaris-user and --solaris-group flags to specify
     the owner of files in a package. (#342, patch by Derek Olsen)

data/lib/fpm/package.rb

@@ -1,6 +1,7 @@
 require "fpm/namespace" # local
 require "fpm/util" # local
 require "pathname" # stdlib
+require "find"
 require "tmpdir" # stdlib
 require "backports" # gem 'backports'
 require "socket" # stdlib, for Socket.gethostname
@@ -361,43 +362,20 @@ 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
+    Find.find(staging_path) do |path|
+      match_path = path.sub("#{staging_path}/", '')
+
+      attributes[:excludes].each do |wildcard|
+        @logger.debug("Checking path against wildcard", :path => path, :wildcard => wildcard)
+
+        if File.fnmatch(wildcard, match_path)
+          @logger.info("Removing excluded path", :path => path, :matches => wildcard)
+          FileUtils.remove_entry_secure(path)
+          Find.prune
           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)
-          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 # files.each
+    end
   end # def exclude
 
 

data/lib/fpm/package/rpm.rb

@@ -28,6 +28,9 @@ class FPM::Package::RPM < FPM::Package
     "bzip2" => "w9.bzdio"
   } unless defined?(COMPRESSION_MAP)
 
+  option "--use-file-permissions", :flag, 
+      "Use existing file permissions when defining ownership and modes"
+
   option "--user", "USER",
     "Set the user to USER in the %files section.", 
     :default => 'root' do |value|
@@ -80,6 +83,17 @@ class FPM::Package::RPM < FPM::Package
 
   private
 
+  def rpm_file_entry(file)
+    return file unless attributes[:rpm_use_file_permissions?]
+
+    stat = File.stat( file.gsub(/\"/, '') )
+    user = Etc.getpwuid(stat.uid).name
+    group = Etc.getgrgid(stat.gid).name
+    mode = stat.mode
+    return sprintf("%%attr(%o, %s, %s) %s\n", mode & 4095 , user, group, file)
+  end
+
+
   # Handle any architecture naming conversions.
   # For example, debian calls amd64 what redhat calls x86_64, this
   # method fixes those types of things.

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "0.4.30"
+  VERSION = "0.4.31"
 end

data/templates/rpm.erb

@@ -119,11 +119,11 @@ cp <%= source_safe %> <%= target_safe %>
 <% end -%>
 <% subdirs = [] -%>
 <% directories.each do |path| -%>
-%dir <%= File.join(prefix, path) %>
+%dir <%= rpm_file_entry(File.join(prefix, path)) %>
 <%#  We need to include hidden directories, but exclude . and .. -%>
 <%   ::Dir.glob("#{path}/**/*/", File::FNM_DOTMATCH) do |subdir| -%>
 <%     next if File.basename(subdir) =~ /^\.+$/ -%>
-%dir <%= File.join(prefix, subdir) %>
+%dir <%= rpm_file_entry(File.join(prefix, subdir)) %>
 <% subdirs << subdir -%>
 <%   end -%>
 <% end -%>
@@ -146,6 +146,7 @@ cp <%= source_safe %> <%= target_safe %>
     .collect { |f| f.gsub("*", "[*]") } \
     .collect { |f| f.gsub("?", "[?]") } \
     .collect { |f| f.gsub("%", "[%]") } \
+    .map { |f| rpm_file_entry(f) } \
     .join("\n")
     #.collect { |f| File.join(prefix, f) } \
 %>

metadata

@@ -1,169 +1,169 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: fpm
-version: !ruby/object:Gem::Version
-  version: 0.4.30
+version: !ruby/object:Gem::Version 
+  hash: 49
   prerelease: 
+  segments: 
+  - 0
+  - 4
+  - 31
+  version: 0.4.31
 platform: ruby
-authors:
+authors: 
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-03-21 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.7.7
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 7
+        - 7
         version: 1.7.7
-- !ruby/object:Gem::Dependency
-  name: cabin
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.0
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: cabin
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: backports
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.6.2
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: backports
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 6
+        - 2
         version: 2.6.2
-- !ruby/object:Gem::Dependency
-  name: arr-pm
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.8
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: arr-pm
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 0
+        - 8
         version: 0.0.8
-- !ruby/object:Gem::Dependency
-  name: clamp
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.3.1
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: clamp
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 3
+        - 1
         version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: open4
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: open4
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rush
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: insist
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.5
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: insist
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 0
+        - 5
         version: 0.0.5
-description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs,
-  solaris packages and more. Win at package management without wasting pointless hours
-  debugging bad rpm specs!
+  type: :development
+  version_requirements: *id009
+description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs, solaris packages and more. Win at package management without wasting pointless hours debugging bad rpm specs!
 email: jls@semicomplete.com
-executables:
+executables: 
 - fpm
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/fpm.rb
 - lib/fpm/errors.rb
 - lib/fpm/namespace.rb
@@ -184,8 +184,8 @@ files:
 - lib/fpm/package/gem.rb
 - lib/fpm/package/rpm.rb
 - lib/fpm/util.rb
-- lib/fpm/package.rb
 - lib/fpm/command.rb
+- lib/fpm/package.rb
 - lib/fpm/version.rb
 - bin/fpm
 - templates/deb.erb
@@ -199,28 +199,37 @@ files:
 - CHANGELIST
 homepage: https://github.com/jordansissel/fpm
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling
 test_files: []
-has_rdoc: 
+