fpm 0.2.3 → 0.2.4

data/lib/fpm/builder.rb

@@ -54,7 +54,8 @@ class FPM::Builder
 
   # Assemble the package
   def assemble!
-    output.gsub!(/VERSION/, "#{@source[:version]}-#{@package.iteration}")
+    version_a = [ @source[:version], @package.iteration ].compact
+    output.gsub!(/VERSION/, version_a.join('-'))
     output.gsub!(/ARCH/, @package.architecture)
 
     File.delete(output) if File.exists?(output) && !File.directory?(output)

data/lib/fpm/package.rb

@@ -48,30 +48,32 @@ class FPM::Package
     @version = source[:version] # || fail
 
     @dependencies = source[:dependencies] || []
-    @iteration = source[:iteration] || 1
+    # Iteration can be nil. If nil, the fpm package implementation is expected
+    # to handle any default value that should be instead.
+    @iteration = source[:iteration] 
     @url = source[:url] || "http://nourlgiven.example.com/no/url/given"
     @category = source[:category] || "default"
     @license = source[:license] || "unknown"
     @maintainer = source[:maintainer] || "<#{ENV["USER"]}@#{Socket.gethostname}>"
     @architecture = source[:architecture] || %x{uname -m}.chomp
     @summary = source[:summary] || "no summary given"
-  end
+  end # def initialize
 
   def generate_specfile(builddir, paths)
     spec = template.result(binding)
     File.open(specfile(builddir), "w") { |f| f.puts spec }
-  end
+  end # def generate_specfile
 
   def generate_md5sums(builddir, paths)
     md5sums = self.checksum(paths)
     File.open("#{builddir}/md5sums", "w") { |f| f.puts md5sums }
     md5sums
-  end
+  end # def generate_md5sums
 
   # TODO [Jay]: make this better...?
   def type
     self.class.name.split(':').last.downcase
-  end
+  end # def type
 
   def template
     @template ||= begin
@@ -80,13 +82,17 @@ class FPM::Package
       )
       ERB.new(tpl, nil, "<>")
     end
-  end
+  end # def template
 
   def render_spec
     template.result(binding)
-  end
+  end # def render_spec
 
   def default_output
-    "#{name}-#{version}-#{iteration}.#{architecture}.#{type}"
-  end
+    if iteration
+      "#{name}-#{version}-#{iteration}.#{architecture}.#{type}"
+    else
+      "#{name}-#{version}.#{architecture}.#{type}"
+    end
+  end # def default_output
 end

data/templates/deb.erb

@@ -1,5 +1,5 @@
 Package: <%= name %>
-Version: <%= version %>-<%= iteration %>
+Version: <%= version %><%= iteration && '-'+iteration.to_s %>
 Architecture: <%= architecture %>
 Maintainer: <%= maintainer or "<unknown>" %>
 <% if dependencies.size > 0 %>

data/templates/rpm.erb

@@ -1,6 +1,6 @@
 Name: <%= @name %>
 Version: <%= @version %>
-Release: <%= @iteration %>
+Release: <%= @iteration or 1 %>
 Summary: <%= @summary %>
 BuildArch: <%= architecture %>
 AutoReqProv: no

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fpm
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Jordan Sissel