fpm 0.3.4 → 0.3.6

data/CHANGELIST

@@ -22,6 +22,6 @@
     Example:
       --python-bin=/usr/bin/python2.7
       --python-easyinstall=/usr/bin/easy_install2.7
-    
+
 0.2.26 and earlier
   No changelist tracked. My bad, yo.

data/bin/fpm-npm

@@ -61,8 +61,8 @@ Dir.glob("#{builddir}/usr/lib/node/.npm/*/*") do |path|
   # So we'll specify deps of {v}-1 <= x <= {v}-999999....
   depends = Dir.glob("#{path}/dependson/*@*") \
     .collect { |p| PACKAGEPREFIX + File.basename(p) } \
-    .collect { |p| n,v = p.split("@"); 
-      ["#{n} (>= #{v}-1)", "#{n} (<= #{v}-99999999999999)"] 
+    .collect { |p| n,v = p.split("@");
+      ["#{n} (>= #{v}-1)", "#{n} (<= #{v}-99999999999999)"]
   }.flatten
 
   if package["author"]
@@ -73,7 +73,7 @@ Dir.glob("#{builddir}/usr/lib/node/.npm/*/*") do |path|
     maintainer = "#{m["name"]} <#{m["email"]}>"
   end
 
-  pkgcmd = [ "fpm", 
+  pkgcmd = [ "fpm",
     "-n", "#{PACKAGEPREFIX}#{package["name"]}",
     "-v", package["version"],
     "-m", maintainer,

data/lib/fpm/builder.rb

@@ -13,7 +13,7 @@ class FPM::Builder
       o = @package.default_output
       if o[0,1] == "/"
         o
-      else 
+      else
         File.join(@working_dir, o)
       end
     end
@@ -47,6 +47,7 @@ class FPM::Builder
       :maintainer => settings.maintainer,
       :provides => [],
       :replaces => [],
+      :conflicts => [],
       :description => settings.description,
       :url => settings.url,
       :settings => settings.source
@@ -55,7 +56,7 @@ 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)
@@ -63,13 +64,16 @@ class FPM::Builder
     # Append provides given from settings (--provides flag for fpm)
     @package.provides += settings.provides if settings.provides
     @package.replaces += settings.replaces if settings.replaces
+    @package.conflicts += settings.conflicts if settings.conflicts
     @package.architecture = settings.architecture if settings.architecture
+    @package.category = settings.category if settings.category
     @package.scripts = settings.scripts
+    @package.config_files = settings.config_files
 
     @output = settings.package_path
     @recurse_dependencies = settings.recurse_dependencies
   end # def initialize
-  
+
   def tar_path
     @tar_path ||= "#{builddir}/data.tar"
   end

data/lib/fpm/flags.rb

@@ -10,7 +10,7 @@ class FPM::Flags
   def on(*args, &block)
     fixed_args = args.collect do |arg|
       if arg =~ /^--/
-        "--#{@flag_prefix}-#{arg.gsub(/^--/, "")}" 
+        "--#{@flag_prefix}-#{arg.gsub(/^--/, "")}"
       else
         "(#{@help_prefix}) #{arg}"
       end

data/lib/fpm/package.rb

@@ -3,7 +3,7 @@ require "socket" # for Socket.gethostname
 require "logger"
 require "find" # for Find.find (directory walking)
 
-class FPM::Package 
+class FPM::Package
   # The name of this package
   attr_accessor :name
 
@@ -18,7 +18,7 @@ class FPM::Package
   # 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
-  #   FreeBSD calls this 'PORTREVISION' 
+  #   FreeBSD calls this 'PORTREVISION'
   # If left unpicked, it defaults to 1.
   attr_accessor :iteration
 
@@ -49,6 +49,10 @@ class FPM::Package
   # (Not all packages support this)
   attr_accessor :provides
 
+  # Array of things this package conflicts with.
+  # (Not all packages support this)
+  attr_accessor :conflicts
+
   # Array of things this package replaces.
   # (Not all packages support this)
   attr_accessor :replaces
@@ -59,6 +63,9 @@ class FPM::Package
   # hash of paths for maintainer/package scripts (postinstall, etc)
   attr_accessor :scripts
 
+  # Array of configuration files
+  attr_accessor :config_files
+
 	# target-specific settings
 	attr_accessor :settings
 
@@ -76,7 +83,7 @@ class FPM::Package
     @dependencies = source[:dependencies] || []
     # Iteration can be nil. If nil, the fpm package implementation is expected
     # to handle any default value that should be instead.
-    @iteration = source[:iteration] 
+    @iteration = source[:iteration]
     @url = source[:url] || "http://nourlgiven.example.com/no/url/given"
     @category = source[:category] || "default"
     @license = source[:license] || "unknown"
@@ -108,10 +115,12 @@ class FPM::Package
     @description = source[:description] || "no description given"
     @provides = source[:provides] || []
     @replaces = source[:replaces] || []
+    @conflicts = source[:conflicts] || []
     @scripts = source[:scripts]
+    @config_files = source[:config_files] || []
 
-		# Target-specific settings, mirrors :settings metadata in FPM::Source
-		@settings = params[:settings] || {}
+    # Target-specific settings, mirrors :settings metadata in FPM::Source
+    @settings = params[:settings] || {}
   end # def initialize
 
   # nobody needs md5sums by default.
@@ -158,7 +167,7 @@ class FPM::Package
   end # def default_output
 
   def fixpath(path)
-    if path[0,1] != "/" 
+    if path[0,1] != "/"
       path = File.join(@source.root, path)
     end
     return path if File.symlink?(path)

data/lib/fpm/program.rb

@@ -14,11 +14,13 @@ class FPM::Program
     @settings.exclude = []  # Paths to exclude in packaging
     @settings.provides = []
     @settings.replaces = []
+    @settings.conflicts = []
     @settings.source = {}   # source settings
     @settings.target = {}   # target settings
+    @settings.config_files ||= []
 
     # Maintainer scripts - https://github.com/jordansissel/fpm/issues/18
-    @settings.scripts ||= {} 
+    @settings.scripts ||= {}
 
     @help = nil
   end # def initialize
@@ -40,7 +42,7 @@ class FPM::Program
 
     if !ok
       $stderr.puts "There were errors; see above."
-      $stderr.puts 
+      $stderr.puts
       $stderr.puts @help
       return 1
     end
@@ -59,14 +61,14 @@ 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)  
-  
+    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
 
@@ -78,7 +80,7 @@ class FPM::Program
     return if !ENV.include?("HOME")
     rcpath = File.expand_path("~/.fpmrc")
     return if !File.exists?(rcpath)
-    
+
     # fpmrc exists, read it as flags, one per line.
     File.new(rcpath, "r").each do |line|
       flag = line.chomp
@@ -109,7 +111,7 @@ class FPM::Program
 
     opts.on("-v VERSION", "--version VERSION",
             "version to give the package") do |version|
-      @settings.version = version 
+      @settings.version = version
     end # --version
 
     opts.on("--iteration ITERATION",
@@ -126,14 +128,27 @@ class FPM::Program
       @settings.dependencies << dep
     end # --depends
 
+    opts.on("--category SECTION_OR_GROUP") do |thing|
+      @settings.category = thing
+    end # --category
+
     opts.on("--provides PROVIDES") do |thing|
       @settings.provides << thing
     end # --provides
 
+    opts.on("--conflicts CONFLICTS") do |thing|
+      @settings.conflicts << thing
+    end # --conflicts
+
     opts.on("--replaces REPLACES") do |thing|
       @settings.replaces << thing
     end # --replaces
 
+    opts.on("--config-files PATH",
+            "(optional) Treat path as a configuration file. Uses conffiles in deb or %config in rpm. (/etc/package.conf)") do |thing|
+      @settings.config_files << thing
+    end
+
     opts.on("-a ARCHITECTURE", "--architecture ARCHITECTURE") do |arch|
       @settings.architecture = arch
     end # --architecture
@@ -152,7 +167,7 @@ class FPM::Program
 
     opts.on("-s SOURCE_TYPE", "what to build the package from") do |st|
       @settings.source_type = st
-    end # -s 
+    end # -s
 
     opts.on("-S PACKAGE_SUFFIX", "which suffix to append to package and dependencies") do |sfx|
       @settings.suffix = sfx

data/lib/fpm/source.rb

@@ -87,11 +87,11 @@ class FPM::Source
     paths = [ paths ] if paths.is_a? String
     paths.each do |path|
       while path != "/" and path != "."
-        dirs << path if !dirs.include?(path) 
+        dirs << path if !dirs.include?(path)
         path = File.dirname(path)
       end
     end # paths.each
-    
+
     # Want directories to be sorted thusly: [ "/usr", "/usr/bin" ]
     # Why? tar and some package managers sometimes fail if the tar is created
     # like: [ "/opt/fizz", "/opt" ]
@@ -136,7 +136,7 @@ class FPM::Source
     end
   end # def tar
 
-  def tar_cmd 
+  def tar_cmd
     # Rely on gnu tar for solaris.
     case %x{uname -s}.chomp
     when "SunOS"

data/lib/fpm/source/dir.rb

@@ -16,7 +16,7 @@ class FPM::Source::Dir < FPM::Source
       @paths.each do |path|
         # Trim @root (--chdir)
         if @root != "." and path.start_with?(@root)
-          path = path[@root.size .. -1] 
+          path = path[@root.size .. -1]
         end
 
         # Copy to self[:prefix] (aka --prefix)

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

@@ -50,7 +50,7 @@ class get_metadata(Command):
       dependencies = self.distribution.install_requires
     except:
       pass
-    
+
     # In some cases (Mysql-Python) 'dependencies' is none, not empty.
     if dependencies is None:
       dependencies = []

data/lib/fpm/source/python.rb

@@ -30,7 +30,7 @@ class FPM::Source::Python < FPM::Source
       return
     end
 
-    if !File.exists?(package) 
+    if !File.exists?(package)
       download(package, params[:version])
     else
       @paths = [ File.expand_path(package) ]

data/lib/fpm/target/deb.rb

@@ -34,7 +34,7 @@ class FPM::Target::Deb < FPM::Package
       # Debian calls x86_64 "amd64"
       @architecture = "amd64"
     end
-    
+
     return @architecture
   end # def architecture
 
@@ -80,7 +80,12 @@ class FPM::Target::Deb < FPM::Package
         else raise "Unsupported script name '#{name}' (path: #{path})"
       end # case name
     end # self.scripts.each
-    
+
+    if self.config_files.any?
+      File.open('conffiles', 'w'){ |f| f.puts(config_files.join("\n")) }
+      control_files << 'conffiles'
+    end
+
     # Make the control
     system("tar -zcf control.tar.gz #{control_files.join(" ")}")
 
@@ -92,30 +97,26 @@ class FPM::Target::Deb < FPM::Package
   end # def build
 
   def default_output
-    v = version
-    v = "#{epoch}:#{v}" if epoch
     if iteration
-      "#{name}_#{v}-#{iteration}_#{architecture}.#{type}"
+      "#{name}_#{version}-#{iteration}_#{architecture}.#{type}"
     else
-      "#{name}_#{v}_#{architecture}.#{type}"
+      "#{name}_#{version}_#{architecture}.#{type}"
     end
   end # def default_output
 
   def fix_dependency(dep)
-    # Convert strings 'foo >= bar' to 'foo (>= bar)'
-    if dep =~ /\(/
-      # nothing
+    if dep =~ /[\(,\|]/
+      # Don't "fix" ones that could appear well formed already.
     else
-      # If the dependency is simply a name, turn it into 'name (>= 0)'
       da = dep.split(/ +/)
-      if da.size == 1
-        da += [">=", "0"]
+      if da.size > 1
+        # Convert strings 'foo >= bar' to 'foo (>= bar)'
+        dep = "#{da[0]} (#{da[1]} #{da[2]})"
       end
-      dep = "#{da[0]} (#{da[1]} #{da[2]})"
     end
 
     name_re = /^[^ \(]+/
-    name = dep[name_re] 
+    name = dep[name_re]
     if name =~ /[A-Z]/
       @logger.warn("Downcasing dependency '#{name}' because deb packages " \
                    " don't work so good with uppercase names")
@@ -149,4 +150,3 @@ class FPM::Target::Deb < FPM::Package
     end
   end # def fix_dependency
 end # class FPM::Target::Deb
-

data/lib/fpm/target/puppet.rb

@@ -36,7 +36,7 @@ class FPM::Target::Puppet < FPM::Package
       dir = File.join(builddir, "manifests", File.dirname(manifest))
       @logger.info("manifests targeting: #{dir}")
       ::Dir.mkdir(dir) if !File.directory?(dir)
-      
+
       File.open(File.join(builddir, "manifests", manifest), "w") do |f|
         @logger.info("manifest: #{f.path}")
         template = template(File.join("puppet", "#{manifest}.erb"))

data/lib/fpm/target/rpm.rb

@@ -10,7 +10,7 @@ class FPM::Target::Rpm < FPM::Package
       when "all"
         # Translate fpm "all" arch to what it means in RPM.
         return "noarch"
-      else 
+      else
         return @architecture
     end
   end # def architecture
@@ -30,7 +30,7 @@ class FPM::Target::Rpm < FPM::Package
     end
 
     %w(BUILD RPMS SRPMS SOURCES SPECS).each { |d| Dir.mkdir(d) }
-    args = ["rpmbuild", "-ba", 
+    args = ["rpmbuild", "-ba",
            "--define", "buildroot #{Dir.pwd}/BUILD",
            "--define", "_topdir #{Dir.pwd}",
            "--define", "_sourcedir #{Dir.pwd}",

data/lib/fpm/target/solaris.rb

@@ -11,7 +11,7 @@ class FPM::Target::Solaris < FPM::Package
     when nil, "native"
       @architecture = %x{uname -p}.chomp
     end
-    # "all" is a valid arch according to 
+    # "all" is a valid arch according to
     # http://www.bolthole.com/solaris/makeapackage.html
 
     return @architecture

data/lib/rpm/header.rb

@@ -23,11 +23,11 @@ class RPMFile::Header
     # At this point assume we've read and consumed the lead and signature.
     #len = @rpm.signature.index_length + @rpm.signature
     #
-    # header size is 
+    # header size is
     #     ( @rpm.signature.index_length * size of a header entry )
     #     + @rpm.signature.data_length
     #
-    # header 'entries' are an 
+    # header 'entries' are an
     #   int32 (tag id), int32 (tag type), int32  (offset), uint32 (count)
     #
     # See rpm's header.c, the headerLoad method function for reference.
@@ -43,7 +43,7 @@ class RPMFile::Header
     @index_size = @index_count * entry_size
     tag_data = @rpm.file.read(@index_size)
     data = @rpm.file.read(@data_length)
-    
+
     #ap :data => data
 
     (0 ... @index_count).each do |i|
@@ -55,7 +55,7 @@ class RPMFile::Header
       @tags << tag
 
       #ap tag.tag => {
-        #:type => tag.type, 
+        #:type => tag.type,
         #:offset => tag.offset,
         #:count => tag.count,
         #:value => (tag.value rescue "???"),

data/lib/rpm/lead.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), "namespace")
 
 class RPMFile::Lead
   #struct rpmlead {
-  attr_accessor :magic #unsigned char magic[4]; 
+  attr_accessor :magic #unsigned char magic[4];
   attr_accessor :major #unsigned char major;
   attr_accessor :minor #unsigned char minor;
   attr_accessor :type  #short type;
@@ -12,7 +12,7 @@ class RPMFile::Lead
   attr_accessor :signature_type #short signature_type;
   attr_accessor :reserved #char reserved[16];
   #}
-  
+
   attr_accessor :length
 
   def initialize(rpm)
@@ -29,7 +29,7 @@ class RPMFile::Lead
       raise "Unknown package 'type' value #{@type}"
     end
   end # def type
-  
+
   def read
     # Use 'A' here instead of 'a' to trim nulls.
     @length = 96

data/lib/rpm/rpmfile.rb

@@ -8,7 +8,7 @@ require File.join(File.dirname(__FILE__), "tag")
 # source code, but mostly it started making more sense after reading this site:
 # http://www.rpm.org/max-rpm/s1-rpm-file-format-rpm-file-format.html
 
-class RPMFile 
+class RPMFile
   attr_reader :file
 
   def initialize(file)

data/templates/deb.erb

@@ -6,21 +6,24 @@ Maintainer: <%= maintainer or "<unknown>" %>
 <%   properdeps = dependencies.collect { |d| fix_dependency(d) }.flatten -%>
 Depends: <%= properdeps.flatten.join(", ") %>
 <% end -%>
+<% if !conflicts.empty? -%>
+Conflicts: <%= conflicts.join(", ") %>
+<% end -%>
 <% if !provides.empty? -%>
-Provides: <%= provides.join(", ") -%>
+Provides: <%= provides.join(", ") %>
 <% end -%>
 <% if !replaces.empty? -%>
 <%   properrepl = replaces.collect { |d| fix_dependency(d) }.flatten -%>
 Replaces: <%= properrepl.flatten.join(", ") %>
 <% end -%>
 Standards-Version: 3.9.1
-Section: <%= category or "unknown" %> 
+Section: <%= category or "unknown" %>
 Priority: extra
 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") -%>
-<% else -%>
-<%= "no description given" %>
+<% lines = (description or "no description given").split("\n") -%>
+<% firstline = lines.first -%>
+<% remainder = lines[1..-1] -%>
+Description: <%= firstline %>
+<% if !remainder.nil? -%>
+<%= remainder.collect { |l| l =~ /^ *$/ ? " ." : " #{l}" }.join("\n") %>
 <% end -%>

data/templates/rpm.erb

@@ -14,7 +14,7 @@ Group: <%= category %>
 TODO: [Jay] rpms require a license
 let's detect it intelligently
 -%>
-License: <%= license %> 
+License: <%= license %>
 URL: <%= url or "http://nourlgiven.example.com/" %>
 Source0:  %{_sourcedir}/data.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -28,7 +28,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
       nextversion = version.split(".").collect { |v| v.to_i }
       l = nextversion.length
       nextversion[l-2] += 1
-      nextversion[l-1] = 0 
+      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: 27
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-07 00:00:00 -07:00
+date: 2011-07-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency