fpm 0.4.41 → 0.4.42

data/CHANGELIST

@@ -1,3 +1,7 @@
+0.4.42 (July 23, 2013)
+  - dir: make source=destination mappings behave the same way 'rsync -a' does
+    with respect to source and destination paths.
+
 0.4.41 (July 17, 2013)
   - cpan: handle cases where modules don't specify a license
   - deb: support multiple init scripts (#487, patch by Kristian Glass)

data/LICENSE

@@ -1,6 +1,6 @@
 (This is an MIT-style license)
 
-Copyright (c) 2011 Jordan Sissel and contributors.
+Copyright (c) 2011,2012,2013 Jordan Sissel and contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/fpm/package.rb

@@ -365,14 +365,14 @@ class FPM::Package
       installdir = staging_path
     end
 
-    Find.find(staging_path) do |path|
-      match_path = path.sub("#{staging_path}/", '')
+    Find.find(installdir) do |path|
+      match_path = path.sub("#{installdir}/", '')
 
       attributes[:excludes].each do |wildcard|
-        @logger.debug("Checking path against wildcard", :path => path, :wildcard => wildcard)
+        @logger.debug("Checking path against wildcard", :path => match_path, :wildcard => wildcard)
 
         if File.fnmatch(wildcard, match_path)
-          @logger.info("Removing excluded path", :path => path, :matches => wildcard)
+          @logger.info("Removing excluded path", :path => match_path, :matches => wildcard)
           FileUtils.remove_entry_secure(path)
           Find.prune
           break
@@ -436,7 +436,7 @@ class FPM::Package
     def default_attributes(&block)
       return if @options.nil?
       @options.each do |flag, param, help, options, block|
-        attr = flag.first.gsub(/^-+/, "").gsub(/-/, "_")
+        attr = flag.first.gsub(/^-+/, "").gsub(/-/, "_").gsub("[no_]", "")
         attr += "?" if param == :flag
         yield attr.to_sym, options[:default]
       end

data/lib/fpm/package/cpan.rb

@@ -218,7 +218,8 @@ class FPM::Package::CPAN < FPM::Package
     version = metadata["version"] if version.nil?
 
     tarball = "#{distribution}-#{version}.tar.gz"
-    url = "http://www.cpan.org/CPAN/authors/id/#{author[0,1]}/#{author[0,2]}/#{author}/#{tarball}"
+    #url = "http://www.cpan.org/CPAN/authors/id/#{author[0,1]}/#{author[0,2]}/#{author}/#{tarball}"
+    url = "http://www.cpan.org/authors/id/#{author[0,1]}/#{author[0,2]}/#{author}/#{tarball}"
     @logger.debug("Fetching perl module", :url => url)
     
     begin
@@ -242,10 +243,10 @@ class FPM::Package::CPAN < FPM::Package
     metacpan_url = "http://api.metacpan.org/v0/module/" + package
     begin
       response = httpfetch(metacpan_url)
-    rescue Net::HTTPServerException
+    rescue Net::HTTPServerException => e
       #@logger.error("metacpan query failed.", :error => response.status_line,
                     #:module => package, :url => metacpan_url)
-      @logger.error("metacpan query failed.", :error => response.message,
+      @logger.error("metacpan query failed.", :error => e.message,
                     :module => package, :url => metacpan_url)
       raise FPM::InvalidPackageConfiguration, "metacpan query failed"
     end

data/lib/fpm/package/dir.rb

@@ -39,15 +39,13 @@ class FPM::Package::Dir < FPM::Package
     chdir = attributes[:chdir] || "."
 
     # Support mapping source=dest
+    # This mapping should work the same way 'rsync -a' does
+    #   Meaning 'rsync -a source dest'
+    #   and 'source=dest' in fpm work the same as the above rsync
     if path =~ /.=./
       origin, destination = path.split("=", 2)
 
-      # file -> directory
-      #   ./some/file=/usr/local should result in /usr/local/file
-      # directory -> directory
-      #   ./some=/usr/local should result in /usr/local/...
-      #   if ./some/file, then /usr/local/file
-      if File.directory?(origin)
+      if File.directory?(origin) && origin[-1,1] == "/"
         chdir = origin
         source = "."
       else
@@ -65,7 +63,6 @@ class FPM::Package::Dir < FPM::Package
     destination = File.join(staging_path, destination)
 
     @logger["method"] = "input"
-    @logger.debug("Copying", :input => source, :output => destination)
     ::Dir.chdir(chdir) do
       clone(source, destination)
     end
@@ -107,11 +104,20 @@ class FPM::Package::Dir < FPM::Package
   # The above will copy, recursively, /tmp/hello/world into
   # /tmp/example/hello/world
   def clone(source, destination)
-    # Copy all files from 'path' into staging_path
-    #p :clone => { source => destination } 
-    Find.find(source) do |path|
-      target = File.join(destination, path)
-      copy(path, target)
+    @logger.debug("Cloning path", :source => source, :destination => destination)
+    # For single file copies, permit file destinations
+    if File.file?(source) && !File.directory?(destination) 
+      if destination[-1,1] == "/"
+        copy(source, File.join(destination, source))
+      else
+        copy(source, destination)
+      end
+    else
+      # Copy all files from 'path' into staging_path
+      Find.find(source) do |path|
+        target = File.join(destination, path)
+        copy(path, target)
+      end
     end
   end # def clone
 
@@ -120,6 +126,7 @@ class FPM::Package::Dir < FPM::Package
   # Files will be hardlinked if possible, but copied otherwise.
   # Symlinks should be copied as symlinks.
   def copy(source, destination)
+    @logger.debug("Copying path", :source => source, :destination => destination)
     directory = File.dirname(destination)
     if !File.directory?(directory)
       FileUtils.mkdir_p(directory)
@@ -149,6 +156,9 @@ class FPM::Package::Dir < FPM::Package
         # Hardlink attempt failed, copy it instead
         @logger.debug("Copying", :source => source, :destination => destination)
         FileUtils.copy_entry(source, destination)
+      rescue Errno::EEXIST
+        sane_path = destination.gsub(staging_path, "")
+        @logger.error("Cannot copy file, the destination path is probably a directory and I attempted to write a file.", :path => sane_path, :staging => staging_path)
       end
     end
 

data/lib/fpm/version.rb

@@ -1,3 +1,3 @@
 module FPM
-  VERSION = "0.4.41"
+  VERSION = "0.4.42"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm
 version: !ruby/object:Gem::Version
-  version: 0.4.41
+  version: 0.4.42
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -249,7 +249,8 @@ files:
 - CONTRIBUTORS
 - CHANGELIST
 homepage: https://github.com/jordansissel/fpm
-licenses: []
+licenses:
+- MIT-like
 post_install_message: 
 rdoc_options: []
 require_paths: