fpm 0.4.1 → 0.4.2

data/CHANGELIST

@@ -1,3 +1,16 @@
+0.4.2 (March 21, 2012)
+  - Set default temporary directory to /tmp 
+    (https://github.com/jordansissel/fpm/issues/174)
+  - Improve symlink handling (patch by Aleix Conchillo Flaqué, pull/177))
+  - Python package support changes (thanks to input by Luke Macken):
+    * New flag: --python-install-bin. Sets the location for python package
+      scripts (default: /usr/bin)
+    * New flag: --python-install-lib. Sets the location for the python
+      package to install libs to, default varies by system. Usually something
+      like /usr/lib/python2.7/site-packages.
+    * Fix up --prefix support
+    * Improve staged package installation
+
 0.4.1 (March 19, 2012)
   - Fix fpm so it works in ruby 1.8 again.
     Tests run, and passing:

data/CONTRIBUTORS

@@ -10,3 +10,6 @@ Pierre-Yves Ritschard
 sabowski
 Thomas Haggett
 Pieter Loubser
+Aleix Conchillo Flaqué (github: aconchillo)
+Luke Macken (github: lmacken)
+Matt Blair (github: mblair)

data/lib/fpm/command.rb

@@ -205,17 +205,29 @@ class FPM::Command < Clamp::Command
     # They are stored in 'settings' as :gem_foo_bar.
     input.attributes ||= {}
 
-    # Iterate over all the options
+    # Iterate over all the options and set their values in the package's
+    # attribute hash.
+    #
+    # Things like '--foo-bar' will be available as pkg.attributes[:foo_bar]
     self.class.declared_options.each do |option|
       with(option.attribute_name) do |attr|
+        next if attr == "help"
         # clamp makes option attributes available as accessor methods
-        # do --foo-bar is available as 'foo_bar'
-        # make these available as package attributes.
-        attr = "#{attr}?" if !respond_to?(attr)
+        # --foo-bar is available as 'foo_bar'. Put these in the package
+        # attributes hash. (See FPM::Package#attributes)
+        # 
+        # In the case of 'flag' options, the accessor is actually 'foo_bar?'
+        # instead of just 'foo_bar'
+        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))
       end
     end
 
+    # Each remaining command line parameter is used as an 'input' argument.
+    # For directories, this means paths. For things like gem and python, this
+    # means package name or paths to the packages (rails, foo-1.0.gem, django,
+    # bar/setup.py, etc)
     args.each do |arg| 
       input.input(arg) 
     end
@@ -228,7 +240,10 @@ class FPM::Command < Clamp::Command
       end
 
       # Read each line as a path
-      File.new(inputs, "r").each_line { |path| input.input(path) }
+      File.new(inputs, "r").each_line do |line| 
+        # Handle each line as if it were an argument
+        input.input(line)
+      end
     end
 
     # Override package settings if they are not the default flag values

data/lib/fpm/package.rb

@@ -223,7 +223,7 @@ class FPM::Package
   end # def output
 
   def staging_path(path=nil)
-    @staging_path ||= ::Dir.mktmpdir("package-#{type}-staging", ::Dir.pwd)
+    @staging_path ||= ::Dir.mktmpdir("package-#{type}-staging") #, ::Dir.pwd)
 
     if path.nil?
       return @staging_path
@@ -233,7 +233,7 @@ class FPM::Package
   end # def staging_path
 
   def build_path(path=nil)
-    @build_path ||= ::Dir.mktmpdir("package-#{type}-build", ::Dir.pwd)
+    @build_path ||= ::Dir.mktmpdir("package-#{type}-build") #, ::Dir.pwd)
 
     if path.nil?
       return @build_path
@@ -333,7 +333,13 @@ class FPM::Package
         flag = [flag]
       end
 
-      flag = flag.collect { |f| "--#{type}-#{f.gsub(/^--/, "")}" }
+      if param == :flag
+        # Automatically make 'flag' (boolean) options tunable with '--[no-]...'
+        flag = flag.collect { |f| "--[no-]#{type}-#{f.gsub(/^--/, "")}" }
+      else
+        flag = flag.collect { |f| "--#{type}-#{f.gsub(/^--/, "")}" }
+      end
+
       help = "(#{type} only) #{help}"
       @options << [flag, param, help, options, block]
     end # def options
@@ -353,13 +359,7 @@ class FPM::Package
       @options ||= []
       @options.each do |args|
         flag, param, help, options, block = args
-        clampcommand.option(flag, param, help, options) do |value|
-          # This is run in the scope of FPM::Command
-          value = block.call(value) unless block.nil?
-          # flag is an array, use the first flag as the attribute name
-          attr = flag.first[2..-1].gsub(/-+/, "_").to_sym
-          settings[attr] = value
-        end
+        clampcommand.option(flag, param, help, options, &block)
       end
     end # def apply_options
 

data/lib/fpm/package/dir.rb

@@ -91,16 +91,17 @@ class FPM::Package::Dir < FPM::Package
     end
 
     # Create a directory if this path is a directory
-    if File.directory?(source)
+    if File.directory?(source) and !File.symlink?(source)
       @logger.debug("Creating", :directory => destination)
       FileUtils.mkdir(destination)
     else
       # Otherwise try copying the file.
-      @logger.debug("Copying", :source => source, :destination => destination)
       begin
+        @logger.debug("Linking", :source => source, :destination => destination)
         File.link(source, destination)
       rescue Errno::EXDEV
         # Hardlink attempt failed, copy it instead
+        @logger.debug("Copying", :source => source, :destination => destination)
         FileUtils.copy(source, destination)
       end
     end

data/lib/fpm/package/python.rb

@@ -40,6 +40,13 @@ class FPM::Package::Python < FPM::Package
   option "--fix-dependencies", :flag, "Should the package dependencies be " \
     "prefixed?", :default => true
 
+  option "--install-bin", "BIN_PATH", "The path to where python scripts " \
+    "should be installed to.", :default => "/usr/bin"
+  option "--install-lib", "LIB_PATH", "The path to where python libs " \
+    "should be installed to (default depends on your python installation). " \
+    "Want to what your target platform is using? Run this: " \
+    "python -c 'from distutils.sysconfig import get_python_lib; " \
+    "print get_python_lib()'"
 
   private
 
@@ -156,22 +163,29 @@ class FPM::Package::Python < FPM::Package
 
   # Install this package to the staging directory
   def install_to_staging(setup_py)
-    dir = File.dirname(setup_py)
-
+    project_dir = File.dirname(setup_py)
+
+    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
     # Some setup.py's assume $PWD == current directory of setup.py, so let's
     # chdir first.
-    ::Dir.chdir(dir) do
-
-      # Install with a specific prefix if requested
-      if attributes[:prefix]
-        safesystem(attributes[:python_bin], "setup.py", "install", "--prefix",
-                   File.join(staging_path, attributes[:prefix]))
-      else
-        # Otherwise set the root in staging_path
-        # TODO(sissel): there needs to be a way to force 
-        safesystem(attributes[:python_bin], "setup.py", "install", "--root",
-                   staging_path)
-      end
+    ::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-scripts", File.join(prefix, attributes[:python_install_bin]))
     end
   end # def install_to_staging
 

data/templates/rpm.erb

@@ -56,8 +56,8 @@ Obsoletes: <%= repl %>
 <%   target = File.join(build_path, "BUILD", path) -%>
 <%   dir = File.dirname(target) %>
 mkdir -p "<%= dir %>"
-if [ -f "<%= source %>" ] ; then
-  cp "<%= source %>" "<%= target %>"
+if [ -f "<%= source %>" ] || [ -h "<%= source %>" ] ; then
+  cp -d "<%= source %>" "<%= target %>"
 elif [ -d "<%= source %>" ] ; then
   mkdir "<%= target %>"
 fi
@@ -96,7 +96,7 @@ fi
 <%= 
   # Reject directories or config files already listed, then prefix files with
   # "/", then make sure paths with spaces are quoted. I hate rpm so much.
-  files.reject { |f| File.directory?(File.join(staging_path, f)) } \
+  files.reject { |f| x = File.join(staging_path, f); File.directory?(x) && !File.symlink?(x) } \
     .collect { |f| "/#{f}" } \
     .reject { |f| config_files.include?(f) } \
     .collect { |f| f[/\s/] and "\"#{f}\"" or f } \

metadata

@@ -1,152 +1,154 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fpm
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: 0.4.2
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
 platform: ruby
-authors: 
+authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: cabin
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cabin
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 4
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.4.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: backports
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.3
+- !ruby/object:Gem::Dependency
+  name: backports
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: arr-pm
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+- !ruby/object:Gem::Dependency
+  name: arr-pm
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 0
-        - 7
+      - !ruby/object:Gem::Version
         version: 0.0.7
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: clamp
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.7
+- !ruby/object:Gem::Dependency
+  name: clamp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rush
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rush
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  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'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: insist
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  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: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 0
-        - 5
+      - !ruby/object:Gem::Version
         version: 0.0.5
   type: :development
-  version_requirements: *id008
-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!
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        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!
 email: jls@semicomplete.com
-executables: 
+executables:
 - fpm
 - fpm-npm
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/fpm/errors.rb
 - lib/fpm/util.rb
 - lib/fpm/command.rb
@@ -180,37 +182,28 @@ 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling
 test_files: []
-
+has_rdoc: