fpm 0.2.18 → 0.2.19

data/bin/fpm

@@ -13,6 +13,9 @@ def main(args)
   settings = OpenStruct.new
   settings.exclude = []
 
+  # Maintainer scripts - https://github.com/jordansissel/fpm/issues/18
+  settings.scripts ||= {} 
+
   opts = OptionParser.new do |opts|
     # TODO(sissel): Maybe this should be '-o OUTPUT' ?
     opts.on("-p PACKAGEFILE", "--package PACKAGEFILE",
@@ -87,6 +90,34 @@ def main(args)
       settings.exclude << pattern
     end # -x / --exclude
 
+    opts.on("--post-install SCRIPTPATH",
+            "Add a post-install action. This script will be included in the" \
+            " resulting package") do |path|
+      settings.scripts["post-install"] = File.expand_path(path)
+    end # --post-install
+
+    opts.on("--pre-install SCRIPTPATH",
+            "Add a pre-install action. This script will be included in the" \
+            " resulting package") do |path|
+      settings.scripts["pre-install"] = File.expand_path(path)
+    end # --pre-install
+
+    opts.on("--pre-uninstall SCRIPTPATH",
+            "Add a pre-uninstall action. This script will be included in the" \
+            " resulting package") do |path|
+      settings.scripts["pre-uninstall"] = File.expand_path(path)
+    end # --pre-uninstall
+
+    opts.on("--post-uninstall SCRIPTPATH",
+            "Add a post-uninstall action. This script will be included in the" \
+            " resulting package") do |path|
+      settings.scripts["post-uninstall"] = File.expand_path(path)
+    end # --post-uninstall
+
+    opts.on("--description DESCRIPTION",
+            "Add a description for this package.") do |description|
+      settings.description = description
+    end # --description
   end # OptionParser
 
   opts.parse!(args)

data/lib/fpm/builder.rb

@@ -39,7 +39,8 @@ class FPM::Builder
       :suffix => settings.suffix,
       :exclude => settings.exclude,
       :maintainer => settings.maintainer,
-      :provides => []
+      :provides => [],
+      :description => settings.description
     )
 
     @edit = !!settings.edit
@@ -51,6 +52,7 @@ class FPM::Builder
     # Append provides given from settings (--provides flag for fpm)
     @package.provides += settings.provides if settings.provides
     @package.architecture = settings.architecture if settings.architecture
+    @package.scripts = settings.scripts
 
     @output = settings.package_path
     @recurse_dependencies = settings.recurse_dependencies

data/lib/fpm/package.rb

@@ -48,8 +48,11 @@ class FPM::Package
   attr_accessor :provides
 
   # a summary or description of the package
-  attr_accessor :summary
-  
+  attr_accessor :description
+
+  # hash of paths for maintainer/package scripts (postinstall, etc)
+  attr_accessor :scripts
+
   def initialize(source)
     @source = source
 
@@ -68,8 +71,9 @@ class FPM::Package
     @license = source[:license] || "unknown"
     @maintainer = source[:maintainer] || "<#{ENV["USER"]}@#{Socket.gethostname}>"
     @architecture = source[:architecture] || %x{uname -m}.chomp
-    @summary = source[:summary] || "no summary given"
+    @description = source[:description] || "no description given"
     @provides = source[:provides] || []
+    @scripts = source[:scripts]
   end # def initialize
 
   def generate_specfile(builddir, paths)

data/lib/fpm/source.rb

@@ -11,7 +11,7 @@ class FPM::Source
     maintainer
     category
     url
-    summary
+    description
   ).each do |attr|
     attr = :"#{attr}"
     define_method(attr) { self[attr] }

data/lib/fpm/source/gem.rb

@@ -91,13 +91,20 @@ class FPM::Source::Gem < FPM::Source
 
   def make_tarball!(tar_path, builddir)
     tmpdir = "#{tar_path}.dir"
-    installdir = "#{tmpdir}/#{::Gem::dir}"
+    gem = @paths.first
+    if self[:prefix]
+      installdir = "#{tmpdir}/#{self[:prefix]}"
+      # TODO(sissel): Overwriting @paths is bad mojo and confusing...
+      @paths = [ self[:prefix] ]
+    else
+      installdir = "#{tmpdir}/#{::Gem::dir}"
+      @paths = [ ::Gem::dir ]
+    end
     ::FileUtils.mkdir_p(installdir)
     args = ["gem", "install", "--quiet", "--no-ri", "--no-rdoc",
-       "--install-dir", installdir, "--ignore-dependencies", @paths.first]
+       "--install-dir", installdir, "--ignore-dependencies", gem]
     system(*args)
     
-    @paths = [ ::Gem::dir ]
     tar(tar_path, ".#{@paths.first}", tmpdir)
     FileUtils.rm_r(tmpdir)
 

data/lib/fpm/target/deb.rb

@@ -17,15 +17,34 @@ class FPM::Target::Deb < FPM::Package
   end
 
   def build!(params)
+    control_files = [ "control", "md5sums" ]
+    # place the postinst prerm files
+    self.scripts.each do |name, path|
+      case name
+        when "pre-install"
+          system("cp #{path} ./preinst")
+          control_files << "preinst"
+        when "post-install"
+          system("cp #{path} ./postinst")
+          control_files << "postinst"
+        when "pre-uninstall"
+          system("cp #{path} ./prerm")
+          control_files << "prerm"
+        when "post-uninstall"
+          system("cp #{path} ./postrm")
+          control_files << "postrm"
+        else raise "Unsupported script name '#{name}' (path: #{path})"
+      end # case name
+    end # self.scripts.each
+    
     # Make the control
-    system("tar -zcf control.tar.gz control md5sums")
+    system("tar -zcf control.tar.gz #{control_files.join(" ")}")
 
     # create debian-binary
     File.open("debian-binary", "w") { |f| f.puts "2.0" }
 
     # pack up the .deb
     system("ar -qc #{params[:output]} debian-binary control.tar.gz data.tar.gz")
-
   end # def build
 
   def default_output

data/templates/deb.erb

@@ -37,5 +37,5 @@ Standards-Version: 3.9.1
 Section: <%= category or "unknown" %> 
 Priority: extra
 Homepage: <%= url or "http://nourlgiven.example.com/" %>
-Description: <%= summary or "no summary given" %>
-  <%= summary or "no description given"%>
+Description: <%= description or "no description given" %>
+  <%= description or "no description given"%>

data/templates/rpm.erb

@@ -1,19 +1,19 @@
-Name: <%= @name %>
-Version: <%= @version %>
-<% if @epoch %>
-Epoch: <%= @epoch %>
+Name: <%= name %>
+Version: <%= version %>
+<% if epoch %>
+Epoch: <%= epoch %>
 <% end %>
-Release: <%= @iteration or 1 %>
-Summary: <%= @summary %>
+Release: <%= iteration or 1 %>
+Summary: <%= description %>
 BuildArch: <%= architecture %>
 AutoReqProv: no
 
-Group: <%= @category %>
+Group: <%= category %>
 <%#
 TODO: [Jay] rpms require a license
 let's detect it intelligently
 %>
-License: <%= @license %> 
+License: <%= license %> 
 Source0:  %{_sourcedir}/data.tar.gz
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -39,7 +39,7 @@ Provides: <%= prov %>
 <% end %>
 
 %description
-<%= @summary %>
+<%= description %>
 
 %prep
 echo "PREP"
@@ -55,6 +55,26 @@ tar -zvxf %SOURCE0
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+<% if scripts["pre-install"] %>
+%pre
+<%= File.read(scripts["pre-install"]) %>
+<% end %>
+
+<% if scripts["post-install"] %>
+%post
+<%= File.read(scripts["post-install"]) %>
+<% end %>
+
+<% if scripts["pre-uninstall"] %>
+%preun
+<%= File.read(scripts["pre-uninstall"]) %>
+<% end %>
+
+<% if scripts["post-uninstall"] %>
+%postun
+<%= File.read(scripts["post-uninstall"]) %>
+<% end %>
+
 %files
 %defattr(-,root,root,-)
 <%# Trim leading '.' from paths if they are './blah...' %>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fpm
 version: !ruby/object:Gem::Version 
-  hash: 51
-  prerelease: false
+  hash: 49
+  prerelease: 
   segments: 
   - 0
   - 2
-  - 18
-  version: 0.2.18
+  - 19
+  version: 0.2.19
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 -07:00
+date: 2011-05-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,16 +43,16 @@ extra_rdoc_files: []
 
 files: 
 - lib/fpm/builder.rb
+- lib/fpm/namespace.rb
 - lib/fpm/source.rb
 - lib/fpm/rubyfixes.rb
-- lib/fpm/target/deb.rb
-- lib/fpm/target/rpm.rb
-- lib/fpm/package.rb
-- lib/fpm/namespace.rb
+- lib/fpm/source/npm.rb
 - lib/fpm/source/dir.rb
 - lib/fpm/source/rpm.rb
-- lib/fpm/source/npm.rb
 - lib/fpm/source/gem.rb
+- lib/fpm/target/deb.rb
+- lib/fpm/target/rpm.rb
+- lib/fpm/package.rb
 - lib/fpm.rb
 - bin/fpm
 - bin/fpm-npm
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling