fpm 0.2.25 → 0.2.26

data/bin/fpm

@@ -8,11 +8,15 @@ require "erb"
 
 $: << "#{File.dirname(__FILE__)}/../lib"
 require "fpm"
+require "fpm/flags"
 
 def main(args)
   settings = OpenStruct.new
   settings.exclude = []
 
+  # Source-specific settings/flags go here.
+  settings.source = {}
+
   # Maintainer scripts - https://github.com/jordansissel/fpm/issues/18
   settings.scripts ||= {} 
 
@@ -125,6 +129,9 @@ def main(args)
     end # --url
   end # OptionParser
 
+  # Add extra flags.
+  FPM::Source::Gem.flags(FPM::Flags.new(opts, "gem", "gem source only"), settings)
+
   opts.parse!(args)
 
   ok = true

data/lib/fpm/builder.rb

@@ -41,7 +41,8 @@ class FPM::Builder
       :maintainer => settings.maintainer,
       :provides => [],
       :description => settings.description,
-      :url => settings.url
+      :url => settings.url,
+      :settings => settings.source
     )
 
     @edit = !!settings.edit

data/lib/fpm/flags.rb

@@ -0,0 +1,20 @@
+require "fpm/namespace"
+
+class FPM::Flags
+  def initialize(opts, flag_prefix, help_prefix)
+    @opts = opts
+    @flag_prefix = flag_prefix
+    @help_prefix = help_prefix
+  end # def initialize
+
+  def on(*args, &block)
+    fixed_args = args.collect do |arg|
+      if arg =~ /^--/
+        "--#{@flag_prefix}-#{arg.gsub(/^--/, "")}" 
+      else
+        "(#{@help_prefix}) #{arg}"
+      end
+    end
+    @opts.on(*fixed_args, &block)
+  end # def on
+end # class FPM::Flags

data/lib/fpm/source/gem.rb

@@ -5,6 +5,13 @@ require "rubygems"
 require "fileutils"
 
 class FPM::Source::Gem < FPM::Source
+  def self.flags(opts, settings)
+    opts.on("--bin-path DIRECTORY",
+            "The directory to install gem executables") do |path|
+      settings.source[:bin_path] = path
+    end
+  end # def flags
+
   def get_source(params)
     gem = @paths.first
     looks_like_name_re = /^[A-Za-z0-9_-]+$/
@@ -102,17 +109,26 @@ class FPM::Source::Gem < FPM::Source
     if self[:prefix]
       installdir = "#{tmpdir}/#{self[:prefix]}"
       # TODO(sissel): Overwriting @paths is bad mojo and confusing...
+      # Maybe we shouldn't?
       @paths = [ self[:prefix] ]
     else
-      installdir = "#{tmpdir}/#{::Gem::dir}"
+      installdir = File.join(tmpdir, ::Gem::dir)
       @paths = [ ::Gem::dir ]
     end
+
     ::FileUtils.mkdir_p(installdir)
     args = ["gem", "install", "--quiet", "--no-ri", "--no-rdoc",
-       "--install-dir", installdir, "--ignore-dependencies", gem]
+       "--install-dir", installdir, "--ignore-dependencies"]
+    if self[:settings][:bin_path]
+      args += ["--bindir", File.join(tmpdir, self[:settings][:bin_path])]
+      @paths << self[:settings][:bin_path]
+    end
+
+    args << gem
     system(*args)
     
-    tar(tar_path, ".#{@paths.first}", tmpdir)
+    # make paths relative  (/foo becomes ./foo)
+    tar(tar_path, @paths.collect {|p| ".#{p}"}, tmpdir)
     FileUtils.rm_r(tmpdir)
 
     # TODO(sissel): Make a helper method.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fpm
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 35
   prerelease: 
   segments: 
   - 0
   - 2
-  - 25
-  version: 0.2.25
+  - 26
+  version: 0.2.26
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 -07:00
+date: 2011-05-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,7 @@ files:
 - lib/rpm/header.rb
 - lib/rpm/rpmfile.rb
 - lib/fpm/builder.rb
+- lib/fpm/flags.rb
 - lib/fpm/namespace.rb
 - lib/fpm/source.rb
 - lib/fpm/rubyfixes.rb
@@ -99,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: fpm - package building and mangling