kameleon-builder 2.6.1 → 2.6.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 641d4aa0ae1153b3203739f7cea51334c764aca6
+  data.tar.gz: a97530956b36a105c8b20802e9fa2faab6f2b0bb
+SHA512:
+  metadata.gz: a5f1c1175bcd1e1bf262da3341bca3287ab2ad05056217072a6ac4488bbc260951d3c748674727a88003131784aa3180207deba1ed3a81f6dbab582819405419
+  data.tar.gz: 68bc3a162b4ea851a3446153f3709d53ead045eff5a6cc53aa3b46dfcaec5cba7c4e16ebab4322ada53bad946e69aa5f45dda17078e090cf953f9a0247d50068

data/.bumpversion.cfg

@@ -1,7 +1,7 @@
 [bumpversion]
 commit = True
 tag = True
-current_version = 2.6.1
+current_version = 2.6.2
 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.2
+-------------
+
+Released on August 25th 2015
+
+- Added ``cache_archive_compression`` option to choose compression tool
+- Tried using curl before wget
+
+
 Version 2.6.1
 -------------
 

data/contrib/kameleon_bashrc.sh

@@ -142,12 +142,12 @@ fi
 
 function __download {
     echo "Downloading: $1..."
-    if which wget >/dev/null; then
-        wget --retry-connrefused --progress=bar:force "$1" -O "$2" 2>&1
+    if which curl >/dev/null; then
+        curl -# -L --retry 999 --retry-max-time 0 "$1" -o "$2" 2>&1
     else
-        echo "wget is missing, trying with curl..."
-        if which curl >/dev/null; then
-            curl -# -L --retry 999 --retry-max-time 0 "$1" -o "$2" 2>&1
+        echo "curl is missing, trying with wget..."
+        if which wget >/dev/null; then
+            wget --retry-connrefused --progress=bar:force "$1" -O "$2" 2>&1
         else
             echo "curl is missing, trying with python..."
             if which python >/dev/null; then

data/lib/kameleon/cli.rb

@@ -220,6 +220,10 @@ module Kameleon
     method_option :from_cache, :type => :string ,
                   :default => nil,
                   :desc => "Uses a persistent cache tar file to build the image."
+    method_option :cache_archive_compression, :type => :string ,
+                  :enum => ["gzip", "xz", "bz2"],
+                  :default => "gz",
+                  :desc => "Uses a persistent cache tar file to build the image."
     method_option :proxy_path, :type => :string ,
                   :default => nil,
                   :desc => "Full path of the proxy binary to use for the persistent cache."

data/lib/kameleon/engine.rb

@@ -43,6 +43,7 @@ module Kameleon
         # 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 @recipe.global["in_context"]["proxy_cache"].nil? then
           raise BuildError, "Missing varible for in context 'proxy_cache' when using the option --cache"

data/lib/kameleon/persistent_cache.rb

@@ -20,6 +20,7 @@ module Kameleon
     attr_accessor :name
     attr_accessor :recipe_files # FIXME have to check those.
     attr_accessor :recipe_path
+    attr_accessor :archive_format
 
     def initialize()
       ## we must configure Polipo to be execute for the in and out context
@@ -145,8 +146,20 @@ module Kameleon
     end
 
     def pack()
-      Kameleon.ui.info("Packing up the generated cache in #{@cwd}/#{@name}-cache.tar")
-      execute("tar","-cf #{@name}-cache.tar -C #{@cache_dir} .",@cwd)
+      if @archive_format.eql? "gzip"
+        env = {"GZIP" => "-9"}
+        Kameleon.ui.info("Packing up the generated cache in #{@cwd}/#{@name}-cache.tar.gz")
+        execute("tar","-czvf #{@name}-cache.tar.gz -C #{@cache_dir} .", @cwd, env)
+      elsif @archive_format.eql? "bz2"
+        env = {"BZIP" => "-9"}
+        Kameleon.ui.info("Packing up the generated cache in #{@cwd}/#{@name}-cache.tar.bz2")
+        execute("tar","-cjvf #{@name}-cache.tar.bz2 -C #{@cache_dir} .", @cwd, env)
+      elsif @archive_format.eql? "xz"
+        env = {"XZ_OPT" => "-9"}
+        Kameleon.ui.info("Packing up the generated cache in #{@cwd}/#{@name}-cache.tar.xz")
+        execute("tar","-cJf #{@name}-cache.tar.xz -C #{@cache_dir} .", @cwd, env)
+      end
+
     end
 
     def unpack(cache_path)
@@ -253,10 +266,13 @@ module Kameleon
       return recipe_file
     end
 
-    def execute(cmd,args,dir=nil)
+    def execute(cmd,args, dir=nil, environment={})
       command = [cmd ] + args.split(" ")
       process = ChildProcess.build(*command)
       process.cwd = dir unless dir.nil?
+      environment.each do |key, value|
+        process.environment[key] = value
+      end
       process.start
       process.wait
     end

data/version.txt

@@ -1 +1 @@
-2.6.1
+2.6.2

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.6.1
-  prerelease: 
+  version: 2.6.2
 platform: ruby
 authors:
 - Salem Harrache
@@ -13,66 +12,60 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.3
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.3
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: table_print
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.2
 description: The mindful appliance builder
@@ -87,10 +80,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .bumpversion.cfg
-- .editorconfig
-- .env
-- .gitignore
+- ".bumpversion.cfg"
+- ".editorconfig"
+- ".env"
+- ".gitignore"
 - AUTHORS
 - CHANGES
 - COPYING
@@ -170,28 +163,27 @@ files:
 homepage: http://kameleon.imag.fr/
 licenses:
 - GPL-2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - polipo 1.0.3, or greater
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Kameleon is a tool to build virtual machines from scratch
 test_files:
 - tests/helper.rb