fpm 0.4.42 → 1.0.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MWE4OWM3Y2MxMzdkOGY3ZWE0MmFkYWRmNGExNTQ1OThkNThjYjlmOA==
+  data.tar.gz: !binary |-
+    YTEwZWJjNGQ1MDA0M2E0YzEyZDJiMzVhMTdmYWU0MTZmOGNkMTdhNg==
+SHA512:
+  metadata.gz: !binary |-
+    NzdlOTZlNTA5NDhhYzIzMjJlMzQ5NzE1ZmE5M2RhNzk3MTUwNjVjMjZmNWJh
+    OWEwYjNhYjA2OTcxNmNkOGY2ZGFkYWQ4NzkxZThlZDRkYzhiNDE2ZmJkMWNk
+    YTE3OGEzN2MxOGNlOTAyOWI4MjZhNjllNDJlNzM4MDc2YjMxMzc=
+  data.tar.gz: !binary |-
+    YTI2OWMyNjE3N2U1NzlkNTdhNTg1OTU3Njc2ZDJlZWVkYWI1MTc0OGFlN2U5
+    OWEzYmMxNjQ4N2VlZDhmMzk1MzBlZTRjOWY0OGNiMmIwMWNmM2EzNTgxMjEz
+    YzQ4NmY1ZDFlOWQ3MGVkYzY3MjdkNThmNmYzN2U3ODdlMGU4ZGM=

data/CHANGELIST

@@ -1,3 +1,57 @@
+1.0.0 (December 5, 2013)
+  - Config file of flags is now supported. Searches for $HOME/.fpm and
+    $PWD/.fpm. If both exist, $HOME is loaded first so $PWD can override.
+    (Pranay Kanwar)
+  - pkgin: Basic support for SmartOS/pkgsrc's pkgin format. (#567, Brian Akins)
+  - cpan: catch more cases of perllocal.pod and delete them 
+    (#510, Jordan Sissel)
+  - cpan: Correctly support module version selection (#518, Matt Sharpe)
+  - cpan: include builddeps in PERL5LIB when running cpan tests 
+    (#500, Matt Sharpe)
+  - cpan: Avoid old system perl modules when doing module builds 
+    (#442, #513; Matt Sharpe)
+  - python: safer gathering of python module dependencies.
+  - python: better handling of unicode strings in python package metadata
+    (#575, Bruno Renié)
+  - cpan: Support 'http_proxy' env var. (#491, Patrick Cable)
+  - deb: --deb-user and --deb-group both default to 'root' now 
+    (#504, Pranay Kanwar)
+  - deb: convert '>' to '>>' in deb version constraints 
+    (#503, #439, Pranay Kanwar)
+  - deb: Warn if epoch is set. Just so you know what's going on, since
+    the default filename doesn't include the epoch. (#502, Pranay Kanwar)
+  - deb,rpm: --config-files is now recursive if you give it a directory.
+    This seems to be the most expected behavior by users. 
+    (#171, #506; Pranay Kanwar)
+  - dir: Respect -C when using path mapping (#498, #507; Pranay Kanwar)
+  - rpm: Add --rpm-ignore-iteration-in-dependencies to let you to depend
+    on any release (aka iteration) of the same version of a package.
+    (#364, #508; Pranay Kanwar)
+  - dir: Handle copying of special files when possible 
+    (#347, #511, #539, #561; Pranay Kanwar)
+  - rpm: Don't mistake symlinks as actual directories (#521, Nathan Huff)
+  - npm: Choose an alternate npm registry with --npm-registry (#445, #524; 
+    Matt Sharpe)
+  - cpan: Choose an alternate cpan server with --cpan-mirror. Additionally, you
+    can use --cpan-mirror-only to only use this mirror for metadata queries.
+    (#524, Matt Sharpe)
+  - deb: Fix broken --deb-changelog flag (#543, #544; Tray Torrance)
+  - deb: When --deb-upstart is given, automatically create an upstart-sysv
+    symlink /etc/init.d/<name> to /lib/init/upstart-job (#545, Igor Galić)
+  - rpm: Fix bug when generating spec file listings on files with strange
+    characters in the names. (#547, Chris Chandler)
+  - dir: Fix bug where the new directory mapping feature would cause you not
+    to be able to select files with '=' in the name for packaging. 
+    (#556, #554; Pranay Kanwar)
+  - python: Fix some unicode string issues in package metadata 
+    (#575, Bruno Renié)
+  - gem-rpm: Now respects the --gem-package-name-prefix when generating the
+    'rubygem(name)' provides statement (#585, Stepan Stipl)
+  - deb: Downcase and replace underscores with dashes in 'provides' list.
+    (#591, Eric Connell)
+  - deb: Fix a lintian complaint about md5sums permissions (#593, Sam Crang)
+  - cpan: Modules with 'MYMETA' files are now supported (#573, Michael Donlon)
+
 0.4.42 (July 23, 2013)
   - dir: make source=destination mappings behave the same way 'rsync -a' does
     with respect to source and destination paths.

data/lib/fpm.rb

@@ -14,3 +14,4 @@ require "fpm/package/puppet"
 require "fpm/package/python"
 require "fpm/package/osxpkg"
 require "fpm/package/solaris"
+require "fpm/package/pkgin"

data/lib/fpm/command.rb

@@ -52,7 +52,7 @@ class FPM::Command < Clamp::Command
     :attribute_name => :chdir
   option "--prefix", "PREFIX",
     "A path to prefix files with when building the target package. This may " \
-    "be necessary for all input packages. For example, the 'gem' type will" \
+    "be necessary for all input packages. For example, the 'gem' type will " \
     "prefix with your gem directory automatically."
   option ["-p", "--package"], "OUTPUT", "The package file path to output."
   option ["-f", "--force"], :flag, "Force output even if it will overwrite an " \
@@ -103,7 +103,7 @@ class FPM::Command < Clamp::Command
     " in debs and %config in rpm. If you have multiple files to mark as " \
     "configuration files, specify this flag multiple times.",
     :multivalued => true, :attribute_name => :config_files
-  option "--directories", "DIRECTORIES", "Mark a directory as being owned " \
+  option "--directories", "DIRECTORIES", "Recursively mark a directory as being owned " \
     "by the package", :multivalued => true, :attribute_name => :directories
   option ["-a", "--architecture"], "ARCHITECTURE",
     "The architecture name. Usually matches 'uname -m'. For automatic values," \
@@ -217,8 +217,6 @@ class FPM::Command < Clamp::Command
 
   # Execute this command. See Clamp::Command#execute and Clamp's documentation
   def execute
-    @logger = Cabin::Channel.get
-    @logger.subscribe(STDOUT)
     @logger.level = :warn
 
     if (stray_flags = args.grep(/^-/); stray_flags.any?)
@@ -415,6 +413,29 @@ class FPM::Command < Clamp::Command
     output.cleanup unless output.nil?
   end # def execute
 
+  def run(*args)
+    @logger = Cabin::Channel.get
+    @logger.subscribe(STDOUT)
+
+    # fpm initialization files, note the order of the following array is
+    # important, try .fpm in users home directory first and then the current
+    # directory
+    rc_files = [File.join(ENV['HOME'],'.fpm'), '.fpm']
+
+    rc_files.each do |rc_file|
+      if File.readable? rc_file
+        @logger.warn("Loading flags from rc file #{rc_file}")
+        File.readlines(rc_file).each do |line|
+          Shellwords.shellsplit(line).each do |e|
+            ARGV << e
+          end
+        end
+      end
+    end
+
+    super(*args)
+  end # def run
+
   # A simple flag validator
   #
   # The goal of this class is to ensure the flags and arguments given

data/lib/fpm/package.rb

@@ -195,7 +195,7 @@ class FPM::Package
 
     # copy other bits
     ivars = [
-      :@architecture, :@attributes, :@category, :@config_files, :@conflicts,
+      :@architecture, :@category, :@config_files, :@conflicts,
       :@dependencies, :@description, :@epoch, :@iteration, :@license, :@maintainer,
       :@name, :@provides, :@replaces, :@scripts, :@url, :@vendor, :@version,
       :@directories, :@staging_path
@@ -206,6 +206,11 @@ class FPM::Package
       pkg.instance_variable_set(ivar, instance_variable_get(ivar))
     end
 
+    # Attributes are special! We do not want to remove the default values of
+    # the destination package type unless their value is specified on the
+    # source package object.
+    pkg.attributes.merge!(self.attributes)
+
     pkg.converted_from(self.class)
     return pkg
   end # def convert
@@ -366,7 +371,7 @@ class FPM::Package
     end
 
     Find.find(installdir) do |path|
-      match_path = path.sub("#{installdir}/", '')
+      match_path = path.sub("#{installdir.chomp('/')}/", '')
 
       attributes[:excludes].each do |wildcard|
         @logger.debug("Checking path against wildcard", :path => match_path, :wildcard => wildcard)

data/lib/fpm/package/cpan.rb

@@ -8,12 +8,24 @@ class FPM::Package::CPAN < FPM::Package
   # Flags '--foo' will be accessable  as attributes[:npm_foo]
   option "--perl-bin", "PERL_EXECUTABLE",
     "The path to the perl executable you wish to run.", :default => "perl"
+
   option "--cpanm-bin", "CPANM_EXECUTABLE",
     "The path to the cpanm executable you wish to run.", :default => "cpanm"
-  option "--package-name-prefix", "NAME_PREFIX", "Name to prefix the package " \
-    "name with.", :default => "perl"
-  option "--test", :flag, "Run the tests before packaging?", :default => true
-  option "--perl-lib-path", "PERL_LIB_PATH", "Path of target Perl Libraries"
+
+  option "--mirror", "CPAN_MIRROR",
+    "The CPAN mirror to use instead of the default."
+
+  option "--mirror-only", :flag,
+    "Only use the specified mirror for metadata.", :default => false
+
+  option "--package-name-prefix", "NAME_PREFIX",
+    "Name to prefix the package name with.", :default => "perl"
+
+  option "--test", :flag,
+    "Run the tests before packaging?", :default => true
+
+  option "--perl-lib-path", "PERL_LIB_PATH",
+    "Path of target Perl Libraries"
 
   private
   def input(package)
@@ -28,9 +40,13 @@ class FPM::Package::CPAN < FPM::Package
     require "net/http"
     require "json"
 
-    result = search(package)
-    tarball = download(result)
-    moduledir = unpack(tarball)
+    if (attributes[:cpan_local_module?])
+      moduledir = package
+    else
+      result = search(package)
+      tarball = download(result, version)
+      moduledir = unpack(tarball)
+    end
 
     # Read package metadata (name, version, etc)
     if File.exists?(File.join(moduledir, "META.json"))
@@ -38,6 +54,11 @@ class FPM::Package::CPAN < FPM::Package
     elsif File.exists?(File.join(moduledir, ("META.yml")))
       require "yaml"
       metadata = YAML.load_file(File.join(moduledir, ("META.yml")))
+    elsif File.exists?(File.join(moduledir, "MYMETA.json"))
+      metadata = JSON.parse(File.read(File.join(moduledir, ("MYMETA.json"))))
+    elsif File.exists?(File.join(moduledir, ("MYMETA.yml")))
+      require "yaml"
+      metadata = YAML.load_file(File.join(moduledir, ("MYMETA.yml")))
     else
       raise FPM::InvalidPackageConfiguration, 
         "Could not find package metadata. Checked for META.json and META.yml"
@@ -73,14 +94,15 @@ class FPM::Package::CPAN < FPM::Package
     # We'll install to a temporary directory.
     @logger.info("Installing any build or configure dependencies")
 
-    if attributes[:cpan_test?]
-      safesystem(attributes[:cpan_cpanm_bin], "-L", build_path("cpan"), moduledir)
-    else
-      safesystem(attributes[:cpan_cpanm_bin], "-nL", build_path("cpan"), moduledir)
-    end
+    cpanm_flags = ["-L", build_path("cpan"), moduledir]
+    cpanm_flags += ["-n"] if attributes[:cpan_test?]
+    cpanm_flags += ["--mirror", "#{attributes[:cpan_mirror]}"] if !attributes[:cpan_mirror].nil?
+    cpanm_flags += ["--mirror-only"] if attributes[:cpan_mirror_only?] && !attributes[:cpan_mirror].nil?
+
+    safesystem(attributes[:cpan_cpanm_bin], *cpanm_flags)
 
     if !attributes[:no_auto_depends?] 
-      if metadata.include?("requires")
+      if metadata.include?("requires") && !metadata["requires"].nil?
         metadata["requires"].each do |dep_name, version|
           # Special case for representing perl core as a version.
           if dep_name == "perl"
@@ -143,7 +165,11 @@ class FPM::Package::CPAN < FPM::Package
                      # Empty install_base to avoid local::lib being used.
                      "INSTALL_BASE=")
         end
-        make = [ "make" ]
+        if attributes[:cpan_test?]
+          make = [ "env", "PERL5LIB=#{build_path("cpan/lib/perl5")}", "make" ]
+        else
+          make = [ "make" ]
+        end
         safesystem(*make)
         safesystem(*(make + ["test"])) if attributes[:cpan_test?]
         safesystem(*(make + ["DESTDIR=#{staging_path}", "install"]))
@@ -152,10 +178,14 @@ class FPM::Package::CPAN < FPM::Package
         safesystem(attributes[:cpan_perl_bin],
                    "-Mlocal::lib=#{build_path("cpan")}",
                    "Build.PL")
-        safesystem("./Build")
+        safesystem(attributes[:cpan_perl_bin],
+                   "-Mlocal::lib=#{build_path("cpan")}",
+                   "./Build")
 
         if attributes[:cpan_test?]
-          safesystem("./Build", "test")
+          safesystem(attributes[:cpan_perl_bin],
+                   "-Mlocal::lib=#{build_path("cpan")}",
+                   "./Build", "test")
         end
         if attributes[:cpan_perl_lib_path]
           perl_lib_path = attributes[:cpan_perl_lib_path]
@@ -173,9 +203,11 @@ class FPM::Package::CPAN < FPM::Package
           "Build.PL found"
       end
 
-      # Fix any files likely to cause conflicts. 
+      # Fix any files likely to cause conflicts that are duplicated
+      # across packages.
       # https://github.com/jordansissel/fpm/issues/443
-      ::Dir.glob(File.join(staging_path, prefix, "lib*/perl/*/perllocal.pod")).each do |path|
+      # https://github.com/jordansissel/fpm/issues/510
+      ::Dir.glob(File.join(staging_path, prefix, "**/perllocal.pod")).each do |path|
         @logger.debug("Removing useless file.",
                       :path => path.gsub(staging_path, ""))
         File.unlink(path)
@@ -207,17 +239,25 @@ class FPM::Package::CPAN < FPM::Package
     return directory
   end
 
-  def download(metadata)
+  def download(metadata, cpan_version=nil)
     distribution = metadata["distribution"]
     author = metadata["author"]
     @logger.info("Downloading perl module",
                  :distribution => distribution,
-                 :version => version)
+                 :version => cpan_version)
 
     # default to latest versionunless we specify one
-    version = metadata["version"] if version.nil?
+    if cpan_version.nil?
+      self.version = metadata["version"]
+    else
+      if metadata["version"] =~ /^v\d/
+        self.version = "v#{cpan_version}"
+      else
+        self.version = cpan_version
+      end
+    end
 
-    tarball = "#{distribution}-#{version}.tar.gz"
+    tarball = "#{distribution}-#{self.version}.tar.gz"
     #url = "http://www.cpan.org/CPAN/authors/id/#{author[0,1]}/#{author[0,2]}/#{author}/#{tarball}"
     url = "http://www.cpan.org/authors/id/#{author[0,1]}/#{author[0,2]}/#{author}/#{tarball}"
     @logger.debug("Fetching perl module", :url => url)
@@ -259,12 +299,20 @@ class FPM::Package::CPAN < FPM::Package
   end # def metadata
 
   def fix_name(name)
-    return [attributes[:cpan_package_name_prefix], name].join("-").gsub("::", "-")
+    case name
+      when "perl"; return "perl"
+      else; return [attributes[:cpan_package_name_prefix], name].join("-").gsub("::", "-")
+    end
   end # def fix_name
 
   def httpfetch(url)
     uri = URI.parse(url)
-    http = Net::HTTP.new(uri.host, uri.port)
+    if ENV['http_proxy']
+      proxy = URI.parse(ENV['http_proxy'])  
+      http = Net::HTTP.Proxy(proxy.host,proxy.port,proxy.user,proxy.password).new(uri.host, uri.port)
+    else
+      http = Net::HTTP.new(uri.host, uri.port)
+    end
     response = http.request(Net::HTTP::Get.new(uri.request_uri))
     case response
       when Net::HTTPSuccess; return response

data/lib/fpm/package/deb.rb

@@ -76,9 +76,9 @@ class FPM::Package::Deb < FPM::Package
   option "--priority", "PRIORITY", 
     "The debian package 'priority' value.", :default => "extra"
 
-  option "--user", "USER", "The owner of files in this package"
+  option "--user", "USER", "The owner of files in this package", :default => 'root'
 
-  option "--group", "GROUP", "The group owner of files in this package"
+  option "--group", "GROUP", "The group owner of files in this package", :default => 'root'
 
   option "--changelog", "FILEPATH", "Add FILEPATH as debian changelog" do |file|
     File.expand_path(file)
@@ -225,7 +225,10 @@ 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
+      with(parse.call("Provides")) do |provides_str|
+        next if provides_str.nil?
+        self.provides = provides_str.split(/\s*,\s*/)
+      end
 
       # 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
@@ -297,6 +300,7 @@ class FPM::Package::Deb < FPM::Package
   end # def extract_files
 
   def output(output_path)
+    self.provides = self.provides.collect { |p| fix_provides(p) }
     output_check(output_path)
     # Abort if the target path already exists.
 
@@ -340,8 +344,13 @@ class FPM::Package::Deb < FPM::Package
 
     tar_flags = []
     if !attributes[:deb_user].nil?
-      tar_flags += [ "--owner", attributes[:deb_user] ]
+      if attributes[:deb_user] == 'root'
+        tar_flags += [ "--numeric-owner", "--owner", "0" ]
+      else
+        tar_flags += [ "--owner", attributes[:deb_user] ]
+      end
     end
+
     if !attributes[:deb_group].nil?
       if attributes[:deb_group] == 'root'
         tar_flags += [ "--numeric-owner", "--group", "0" ]
@@ -351,7 +360,7 @@ class FPM::Package::Deb < FPM::Package
     end
 
     if attributes[:deb_changelog]
-      dest_changelog = File.join(staging_path, "usr/share/doc/#{attributes[:name]}/changelog.Debian")
+      dest_changelog = File.join(staging_path, "usr/share/doc/#{name}/changelog.Debian")
       FileUtils.mkdir_p(File.dirname(dest_changelog))
       FileUtils.cp attributes[:deb_changelog], dest_changelog
       File.chmod(0644, dest_changelog)
@@ -376,10 +385,15 @@ class FPM::Package::Deb < FPM::Package
 
     attributes.fetch(:deb_upstart_list, []).each do |upstart|
       name = File.basename(upstart, ".upstart")
-      dest_upstart = File.join(staging_path, "etc/init/#{name}.conf")
+      dest_upstart = staging_path("etc/init/#{name}.conf")
       FileUtils.mkdir_p(File.dirname(dest_upstart))
-      FileUtils.cp upstart, dest_upstart
+      FileUtils.cp(upstart, dest_upstart)
       File.chmod(0644, dest_upstart)
+
+      # Install an init.d shim that calls upstart
+      dest_init = staging_path("/etc/init.d/#{name}")
+      FileUtils.mkdir_p(File.dirname(dest_init))
+      FileUtils.ln_s("/lib/init/upstart-job", dest_init)
     end
 
     args = [ tar_cmd, "-C", staging_path, compression ] + tar_flags + [ "-cf", datatar, "." ]
@@ -399,6 +413,10 @@ class FPM::Package::Deb < FPM::Package
     self.dependencies = self.dependencies.collect do |dep|
       fix_dependency(dep)
     end.flatten
+    self.provides = self.provides.collect do |provides|
+      fix_provides(provides)
+    end.flatten
+      
   end # def converted_from
 
   def debianize_op(op)
@@ -430,7 +448,7 @@ class FPM::Package::Deb < FPM::Package
     end
 
     if dep.include?("_")
-      @logger.warn("Replacing underscores with dashes in '#{dep}' because " \
+      @logger.warn("Replacing dependency underscores with dashes in '#{dep}' because " \
                    "debs don't like underscores")
       dep = dep.gsub("_", "-")
     end
@@ -458,12 +476,33 @@ class FPM::Package::Deb < FPM::Package
       nextversion[-1] += 1
       nextversion = nextversion.join(".")
       return ["#{name} (>= #{version})", "#{name} (<< #{nextversion})"]
+    elsif (m = dep.match(/(\S+)\s+\(> (.+)\)/))
+      # Convert 'foo (> x) to 'foo (>> x)'
+      name, version = m[1..2]
+      return ["#{name} (>> #{version})"]
     else
       # otherwise the dep is probably fine
       return dep.rstrip
     end
   end # def fix_dependency
 
+  def fix_provides(provides)
+    name_re = /^[^ \(]+/
+    name = provides[name_re]
+    if name =~ /[A-Z]/
+      @logger.warn("Downcasing provides '#{name}' because deb packages " \
+                   " don't work so good with uppercase names")
+      provides = provides.gsub(name_re) { |n| n.downcase }
+    end
+
+    if provides.include?("_")
+      @logger.warn("Replacing 'provides' underscores with dashes in '#{provides}' because " \
+                   "debs don't like underscores")
+      provides = provides.gsub("_", "-")
+    end
+    return provides.rstrip
+  end
+
   def control_path(path=nil)
     @control_path ||= build_path("control")
     FileUtils.mkdir(@control_path) if !File.directory?(@control_path)
@@ -499,6 +538,9 @@ class FPM::Package::Deb < FPM::Package
   end # def write_control_tarball
 
   def write_control
+    # warn user if epoch is set
+    @logger.warn("epoch in Version is set", :epoch => self.epoch) if self.epoch
+
     # calculate installed-size if necessary:
     if attributes[:deb_installed_size].nil?
       @logger.info("No deb_installed_size set, calculating now.")
@@ -549,10 +591,26 @@ class FPM::Package::Deb < FPM::Package
 
   def write_conffiles
     return unless config_files.any?
+
+    # scan all conf file paths for files and add them
+    allconfigs = []
+    config_files.each do |path|
+      cfg_path = File.expand_path(path, staging_path)
+      begin
+        Find.find(cfg_path) do |p|
+          allconfigs << p.gsub("#{staging_path}/", '') if File.file? p
+        end
+      rescue Errno::ENOENT => e
+        raise FPM::InvalidPackageConfiguration,
+          "Error trying to use '#{cfg_path}' as a config file in the package. Does it exist?"
+      end
+    end
+    allconfigs.sort!.uniq!
+
     File.open(control_path("conffiles"), "w") do |out|
       # 'config_files' comes from FPM::Package and is usually set with
       # FPM::Command's --config-files flag
-      config_files.each { |cf| out.puts(cf) }
+      allconfigs.each { |cf| out.puts(cf) }
     end
   end # def write_conffiles
 
@@ -593,6 +651,7 @@ class FPM::Package::Deb < FPM::Package
           out.puts "#{md5} #{path}"
         end
       end
+      File.chmod(0644, control_path("md5sums"))
     end
   end # def write_md5sums