fpm-cookery 0.12.0 → 0.13.0

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.13.0 (2013-01-28)
+* Make local file source behave like the remote url source. (#14)
+
 # v0.12.0 (2013-01-28)
 * Copy source files with no or unknown file extension to
   the source dir. (smasset)

data/lib/fpm/cookery/source_handler/curl.rb

@@ -31,11 +31,11 @@ module FPM
             when '.zip'
               safesystem('unzip', '-d', local_path.basename('.zip'), local_path)
             else
-              unless local_path.basename.exist?
+              if !local_path.directory? && !local_path.basename.exist?
                 Dir.mkdir(local_path.basename)
               end
 
-              safesystem('cp', '-f', local_path, local_path.basename)
+              FileUtils.cp_r(local_path, local_path.basename)
             end
             extracted_source
           end

data/lib/fpm/cookery/source_handler/local_path.rb

@@ -5,23 +5,18 @@ require 'fileutils'
 module FPM
   module Cookery
     class SourceHandler
-      class LocalPath < FPM::Cookery::SourceHandler::Template
+      class LocalPath < FPM::Cookery::SourceHandler::Curl
         CHECKSUM = false
         NAME = :local_path
 
         def fetch
-          # No need to fetch anything. The files are on the disk already.
-          Log.info "Local path: #{source.path}"
-          @local_path = source.path
-        end
-
-        def extract
-          extracted_source = (builddir/File.basename(local_path)).to_s
-
-          FileUtils.rm_rf(extracted_source)
-          FileUtils.cp_r(source.path, extracted_source)
-
-          extracted_source
+          if local_path.exist?
+            Log.info "Using cached file #{local_path}"
+          else
+            Log.info "Copying #{source.path} to cache"
+            FileUtils.cp_r(source.path, cachedir)
+          end
+          local_path
         end
       end
     end

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.12.0'
+    VERSION = '0.13.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors: