Merge pull request jordansissel#182 from MITx/master

Fixed bugs around binpath not being created and with links inside the package

lib/fpm/package/deb.rb

@@ -310,7 +310,7 @@ def write_control
       @logger.info("No deb_installed_size set, calculating now.")
       total = 0
       Find.find(staging_path) do |path|
-        stat = File.stat(path)
+        stat = File.lstat(path)
         next if stat.directory?
         total += stat.size
       end

lib/fpm/package/dir.rb

@@ -102,7 +102,7 @@ def copy(source, destination)
       rescue Errno::EXDEV
         # Hardlink attempt failed, copy it instead
         @logger.debug("Copying", :source => source, :destination => destination)
-        FileUtils.copy(source, destination)
+        FileUtils.copy_entry(source, destination)
       end
     end
   end # def copy

lib/fpm/package/gem.rb

@@ -172,6 +172,7 @@ def install_to_staging(gem_path)
     if attributes[:gem_bin_path]
       bin_path = File.join(staging_path, attributes[:gem_bin_path])
       args += ["--bindir", bin_path]
+      ::FileUtils.mkdir_p(bin_path)
     end
 
     args << gem_path