fpm 0.4.23 → 0.4.24

data/CHANGELIST

@@ -1,3 +1,13 @@
+0.4.xx (???)
+  - Don't include an empty url in rpm spec (#296, #276; patch by Pranay Kanwar)
+  - Don't require extra parameters if you use --inputs (#278, #297; Patch by
+    Pranay Kanwar)
+  - python: supports requirements.txt now for dependency information.
+  - python: supports pip now. Use '--python-pip path/to/pip' to have fpm use
+    it instead of easy_install.
+  - solaris: package building works again (#216, #299, patch by Pierre-Yves
+    Ritschard)
+
 0.4.23 (November 26, 2012)
   - The --directories flag is now recursive when the output package is rpm.
     This makes all directories under a given path as owned by the package

data/lib/fpm/command.rb

@@ -325,7 +325,7 @@ class FPM::Command < Clamp::Command
       # Read each line as a path
       File.new(inputs, "r").each_line do |line| 
         # Handle each line as if it were an argument
-        input.input(line)
+        input.input(line.strip)
       end
     end
 
@@ -483,7 +483,11 @@ class FPM::Command < Clamp::Command
         end
       end
 
-      mandatory(@command.args.any?,
+      if @command.inputs
+        mandatory(@command.input_type == "dir", "--inputs is only valid with -s dir")
+      end
+
+      mandatory(@command.args.any? || @command.inputs,
                 "No parameters given. You need to pass additional command " \
                 "arguments so that I know what you want to build packages " \
                 "from. For example, for '-s dir' you would pass a list of " \

data/lib/fpm/package/python.rb

@@ -23,6 +23,9 @@ class FPM::Package::Python < FPM::Package
     "The path to the python executable you wish to run.", :default => "python"
   option "--easyinstall", "EASYINSTALL_EXECUTABLE",
     "The path to the easy_install executable tool", :default => "easy_install"
+  option "--pip", "PIP_EXECUTABLE",
+    "The path to the pip executable tool. If not specified, easy_install " \
+    "is used instead", :default => nil
   option "--pypi", "PYPI_URL",
     "PyPi Server uri for retrieving packages.",
     :default => "http://pypi.python.org/simple"
@@ -100,8 +103,17 @@ class FPM::Package::Python < FPM::Package
     target = build_path(package)
     FileUtils.mkdir(target) unless File.directory?(target)
 
-    safesystem(attributes[:python_easyinstall], "-i", attributes[:python_pypi],
-               "--editable", "-U", "--build-directory", target, want_pkg)
+    if attributes[:python_pip].nil?
+      # no pip, use easy_install
+      puts "EASY_INSTALL"
+      safesystem(attributes[:python_easyinstall], "-i",
+                 attributes[:python_pypi], "--editable", "-U",
+                 "--build-directory", target, want_pkg)
+    else
+      puts "PIP PIP CHEERIOS"
+      safesystem(attributes[:python_pip], "install", "--no-install",
+                 "-U", "--build", target, want_pkg)
+    end
 
     # easy_install will put stuff in @tmpdir/packagename/, so find that:
     #  @tmpdir/somepackage/setup.py
@@ -123,13 +135,21 @@ class FPM::Package::Python < FPM::Package
 
     # chdir to the directory holding setup.py because some python setup.py's assume that you are
     # in the same directory.
-    output = ::Dir.chdir(File.dirname(setup_py)) do
+    setup_dir = File.dirname(setup_py)
+
+    output = ::Dir.chdir(setup_dir) do
       setup_cmd = "env PYTHONPATH=#{pylib} #{attributes[:python_bin]} " \
         "setup.py --command-packages=pyfpm get_metadata"
       # Capture the output, which will be JSON metadata describing this python
       # package. See fpm/lib/fpm/package/pyfpm/get_metadata.py for more
       # details.
-      `#{setup_cmd}`
+      output = `#{setup_cmd}`
+      if !$?.success?
+        @logger.error("setup.py get_metadata failed", :command => setup_cmd,
+                      :exitcode => $?.exitcode)
+        raise "An unexpected error occurred while processing the setup.py file"
+      end
+      output
     end
     @logger.debug("full text from `setup.py get_metadata`", :data => output)
     metadata = JSON.parse(output[/\{.*\}/msx])
@@ -149,8 +169,26 @@ class FPM::Package::Python < FPM::Package
       self.name = metadata["name"]
     end
 
+    requirements_txt = File.join(setup_dir, "requirements.txt")
+    if File.exists?(requirements_txt)
+      @logger.info("Found requirements.txt, using it instead of setup.py " \
+                    "for dependency information", :path => requirements_txt)
+      @logger.debug("Clearing dependency list (from setup.py) in prep for " \
+                    "reading requirements.txt")
+      # Best I can tell, requirements.txt are a superset of what
+      # is already supported as 'dependencies' in setup.py
+      # So we'll parse them the same way below.
+      metadata["dependencies"] = File.read(requirements_txt).split("\n")
+    end
+
     self.dependencies += metadata["dependencies"].collect do |dep|
-      name, cmp, version = dep.split
+      dep_re = /^([^<>= ]+)\s*(?:([<>=]{1,2})\s*(.*))?$/
+      match = dep_re.match(dep)
+      if match.nil?
+        @logger.error("Unable to parse dependency", :dependency => dep)
+        raise FPM::InvalidPackageConfiguration, "Invalid dependency '#{dep}'"
+      end
+      name, cmp, version = match.captures
       # 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/solaris.rb

@@ -22,14 +22,14 @@ class FPM::Package::Solaris < FPM::Package
     "#{builddir}/pkginfo"
   end
 
-  def build!(params)
+  def output(output_path)
     self.scripts.each do |name, path|
       case name
         when "pre-install"
-          safesystem("cp #{path} ./preinstall")
+          safesystem("cp", path, "./preinstall")
           File.chmod(0755, "./preinstall")
         when "post-install"
-          safesystem("cp #{path} ./postinstall")
+          safesystem("cp", path, "./postinstall")
           File.chmod(0755, "./postinstall")
         when "pre-uninstall"
           raise FPM::InvalidPackageConfiguration.new(
@@ -42,25 +42,21 @@ class FPM::Package::Solaris < FPM::Package
       end # case name
     end # self.scripts.each
 
-    # Unpack data.tar.gz so we can build a package from it.
-    Dir.mkdir("data")
-    safesystem("gzip -d data.tar.gz");
-    Dir.chdir("data") do
-      safesystem("tar -xf ../data.tar");
+    template = template("solaris.erb")
+    File.open("#{build_path}/pkginfo", "w") do |pkginfo|
+      pkginfo.puts template.result(binding)
     end
 
-    #system("(echo 'i pkginfo'; pkgproto data=/) > Prototype")
-
     # Generate the package 'Prototype' file
     # TODO(sissel): allow setting default file owner.
-    File.open("Prototype", "w") do |prototype|
+    File.open("#{build_path}/Prototype", "w") do |prototype|
       prototype.puts("i pkginfo")
       prototype.puts("i preinstall") if self.scripts["pre-install"]
       prototype.puts("i postinstall") if self.scripts["post-install"]
 
       # TODO(sissel): preinstall/postinstall
       # strip @prefix, since BASEDIR will set prefix via the pkginfo file
-      IO.popen("pkgproto data/#{@prefix}=").each_line do |line|
+      IO.popen("pkgproto #{staging_path}/#{@prefix}=").each_line do |line|
         type, klass, path, mode, user, group = line.split
         # Override stuff in pkgproto
         # TODO(sissel): Make this tunable?
@@ -70,12 +66,16 @@ class FPM::Package::Solaris < FPM::Package
       end # popen "pkgproto ..."
     end # File prototype
 
-    # Should create a package directory named by the package name.
-    safesystem("pkgmk -o -d .")
+    ::Dir.chdir staging_path do
+      # Should create a package directory named by the package name.
+      safesystem("pkgmk", "-o", "-f", "#{build_path}/Prototype", "-d", build_path)
+    end
+    
 
     # Convert the 'package directory' built above to a real solaris package.
-    safesystem("pkgtrans -s . #{params[:output]} #{name}")
-  end # def build
+    safesystem("pkgtrans", "-s", build_path, output_path, name)
+    safesystem("cp", "#{build_path}/#{output_path}", output_path)
+  end # def output
 
   def default_output
     v = version

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "0.4.23"
+  VERSION = "0.4.24"
 end

data/templates/rpm.erb

@@ -40,7 +40,11 @@ License: <%= license.gsub("\n", " ") %>
 <% if !vendor.nil? and !vendor.empty? -%>
 Vendor: <%= vendor %>
 <% end -%>
-URL: <%= url or "http://nourlgiven.example.com/" %>
+<% if !url.nil? and !url.empty? -%>
+URL: <%= url %>
+<%else -%>
+URL: http://nourlgiven.example.com/
+<% end -%>
 Packager: <%= maintainer %>
 
 <% if !attributes[:no_depends?] -%>

data/templates/solaris.erb

@@ -1,7 +1,7 @@
 CLASSES=none
-BASEDIR=<%= prefix %>
 TZ=PST
 PATH=/sbin:/usr/sbin:/usr/bin:/usr/sadm/install/bin
+BASEDIR=/
 PKG=<%= name %>
 NAME=<%= name %>
 ARCH=<%= architecture %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.23
+  version: 0.4.24
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2012-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -149,32 +149,34 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/fpm.rb
-- lib/fpm/errors.rb
+- lib/fpm/command.rb
 - lib/fpm/namespace.rb
 - lib/fpm/package.rb
+- 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/tar.rb
 - lib/fpm/package/deb.rb
 - lib/fpm/package/dir.rb
-- lib/fpm/package/npm.rb
-- lib/fpm/package/pear.rb
 - lib/fpm/package/puppet.rb
-- lib/fpm/package/pyfpm/__init__.py
-- lib/fpm/package/pyfpm/get_metadata.py
+- lib/fpm/package/gem.rb
 - lib/fpm/package/python.rb
-- lib/fpm/package/rpm.rb
 - lib/fpm/package/solaris.rb
-- lib/fpm/package/tar.rb
-- lib/fpm/package/gem.rb
-- lib/fpm/util.rb
-- lib/fpm/command.rb
+- lib/fpm/package/rpm.rb
+- lib/fpm/package/npm.rb
+- lib/fpm/package/pear.rb
 - lib/fpm/version.rb
-- bin/fpm
+- lib/fpm/errors.rb
+- lib/fpm/util.rb
+- lib/fpm.rb
 - bin/fpm-npm
-- templates/deb.erb
-- templates/puppet/package.pp.erb
-- templates/puppet/package/remove.pp.erb
+- bin/fpm
 - templates/solaris.erb
 - templates/rpm.erb
+- templates/deb.erb
+- templates/puppet/package/remove.pp.erb
+- templates/puppet/package.pp.erb
 - LICENSE
 - CONTRIBUTORS
 - CHANGELIST