fpm 0.4.6 → 0.4.8

data/CHANGELIST

@@ -1,3 +1,13 @@
+0.4.8 (April 25, 2012)
+  - RPM: use 'noreplace' option for config files (#194, patch by Steve Lum)
+  - Python: Fix bug around exact dependency versions (#206, patch by Lars van
+    de Kerkhof)
+  - Gem->RPM: Make 'provides' "rubygem(thegemname)" instead of "rubygem-thegemname"
+  - Fix oddity where Ruby would complain about constant redefinition (#198,
+    patch by Marcus Vinicius Ferreira)
+
+0.4.7 skipped.
+
 0.4.6 (April 10, 2012)
   - Work around more problems in RPM with respect to file listing (#202)
 

data/lib/fpm/package/deb.rb

@@ -17,7 +17,7 @@ class FPM::Package::Deb < FPM::Package
     :after_install      => "postinst",
     :before_remove      => "prerm",
     :after_remove       => "postrm",
-  }
+  } unless defined?(SCRIPT_MAP)
 
   option "--ignore-iteration-in-dependencies", :flag, 
             "For '=' (equal) dependencies, allow iterations on the specified " \
@@ -261,8 +261,10 @@ class FPM::Package::Deb < FPM::Package
       nextversion[l-1] = 0
       nextversion = nextversion.join(".")
       return ["#{name} (>= #{version})", "#{name} (<< #{nextversion})"]
-    elsif (m = dep.match(/(\S+)\s+\(= (.+)\)/))
+    elsif (m = dep.match(/(\S+)\s+\(= (.+)\)/)) and
+        self.attributes[:deb_ignore_iteration_in_dependencies?]
       # Convert 'foo (= x)' to 'foo (>= x)' and 'foo (<< x+1)'
+      # but only when flag --ignore-iteration-in-dependencies is passed.
       name, version = m[1..2]
       nextversion = version.split('.').collect { |v| v.to_i }
       nextversion[-1] += 1
@@ -270,7 +272,7 @@ class FPM::Package::Deb < FPM::Package
       return ["#{name} (>= #{version})", "#{name} (<< #{nextversion})"]
     else
       # otherwise the dep is probably fine
-      return dep
+      return dep.rstrip
     end
   end # def fix_dependency
 

data/lib/fpm/package/gem.rb

@@ -135,7 +135,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 << "rubygem-#{self.name}"
+      self.provides << "#{self.name}"
 
       spec.runtime_dependencies.map do |dep|
         # rubygems 1.3.5 doesn't have 'Gem::Dependency#requirement'

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

@@ -2,11 +2,13 @@ from distutils.core import Command
 import json
 import re
 import time
+import pkg_resources
 
 # 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.
 # If you have fixes, let me know.
 
+
 class get_metadata(Command):
   description = "get package metadata"
   user_options = []
@@ -45,44 +47,19 @@ class get_metadata(Command):
       data["architecture"] = "all"
     # end if
 
-    dependencies = None
-    try:
-      dependencies = self.distribution.install_requires
-    except:
-      pass
-
-    # In some cases (Mysql-Python) 'dependencies' is none, not empty.
-    if dependencies is None:
-      dependencies = []
-
-    # Some cases (like paramiko) dependencies is actually just a string, not a
-    # list
-    if isinstance(dependencies, str):
-      dependencies = [dependencies]
-
     final_deps = []
-    dep_re = re.compile("([^<>= ]+)(?:\s*([<>=]{1,2})\s*([^,]*))?(?:,\s*([<>=]{1,2})\s*(.*))?$")
-    for dep in dependencies:
-      # python deps are strings that look like:
-      # "packagename"
-      # "packagename >= version"
-      # Replace 'packagename' with 'python#{suffix}-packagename'
-      m = dep_re.match(dep)
-      if m is None:
-        print "Bad dep: %s" % dep
-        time.sleep(3)
-      elif m.groups()[1] is None:
-        name, cond, version = m.groups()[0], ">=", 0
-      else:
-        groups = m.groups()
-        name, cond, version = groups[0:3]
-        if groups[3] is not None:
-          final_deps.append("%s %s %s" % (groups[0], groups[3], groups[4]))
-        # end if
-      # end if
-
-      final_deps.append("%s %s %s" % (name, cond, version))
-    # end for i in dependencies
+    if getattr(self.distribution, 'install_requires', None):
+        for dep in pkg_resources.parse_requirements(self.distribution.install_requires):
+            # add all defined specs to the dependecy list separately.
+            if dep.specs:
+                for operator, version in dep.specs:
+                    final_deps.append("%s %s %s" % (
+                        dep.project_name,
+                        "=" if operator == "==" else operator,
+                        version
+                    ))
+            else:
+                final_deps.append(dep.project_name)            
 
     data["dependencies"] = final_deps
 

data/lib/fpm/package/rpm.rb

@@ -21,13 +21,13 @@ class FPM::Package::RPM < FPM::Package
     "sha256" => 8,
     "sha384" => 9,
     "sha512" => 10
-  }
+  } unless defined?(DIGEST_ALGORITHM_MAP)
 
   COMPRESSION_MAP = {
     "xz" => "w2.xzdio",
     "gzip" => "w9.gzdio",
     "bzip2" => "w9.bzdio"
-  }
+  } unless defined?(COMPRESSION_MAP)
 
 
   option "--rpmbuild-define", "DEFINITION",
@@ -98,6 +98,20 @@ class FPM::Package::RPM < FPM::Package
         end
       end
       self.dependencies = fixed_deps
+
+      # Convert 'rubygem-foo' provides values to 'rubygem(foo)'
+      # since that's what most rpm packagers seem to do.
+      self.provides = self.provides.collect do |provides|
+        first, remainder = provides.split("-", 2)
+        if first == "rubygem"
+          name, remainder = remainder.split(" ", 2)
+          # yield rubygem(name)...
+          "rubygem(#{name})#{remainder ? " #{remainder}" : ""}"
+        else
+          provides
+        end
+      end
+      #self.provides << "rubygem(#{self.name})"
     end
   end # def converted
 

data/templates/rpm.erb

@@ -99,7 +99,7 @@ fi
 %defattr(-,root,root,-)
 <%# Output config files and then regular files. -%>
 <% config_files.each do |path| -%>
-%config <%= path %>
+%config(noreplace) <%= path %>
 <% end -%>
 <%# list only files, not directories? -%>
 <%= 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-04-25 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: '0'
+        version: 1.6.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.6
 - !ruby/object:Gem::Dependency
   name: cabin
   requirement: !ruby/object:Gem::Requirement
@@ -80,17 +80,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: rush
   requirement: !ruby/object:Gem::Requirement