fpm 0.3.9 → 0.3.10

data/CHANGELIST

@@ -1,3 +1,10 @@
+0.3.10 (Oct 10, 2011)
+  - Allow taking a list of files/inputs on stdin with '-' or with the --inputs
+    flag. (Matt Patterson)
+  - (python) pass -U to easy_install (Khalid Goudeaux)
+  - (debian) quote paths in md5sum calls (Matt Patterson)
+  - (debian) quiet stderr from dpkg --print-architecture
+
 0.3.9 (Sep 8, 2011)
   - Fix bug in 'dir' source that breaks full paths
   - Added a bunch of tests (yaay)

data/lib/fpm/builder.rb

@@ -211,7 +211,7 @@ class FPM::Builder
           "%s  %s" % [i[0], i[1].sub(/#{path}\//, '').sub(/\.\//, '')]
         end
       elsif File.exists? path
-        %x{md5sum #{path}}
+        %x{md5sum "#{path}"}
       else
         next
       end

data/lib/fpm/program.rb

@@ -18,6 +18,8 @@ class FPM::Program
     @settings.source = {}   # source settings
     @settings.target = {}   # target settings
     @settings.config_files ||= []
+    @settings.inputs_path = nil # file path to read a list of paths from
+    @settings.paths = [] # Paths to include in the package
 
     # Maintainer scripts - https://github.com/jordansissel/fpm/issues/18
     @settings.scripts ||= {}
@@ -27,7 +29,7 @@ class FPM::Program
 
   def run(args)
     $: << File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
-    paths = options(args)
+    extracted_args = options(args)
 
     ok = true
     if @settings.package_type.nil?
@@ -40,6 +42,9 @@ class FPM::Program
       ok = false
     end
 
+    paths = process_paths(extracted_args)
+    ok = false if paths == :errors
+
     if !ok
       $stderr.puts "There were errors; see above."
       $stderr.puts
@@ -53,6 +58,39 @@ class FPM::Program
     return 0
   end # def run
 
+  def process_paths(args)
+    paths_iolike = args
+    read_from_stdin = args.length == 1 && args.first == '-'
+
+    ok = true
+    if @settings.inputs_path 
+      if read_from_stdin
+        $stderr.puts "Error: setting --inputs conflicts with passing '-' as the only argument"
+        ok = false
+      end
+      unless File.file?(@settings.inputs_path)
+        $stderr.puts "Error: '#{@settings.inputs_path}' does not exist"
+        ok = false
+      end
+    end
+
+    return :errors if !ok
+
+    if read_from_stdin
+      paths_iolike = $stdin
+    end
+    if @settings.inputs_path
+      paths_iolike = File.open(@settings.inputs_path, 'r')
+    end
+
+    paths = []
+    paths_iolike.each do |entry|
+      paths << entry.strip
+    end
+    paths_iolike.close if paths_iolike.respond_to?(:close)
+    paths
+  end # def process_paths
+
   def options(args)
     opts = OptionParser.new
     default_options(opts)
@@ -221,5 +259,15 @@ class FPM::Program
       @settings.url = url
     end # --url
 
+    opts.on("--inputs FILEPATH",
+            "The path to a file containing a newline-separated list of " \
+            "files and dirs to package.") do |path|
+      settings.source[:inputs] = path
+    end
+
+    opts.separator "Pass - as the only argument to have the list of " \
+                   "files and dirs read from STDIN " \
+                   "(e.g. fpm -s dir -t deb - < FILELIST)"
+
   end # def default_options
 end # class FPM::Program

data/lib/fpm/source/python.rb

@@ -60,7 +60,7 @@ class FPM::Source::Python < FPM::Source
     end
 
     safesystem(self[:settings][:easy_install], "-i", self[:settings][:pypi],
-               "--editable", "--build-directory", @tmpdir, want_pkg)
+               "--editable", "-U", "--build-directory", @tmpdir, want_pkg)
 
     # easy_install will put stuff in @tmpdir/packagename/, flatten that.
     #  That is, we want @tmpdir/setup.py, and start with

data/lib/fpm/target/deb.rb

@@ -33,7 +33,7 @@ class FPM::Target::Deb < FPM::Package
     if @architecture.nil? or @architecture == "native"
       # Default architecture should be 'native' which we'll need
       # to ask the system about.
-      arch = %x{dpkg --print-architecture}.chomp
+      arch = %x{dpkg --print-architecture 2> /dev/null}.chomp
       if $?.exitstatus != 0
         arch = %x{uname -m}.chomp
         @logger.warn("Can't find 'dpkg' tool (need it to get default " \

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fpm
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 3
-  - 9
-  version: 0.3.9
+  - 10
+  version: 0.3.10
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 Z
+date: 2011-10-11 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -25,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -41,45 +40,44 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/fpm/builder.rb
-- lib/fpm/target/puppet.rb
-- lib/fpm/target/solaris.rb
-- lib/fpm/target/rpm.rb
-- lib/fpm/target/deb.rb
+- lib/fpm.rb
+- lib/rpm/lead.rb
+- lib/rpm/namespace.rb
+- lib/rpm/rpmfile.rb
+- lib/rpm/tag.rb
+- lib/rpm/header.rb
 - lib/fpm/rubyfixes.rb
 - lib/fpm/flags.rb
-- lib/fpm/errors.rb
-- lib/fpm/source.rb
 - lib/fpm/namespace.rb
-- lib/fpm/package.rb
-- lib/fpm/util.rb
 - lib/fpm/program.rb
 - lib/fpm/source/gem.rb
-- lib/fpm/source/npm.rb
-- lib/fpm/source/python.rb
-- lib/fpm/source/rpm.rb
 - lib/fpm/source/dir.rb
 - lib/fpm/source/tar.rb
-- lib/fpm/source/pyfpm/__init__.pyc
-- lib/fpm/source/pyfpm/get_metadata.pyc
-- lib/fpm/source/pyfpm/__init__.py
+- lib/fpm/source/npm.rb
+- lib/fpm/source/rpm.rb
 - lib/fpm/source/pyfpm/get_metadata.py
-- lib/rpm/tag.rb
-- lib/rpm/rpmfile.rb
-- lib/rpm/lead.rb
-- lib/rpm/namespace.rb
-- lib/rpm/header.rb
-- lib/fpm.rb
-- bin/fpm
+- lib/fpm/source/pyfpm/__init__.py
+- lib/fpm/source/python.rb
+- lib/fpm/builder.rb
+- lib/fpm/source.rb
+- lib/fpm/package.rb
+- lib/fpm/target/puppet.rb
+- lib/fpm/target/deb.rb
+- lib/fpm/target/solaris.rb
+- lib/fpm/target/rpm.rb
+- lib/fpm/util.rb
+- lib/fpm/errors.rb
 - bin/fpm-npm
-- templates/puppet/package.pp.erb
-- templates/puppet/package/remove.pp.erb
-- templates/deb.erb
+- bin/fpm
 - templates/rpm.erb
 - templates/solaris.erb
+- templates/puppet/package/remove.pp.erb
+- templates/puppet/package.pp.erb
+- templates/deb.erb
 - LICENSE
 - CONTRIBUTORS
 - CHANGELIST
+has_rdoc: true
 homepage: https://github.com/jordansissel/fpm
 licenses: []
 
@@ -94,7 +92,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -103,14 +100,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling