fpm 0.4.20 → 0.4.21

data/CHANGELIST

@@ -1,3 +1,11 @@
+0.4.21 (November 8, 2012)
+  - gem: remove restriction on expected gem names (#287)
+  - add --directory flag; lets you mark a directory as being owned by a
+    package. (#260, #245, patch by ajf8)
+  - deb: don't include a version in the Provides field (#280)
+  - gem: if the version is '1.1' make it imply '1.1.0' (#269, patch by 
+    Radim Marek)
+
 0.4.20 (October 5, 2012)
   - python: only specify --install-{scripts,lib,data} flags to setup.py if
     they were given on the command line to fpm. Fixes #273.

data/lib/fpm/command.rb

@@ -89,6 +89,12 @@ class FPM::Command < Clamp::Command
     @config_files ||= []
     @config_files << val
   end # --config-files
+  option "--directories", "DIRECTORIES",
+    "Mark a directory as being owned by the package" \
+    do |val|
+    @directories ||= []
+    @directories << val
+  end # directories
   option ["-a", "--architecture"], "ARCHITECTURE",
     "The architecture name. Usually matches 'uname -m'. For automatic values," \
     " you can use '-a all' or '-a native'. These two strings will be " \
@@ -204,6 +210,7 @@ class FPM::Command < Clamp::Command
     @provides = []
     @dependencies = []
     @config_files = []
+    @directories = []
     @excludes = []
   end # def initialize
 
@@ -332,6 +339,7 @@ class FPM::Command < Clamp::Command
     input.provides += provides
     input.replaces += replaces
     input.config_files += config_files
+    input.directories += directories
     
     setscript = proc do |scriptname|
       # 'self.send(scriptname) == self.before_install == --before-install
@@ -390,6 +398,9 @@ class FPM::Command < Clamp::Command
   rescue FPM::InvalidPackageConfiguration => e
     @logger.error("Invalid package configuration: #{e}")
     return 1
+  rescue FPM::Package::InvalidArgument => e
+    @logger.error("Invalid package argument: #{e}")
+    return 1
   ensure
     input.cleanup unless input.nil?
     output.cleanup unless output.nil?

data/lib/fpm/package.rb

@@ -104,6 +104,8 @@ class FPM::Package
   # Array of configuration files
   attr_accessor :config_files
 
+  attr_accessor :directories
+
   # Any other attributes specific to this package.
   # This is where you'd put rpm, deb, or other specific attributes.
   attr_accessor :attributes
@@ -168,6 +170,7 @@ class FPM::Package
     @dependencies = []
     @scripts = {}
     @config_files = []
+    @directories = []
 
     staging_path
     build_path
@@ -194,7 +197,7 @@ class FPM::Package
       :@architecture, :@attributes, :@category, :@config_files, :@conflicts,
       :@dependencies, :@description, :@epoch, :@iteration, :@license, :@maintainer,
       :@name, :@provides, :@replaces, :@scripts, :@url, :@vendor, :@version,
-      :@config_files, :@staging_path
+      :@directories, :@staging_path
     ]
     ivars.each do |ivar|
       #@logger.debug("Copying ivar", :ivar => ivar, :value => instance_variable_get(ivar),
@@ -502,9 +505,17 @@ class FPM::Package
     end
   end # def output_path
 
+  def provides=(value)
+    if !value.is_a?(Array)
+      @provides = [value]
+    else 
+      @provides = value
+    end
+  end
+
   # General public API
   public(:type, :initialize, :convert, :input, :output, :to_s, :cleanup, :files,
-         :version, :script)
+         :version, :script, :provides=)
 
   # Package internal public api
   public(:cleanup_staging, :cleanup_build, :staging_path, :converted_from,

data/lib/fpm/package/deb.rb

@@ -170,6 +170,7 @@ class FPM::Package::Deb < FPM::Package
       self.name = parse.call("Package")
       self.url = parse.call("Homepage")
       self.vendor = parse.call("Vendor") || self.vendor
+      self.provides = parse.call("Provides") || self.provides
 
       # The description field is a special flower, parse it that way.
       # The description is the first line as a normal Description field, but also continues
@@ -286,14 +287,6 @@ class FPM::Package::Deb < FPM::Package
     @logger.log("Created deb package", :path => output_path)
   end # def output
 
-  def default_output
-    if iteration
-      "#{name}_#{version}-#{iteration}_#{architecture}.#{type}"
-    else
-      "#{name}_#{version}_#{architecture}.#{type}"
-    end
-  end # def default_output
-
   def converted_from(origin)
     self.dependencies = self.dependencies.collect do |dep|
       fix_dependency(dep)

data/lib/fpm/package/gem.rb

@@ -51,12 +51,7 @@ class FPM::Package::Gem < FPM::Package
   def download_if_necessary(gem, gem_version)
     path = gem
     if !File.exists?(path)
-      looks_like_name_re = /^[A-Za-z0-9_-]+$/
-      if path =~ looks_like_name_re
-        path = download(gem, gem_version)
-      else
-        raise FPM::Package::InvalidArgument.new("Gem '#{gem}' doesn't appear to be a valid rubygem file or name?")
-      end
+      path = download(gem, gem_version)
     end
 
     @logger.info("Using gem file", :path => path)
@@ -112,7 +107,13 @@ class FPM::Package::Gem < FPM::Package
 
       #self.name = [attributes[:gem_package_name_prefix], spec.name].join("-")
       self.license = (spec.license or "no license listed in #{File.basename(file)}")
-      self.version = spec.version.to_s
+
+      # expand spec's version to match RationalVersioningPolicy to prevent cases
+      # where missing 'build' number prevents correct dependency resolution by target
+      # package manager. Ie. for dpkg 1.1 != 1.1.0
+      m = spec.version.to_s.match /^(\d)?.?(\d+)?.?(\d+)?/
+      self.version = m.captures.map {|m| m ? m : 0}.join('.')
+
       self.vendor = spec.author
       self.url = spec.homepage
       self.category = "Languages/Development/Ruby"

data/lib/fpm/package/rpm.rb

@@ -167,6 +167,7 @@ class FPM::Package::RPM < FPM::Package
     #input.replaces += replaces
     
     self.config_files += rpm.config_files
+    self.directories += rpm.directories
 
     # Extract to the staging directory
     rpm.extract(staging_path)

data/templates/deb.erb

@@ -16,7 +16,9 @@ Conflicts: <%= conflicts.join(", ") %>
 #Pre-Depends: <%#= properpredeps.flatten.join(", ") %>
 <%# end -%>
 <% if !provides.empty? -%>
-Provides: <%= provides.join(", ") %>
+<%# Turn each provides from 'foo = 123' to simply 'foo' because Debian :\ -%>
+<%#  http://www.debian.org/doc/debian-policy/ch-relationships.html %>
+Provides: <%= provides.first.split(" ").first %>
 <% end -%>
 <% if !replaces.empty? -%>
 Replaces: <%= replaces.join(", ") %>

data/templates/rpm.erb

@@ -107,6 +107,9 @@ fi
 <% config_files.each do |path| -%>
 %config(noreplace) <%= File.join(prefix, path) %>
 <% end -%>
+<% directories.each do |path| -%>
+%dir <%= File.join(prefix, path) %>
+<% end -%>
 <%# list only files, not directories? -%>
 <%= 
   # Reject config files already listed or parent directories, then prefix files

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.20
+  version: 0.4.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -152,28 +152,28 @@ files:
 - lib/fpm/command.rb
 - lib/fpm/namespace.rb
 - lib/fpm/package.rb
-- lib/fpm/errors.rb
-- lib/fpm/package/gem.rb
-- lib/fpm/package/dir.rb
-- lib/fpm/package/pyfpm/__init__.pyc
 - lib/fpm/package/pyfpm/get_metadata.pyc
 - lib/fpm/package/pyfpm/get_metadata.py
+- lib/fpm/package/pyfpm/__init__.pyc
 - lib/fpm/package/pyfpm/__init__.py
-- lib/fpm/package/npm.rb
-- lib/fpm/package/pear.rb
+- lib/fpm/package/tar.rb
 - lib/fpm/package/deb.rb
-- lib/fpm/package/python.rb
-- lib/fpm/package/rpm.rb
+- lib/fpm/package/dir.rb
 - lib/fpm/package/puppet.rb
-- lib/fpm/package/tar.rb
+- lib/fpm/package/gem.rb
+- lib/fpm/package/python.rb
 - lib/fpm/package/solaris.rb
+- lib/fpm/package/rpm.rb
+- lib/fpm/package/npm.rb
+- lib/fpm/package/pear.rb
+- lib/fpm/errors.rb
 - lib/fpm/util.rb
 - lib/fpm.rb
 - bin/fpm-npm
 - bin/fpm
-- templates/deb.erb
-- templates/rpm.erb
 - templates/solaris.erb
+- templates/rpm.erb
+- templates/deb.erb
 - templates/puppet/package/remove.pp.erb
 - templates/puppet/package.pp.erb
 - LICENSE
@@ -205,4 +205,3 @@ signing_key:
 specification_version: 3
 summary: fpm - package building and mangling
 test_files: []
-has_rdoc: