fpm 0.4.39 → 0.4.40

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3e2f13a6e31f3f466459c62a7ef6882df437e8e1
+  data.tar.gz: 5807232e851343365819cf41fe5a02adaab8f3df
+SHA512:
+  metadata.gz: 68f0d01498ad4de5d57f19075e4a2f2ffa8fbf4229ad1a73154fe0d4d2c3dbee35aa9fb2781a955ea5248dd931d7e3f6d415fef3ce8a959f6d77352a78881a15
+  data.tar.gz: 34d8cfc3d02113a40291a35e80250ff57f34f9e4b2a06c423e825620ebb21472837d91b49706830c3e4b0e468c06bfa895642b0ba34ddef09708c9e9811d57af

data/CHANGELIST

@@ -1,3 +1,16 @@
+0.4.40 (July 12, 2013)
+  - dir: supports mapping one path to another.
+    You set mappings by using 'source=destination' syntax. For example:
+    % fpm -s dir -t deb -n example /home/jls/.zshrc=/etc/skel/
+    The key above is the '=' symbol. The result of the above will be a package
+    containing only /etc/skel/.zshrc
+    For more, see https://github.com/jordansissel/fpm/wiki/Source:-dir#mapping
+  - python: the default scripts location is now chosen by python itself. The
+    previous default was "/usr/bin" and was not a good default. (#480)
+  - rpm: config files should have attributes (#484, patch by adamcstephens)
+  - python: correctly log the python setup.py exit code (#481, patch by Derek
+    Ludwig)
+
 0.4.39 (June 27, 2013)
   - cpan: support more complex dependency specifications (reported by Mabi
     Knittel)

data/lib/fpm/package/dir.rb

@@ -14,6 +14,15 @@ class FPM::Package::Dir < FPM::Package
 
   # Add a new path to this package.
   #
+  # A special handling of the path occurs if it includes a '=' symbol.
+  # You can say "source=destination" and it will copy files from that source
+  # to the given destination in the package.
+  #
+  # This lets you take a local directory and map it to the desired location at
+  # packaging time. Such as: "./src/redis-server=/usr/local/bin" will make
+  # the local file ./src/redis-server appear as /usr/local/bin/redis-server in
+  # your package.
+  #
   # If the path is a directory, it is copied recursively. The behavior
   # of the copying is modified by the :chdir and :prefix attributes.
   #
@@ -27,14 +36,38 @@ class FPM::Package::Dir < FPM::Package
   #     package.attributes[:chdir] = "/etc"
   #     package.input("X11")
   def input(path)
-    @logger.debug("Copying", :input => path)
-    @logger["method"] = "input"
-    ::Dir.chdir(@attributes[:chdir] || ".") do
-      if @attributes[:prefix]
-        clone(path, File.join(staging_path, @attributes[:prefix]))
+    chdir = attributes[:chdir] || "."
+
+    # Support mapping source=dest
+    if path =~ /.=./
+      origin, destination = path.split("=", 2)
+
+      # file -> directory
+      #   ./some/file=/usr/local should result in /usr/local/file
+      # directory -> directory
+      #   ./some=/usr/local should result in /usr/local/...
+      #   if ./some/file, then /usr/local/file
+      if File.directory?(origin)
+        chdir = origin
+        source = "."
       else
-        clone(path, staging_path)
+        chdir = File.dirname(origin)
+        source = File.basename(origin)
       end
+    else
+      source, destination = path, "/"
+    end
+
+    if attributes[:prefix]
+      destination = File.join(attributes[:prefix], destination)
+    end
+
+    destination = File.join(staging_path, destination)
+
+    @logger["method"] = "input"
+    @logger.debug("Copying", :input => source, :output => destination)
+    ::Dir.chdir(chdir) do
+      clone(source, destination)
     end
 
     # Set some defaults. This is useful because other package types
@@ -75,7 +108,7 @@ class FPM::Package::Dir < FPM::Package
   # /tmp/example/hello/world
   def clone(source, destination)
     # Copy all files from 'path' into staging_path
-
+    #p :clone => { source => destination } 
     Find.find(source) do |path|
       target = File.join(destination, path)
       copy(path, target)

data/lib/fpm/package/python.rb

@@ -49,7 +49,7 @@ class FPM::Package::Python < FPM::Package
     "be in lowercase?", :default => true
 
   option "--install-bin", "BIN_PATH", "The path to where python scripts " \
-    "should be installed to.", :default => "/usr/bin"
+    "should be installed to."
   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: " \
@@ -163,7 +163,7 @@ class FPM::Package::Python < FPM::Package
       output = %x{#{setup_cmd}}
       if !$?.success?
         @logger.error("setup.py get_metadata failed", :command => setup_cmd,
-                      :exitcode => $?.exitcode)
+                      :exitcode => $?.exitstatus)
         raise "An unexpected error occurred while processing the setup.py file"
       end
       output

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "0.4.39"
+  VERSION = "0.4.40"
 end

data/templates/rpm.erb

@@ -145,7 +145,7 @@ cp <%= source_safe %> <%= target_safe %>
 %defattr(<%= attributes[:rpm_defattrfile] %>,<%= attributes[:rpm_user] %>,<%= attributes[:rpm_group] %>,<%= attributes[:rpm_defattrdir] %>)
 <%# Output config files and then regular files. -%>
 <% config_files.each do |path| -%>
-%config(noreplace) <%= rpm_fix_name(path) %>
+%config(noreplace) <%= rpm_file_entry(path) %>
 <% end -%>
 <%# list directories %>
 <% directories.each do |path| -%>

metadata

@@ -1,68 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.39
-  prerelease: 
+  version: 0.4.40
 platform: ruby
 authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 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
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         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
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         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
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: arr-pm
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ftw
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,97 +97,85 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rush
+  name: rspec
   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
+  name: insist
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
-  name: insist
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: pry
   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: pry
+  name: stud
   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'
 description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs,
@@ -250,27 +225,26 @@ files:
 - CHANGELIST
 homepage: https://github.com/jordansissel/fpm
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: fpm - package building and mangling
 test_files: []