fpm 0.4.22 → 0.4.23

data/CHANGELIST

@@ -1,3 +1,20 @@
+0.4.23 (November 26, 2012)
+  - The --directories flag is now recursive when the output package is rpm.
+    This makes all directories under a given path as owned by the package
+    so they'll be removed when the package is uninstalled (#245, #293, #294,
+    patch by Justin Ellison)
+  - Add fpm version info to '--help' output (#281)
+  - gem to rpm: Use 'rubygem(gemname)' for dependencies (#284, patch by
+    Jan Vansteenkiste)
+  - Fix a bug in gem version mangling (#292, #291; patch by Pranay Kanwar)
+  - Fix compatibility with Python 2.5 (#279, patch by Denis Bilenko)
+
+0.4.22 (November 15, 2012)
+  - Add --no-depends flag for creating packages with no dependencies listed
+    (#289, patch by Brett Gailey)
+  - Fix a bug where blank lines were present in a debian control file.
+    (#288, patch by Andrew Bunday)
+
 0.4.21 (November 8, 2012)
   - gem: remove restriction on expected gem names (#287)
   - add --directory flag; lets you mark a directory as being owned by a

data/lib/fpm/command.rb

@@ -1,5 +1,6 @@
 require "rubygems"
 require "fpm/namespace"
+require "fpm/version"
 require "fpm/util"
 require "clamp"
 require "ostruct"
@@ -21,6 +22,24 @@ end
 class FPM::Command < Clamp::Command
   include FPM::Util
 
+  def help(*args)
+    return [
+      "Intro:",
+      "",
+      "  This is fpm version #{FPM::VERSION}",
+      "",
+      "  If you think something is wrong, it's probably a bug! :)",
+      "  Please file these here: https://github.com/jordansissel/fpm/issues",
+      "",
+      "  You can find support on irc (#fpm on freenode irc) or via email with",
+      "  fpm-users@googlegroups.com",
+      "",
+
+      # Lastly, include the default help output via Clamp.
+      super
+    ].join("\n")
+  end # def help
+
   option "-t", "OUTPUT_TYPE",
     "the type of package you want to create (deb, rpm, solaris, etc)",
     :attribute_name => :output_type

data/lib/fpm/package/gem.rb

@@ -111,8 +111,8 @@ class FPM::Package::Gem < FPM::Package
       # expand spec's version to match RationalVersioningPolicy to prevent cases
       # where missing 'build' number prevents correct dependency resolution by target
       # package manager. Ie. for dpkg 1.1 != 1.1.0
-      m = spec.version.to_s.match /^(\d)?.?(\d+)?.?(\d+)?/
-      self.version = m.captures.map {|m| m ? m : 0}.join('.')
+      m = spec.version.to_s.scan(/(\d+)\.?/)
+      self.version = m.flatten.fill('0', m.length..2).join('.') 
 
       self.vendor = spec.author
       self.url = spec.homepage

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

@@ -1,8 +1,11 @@
 from distutils.core import Command
-import json
 import re
 import time
 import pkg_resources
+try:
+    import json
+except ImportError:
+    import simplejson as json
 
 # Note, the last time I coded python daily was at Google, so it's entirely
 # possible some of my techniques below are outdated or bad.
@@ -64,10 +67,10 @@ class get_metadata(Command):
     data["dependencies"] = final_deps
 
     #print json.dumps(data, indent=2)
-    try:
-      print(json.dumps(data, indent=2))
-    except AttributeError as e:
-      # For Python 2.5 and Debian's python-json
-      print(json.write(data))
+    if hasattr(json, 'dumps'):
+        print(json.dumps(data, indent=2))
+    else:
+        # For Python 2.5 and Debian's python-json
+        print(json.write(data))
   # def run
 # class list_dependencies

data/lib/fpm/package/rpm.rb

@@ -121,6 +121,15 @@ class FPM::Package::RPM < FPM::Package
           provides
         end
       end
+      self.dependencies = self.dependencies.collect do |dependency|
+        first, remainder = dependency.split("-", 2)
+        if first == "rubygem"
+          name, remainder = remainder.split(" ", 2)
+          "rubygem(#{name})#{remainder ? " #{remainder}" : ""}"
+        else
+          dependency
+        end
+      end
       #self.provides << "rubygem(#{self.name})"
     end
   end # def converted

data/lib/fpm/version.rb

@@ -0,0 +1,3 @@
+module FPM
+  VERSION = "0.4.23"
+end

data/templates/rpm.erb

@@ -109,8 +109,15 @@ fi
 <% config_files.each do |path| -%>
 %config(noreplace) <%= File.join(prefix, path) %>
 <% end -%>
+<% subdirs = [] -%>
 <% directories.each do |path| -%>
 %dir <%= File.join(prefix, path) %>
+<%#  We need to include hidden directories, but exclude . and .. -%>
+<%   ::Dir.glob("#{path}/**/*/", File::FNM_DOTMATCH) do |subdir| -%>
+<%     next if File.basename(subdir) =~ /^\.+$/ -%>
+%dir <%= File.join(prefix, subdir) %>
+<% subdirs << subdir -%>
+<%   end -%>
 <% end -%>
 <%# list only files, not directories? -%>
 <%= 
@@ -125,6 +132,7 @@ fi
   # Replace % with [%] to make rpm not expand macros
   files.collect { |f| "/#{f}" } \
     .reject { |f| config_files.include?(f) } \
+    .reject { |f| subdirs.include?("#{f}/") } \
     .collect { |f| f[/\s/] and "\"#{f}\"" or f } \
     .collect { |f| f.gsub("[", "[\\[]") } \
     .collect { |f| f.gsub("*", "[*]") } \

metadata

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