fpm 0.4.19 → 0.4.20

data/CHANGELIST

@@ -1,3 +1,7 @@
+0.4.20 (October 5, 2012)
+  - python: only specify --install-{scripts,lib,data} flags to setup.py if
+    they were given on the command line to fpm. Fixes #273.
+
 0.4.19 (September 26, 2012)
   - Escape '%' characters in file names (#266, #222. Patch by John Wittkoski)
 

data/lib/fpm/package.rb

@@ -260,8 +260,8 @@ class FPM::Package
 
   # Clean up any temporary storage used by this class.
   def cleanup
-    cleanup_staging
-    cleanup_build
+    cleanup_staging unless @logger.level == :debug
+    cleanup_build unless @logger.level == :debug
   end # def cleanup
 
   def cleanup_staging

data/lib/fpm/package/deb.rb

@@ -127,6 +127,10 @@ class FPM::Package::Deb < FPM::Package
 
     return @name
   end # def name
+  
+  def prefix
+    return (attributes[:prefix] or "/")
+  end # def prefix
 
   def input(input_path)
     extract_info(input_path)
@@ -464,5 +468,5 @@ class FPM::Package::Deb < FPM::Package
     return super(format)
   end # def to_s
 
-  public(:input, :output, :architecture, :name, :converted_from, :to_s)
+  public(:input, :output, :architecture, :name, :prefix, :converted_from, :to_s)
 end # class FPM::Target::Deb

data/lib/fpm/package/gem.rb

@@ -136,7 +136,7 @@ class FPM::Package::Gem < FPM::Package
 
       # By default, we'll usually automatically provide this, but in the case that we are
       # composing multiple packages, it's best to explicitly include it in the provides list.
-      self.provides << "#{self.name}"
+      self.provides << "#{self.name} = #{self.version}"
 
       spec.runtime_dependencies.map do |dep|
         # rubygems 1.3.5 doesn't have 'Gem::Dependency#requirement'

data/lib/fpm/package/python.rb

@@ -181,28 +181,20 @@ class FPM::Package::Python < FPM::Package
     prefix = "/"
     prefix = attributes[:prefix] unless attributes[:prefix].nil?
     
-    # Set the default install library location (like
-    # /usr/lib/python2.7/site-packages) if it is not given
-    if attributes[:python_install_lib].nil?
-      # 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())'
-      }.chomp
-      @logger.info("Setting default :python_install_lib attribute",
-                   :value => attributes[:python_install_lib])
-    end
-    if attributes[:python_install_data].nil?
-      attributes[:python_install_data] = attributes[:python_install_lib]
-    end
     # Some setup.py's assume $PWD == current directory of setup.py, so let's
     # chdir first.
     ::Dir.chdir(project_dir) do
-      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_data]),
-                 "--install-scripts", File.join(prefix, attributes[:python_install_bin]))
+      flags = [ "--root", staging_path ]
+      if !attributes[:python_install_lib].nil?
+        flags += [ "--install-lib", File.join(prefix, attributes[:python_install_lib]) ]
+      end
+      if !attributes[:python_install_data].nil?
+        flags += [ "--install-data", File.join(prefix, attributes[:python_install_data]) ]
+      end
+      if !attributes[:python_install_bin].nil?
+        flags += [ "--install-scripts", File.join(prefix, attributes[:python_install_bin]) ]
+      end
+      safesystem(attributes[:python_bin], "setup.py", "install", *flags)
     end
   end # def install_to_staging
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.19
+  version: 0.4.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000 Z
+date: 2012-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -149,33 +149,33 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/fpm/errors.rb
-- lib/fpm/util.rb
 - lib/fpm/command.rb
-- lib/fpm/package/pyfpm/get_metadata.py
+- lib/fpm/namespace.rb
+- lib/fpm/package.rb
+- lib/fpm/errors.rb
+- lib/fpm/package/gem.rb
+- lib/fpm/package/dir.rb
 - lib/fpm/package/pyfpm/__init__.pyc
 - lib/fpm/package/pyfpm/get_metadata.pyc
+- lib/fpm/package/pyfpm/get_metadata.py
 - lib/fpm/package/pyfpm/__init__.py
-- lib/fpm/package/python.rb
-- lib/fpm/package/rpm.rb
 - lib/fpm/package/npm.rb
-- lib/fpm/package/deb.rb
-- lib/fpm/package/gem.rb
-- lib/fpm/package/tar.rb
 - lib/fpm/package/pear.rb
-- lib/fpm/package/dir.rb
+- lib/fpm/package/deb.rb
+- lib/fpm/package/python.rb
+- lib/fpm/package/rpm.rb
 - lib/fpm/package/puppet.rb
+- lib/fpm/package/tar.rb
 - lib/fpm/package/solaris.rb
-- lib/fpm/package.rb
-- lib/fpm/namespace.rb
+- lib/fpm/util.rb
 - lib/fpm.rb
 - bin/fpm-npm
 - bin/fpm
-- templates/puppet/package/remove.pp.erb
-- templates/puppet/package.pp.erb
 - templates/deb.erb
-- templates/solaris.erb
 - templates/rpm.erb
+- templates/solaris.erb
+- templates/puppet/package/remove.pp.erb
+- templates/puppet/package.pp.erb
 - LICENSE
 - CONTRIBUTORS
 - CHANGELIST