fpm 0.1.7 → 0.1.9

data/bin/fpm

@@ -68,7 +68,9 @@ def main(args)
 
   opts.parse!(args)
 
-  FPM::Builder.new(settings, args).assemble!
+  builder = FPM::Builder.new(settings, args)
+  builder.assemble!
+  puts "Created #{builder.output}"
 
   return 0
 end # def main

data/lib/fpm/builder.rb

@@ -40,12 +40,12 @@ class FPM::Builder
     @paths = paths
     @package = package_class_for(settings.package_type).new(@source)
     # Append dependencies given from settings (-d flag for fpm)
-    @package.dependencies += settings.dependencies
+    @package.dependencies += settings.dependencies if settings.dependencies
 
     @output = settings.package_path
     @recurse_dependencies = settings.recurse_dependencies
   end # def initialize
-
+  
   def tar_path
     @tar_path ||= "#{builddir}/data.tar"
   end

data/lib/fpm/source/gem.rb

@@ -31,11 +31,16 @@ class FPM::Source::Gem < FPM::Source
     # How to handle prerelease? Some extra magic options?
     #dep.prerelease = options[:prerelease]
     
-    specs_and_sources, errors =
-      ::Gem::SpecFetcher.fetcher.fetch_with_errors(dep, false, true, false)
+    if ::Gem::SpecFetcher.fetcher.respond_to?(:fetch_with_errors)
+      specs_and_sources, errors =
+        ::Gem::SpecFetcher.fetcher.fetch_with_errors(dep, true, true, false)
+    else
+      specs_and_sources = 
+        ::Gem::SpecFetcher.fetcher.fetch(dep, true)
+      errors = "???"
+    end
     spec, source_uri = specs_and_sources.sort_by { |s,| s.version }.last
 
-
     if spec.nil? then
       raise "Invalid gem? Name: #{gem_name}, Version: #{version}, Errors: #{errors}"
     end
@@ -67,14 +72,19 @@ class FPM::Source::Gem < FPM::Source
         self[:category] = 'Languages/Development/Ruby'
 
         self[:dependencies] = spec.runtime_dependencies.map do |dep|
-          reqs = dep.requirement.to_s.gsub(/,/, '')
+          # rubygems 1.3.5 doesn't have 'Gem::Dependency#requirement'
+          if dep.respond_to?(:requirement)
+            reqs = dep.requirement.to_s.gsub(/,/, '')
+          else
+            reqs = dep.version_requirements
+          end
           "rubygem-#{dep.name} #{reqs}"
         end
       end # ::Gem::Package
     end # File.open (the gem)
   end # def get_metadata
 
-  def make_tarball!(tar_path)
+  def make_tarball!(tar_path, builddir)
     tmpdir = "#{tar_path}.dir"
     installdir = "#{tmpdir}/#{::Gem::dir}"
     ::FileUtils.mkdir_p(installdir)

data/lib/fpm/source/rpm.rb

@@ -16,7 +16,7 @@ class FPM::Source::RPM < FPM::Source
 
   end
 
-  def make_tarball!(tar_path)
+  def make_tarball!(tar_path, builddir)
     tmpdir = "#{tar_path}.dir"
     ::Dir.mkdir(tmpdir)
     system("rpm2cpio #{@rpm} | (cd #{tmpdir}; cpio -i --make-directories)")

data/templates/deb.erb

@@ -5,15 +5,27 @@ Maintainer: <%= maintainer or "<unknown>" %>
 <% if dependencies.size > 0 %>
 <%
   properdeps = dependencies.collect do |d|
+    # Convert strings 'foo >= bar' to 'foo (>= bar)'
     if d =~ /\(/
-      d
+      # nothing
     else
-      # Convert strings 'foo >= bar' to 'foo (>= bar)'
       da = d.split(/ +/)
-      "#{da[0]} (#{da[1]} #{da[2]})"
+      d = "#{da[0]} (#{da[1]} #{da[2]})"
+    end
+
+    # Convert gem ~> X.Y.Z to '>= X.Y.Z' and << X.Y+1.0
+    if d =~ /\(~>/
+      name, version = d.gsub(/[()~>]/, "").split(/ +/)[0..1]
+      nextversion = version.split(".").collect { |v| v.to_i }
+      nextversion[1] += 1
+      nextversion[2] = 0 
+      nextversion = nextversion.join(".")
+      ["#{name} (>= #{version})", "#{name} (<< #{nextversion})"]
+    else
+      d
     end
   end
-%>Depends: <%= properdeps.join(", ") %>
+%>Depends: <%= properdeps.flatten.join(", ") %>
 <% end %>
 Standards-Version: 3.9.1
 Section: <%= category or "unknown" %> 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fpm
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 9
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 -08:00
+date: 2011-01-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling