fpm 0.3.3 → 0.3.4

data/lib/fpm/builder.rb

@@ -55,7 +55,9 @@ class FPM::Builder
     @edit = !!settings.edit
 
     @paths = paths
-    @package = package_class_for(settings.package_type).new(@source)
+    @package = package_class_for(settings.package_type).new(@source, 
+			:settings => settings.target
+		)
     # Append dependencies given from settings (-d flag for fpm)
     @package.dependencies += settings.dependencies if settings.dependencies
     # Append provides given from settings (--provides flag for fpm)

data/lib/fpm/package.rb

@@ -59,7 +59,10 @@ class FPM::Package
   # hash of paths for maintainer/package scripts (postinstall, etc)
   attr_accessor :scripts
 
-  def initialize(source)
+	# target-specific settings
+	attr_accessor :settings
+
+  def initialize(source, params={})
     @source = source
     @logger = Logger.new(STDERR)
     @logger.level = $DEBUG ? Logger::DEBUG : Logger::WARN
@@ -106,6 +109,9 @@ class FPM::Package
     @provides = source[:provides] || []
     @replaces = source[:replaces] || []
     @scripts = source[:scripts]
+
+		# Target-specific settings, mirrors :settings metadata in FPM::Source
+		@settings = params[:settings] || {}
   end # def initialize
 
   # nobody needs md5sums by default.

data/lib/fpm/program.rb

@@ -15,9 +15,12 @@ class FPM::Program
     @settings.provides = []
     @settings.replaces = []
     @settings.source = {}   # source settings
+    @settings.target = {}   # target settings
 
     # Maintainer scripts - https://github.com/jordansissel/fpm/issues/18
     @settings.scripts ||= {} 
+
+    @help = nil
   end # def initialize
 
   def run(args)
@@ -38,7 +41,7 @@ class FPM::Program
     if !ok
       $stderr.puts "There were errors; see above."
       $stderr.puts 
-      $stderr.puts opts.help
+      $stderr.puts @help
       return 1
     end
 
@@ -56,12 +59,17 @@ class FPM::Program
     FPM::Source::Gem.flags(FPM::Flags.new(opts, "gem", "gem source only"), @settings)
     FPM::Source::Python.flags(FPM::Flags.new(opts, "python", "python source only"),
                               @settings)
-    
+		FPM::Target::Deb.flags(FPM::Flags.new(opts, "deb", "deb target only"), @settings)  
+  
     # Process fpmrc first
     fpmrc(opts)
 
     # Proces normal flags now.
     remaining = opts.parse(args)
+    
+    # need to print help in a different scope
+    @help = opts.help
+
     return remaining
   end # def options
 
@@ -197,5 +205,6 @@ class FPM::Program
             "Add a url for this package.") do |url|
       @settings.url = url
     end # --url
+
   end # def default_options
 end # class FPM::Program

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

@@ -55,6 +55,11 @@ class get_metadata(Command):
     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*(.*))?$")
     for dep in dependencies:

data/lib/fpm/target/deb.rb

@@ -4,6 +4,16 @@ require "fpm/package"
 require "fpm/errors"
 
 class FPM::Target::Deb < FPM::Package
+
+  def self.flags(opts, settings)
+    settings.target[:deb] = "deb"
+
+    opts.on("--ignore-iteration-in-dependencies",
+            "For = dependencies, allow iterations on the specified version.  Default is to be specific.") do |x|
+      settings.target[:ignore_iteration] = true
+    end
+  end
+
   def needs_md5sums
     true
   end # def needs_md5sums
@@ -107,17 +117,31 @@ class FPM::Target::Deb < FPM::Package
     name_re = /^[^ \(]+/
     name = dep[name_re] 
     if name =~ /[A-Z]/
-      @logger.warn("Downcasing dependnecy '#{name}' because deb packages " \
+      @logger.warn("Downcasing dependency '#{name}' because deb packages " \
                    " don't work so good with uppercase names")
       dep.gsub!(name_re) { |n| n.downcase }
     end
 
+    if dep =~ /_/
+      @logger.warn("Replacing underscores with dashes in '#{dep}' because " \
+                   "debs don't like underscores")
+      dep.gsub!("_", "-")
+    end
+
     # Convert gem ~> X.Y.Z to '>= X.Y.Z' and << X.Y+1.0
     if dep =~ /\(~>/
       name, version = dep.gsub(/[()~>]/, "").split(/ +/)[0..1]
       nextversion = version.split(".").collect { |v| v.to_i }
-      nextversion[1] += 1
-      nextversion[2] = 0
+      l = nextversion.length
+      nextversion[l-2] += 1
+      nextversion[l-1] = 0
+      nextversion = nextversion.join(".")
+      return ["#{name} (>= #{version})", "#{name} (<< #{nextversion})"]
+    # ignore iterations for = dependencies if flag specified
+    elsif (m = dep.match(/(\S+)\s+\(= (.+)\)/)) && self.settings[:ignore_iteration]
+      name, version = m[1..2]
+      nextversion = version.split('.').collect { |v| v.to_i }
+      nextversion[-1] += 1
       nextversion = nextversion.join(".")
       return ["#{name} (>= #{version})", "#{name} (<< #{nextversion})"]
     else

data/templates/deb.erb

@@ -20,8 +20,7 @@ Homepage: <%= url or "http://nourlgiven.example.com/" %>
 Description: <%= name %> (FPM-generated package)
 <% max_len = 74 -%>
 <% if description -%>
-<%= description.gsub(/^$/, ".").gsub(/(.{1,#{max_len}})( +|$)\n?|(.{#{max_len}})/,"  \\1\\3\n") %>
+<%= description.gsub(/^$/, ".").gsub(/(.{1,#{max_len}})( +|$)\n?|(.{#{max_len}})/,"  \\1\\3\n") -%>
 <% else -%>
 <%= "no description given" %>
 <% end -%>
-

data/templates/rpm.erb

@@ -26,8 +26,9 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
     if d =~ /\~>/
       name, version = d.gsub(/[()~>]/, "").split(/ +/)[0..1]
       nextversion = version.split(".").collect { |v| v.to_i }
-      nextversion[1] += 1
-      nextversion[2] = 0 
+      l = nextversion.length
+      nextversion[l-2] += 1
+      nextversion[l-1] = 0 
       nextversion = nextversion.join(".")
       ["#{name} >= #{version}", "#{name} < #{nextversion}"]
     # Convert gem >= A.B.C <= X.Y.Z to '>= A.B.C' and '<= X.Y.Z'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fpm
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-24 00:00:00 -07:00
+date: 2011-07-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency