fpm 0.3.11 → 0.4.0pre1

data/lib/fpm/{target → package}/solaris.rb

@@ -6,7 +6,7 @@ require "fpm/util"
 
 # TODO(sissel): Add dependency checking support.
 # IIRC this has to be done as a 'checkinstall' step.
-class FPM::Target::Solaris < FPM::Package
+class FPM::Package::Solaris < FPM::Package
   def architecture
     case @architecture
     when nil, "native"
@@ -59,7 +59,8 @@ class FPM::Target::Solaris < FPM::Package
       prototype.puts("i postinstall") if self.scripts["post-install"]
 
       # TODO(sissel): preinstall/postinstall
-      IO.popen("pkgproto data=/").each_line do |line|
+      # strip @prefix, since BASEDIR will set prefix via the pkginfo file
+      IO.popen("pkgproto data/#{@prefix}=").each_line do |line|
         type, klass, path, mode, user, group = line.split
         # Override stuff in pkgproto
         # TODO(sissel): Make this tunable?

data/lib/fpm/package/tar.rb

@@ -0,0 +1,62 @@
+require "backports" # gem backports
+require "fpm/package"
+require "fpm/util"
+require "fileutils"
+require "fpm/package/dir"
+
+class FPM::Package::Tar < FPM::Package
+  def input(input_path)
+    # use part of the filename as the package name
+    self.name = File.basename(input_path).split(".").first
+
+    # Unpack the tarball to the build path before ultimately moving it to
+    # staging.
+    args = ["-xf", input_path, "-C", build_path]
+
+    # Add the tar compression flag if necessary
+    with(tar_compression_flag(input_path)) do |flag|
+      args << flag unless flag.nil?
+    end
+
+    safesystem("tar", *args)
+
+    # use dir to set stuff up properly, mainly so I don't have to reimplement
+    # the chdir/prefix stuff special for tar.
+    dir = convert(FPM::Package::Dir)
+    if attributes[:chdir]
+      dir.attributes[:chdir] = File.join(build_path, attributes[:chdir])
+    else
+      dir.attributes[:chdir] = build_path
+    end
+
+    cleanup_staging
+    # Tell 'dir' to input "." and chdir/prefix will help it figure out the
+    # rest.
+    dir.input(".")
+    @staging_path = dir.staging_path
+    dir.cleanup_build
+  end # def input
+
+  def output(output_path)
+    # Unpack the tarball to the staging path
+    args = ["-cf", output_path, "-C", staging_path, "."]
+    with(tar_compression_flag(output_path)) do |flag|
+      args << flag unless flag.nil?
+    end
+
+    safesystem("tar", *args)
+  end # def output
+
+  def tar_compression_flag(path)
+    case path
+      when /\.tar\.bz2$/
+        return "-j"
+      when /\.tar\.gz$|\.tgz$/
+        return "-z"
+      when /\.tar\.xz$/
+        return "-J"
+      else
+        return nil
+    end
+  end # def tar_compression_flag
+end # class FPM::Package::Tar

data/lib/fpm/util.rb

@@ -1,7 +1,56 @@
-def safesystem(*args)
-  success = system(*args)
-  if !success
-    raise "'system(#{args.inspect})' failed with error code: #{$?.exitstatus}"
-  end
-  return success
-end # def safesystem
+require "fpm/namespace"
+
+# Some utility functions
+module FPM::Util
+  # Raised if safesystem cannot find the program to run.
+  class ExecutableNotFound < StandardError; end
+
+  # Raised if a safesystem program exits nonzero
+  class ProcessFailed < StandardError; end
+
+  # Is the given program in the system's PATH?
+  def program_in_path?(program)
+    # Scan path to find the executable
+    # Do this to help the user get a better error message.
+    envpath = ENV["PATH"].split(":")
+    return envpath.select { |p| File.executable?(File.join(p, program)) }.any?
+  end # def program_in_path
+
+  # Run a command safely in a way that gets reports useful errors.
+  def safesystem(*args)
+    program = args[0]
+
+    # Scan path to find the executable
+    # Do this to help the user get a better error message.
+    if !program.include?("/") and !program_in_path?(program)
+      raise ExecutableNotFound.new(program)
+    end
+
+    @logger.debug("Running command", :args => args)
+    success = system(*args)
+    if !success
+      raise ProcessFailed.new("#{program} failed (exit code #{$?.exitstatus})" \
+                              ". Full command was:#{args.inspect}")
+    end
+    return success
+  end # def safesystem
+
+  # Get the recommended 'tar' command for this platform.
+  def tar_cmd
+    # Rely on gnu tar for solaris and OSX.
+    case %x{uname -s}.chomp
+    when "SunOS"
+      return "gtar"
+    when "Darwin"
+      return "gnutar"
+    else
+      return "tar"
+    end
+  end # def tar_cmd
+
+  # Run a block with a value.
+  # Useful in lieu of assigning variables 
+  def with(value, &block)
+    block.call(value)
+  end # def with
+end # module FPM::Util

data/templates/deb.erb

@@ -1,27 +1,27 @@
 Package: <%= name %>
-Version: <%= "#{epoch}:" if epoch %><%= version %><%= iteration && '-'+iteration.to_s %>
+Version: <%= "#{epoch}:" if epoch %><%= version %><%= "-" + iteration.to_s if iteration %>
+License: <%= license %>
+Vendor: <%= vendor %>
 Architecture: <%= architecture %>
-Maintainer: <%= maintainer or "<unknown>" %>
+Maintainer: <%= maintainer  %>
+Installed-Size: <%= attributes[:deb_installed_size] %>
 <% if !dependencies.empty? -%>
-<%   properdeps = dependencies.collect { |d| fix_dependency(d) }.flatten -%>
-Depends: <%= properdeps.flatten.join(", ") %>
-<% end -%>
-<% if !pre_dependencies.empty? -%>
-<%   properpredeps = pre_dependencies.collect { |d| fix_dependency(d) }.flatten -%>
-Pre-Depends: <%= properpredeps.flatten.join(", ") %>
+Depends: <%= dependencies.join(", ") %>
 <% end -%>
 <% if !conflicts.empty? -%>
 Conflicts: <%= conflicts.join(", ") %>
 <% end -%>
+<%# if !pre_dependencies.empty? -%>
+<%#   properpredeps = pre_dependencies.collect { |d| fix_dependency(d) }.flatten -%>
+#Pre-Depends: <%#= properpredeps.flatten.join(", ") %>
+<%# end -%>
 <% if !provides.empty? -%>
 Provides: <%= provides.join(", ") %>
 <% end -%>
 <% if !replaces.empty? -%>
-<%   properrepl = replaces.collect { |d| fix_dependency(d) }.flatten -%>
-Replaces: <%= properrepl.flatten.join(", ") %>
+Replaces: <%= replaces.join(", ") %>
 <% end -%>
-Standards-Version: 3.9.1
-Section: <%= category or "unknown" %>
+Section: <%= category %>
 Priority: extra
 Homepage: <%= url or "http://nourlgiven.example.com/" %>
 <% lines = (description or "no description given").split("\n") -%>

data/templates/rpm.erb

@@ -1,3 +1,13 @@
+# Disable the stupid stuff rpm distros include in the build process by default:
+<% %w(prep build install clean).each do |step| -%>
+<%# These definitions have to be non-empty... I guess... -%>
+#   Disable any <%= step %> shell actions. replace them with simply 'true'
+%define __spec_<%= step %>_post true
+%define __spec_<%= step %>_pre true
+<% end -%>
+# Disable checking for unpackaged files ?
+#%undefine __check_files
+
 Name: <%= name %>
 Version: <%= version %>
 <% if epoch -%>
@@ -5,43 +15,18 @@ Epoch: <%= epoch %>
 <% end -%>
 Release: <%= iteration or 1 %>
 <%# use the first line of the description as the summary -%>
-Summary: <%= description.split("\n").first %>
+Summary: <%= description.split("\n").first.empty? ? "_" :  description.split("\n").first %>
 BuildArch: <%= architecture %>
 AutoReqProv: no
 
 Group: <%= category %>
-<%#
-TODO: [Jay] rpms require a license
-let's detect it intelligently
--%>
 License: <%= license %>
+Vendor: <%= vendor %>
 URL: <%= url or "http://nourlgiven.example.com/" %>
-Source0:  %{_sourcedir}/data.tar.gz
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Packager: <%= maintainer %>
 
-<% if !dependencies.empty? -%>
-<%
-  properdeps = dependencies.collect do |d|
-    # Convert gem ~> X.Y.Z to '>= X.Y.Z' and < X.Y+1.0
-    if d =~ /\~>/
-      name, version = d.gsub(/[()~>]/, "").split(/ +/)[0..1]
-      nextversion = version.split(".").collect { |v| v.to_i }
-      l = nextversion.length
-      nextversion[l-2] += 1
-      nextversion[l-1] = 0
-      nextversion = nextversion.join(".")
-      ["#{name} >= #{version}", "#{name} < #{nextversion}"]
-    elsif d =~ /\d [<>]=? [0-9.+] [<>]=? \d/
-      # Convert gem >= A.B.C <= X.Y.Z to '>= A.B.C' and '<= X.Y.Z'
-      puts d
-      # split out version numbers with their equality sign
-      name, lower_version, upper_version = d.scan(/([\w-]+) ([<>]=? [\d\.]+) ([<>]=? [\d\.]+)/)[0]
-      ["#{name} #{lower_version}", "#{name} #{upper_version}"]
-    else
-      d
-    end
-  end
--%>Requires: <%= properdeps.join(", ") %>
+<% dependencies.each do |req| -%>
+Requires: <%= req %>
 <% end -%>
 <% provides.each do |prov| -%>
 Provides: <%= prov %>
@@ -62,13 +47,21 @@ Obsoletes: <%= repl %>
 # noop
 
 %install
-# some rpm implementations delete the build dir and then recreate it by
-# default, for some reason. Whatever, let's work around it.
-cd $RPM_BUILD_ROOT
-tar -zxf %SOURCE0
+<% files.each do |path| -%>
+<%   source = File.join(staging_path, path) -%>
+<%   # Copy to the build_path/BUILD/ to make rpmbuild happy -%>
+<%   target = File.join(build_path, "BUILD", path) -%>
+<%   dir = File.dirname(target) %>
+mkdir -p "<%= dir %>"
+if [ -f "<%= source %>" ] ; then
+  cp "<%= source %>" "<%= target %>"
+elif [ -d "<%= source %>" ] ; then
+  mkdir "<%= target %>"
+fi
+<% end %>
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+# noop
 
 <% if scripts["pre-install"] -%>
 %pre
@@ -92,8 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 <% end -%>
 %files
 %defattr(-,root,root,-)
-<%# Trim leading '.' from paths if they are './blah...' -%>
-<%# Also ensure paths start with '/' -%>
-<%= @source.paths.collect { |p| p.gsub(/^\.\//, "/").gsub(/^[^\/]/, "/\\0") }.join("\n") %>
+<%# Output config files and then regular files. -%>
+<%= config_files.collect { |c| '%config ' + c }.join("\n") -%>
+<%# list only files, not directories? %>
+<%= files.reject { |f| File.directory?(File.join(staging_path, f)) }.collect { |f| "/#{f}" }.join("\n") %>
 
 %changelog

data/templates/solaris.erb

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

metadata

@@ -1,116 +1,157 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fpm
-version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 11
-  version: 0.3.11
+version: !ruby/object:Gem::Version
+  version: 0.4.0pre1
+  prerelease: 5
 platform: ruby
-authors: 
+authors:
 - Jordan Sissel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
+  requirement: &14920820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *14920820
+- !ruby/object:Gem::Dependency
+  name: cabin
+  requirement: &14920320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *14920320
+- !ruby/object:Gem::Dependency
+  name: backports
+  requirement: &14919820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *14919820
+- !ruby/object:Gem::Dependency
+  name: arr-pm
+  requirement: &14919440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *14919440
+- !ruby/object:Gem::Dependency
+  name: rush
+  requirement: &14918980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *14918980
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &14918560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *14918560
+- !ruby/object:Gem::Dependency
+  name: insist
+  requirement: &14918140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs, solaris packages and more. Win at package management without wasting pointless hours debugging bad rpm specs!
+  prerelease: false
+  version_requirements: *14918140
+description: Convert directories, rpms, python eggs, rubygems, and more to rpms, debs,
+  solaris packages and more. Win at package management without wasting pointless hours
+  debugging bad rpm specs!
 email: jls@semicomplete.com
-executables: 
+executables:
 - fpm
 - fpm-npm
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/fpm.rb
-- lib/rpm/lead.rb
-- lib/rpm/namespace.rb
-- lib/rpm/rpmfile.rb
-- lib/rpm/tag.rb
-- lib/rpm/header.rb
-- lib/fpm/rubyfixes.rb
-- lib/fpm/flags.rb
-- lib/fpm/namespace.rb
-- lib/fpm/program.rb
-- lib/fpm/source/gem.rb
-- lib/fpm/source/dir.rb
-- lib/fpm/source/tar.rb
-- lib/fpm/source/npm.rb
-- lib/fpm/source/rpm.rb
-- lib/fpm/source/pyfpm/get_metadata.py
-- lib/fpm/source/pyfpm/__init__.py
-- lib/fpm/source/python.rb
-- lib/fpm/builder.rb
-- lib/fpm/source.rb
-- lib/fpm/package.rb
-- lib/fpm/target/puppet.rb
-- lib/fpm/target/deb.rb
-- lib/fpm/target/solaris.rb
-- lib/fpm/target/rpm.rb
-- lib/fpm/util.rb
+files:
 - lib/fpm/errors.rb
+- lib/fpm/util.rb
+- lib/fpm/command.rb
+- lib/fpm/package/pyfpm/get_metadata.py
+- lib/fpm/package/pyfpm/__init__.pyc
+- lib/fpm/package/pyfpm/get_metadata.pyc
+- lib/fpm/package/pyfpm/__init__.py
+- lib/fpm/package/python.rb
+- lib/fpm/package/rpm.rb
+- lib/fpm/package/npm.rb
+- lib/fpm/package/deb.rb
+- lib/fpm/package/gem.rb
+- lib/fpm/package/tar.rb
+- lib/fpm/package/pear.rb
+- lib/fpm/package/dir.rb
+- lib/fpm/package/puppet.rb
+- lib/fpm/package/solaris.rb
+- lib/fpm/package.rb
+- lib/fpm/namespace.rb
+- lib/fpm.rb
 - bin/fpm-npm
 - bin/fpm
-- templates/rpm.erb
-- templates/solaris.erb
 - templates/puppet/package/remove.pp.erb
 - templates/puppet/package.pp.erb
 - templates/deb.erb
+- templates/solaris.erb
+- templates/rpm.erb
 - LICENSE
 - CONTRIBUTORS
 - CHANGELIST
 homepage: https://github.com/jordansissel/fpm
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling
 test_files: []
-
+has_rdoc: