fpm 0.2.32 → 0.2.33

data/bin/fpm

@@ -6,6 +6,16 @@ $: << File.join(File.dirname(__FILE__), "..", "lib")
 require "fpm"
 require "fpm/program"
 
+if $DEBUG
+  module Kernel
+    alias :orig_system :system
+    def system(*args)
+      p :system => args
+      orig_system(*args)
+    end
+  end
+end
+
 program = FPM::Program.new
 ret = program.run(ARGV)
 exit(ret.nil? ? 0 : ret)

data/lib/fpm.rb

@@ -4,6 +4,7 @@ require "fpm/builder"
 require "fpm/package"
 require "fpm/target/deb"
 require "fpm/target/rpm"
+require "fpm/target/solaris"
 
 require "fpm/source"
 require "fpm/source/dir"

data/lib/fpm/builder.rb

@@ -84,7 +84,7 @@ class FPM::Builder
     ::Dir.chdir root do
       @source.make_tarball!(tar_path, builddir)
 
-      generate_md5sums
+      generate_md5sums if @package.needs_md5sums
       generate_specfile
       edit_specfile if @edit
     end

data/lib/fpm/package.rb

@@ -111,11 +111,16 @@ class FPM::Package
     File.open(specfile(builddir), "w") { |f| f.puts spec }
   end # def generate_specfile
 
-  def generate_md5sums(builddir, paths)
-    md5sums = self.checksum(paths)
-    File.open("#{builddir}/md5sums", "w") { |f| f.puts md5sums }
-    md5sums
-  end # def generate_md5sums
+  # nobody needs md5sums by default.
+  def needs_md5sums
+    false
+  end # def needs_md5sums
+
+  #def generate_md5sums(builddir, paths)
+    #md5sums = self.checksum(paths)
+    #File.open("#{builddir}/md5sums", "w") { |f| f.puts md5sums }
+    #md5sums
+  #end # def generate_md5sums
 
   # TODO [Jay]: make this better...?
   def type

data/lib/fpm/source.rb

@@ -96,21 +96,49 @@ class FPM::Source
     dirs.sort! { |a,b| a.size <=> b.size }
     paths.sort! { |a,b| a.size <=> b.size }
 
+
+    # Solaris's tar is pretty neutered, so implement --exclude and such
+    # ourselves.
+    # TODO(sissel): May need to implement our own tar file generator
+    # so we can enforce file ownership. Again, solaris' tar doesn't support
+    # --owner, etc.
+    #paths = []
+    #dirs.each do |dir|
+      #Dir.glob(File.join(dir, "**", "*")).each do |path|
+        #next if excludesFile.fnmatch?(
+      #end
+    #end
+
     excludes = self[:exclude].map { |e| ["--exclude", e] }.flatten
 
     # TODO(sissel): To properly implement excludes as regexps, we
     # will need to find files ourselves. That may be more work
     # than it is worth. For now, rely on tar's --exclude.
-    dir_tar = ["tar", "-C", chdir, "--owner=root", "--group=root" ] \
+    dir_tar = [tar_cmd, "--owner=root", "--group=root" ] \
               + excludes \
               + ["-cf", output, "--no-recursion" ] \
               + dirs
-    system(*dir_tar) if dirs.any?
 
-    files_tar = [ "tar", "-C", chdir ] \
+    ::Dir.chdir(chdir) do
+      system(*dir_tar) if dirs.any?
+    end
+
+    files_tar = [ tar_cmd ] \
                 + excludes \
                 + [ "--owner=root", "--group=root", "-rf", output ] \
                 + paths
-    system(*files_tar)
+    ::Dir.chdir(chdir) do
+      system(*files_tar)
+    end
   end # def tar
-end
+
+  def tar_cmd 
+    # Rely on gnu tar for solaris.
+    case %x{uname -s}.chomp
+    when "SunOS"
+      return "gtar"
+    else
+      return "tar"
+    end
+  end # def tar_cmd
+end # class FPM::Source

data/lib/fpm/source/dir.rb

@@ -15,7 +15,9 @@ class FPM::Source::Dir < FPM::Source
       # Prefix all files with a path if given.
       @paths.each do |path|
         # Trim @root (--chdir)
-        path = path[@root.size .. -1] if path.start_with?(@root)
+        if @root != "." and path.start_with?(@root)
+          path = path[@root.size .. -1] 
+        end
 
         # Copy to self[:prefix] (aka --prefix)
         if File.directory?(path)

data/lib/fpm/target/deb.rb

@@ -4,6 +4,10 @@ require "fpm/package"
 require "fpm/errors"
 
 class FPM::Target::Deb < FPM::Package
+  def needs_md5sums
+    true
+  end # def needs_md5sums
+
   def architecture
     if @architecture.nil? or @architecture == "native"
       # Default architecture should be 'native' which we'll need

data/lib/fpm/target/solaris.rb

@@ -0,0 +1,85 @@
+require "erb"
+require "fpm/namespace"
+require "fpm/package"
+require "fpm/errors"
+
+# TODO(sissel): Add dependency checking support.
+# IIRC this has to be done as a 'checkinstall' step.
+class FPM::Target::Solaris < FPM::Package
+  def architecture
+    case @architecture
+    when nil, "native"
+      @architecture = %x{uname -p}.chomp
+    end
+    # "all" is a valid arch according to 
+    # http://www.bolthole.com/solaris/makeapackage.html
+
+    return @architecture
+  end # def architecture
+
+  def specfile(builddir)
+    "#{builddir}/pkginfo"
+  end
+
+  def build!(params)
+    self.scripts.each do |name, path|
+      case name
+        when "pre-install"
+          system("cp #{path} ./preinstall")
+          File.chmod(0755, "./preinstall")
+        when "post-install"
+          system("cp #{path} ./postinstall")
+          File.chmod(0755, "./postinstall")
+        when "pre-uninstall"
+          raise FPM::InvalidPackageConfiguration.new(
+            "pre-uninstall is not supported by Solaris packages"
+          )
+        when "post-uninstall"
+          raise FPM::InvalidPackageConfiguration.new(
+            "post-uninstall is not supported by Solaris packages"
+          )
+      end # case name
+    end # self.scripts.each
+
+    # Unpack data.tar.gz so we can build a package from it.
+    Dir.mkdir("data")
+    system("gzip -d data.tar.gz");
+    Dir.chdir("data") do
+      system("tar -xf ../data.tar");
+    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|
+      prototype.puts("i pkginfo")
+      # TODO(sissel): preinstall/postinstall
+      IO.popen("pkgproto data=/").each_line do |line|
+        type, klass, path, mode, user, group = line.split
+        # Override stuff in pkgproto
+        # TODO(sissel): Make this tunable?
+        user = "root"
+        group = "root"
+        prototype.puts([type, klass, path, mode, user, group].join(" "))
+      end # popen "pkgproto ..."
+    end # File prototype
+
+    # Should create a package directory named by the package name.
+    system("pkgmk -o -d .")
+
+    # Convert the 'package directory' built above to a real solaris package.
+    system("pkgtrans -s . #{params[:output]} #{name}")
+  end # def build
+
+  def default_output
+    v = version
+    v = "#{epoch}:#{v}" if epoch
+    if iteration
+      "#{name}_#{v}-#{iteration}_#{architecture}.#{type}"
+    else
+      "#{name}_#{v}_#{architecture}.#{type}"
+    end
+  end # def default_output
+end # class FPM::Deb
+

data/templates/solaris.erb

@@ -0,0 +1,15 @@
+CLASSES=none
+BASEDIR=/usr/local
+TZ=PST
+PATH=/sbin:/usr/sbin:/usr/bin:/usr/sadm/install/bin
+PKG=<%= name %>
+NAME=<%= name %>
+ARCH=<%= architecture %>
+VERSION=<%= version %><%= iteration && "-" + iteration.to_s %>
+CATEGORY=application
+<%# pkginfo(4) says DESC is max 256 characters %>
+DESC=<%= description.split("\n").first[0..255] or "no description given" %>
+VENDOR=<%= maintainer %>
+<%# Take maintainer of "Foo <bar@baz.com>" and use "bar@baz.com" %>
+EMAIL=<%= maintainer[/<.+>/].gsub(/[<>]/, "") %>
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fpm
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 85
   prerelease: 
   segments: 
   - 0
   - 2
-  - 32
-  version: 0.2.32
+  - 33
+  version: 0.2.33
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 -07:00
+date: 2011-06-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,6 +63,7 @@ files:
 - lib/fpm/source/pyfpm/__init__.py
 - lib/fpm/source/tar.rb
 - lib/fpm/source/gem.rb
+- lib/fpm/target/solaris.rb
 - lib/fpm/target/deb.rb
 - lib/fpm/target/rpm.rb
 - lib/fpm/program.rb
@@ -70,6 +71,7 @@ files:
 - lib/fpm.rb
 - bin/fpm
 - bin/fpm-npm
+- templates/solaris.erb
 - templates/rpm.erb
 - templates/deb.erb
 - LICENSE
@@ -106,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling