fpm-cookery 0.30.0 → 0.30.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d4a540ee8894e347b9b30df41f55735f670f565
-  data.tar.gz: 974940d490281d11761d8e079e6c0f49df7f968b
+  metadata.gz: 01f2d979c1ed4c88bda487ea7612442470a985a7
+  data.tar.gz: 2e343014f3158e19916a2f8cfaf26f714c2f6c28
 SHA512:
-  metadata.gz: 6b287616baef2e572014cf0ba9736191b0e50a363e25c54ae05d6f96854e8cf3774b74dc0b6a6c72cf43185798eedcc98bf8c88c359a3e48c9eededb1df73948
-  data.tar.gz: 22e6f563aa586c7e771f3fa9c1c172bde1a0fdd5ae420e4c2ea5352f2a83d31136beef972a57f6e5d737f8e4af95a0ebb780bc9eb0fa8d5a91be64414191e27b
+  metadata.gz: ab8313c80b7df62b75c51d811b52f2dd935629714313dfe623e8d0682b7a3f931170a25ea3803b8922c1077e7ec44372a3ecad3719745d5d2a4b9af1f5938626
+  data.tar.gz: 25cfca9d6af24b0c3566b5df6ff7be51246ab046cee4ec02b5492613f2f4e54d312ac66d08bc1a497e7a1ec583f8efce6b03c720c1005df1fcbc11f276114315

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.30.1 (2015-09-17)
+* Do not extract the source again if it has been extraced in a previous run. (#100)
+* Allow passing a `Path` object to the `Path#/` method. (#127)
+
 # v0.30.0 (2015-09-10)
 * Add more lifecylce hooks:
   * `before_package_create`

data/lib/fpm/cookery/packager.rb

@@ -114,7 +114,17 @@ module FPM
           recipe.builddir.mkdir
           Dir.chdir(recipe.builddir) do
             recipe.run_lifecycle_hook(:before_source_extraction)
-            extracted_source = source.extract
+            extract_cookie = extract_cookie_name(package_name)
+
+            # Do not extract source again because it might destroy changes
+            # that have been made to the source. (like patches)
+            if File.exists?(extract_cookie)
+              extracted_source = File.read(extract_cookie).chomp
+              Log.debug "Extract cookie exists, using existing source directory: #{extracted_source}"
+            else
+              extracted_source = source.extract
+              File.open(extract_cookie, 'w', 0644) {|f| f.puts(extracted_source) }
+            end
 
             if recipe.extracted_source
               Log.debug "Using custom extracted source dir: #{recipe.builddir(recipe.extracted_source)}"
@@ -123,6 +133,8 @@ module FPM
 
             recipe.run_lifecycle_hook(:after_source_extraction, recipe.builddir(extracted_source))
 
+            Log.info "Using source directory: #{extracted_source}"
+
             Dir.chdir(extracted_source) do
               #Source::Patches.new(recipe.patches).apply!
 
@@ -164,6 +176,10 @@ module FPM
         ENV.replace(env)
       end
 
+      def extract_cookie_name(name)
+        (recipe.builddir/".extract-cookie-#{name.gsub(/[^\w]/,'_')}").to_s
+      end
+
       def build_cookie_name(name)
         (recipe.builddir/".build-cookie-#{name.gsub(/[^\w]/,'_')}").to_s
       end

data/lib/fpm/cookery/path.rb

@@ -18,7 +18,7 @@ module FPM
       end
 
       def /(path)
-        self + (path || '').gsub(%r{^/}, '')
+        self + (path || '').to_s.gsub(%r{^/}, '')
       end
 
       def =~(regex)

data/lib/fpm/cookery/version.rb

@@ -1,5 +1,5 @@
 module FPM
   module Cookery
-    VERSION = '0.30.0'
+    VERSION = '0.30.1'
   end
 end

data/spec/path_spec.rb

@@ -54,6 +54,12 @@ describe "Path" do
       end
     end
 
+    describe "with a Path argument" do
+      it "returns a new concatenated path object" do
+        expect((path/path).to_s).to eq('/foo/foo')
+      end
+    end
+
     describe "with a nil argument" do
       it "does not modify the path" do
         expect((path/nil).to_s).to eq('/foo')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fpm-cookery
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.30.1
 platform: ruby
 authors:
 - Bernd Ahlers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2015-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec