fpm 0.4.9 → 0.4.10

data/CHANGELIST

@@ -1,3 +1,17 @@
+0.4.10 (May 25, 2012)
+  - Fix python package support for python3 (#212, patch by Slezhuk Evgeniy)
+  - Preserve file metadata (time, owner, etc) when copying with the dir
+    package. (#217, patch by Marshall T. Vandegrift)
+  - Missing executables will now error more readably in fpm.
+  - Fix gem and python 'version' selection (#215, #204)
+  - Dependencies using '!=' will now map to 'Conflicts' in deb packages. (#221,
+    patch by Sven Fischer)
+  - Allow setting default user/group for files in rpm packages (#208, patch by
+    Jason Rogers). Note: This adds --user and --group flags to effect this.
+    These flags may go away in the future, but if they do, they will be
+  - In python packages set 'install-data' correctly. (#223, patch by Jamie
+    Scheinblum)
+
 0.4.9 (April 25, 2012)
   - Fix --prefix support when building gems (#213, patch by Jan Vansteenkiste)
 

data/CONTRIBUTORS

@@ -1,4 +1,5 @@
-The following fine folks have contributed patches or things to fpm:
+The following awesome folks have contributed ideas, 
+bug reports, code, or other to fpm:
 
 anthezium
 Curt Micol
@@ -14,3 +15,4 @@ Aleix Conchillo Flaqué (github: aconchillo)
 Luke Macken (github: lmacken)
 Matt Blair (github: mblair)
 Thomas Meson (github: zllak)
+Oliver Hookins (github: ohookins)

data/lib/fpm/command.rb

@@ -229,6 +229,11 @@ class FPM::Command < Clamp::Command
         # 
         # In the case of 'flag' options, the accessor is actually 'foo_bar?'
         # instead of just 'foo_bar'
+       
+        # If the instance variable @{attr} is defined, then
+        # it means the flag was given on the command line.
+        flag_given = instance_variable_defined?("@#{attr}")
+        input.attributes["#{attr}_given?".to_sym] = flag_given
         attr = "#{attr}?" if !respond_to?(attr) # handle boolean :flag cases
         input.attributes[attr.to_sym] = send(attr) if respond_to?(attr)
         @logger.debug("Setting attribute", attr.to_sym => send(attr))
@@ -328,6 +333,9 @@ class FPM::Command < Clamp::Command
     end
 
     return 0
+  rescue FPM::Util::ExecutableNotFound => e
+    @logger.error("Need executable '#{e}' to convert #{input_type} to #{output_type}")
+    return 1
   ensure
     input.cleanup unless input.nil?
     output.cleanup unless output.nil?

data/lib/fpm/package.rb

@@ -420,8 +420,25 @@ class FPM::Package
     end # def self.type
   end # class << self
 
+  # Get the version of this package
+  def version
+    if instance_variable_defined?(:@version) && !@version.nil?
+      return @version
+    elsif attributes[:version_given?]
+      # 'version_given?' will be true in cases where the
+      # fpm command-line tool has been given '-v' or '--version' settings
+      # We do this check because the default version is "1.0"
+      # on the fpm command line.
+      return attributes.fetch(:version)
+    end
+
+    # No version yet, nil.
+    return nil
+  end # def version
+
   # General public API
-  public(:type, :initialize, :convert, :input, :output, :to_s, :cleanup, :files)
+  public(:type, :initialize, :convert, :input, :output, :to_s, :cleanup, :files,
+         :version)
 
   # Package internal public api
   public(:cleanup_staging, :cleanup_build, :staging_path, :converted_from,

data/lib/fpm/package/deb.rb

@@ -261,6 +261,10 @@ class FPM::Package::Deb < FPM::Package
       nextversion[l-1] = 0
       nextversion = nextversion.join(".")
       return ["#{name} (>= #{version})", "#{name} (<< #{nextversion})"]
+    elsif (m = dep.match(/(\S+)\s+\(!= (.+)\)/))
+      # Append this to conflicts
+      self.conflicts += [dep.gsub(/!=/,"=")]
+      return []
     elsif (m = dep.match(/(\S+)\s+\(= (.+)\)/)) and
         self.attributes[:deb_ignore_iteration_in_dependencies?]
       # Convert 'foo (= x)' to 'foo (>= x)' and 'foo (<< x+1)'

data/lib/fpm/package/dir.rb

@@ -107,7 +107,27 @@ class FPM::Package::Dir < FPM::Package
         FileUtils.copy_entry(source, destination)
       end
     end
+
+    copy_metadata(source, destination)
   end # def copy
 
+  def copy_metadata(source, destination)
+    source_stat = File::lstat(source)
+    dest_stat = File::lstat(destination)
+
+    # If this is a hard-link, there's no metadata to copy.
+    return if source_stat.ino == dest_stat.ino
+
+    File.utime(source_stat.atime, source_stat.mtime, destination)
+    begin
+      File.chown(source_stat.uid, source_stat.gid, destination)
+    rescue Errno::EPERM
+      # clear setuid/setgid
+      File.chmod(source_stat.mode & 01777, destination)
+    else
+      File.chmod(source_stat.mode, destination)
+    end
+  end # def copy_metadata
+
   public(:input, :output)
 end # class FPM::Package::Dir

data/lib/fpm/package/pyfpm/get_metadata.py

@@ -65,9 +65,9 @@ class get_metadata(Command):
 
     #print json.dumps(data, indent=2)
     try:
-      print json.dumps(data, indent=2)
-    except AttributeError, e:
+      print(json.dumps(data, indent=2))
+    except AttributeError as e:
       # For Python 2.5 and Debian's python-json
-      print json.write(data)
+      print(json.write(data))
   # def run
 # class list_dependencies

data/lib/fpm/package/python.rb

@@ -183,7 +183,7 @@ class FPM::Package::Python < FPM::Package
       # Ask python where libraries are installed to.
       # This line is unusually long because I don't have a shorter way to express it.
       attributes[:python_install_lib] = %x{
-        #{attributes[:python_bin]} -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()'
+        #{attributes[:python_bin]} -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())'
       }.chomp
       @logger.info("Setting default :python_install_lib attribute",
                    :value => attributes[:python_install_lib])
@@ -194,6 +194,7 @@ class FPM::Package::Python < FPM::Package
       safesystem(attributes[:python_bin], "setup.py", "install",
                  "--root", staging_path, 
                  "--install-lib", File.join(prefix, attributes[:python_install_lib]),
+                 "--install-data", File.join(prefix, attributes[:python_install_lib]),
                  "--install-scripts", File.join(prefix, attributes[:python_install_bin]))
     end
   end # def install_to_staging

data/lib/fpm/package/rpm.rb

@@ -29,6 +29,17 @@ class FPM::Package::RPM < FPM::Package
     "bzip2" => "w9.bzdio"
   } unless defined?(COMPRESSION_MAP)
 
+  option "--user", "USER",
+    "Set the user to USER in the %files section.", 
+    :default => 'root' do |value|
+      value
+  end
+
+  option "--group", "GROUP",
+    "Set the group to GROUP in the %files section.",
+    :default => 'root' do |value|
+      value
+  end
 
   option "--rpmbuild-define", "DEFINITION",
     "Pass a --define argument to rpmbuild." do |define|

data/templates/rpm.erb

@@ -96,7 +96,7 @@ fi
 
 <% end -%>
 %files
-%defattr(-,root,root,-)
+%defattr(-,<%= attributes[:rpm_user] %>,<%= attributes[:rpm_group] %>,-)
 <%# Output config files and then regular files. -%>
 <% config_files.each do |path| -%>
 %config(noreplace) <%= path %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling