kameleon-builder 2.6.6 → 2.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01ed0528903cb0ab65cba07d600b98c77d6abeb7
-  data.tar.gz: d219bb864c9a7212e8b3f771706fa2b0d940f883
+  metadata.gz: 41ec4253d5c8e1212274257dd0ef731fd911680c
+  data.tar.gz: 9f6a9adf0e0764e352d2968ade87478d8c9c82a5
 SHA512:
-  metadata.gz: 5c57e8ad6f6a0f64bf97ebfff98b4b8c28c0b09a8e1709bfee852525b282f52b454c42f135886bf1db17100bda91dfc9b79b2fe064f61136fc13ea0d4d8fdbc7
-  data.tar.gz: 84ff37f3f6cf1536e02fd5ed5829209fadec0db232769a1cc9da6056232cf9384bf4e1610d8d203a4bea811ed69f96b346e6088b244fe76d46f1e7b921b6743c
+  metadata.gz: ecd9d831258ff4d46e034e740221c4dc3cf5a10b8e66e711bec447b9fbc417f3519b019e930d503ee2d9791ec5b2d14c412b357bf41cee617e3a7f52009c733b
+  data.tar.gz: 31575ddef96d63072c0d2d4a8ab391a989eaf871a2fce7e7d5bc89babe03febfb1059330fe5b6221bd94fd71c3952ff15ccec5a5e05bfa122d24edff3a2bce4c

data/.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 2.6.6
+current_version = 2.6.7
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+))?
 serialize = 
 	{major}.{minor}.{patch}.{release}

data/CHANGES

@@ -1,6 +1,15 @@
 Kameleon CHANGELOG
 ==================
 
+Version 2.6.7
+-------------
+
+Released on October 01st 2015
+
+- Decreased polipo exit timeout (120 to 5s)
+- Passed only recipe files (not directories) to the cache to fixed persistant cache crash 
+
+
 Version 2.6.6
 -------------
 

data/lib/kameleon/engine.rb

@@ -47,8 +47,6 @@ module Kameleon
         @cache.name = @recipe.name
         @cache.mode = @options[:enable_cache] ? :build : :from
         @cache.cache_path = @options[:from_cache]
-        # I'm passing the Pathname objects
-        @cache.recipe_files = @recipe.all_files
         @cache.recipe_path = @recipe.path
         @cache.archive_format = @options[:cache_archive_compression]
         if @options[:proxy] != ""
@@ -72,6 +70,10 @@ module Kameleon
 
       @recipe.resolve!
 
+      if @options[:enable_cache] || @options[:from_cache] then
+        @cache.recipe_files = @recipe.all_files
+      end
+
       begin
         Kameleon.ui.info("Creating kameleon build directory : #{@cwd}")
         FileUtils.mkdir_p @cwd

data/lib/kameleon/persistent_cache.rb

@@ -199,7 +199,7 @@ module Kameleon
 
     def stop()
       begin
-        @polipo_process.poll_for_exit(120)
+        @polipo_process.poll_for_exit(5)
       rescue ChildProcess::TimeoutError
         @polipo_process.stop # tries increasingly harsher methods to kill the process.
       end

data/version.txt

@@ -1 +1 @@
-2.6.6
+2.6.7

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.6.7
 platform: ruby
 authors:
 - Salem Harrache
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess