fpm 0.3.2 → 0.3.3

data/lib/fpm/package.rb

@@ -152,7 +152,7 @@ class FPM::Package
   end # def default_output
 
   def fixpath(path)
-    if path.first != "/" 
+    if path[0,1] != "/" 
       path = File.join(@source.root, path)
     end
     return path if File.symlink?(path)

data/lib/fpm/source/gem.rb

@@ -15,7 +15,7 @@ class FPM::Source::Gem < FPM::Source
   def get_source(params)
     gem = @paths.first
     looks_like_name_re = /^[A-Za-z0-9_-]+$/
-    if !File.exists?(gem) 
+    if !File.exists?(gem)
       if gem =~ looks_like_name_re
         download(gem, params[:version])
       else
@@ -37,12 +37,12 @@ class FPM::Source::Gem < FPM::Source
     dep = ::Gem::Dependency.new gem_name, version
     # How to handle prerelease? Some extra magic options?
     #dep.prerelease = options[:prerelease]
-    
+
     if ::Gem::SpecFetcher.fetcher.respond_to?(:fetch_with_errors)
       specs_and_sources, errors =
         ::Gem::SpecFetcher.fetcher.fetch_with_errors(dep, true, true, false)
     else
-      specs_and_sources = 
+      specs_and_sources =
         ::Gem::SpecFetcher.fetcher.fetch(dep, true)
       errors = "???"
     end
@@ -120,13 +120,15 @@ class FPM::Source::Gem < FPM::Source
     args = ["gem", "install", "--quiet", "--no-ri", "--no-rdoc",
        "--install-dir", installdir, "--ignore-dependencies"]
     if self[:settings][:bin_path]
-      args += ["--bindir", File.join(tmpdir, self[:settings][:bin_path])]
+      tmp_bin_path = File.join(tmpdir, self[:settings][:bin_path])
+      args += ["--bindir", tmp_bin_path]
       @paths << self[:settings][:bin_path]
+      FileUtils.mkdir_p(tmp_bin_path) # Fixes #27
     end
 
     args << gem
     system(*args)
-    
+
     # make paths relative  (/foo becomes ./foo)
     tar(tar_path, @paths.collect {|p| ".#{p}"}, tmpdir)
     FileUtils.rm_r(tmpdir)

data/lib/fpm/target/puppet.rb

@@ -3,7 +3,7 @@ require "fpm/namespace"
 require "fpm/package"
 require "fpm/errors"
 require "etc"
-require "ftools"
+require "fileutils"
 
 # TODO(sissel): Add dependency checking support.
 # IIRC this has to be done as a 'checkinstall' step.
@@ -77,7 +77,7 @@ class FPM::Target::Puppet < FPM::Package
       if File.directory?(path)
         ::Dir.mkdir(File.join(params[:output], path))
       else
-        File.copy(path, File.join(params[:output], path))
+        FileUtils.cp(path, File.join(params[:output], path))
       end
     end
   end # def build!

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fpm
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Jordan Sissel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-20 00:00:00 -07:00
+date: 2011-06-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,8 @@ files:
 - lib/fpm/source/rpm.rb
 - lib/fpm/source/dir.rb
 - lib/fpm/source/tar.rb
+- lib/fpm/source/pyfpm/__init__.pyc
+- lib/fpm/source/pyfpm/get_metadata.pyc
 - lib/fpm/source/pyfpm/__init__.py
 - lib/fpm/source/pyfpm/get_metadata.py
 - lib/rpm/tag.rb