fpm 0.4.37 → 0.4.38

data/CHANGELIST

@@ -1,3 +1,12 @@
+0.4.38 (June 24, 2013)
+  - cpan: fpm's cpan code now works under ruby 1.8.7
+  - python: fix a bug in dependency handling (#461, Pranay Kanwar)
+  - pear: Added --pear-data-dir flag (#465, Zsolt Takács)
+  - cpan: fix a bug with some clean up on certain 64bit systems
+  - gem: improve detection of the gem bin install path (#476, Tray Torrance)
+  - rpm: fix bug when calling using --rpm-use-file-permissions 
+    (#464, Rich Horwood)
+
 0.4.37 (May 30, 2013)
   - deb: fix creation failures on OS X (#450, patch by Anthony Scalisi and
     Matthew M. Boedicker)

data/lib/fpm.rb

@@ -4,7 +4,13 @@ require "fpm/package"
 require "fpm/package/dir"
 require "fpm/package/gem"
 require "fpm/package/deb"
+require "fpm/package/npm"
 require "fpm/package/rpm"
 require "fpm/package/tar"
+require "fpm/package/cpan"
+require "fpm/package/pear"
+require "fpm/package/empty"
+require "fpm/package/puppet"
 require "fpm/package/python"
 require "fpm/package/osxpkg"
+require "fpm/package/solaris"

data/lib/fpm/package/cpan.rb

@@ -17,19 +17,19 @@ class FPM::Package::CPAN < FPM::Package
 
   private
   def input(package)
-    if RUBY_VERSION =~ /^1\.8/
-      raise FPM::Package::InvalidArgument,
-        "Sorry, CPAN support requires ruby 1.9 or higher. You have " \
-        "#{RUBY_VERSION}. If this negatively impacts you, please let " \
-        "me know by filing an issue: " \
-        "https://github.com/jordansissel/fpm/issues"
-    end
-    require "ftw" # for http access
+    #if RUBY_VERSION =~ /^1\.8/
+      #raise FPM::Package::InvalidArgument,
+        #"Sorry, CPAN support requires ruby 1.9 or higher. You have " \
+        #"#{RUBY_VERSION}. If this negatively impacts you, please let " \
+        #"me know by filing an issue: " \
+        #"https://github.com/jordansissel/fpm/issues"
+    #end
+    #require "ftw" # for http access
+    require "net/http"
     require "json"
 
-    agent = FTW::Agent.new
-    result = search(package, agent)
-    tarball = download(result, agent)
+    result = search(package)
+    tarball = download(result)
     moduledir = unpack(tarball)
 
     # Read package metadata (name, version, etc)
@@ -86,7 +86,7 @@ class FPM::Package::CPAN < FPM::Package
             self.dependencies << "#{dep_name} >= #{version}"
             next
           end
-          dep = search(dep_name, agent)
+          dep = search(dep_name)
           
           if dep.include?("distribution")
             name = fix_name(dep["distribution"])
@@ -162,7 +162,7 @@ class FPM::Package::CPAN < FPM::Package
 
       # Fix any files likely to cause conflicts. 
       # https://github.com/jordansissel/fpm/issues/443
-      ::Dir.glob(File.join(staging_path, prefix, "lib/perl/*/perllocal.pod")).each do |path|
+      ::Dir.glob(File.join(staging_path, prefix, "lib*/perl/*/perllocal.pod")).each do |path|
         @logger.debug("Removing useless file.",
                       :path => path.gsub(staging_path, ""))
         File.unlink(path)
@@ -194,7 +194,7 @@ class FPM::Package::CPAN < FPM::Package
     return directory
   end
 
-  def download(metadata, agent)
+  def download(metadata)
     distribution = metadata["distribution"]
     author = metadata["author"]
     @logger.info("Downloading perl module",
@@ -207,31 +207,40 @@ class FPM::Package::CPAN < FPM::Package
     tarball = "#{distribution}-#{version}.tar.gz"
     url = "http://www.cpan.org/CPAN/authors/id/#{author[0,1]}/#{author[0,2]}/#{author}/#{tarball}"
     @logger.debug("Fetching perl module", :url => url)
-    response = agent.get!(url)
-    if response.error?
-      @logger.error("Download failed", :error => response.status_line,
+    
+    begin
+      response = httpfetch(url)
+    rescue Net::HTTPServerException
+      #@logger.error("Download failed", :error => response.status_line,
+                    #:url => url)
+      @logger.error("Download failed", :error => response.message,
                     :url => url)
       raise FPM::InvalidPackageConfiguration, "metacpan query failed"
     end
 
     File.open(build_path(tarball), "w") do |fd|
-      response.read_body { |c| fd.write(c) }
+      #response.read_body { |c| fd.write(c) }
+      fd.write(response.body)
     end
     return build_path(tarball)
   end # def download
 
-  def search(package, agent)
+  def search(package)
     @logger.info("Asking metacpan about a module", :module => package)
     metacpan_url = "http://api.metacpan.org/v0/module/" + package
-    response = agent.get!(metacpan_url)
-    if response.error?
-      @logger.error("metacpan query failed.", :error => response.status_line,
+    begin
+      response = httpfetch(metacpan_url)
+    rescue Net::HTTPServerException
+      #@logger.error("metacpan query failed.", :error => response.status_line,
+                    #:module => package, :url => metacpan_url)
+      @logger.error("metacpan query failed.", :error => response.message,
                     :module => package, :url => metacpan_url)
       raise FPM::InvalidPackageConfiguration, "metacpan query failed"
     end
 
-    data = ""
-    response.read_body { |c| data << c }
+    #data = ""
+    #response.read_body { |c| p c; data << c }
+    data = response.body
     metadata = JSON.parse(data)
     return metadata
   end # def metadata
@@ -240,5 +249,16 @@ class FPM::Package::CPAN < FPM::Package
     return [attributes[:cpan_package_name_prefix], name].join("-").gsub("::", "-")
   end # def fix_name
 
+  def httpfetch(url)
+    uri = URI.parse(url)
+    http = Net::HTTP.new(uri.host, uri.port)
+    response = http.request(Net::HTTP::Get.new(uri.request_uri))
+    case response
+      when Net::HTTPSuccess; return response
+      when Net::HTTPRedirection; return httpfetch(response["location"])
+      else; response.error!
+    end
+  end
+
   public(:input)
 end # class FPM::Package::NPM

data/lib/fpm/package/gem.rb

@@ -16,8 +16,7 @@ require "yaml"
 # * :gem_gem
 class FPM::Package::Gem < FPM::Package
   # Flags '--foo' will be accessable  as attributes[:gem_foo]
-  option "--bin-path", "DIRECTORY", "The directory to install gem executables",
-    :default => ::Gem::bindir
+  option "--bin-path", "DIRECTORY", "The directory to install gem executables"
   option "--package-prefix", "NAMEPREFIX",
     "(DEPRECATED, use --package-name-prefix) Name to prefix the package " \
     "name with." do |value|
@@ -163,7 +162,8 @@ class FPM::Package::Gem < FPM::Package
     if attributes.include?(:prefix) && ! attributes[:prefix].nil?
       installdir = "#{staging_path}/#{attributes[:prefix]}"
     else
-      installdir = File.join(staging_path, ::Gem::dir)
+      gemdir = safesystemout(*[attributes[:gem_gem], 'env', 'gemdir']).chomp
+      installdir = File.join(staging_path, gemdir)
     end
 
     ::FileUtils.mkdir_p(installdir)
@@ -173,12 +173,17 @@ class FPM::Package::Gem < FPM::Package
     if attributes[:gem_env_shebang?]
       args += ["-E"]
     end
-    if attributes[:gem_bin_path]
+
+    if attributes.include?(:gem_bin_path) && ! attributes[:gem_bin_path].nil?
       bin_path = File.join(staging_path, attributes[:gem_bin_path])
-      args += ["--bindir", bin_path]
-      ::FileUtils.mkdir_p(bin_path)
+    else
+      gem_env  = safesystemout(*[attributes[:gem_gem], 'env']).split("\n")
+      gem_bin  = gem_env.select{ |line| line =~ /EXECUTABLE DIRECTORY/ }.first.split(': ').last
+      bin_path = File.join(staging_path, gem_bin)
     end
 
+    args += ["--bindir", bin_path]
+    ::FileUtils.mkdir_p(bin_path)
     args << gem_path
     safesystem(*args)
   end # def install_to_staging

data/lib/fpm/package/npm.rb

@@ -56,12 +56,12 @@ class FPM::Package::NPM < FPM::Package
     # Query details about our now-installed package.
     # We do this by using 'npm ls' with json + long enabled to query details
     # about the installed package.
-    npm_ls_out = safesystemout(attributes[:npm_bin], "ls", "--json", "--long", package, *npm_flags)
+    npm_ls_out = safesystemout(attributes[:npm_bin], "ls", "--json", "--long", *npm_flags)
     npm_ls = JSON.parse(npm_ls_out)
     name, info = npm_ls["dependencies"].first
 
     self.name = [attributes[:npm_package_name_prefix], name].join("-")
-    self.version = info["version"]
+    self.version = info.fetch("version", "0.0.0")
 
     if info.include?("repository")
       self.url = info["repository"]["url"]
@@ -70,8 +70,20 @@ class FPM::Package::NPM < FPM::Package
     end
 
     self.description = info["description"]
-    self.vendor = sprintf("%s <%s>", info["author"]["name"],
-                          info["author"]["email"])
+    # Supposedly you can upload a package for npm with no author/author email 
+    # so I'm being safer with this. Author can also be a hash or a string
+    self.vendor = "Unknown <unknown@unknown.unknown>"
+    if info.include?("author")
+      author_info = info["author"]
+      # If a hash, assemble into a string
+      if author_info.respond_to? :fetch
+        self.vendor = sprintf("%s <%s>", author_info.fetch("name", "unknown"),
+                              author_info.fetch("email", "unknown@unknown.unknown"))
+      else
+        # Probably will need a better check for validity here
+        self.vendor = author_info unless author_info == ""
+      end
+    end
 
     # npm installs dependencies in the module itself, so if you do
     # 'npm install express' it installs dependencies (like 'connect')

data/lib/fpm/package/pear.rb

@@ -25,6 +25,9 @@ class FPM::Package::PEAR < FPM::Package
   option "--php-dir", "PHP_DIR",
     "Specify php dir relative to prefix if differs from pear default (pear/php)"
 
+  option "--data-dir", "DATA_DIR",
+    "Specify php dir relative to prefix if differs from pear default (pear/data)"
+
   # Input a PEAR package.
   #
   # The parameter is a PHP PEAR package name.
@@ -48,6 +51,11 @@ class FPM::Package::PEAR < FPM::Package
       safesystem("pear", "-c", config, "config-set", "php_dir", "#{staging_path(installroot)}/#{attributes[:pear_php_dir]}")
     end
 
+    if attributes[:pear_data_dir]
+      @logger.info("Setting data_dir", :data_dir => attributes[:pear_data_dir])
+      safesystem("pear", "-c", config, "config-set", "data_dir", "#{staging_path(installroot)}/#{attributes[:pear_data_dir]}")
+    end
+
     bin_dir = attributes[:pear_bin_dir] || "usr/bin"
     @logger.info("Setting bin_dir", :bin_dir => bin_dir)
     safesystem("pear", "-c", config, "config-set", "bin_dir", bin_dir)
@@ -60,8 +68,7 @@ class FPM::Package::PEAR < FPM::Package
     if !attributes[:pear_channel].nil?
       @logger.info("Custom channel specified", :channel => attributes[:pear_channel])
       channel_list = safesystemout("pear", "-c", config, "list-channels")
-
-      if !channel_list =~ /#{Regexp.quote(attributes[:pear_channel])}/
+      if channel_list !~ /#{Regexp.quote(attributes[:pear_channel])}/
         @logger.info("Discovering new channel", :channel => attributes[:pear_channel])
         safesystem("pear", "-c", config, "channel-discover", attributes[:pear_channel])
       end
@@ -94,11 +101,14 @@ class FPM::Package::PEAR < FPM::Package
     # Remove the stuff we don't want
     delete_these = [".depdb", ".depdblock", ".filemap", ".lock", ".channel", "cache", "temp", "download", ".channels", ".registry"]
     Find.find(staging_path) do |path|
-      if File.file?(path) && File.executable?(path)
-        @logger.info("replacing pear_dir in binary", :binary => path)
-        staging_path_re = Regexp.new("^" + Regexp.escape(staging_path))
-        content = File.read(path).gsub(staging_path_re, "")
-        File.write(path, content)
+      if File.file?(path)
+        @logger.info("replacing staging_path in file", :replace_in => path, :staging_path => staging_path)
+        begin
+          content = File.read(path).gsub(/#{Regexp.escape(staging_path)}/, "")
+          File.write(path, content)
+        rescue ArgumentError
+          @logger.warn("error replacing staging_path in file", :replace_in => path)
+        end
       end
       FileUtils.rm_r(path) if delete_these.include?(File.basename(path))
     end

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

@@ -35,13 +35,8 @@ class get_metadata(Command):
         deps = []
         if dep.specs:
             for operator, version in dep.specs:
-                final_operator = operator
-
-                if operator == "==":
-                    final_operator = "="
-
                 deps.append("%s %s %s" % (dep.project_name,
-                    final_operator, version))
+                        operator, version))
         else:
             deps.append(dep.project_name)
 

data/lib/fpm/package/python.rb

@@ -200,6 +200,13 @@ class FPM::Package::Python < FPM::Package
           raise FPM::InvalidPackageConfiguration, "Invalid dependency '#{dep}'"
         end
         name, cmp, version = match.captures
+
+        # convert == to =
+        if cmp == "=="
+          @logger.info("Converting == dependency requirement to =", :dependency => dep )
+          cmp = "="
+        end
+
         # dependency name prefixing is optional, if enabled, a name 'foo' will
         # become 'python-foo' (depending on what the python_package_name_prefix
         # is)

data/lib/fpm/package/rpm.rb

@@ -132,7 +132,7 @@ class FPM::Package::RPM < FPM::Package
     file = rpm_fix_name(file)
     return file unless attributes[:rpm_use_file_permissions?]
 
-    stat = File.stat( file.gsub(/\"/, '') )
+    stat = File.stat(file.gsub(/\"/, '').sub(/^\//,''))
     user = Etc.getpwuid(stat.uid).name
     group = Etc.getgrgid(stat.gid).name
     mode = stat.mode

data/lib/fpm/package/tar.rb

@@ -49,10 +49,11 @@ class FPM::Package::Tar < FPM::Package
   def output(output_path)
     output_check(output_path)
     # Unpack the tarball to the staging path
-    args = ["-cf", output_path, "-C", staging_path, "."]
+    args = ["-cf", output_path, "-C", staging_path]
     with(tar_compression_flag(output_path)) do |flag|
       args << flag unless flag.nil?
     end
+    args << "."
 
     safesystem("tar", *args)
   end # def output

data/lib/fpm/util.rb

@@ -80,6 +80,8 @@ module FPM::Util
 
     process.start
     stdout_w.close; stderr_w.close
+    stdout_r_str = stdout_r.read
+    stdout_r.close; stderr_r.close
     @logger.debug("Process is running", :pid => process.pid)
 
     process.wait
@@ -90,7 +92,7 @@ module FPM::Util
                               ". Full command was:#{args.inspect}")
     end
 
-    return :stdout_r
+    return stdout_r_str
   end # def safesystemout
 
   # Get the recommended 'tar' command for this platform.

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "0.4.37"
+  VERSION = "0.4.38"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.37
+  version: 0.4.38
   prerelease: 
 platform: ruby
 authors:
@@ -9,195 +9,195 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.7
   name: json
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.7.7
+- !ruby/object:Gem::Dependency
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.7
-- !ruby/object:Gem::Dependency
+        version: 0.6.0
   name: cabin
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
+        version: 2.6.2
   name: backports
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.6.2
+- !ruby/object:Gem::Dependency
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.2
-- !ruby/object:Gem::Dependency
+        version: 0.0.8
   name: arr-pm
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.8
+- !ruby/object:Gem::Dependency
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.8
-- !ruby/object:Gem::Dependency
+        version: 0.0.30
   name: ftw
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.30
+- !ruby/object:Gem::Dependency
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.30
-- !ruby/object:Gem::Dependency
+        version: '0.6'
   name: clamp
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
   type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
+        version: '0'
   name: childprocess
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
+- !ruby/object:Gem::Dependency
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   name: rush
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   name: rspec
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: 0.0.5
   name: insist
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.5
+- !ruby/object:Gem::Dependency
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.5
-- !ruby/object:Gem::Dependency
+        version: '0'
   name: minitest
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -216,6 +216,9 @@ files:
 - lib/fpm/util.rb
 - lib/fpm/package.rb
 - lib/fpm/errors.rb
+- lib/fpm/version.rb
+- lib/fpm/command.rb
+- lib/fpm/namespace.rb
 - lib/fpm/package/solaris.rb
 - lib/fpm/package/gem.rb
 - lib/fpm/package/dir.rb
@@ -233,18 +236,15 @@ files:
 - lib/fpm/package/pyfpm/get_metadata.py
 - lib/fpm/package/pyfpm/get_metadata.pyc
 - lib/fpm/package/pyfpm/__init__.py
-- lib/fpm/version.rb
-- lib/fpm/command.rb
-- lib/fpm/namespace.rb
 - bin/fpm
 - templates/rpm.erb
-- templates/puppet/package.pp.erb
-- templates/puppet/package/remove.pp.erb
-- templates/rpm/filesystem_list
 - templates/solaris.erb
-- templates/deb/ldconfig.sh.erb
 - templates/osxpkg.erb
 - templates/deb.erb
+- templates/puppet/package.pp.erb
+- templates/rpm/filesystem_list
+- templates/deb/ldconfig.sh.erb
+- templates/puppet/package/remove.pp.erb
 - LICENSE
 - CONTRIBUTORS
 - CHANGELIST