fpm 0.2.15 → 0.2.16

data/bin/fpm

@@ -22,55 +22,60 @@ def main(args)
       else
         settings.package_path = "#{Dir.pwd}/#{path}"
       end
-    end
+    end # --package
 
     opts.on("-n PACKAGENAME", "--name PACKAGENAME",
             "What name to give to the package") do |name|
       settings.package_name = name
-    end
+    end # --name
 
     opts.on("-v VERSION", "--version VERSION",
             "version to give the package") do |version|
-      settings.version = version
-    end
+      settings.version = version 
+    end # --version
+
+    opts.on("--epoch EPOCH",
+            "(optional) Set epoch value for this package.") do |epoch|
+      settings.epoch = epoch
+    end # --epoch
 
     opts.on("-d DEPENDENCY", "--depends DEPENDENCY") do |dep|
       settings.dependencies ||= []
       settings.dependencies << dep
-    end
+    end # --depends
 
     opts.on("-a ARCHITECTURE", "--architecture ARCHITECTURE") do |arch|
       settings.architecture = arch
-    end
+    end # --architecture
 
     opts.on("-m MAINTAINER", "--maintainer MAINTAINER") do |maintainer|
       settings.maintainer = maintainer
-    end
+    end # --maintainer
 
     opts.on("-C DIRECTORY", "Change directory before searching for files") do |dir|
       settings.chdir = dir
-    end
+    end # -C
 
     opts.on("-t PACKAGE_TYPE", "the type of package you want to create") do |type|
       settings.package_type = type
-    end
+    end # -t
 
     opts.on("-s SOURCE_TYPE", "what to build the package from") do |st|
       settings.source_type = st
-    end
+    end # -s 
 
     opts.on("-S PACKAGE_SUFFIX", "which suffix to append to package and dependances") do |sfx|
       settings.suffix = sfx
-    end
+    end # -S
 
     opts.on("--prefix PREFIX",
             "A path to prefix files with when building the target package. This may not be necessary for all source types. For example, the 'gem' type will prefix with your gem directory (gem env | grep -A1 PATHS:)") do |prefix|
       settings.prefix = prefix
-    end
+    end # --prefix
 
     opts.on("-e", "--edit", "Edit the specfile before building") do
       settings.edit = true
-    end
+    end # --edit
 
     opts.on("-x PATTERN", "--exclude PATTERN",
             "Exclude paths matching pattern (according to tar --exclude)") do |pattern|

data/lib/fpm/builder.rb

@@ -33,6 +33,7 @@ class FPM::Builder
     @source  = source_class_for(settings.source_type || 'dir').new(
       paths, root,
       :version => settings.version,
+      :epoch => settings.epoch,
       :name => settings.package_name,
       :prefix => settings.prefix,
       :suffix => settings.suffix,
@@ -47,6 +48,7 @@ class FPM::Builder
     # Append dependencies given from settings (-d flag for fpm)
     @package.dependencies += settings.dependencies if settings.dependencies
     @package.architecture = settings.architecture if settings.architecture
+    #@package.epoch = settings.epoch # nil is OK
 
     @output = settings.package_path
     @recurse_dependencies = settings.recurse_dependencies

data/lib/fpm/package.rb

@@ -8,6 +8,11 @@ class FPM::Package
   # The version of this package (the upstream version)
   attr_accessor :version
 
+  # The epoch version of this package
+  # This is used most when an upstream package changes it's versioning
+  # style so standard comparisions wouldn't work.
+  attr_accessor :epoch
+
   # The iteration of this package.
   #   Debian calls this 'release' and is the last '-NUMBER' in the version
   #   RedHat has this as 'Release' in the .spec file
@@ -48,6 +53,7 @@ class FPM::Package
 
     # Default version is 1.0 in case nobody told us a specific version.
     @version = source[:version] || "1.0"
+    @epoch = source[:epoch]
 
     @dependencies = source[:dependencies] || []
     # Iteration can be nil. If nil, the fpm package implementation is expected

data/lib/fpm/target/rpm.rb

@@ -7,6 +7,8 @@ class FPM::Target::Rpm < FPM::Package
 
   def build!(params)
     raise "No package name given. Can't assemble package" if !@name
+    # TODO(sissel): Abort if 'rpmbuild' tool not found.
+
     %w(BUILD RPMS SRPMS SOURCES SPECS).each { |d| Dir.mkdir(d) }
     args = ["rpmbuild", "-ba", 
            "--define", "buildroot #{Dir.pwd}/BUILD",

data/templates/deb.erb

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

data/templates/rpm.erb

@@ -1,5 +1,8 @@
 Name: <%= @name %>
 Version: <%= @version %>
+<% if @epoch %>
+Epoch: <%= @epoch %>
+<% end %>
 Release: <%= @iteration or 1 %>
 Summary: <%= @summary %>
 BuildArch: <%= architecture %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fpm
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 2
-  - 15
-  version: 0.2.15
+  - 16
+  version: 0.2.16
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 -07:00
+date: 2011-04-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-description: Turn directories into packages. Fix broken packages. Win the package management game.
+description: Turn directories into packages. Fix broken packages. Win the package building game.
 email: jls@semicomplete.com
 executables: 
 - fpm
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling