fpm 0.1.6 → 0.1.7

data/bin/fpm

@@ -59,6 +59,11 @@ def main(args)
     opts.on("-s SOURCE_TYPE", "what to build the package from") do |st|
       settings.source_type = st
     end
+
+    opts.on("--prefix PREFIX",
+            "A path to prefix files with when building the target package. This may not be necessary for all source types. For example, the 'gem' type will prefix with your gem directory (gem env | grep -A1 PATHS:)") do |prefix|
+      settings.prefix = prefix
+    end
   end # OptionParser
 
   opts.parse!(args)

data/lib/fpm/builder.rb

@@ -33,11 +33,14 @@ class FPM::Builder
     @source  = source_class_for(settings.source_type || 'dir').new(
       paths, root,
       :version => settings.version,
-      :name => settings.package_name
+      :name => settings.package_name,
+      :prefix => settings.prefix
     )
 
-    @package = package_class_for(settings.package_type).new(@source)
     @paths = paths
+    @package = package_class_for(settings.package_type).new(@source)
+    # Append dependencies given from settings (-d flag for fpm)
+    @package.dependencies += settings.dependencies
 
     @output = settings.package_path
     @recurse_dependencies = settings.recurse_dependencies
@@ -57,7 +60,7 @@ class FPM::Builder
     make_builddir!
 
     ::Dir.chdir root do
-      @source.make_tarball!(tar_path)
+      @source.make_tarball!(tar_path, builddir)
 
       generate_md5sums
       generate_specfile

data/lib/fpm/source.rb

@@ -50,7 +50,7 @@ class FPM::Source
     # noop by default
   end # def get_source
 
-  def make_tarball!(tar_path)
+  def make_tarball!(tar_path, builddir)
     raise NoMethodError,
       "Please subclass FPM::Source and define make_tarball!(tar_path)"
   end

data/lib/fpm/source/dir.rb

@@ -1,12 +1,41 @@
 require "fpm/source"
+require "fileutils"
 
 class FPM::Source::Dir < FPM::Source
   def get_metadata
     self[:name] = File.basename(File.expand_path(root))
   end
 
-  def make_tarball!(tar_path)
-    tar(tar_path, paths)
+  def make_tarball!(tar_path, builddir)
+    if self[:prefix]
+      self[:prefix] = self[:prefix][1..-1] if self[:prefix] =~ /^\//
+      # Prefix all files with a path.
+      FileUtils.mkdir_p(self[:prefix])
+      paths.each do |path|
+        # Trim @root (--chdir)
+        path = path[@root.size .. -1] if path.start_with?(@root)
+
+        # Copy to self[:prefix] (aka --prefix)
+        dest = "#{builddir}/tarbuild/#{self[:prefix]}/#{path}"
+        FileUtils.mkdir_p(dest)
+        rsync = ["rsync", "-a", path, dest]
+        system(*rsync)
+
+        # FileUtils.cp_r is pretty silly about how it copies files in some
+        # cases (funky permissions, etc)
+        # Use rsync instead..
+        #FileUtils.cp_r(path, dest)
+      end
+      ::Dir.chdir("#{builddir}/tarbuild") do
+        puts "TAR"
+        puts tar_path
+        puts "#{builddir}/tarbuild"
+        system("ls #{builddir}/tarbuild")
+        tar(tar_path, ".")
+      end
+    else
+      tar(tar_path, paths)
+    end
 
     # TODO(sissel): Make a helper method.
     system(*["gzip", "-f", tar_path])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fpm
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-07 00:00:00 -08:00
+date: 2011-01-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency