fpm 0.1.3 → 0.1.4

data/bin/fpm-npm

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-#
 
 require "optparse"
 require "ostruct"
@@ -40,17 +39,18 @@ builddir="#{Dir.pwd}/npm2pkg"
 # Prefix package names with 'nodejs-'
 PACKAGEPREFIX = "nodejs-"
 
-INSTALLPATH="/usr/lib/node"
 Dir.mkdir(builddir) if !File.exists?(builddir)
 File.open("#{builddir}/.npmrc", "w") do |file|
-  file.puts "root = #{builddir}#{INSTALLPATH}"
+  file.puts "root = #{builddir}/usr/lib/node"
+  file.puts "binroot = #{builddir}/usr/lib/node/bin"
+  file.puts "manroot = #{builddir}/usr/share/man"
 end
 
 ## Trick npm into using a custom .npmrc
 system("env - PATH=$PATH HOME=#{builddir} npm install #{settings.name} #{settings.version}")
 
 # Find all installed npms in builddir, make packages.
-Dir.glob("#{builddir}#{INSTALLPATH}/.npm/*/*") do |path|
+Dir.glob("#{builddir}/usr/lib/node/.npm/*/*") do |path|
   next if File.symlink?(path)
   puts path
 
@@ -86,10 +86,19 @@ Dir.glob("#{builddir}#{INSTALLPATH}/.npm/*/*") do |path|
 
   pkgcmd += ["-p", "#{PACKAGEPREFIX}#{package["name"]}-VERSION_ARCH.deb"]
   pkgcmd += ["-C", builddir]
-  pkgcmd << "#{INSTALLPATH[1..-1]}/.npm/#{package["name"]}/active"
-  pkgcmd << "#{INSTALLPATH[1..-1]}/#{package["name"]}"
-  pkgcmd << "#{INSTALLPATH[1..-1]}/#{package["name"]}@#{package["version"]}"
+  pkgcmd << "usr/lib/node/.npm/#{package["name"]}/active"
+  pkgcmd << "usr/lib/node/.npm/#{package["name"]}/#{package["version"]}"
+  pkgcmd << "usr/lib/node/#{package["name"]}"
+  pkgcmd << "usr/lib/node/#{package["name"]}@#{package["version"]}"
+
+  # Include bin files, install to usr/lib/node/bin
+  (package["bin"] or []).each do |bin, script|
+    pkgcmd << "usr/lib/node/bin/#{bin}"
+    pkgcmd << "usr/lib/node/bin/#{bin}@#{package["version"]}"
+  end
+
+  # TODO(sissel): We could include manpages and docs, but I don't care right
+  # now. If you want it, I accept patches! :)
 
-  puts pkgcmd.map { |x| "\"#{x}\"" }.join(" ")
   system *pkgcmd
 end

data/lib/fpm/deb.rb

@@ -47,7 +47,7 @@ class FPM::Deb < FPM::Package
 
       # Generate 'control' file
       template = File.new("#{File.dirname(__FILE__)}/../../templates/deb.erb").read()
-      control = ERB.new(template).result(binding)
+      control = ERB.new(template, nil, "<>").result(binding)
       File.open("#{builddir}/control", "w") { |f| f.puts control }
     end
 

data/lib/fpm/package.rb

@@ -40,11 +40,12 @@ class FPM::Package
   
   def initialize
     @iteration = 1
-    @url = ""
+    @url = "http://nourlgiven.example.com/no/url/given"
     @category = "default"
     @license = "unknown"
     @maintainer = "<#{ENV["USER"]}@#{Socket.gethostname}>"
     @architecture = nil
+    @summary = "no summary given"
 
     # Garbage is stuff you may want to clean up.
     @garbage = []

data/templates/deb.erb

@@ -1,11 +1,13 @@
 Package: <%= @name %>
 Version: <%= @version %>-<%= @iteration %>
 Architecture: <%= @architecture %>
-Maintainer: <%= @maintainer %>
+Maintainer: <%= @maintainer or "<unknown>" %>
+<% if @dependencies.size > 0 %>
 Depends: <%= @dependencies.join(", ") %>
-Section: <%= @category %> 
+<% end %>
+Standards-Version: 3.9.1
+Section: <%= @category or "unknown" %> 
 Priority: extra
-Homepage: <%= @url %>
-Description: <%= @summary %>
-  <%= @summary %>
-
+Homepage: <%= @url or "http://nourlgiven.example.com/" %>
+Description: <%= @summary or "no summary given" %>
+  <%= @summary or "no description given"%>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fpm
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 -08:00
+date: 2011-01-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency