kameleon-builder 2.3.4 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7204c5d93f698ee3b1dfadf9f184c87348b659a3
-  data.tar.gz: 2bb76cccb00fe51182001159f9701372a4e1b3b0
+  metadata.gz: 3ea210f8c92d3cd72c918c27a6dcbee74d846ebf
+  data.tar.gz: 752f7e7eb4ce29d5523eadb1aae91f9b78b32585
 SHA512:
-  metadata.gz: e71d6b9f9099e5607671b8c7b3d42a97692886d80e96e13a62185662d58baaf2bfb6ab49d6252f18c3bb391225707ac44a79050c4c86c57d3462a32875519a79
-  data.tar.gz: 52b3bfd0fc08e6dadfdab885c1974fc363d74f6a7f276214a83654349fc57dfcad636c9363f85d6b4d548adbf9d4cff2a679dfcf1a6a2390378c7a5ce76cbd5f
+  metadata.gz: d551b0e06eff56805b1b341061b7503c20f65904798a04f695c782d187a1a3d8c7598aee365ae5d5fa308b215127633a0b1d640e1b448e88036f71922762b94e
+  data.tar.gz: 04166cc72eba05897f6441716169ceb16feab23be9418e963dc726662d80cbf3354ae9e9b699b85363594d9bd3becea0af7f82f9cfcb22bc1effb991422e4089

data/CHANGELOG.rst

@@ -1,6 +1,14 @@
 Kameleon CHANGELOG
 ==================
 
+version 2.3.5
+-------------
+
+Released on Dec 2nd 2014
+
+- Fixed kameleon 2.3.4 regressions about ``kameleon build``
+
+
 version 2.3.4
 -------------
 

data/contrib/kameleon_bashrc.sh

@@ -140,7 +140,7 @@ fi
 function __download {
     echo "Downloading: $1..."
     if which wget >/dev/null; then
-        wget --progress=bar:force "$1" -O "$2" 2>&1
+        wget --retry-connrefused --progress=bar:force "$1" -O "$2" 2>&1
     else
         fail "wget is missing, trying with curl..."
         if which curl >/dev/null; then

data/lib/kameleon/recipe.rb

@@ -39,28 +39,28 @@ module Kameleon
       Kameleon.ui.debug("Initialize new recipe (#{path})")
       @base_recipes_files = [@path]
       @steps_dirs = []
-      steps_dir = get_default_steps_dir
-      @steps_dirs.push(steps_dir) unless steps_dir.nil?
       load! :strict => false
     end
 
-    def get_default_steps_dir
-      relative_path = @path.to_path.gsub(Kameleon.env.root_dir.to_path + '/', '')
-      last_dir = Kameleon.env.root_dir
-      subdirs = [last_dir]
-      relative_path.split("/")[0...-1].each do |p|
-        subdir = last_dir.join(p)
-        subdirs.push(subdir)
-        last_dir = subdir
+    def get_steps_dirs(recipe_path)
+      relative_path = recipe_path.to_path.gsub(Kameleon.env.root_dir.to_path + '/', '')
+      if relative_path.eql? recipe_path.to_path
+        subdirs = [recipe_path.dirname]
+      else
+        last_dir = Kameleon.env.root_dir
+        subdirs = [last_dir]
+        relative_path.split("/")[0...-1].each do |p|
+          subdir = last_dir.join(p)
+          subdirs.push(subdir)
+          last_dir = subdir
+        end
       end
       steps_dirs = []
       subdirs.reverse_each do |p|
         steps_dirs.push(File.expand_path(File.join(p.to_path, 'steps')))
         steps_dirs.push(File.expand_path(File.join(p.to_path, '.steps')))
       end
-      steps_dirs.each do |p|
-        return p if File.exist? p
-      end
+      steps_dirs.select! { |x| File.exists? x }
     end
 
     def load!(kwargs = {})
@@ -77,13 +77,9 @@ module Kameleon
       yaml_recipe.delete("extend")
 
       # Where we can find steps
-      @base_recipes_files.each do |recipe_path|
-        dirname = File.dirname(recipe_path)
-        ['steps', '.steps'].each do |p|
-          dir = File.expand_path(File.join(dirname, p))
-          @steps_dirs.push(dir) if File.exists? dir
-        end
-      end
+      @steps_dirs = @base_recipes_files.map do |recipe_path|
+        get_steps_dirs(recipe_path)
+      end.flatten!
       @steps_dirs.uniq!
 
       # Load Global variables
@@ -101,8 +97,8 @@ module Kameleon
       resolved_global['include_steps'].flatten!
       resolved_global['include_steps'].compact!
       @sections.values.each do |section|
-        dir_to_search = resolved_global['include_steps'].map do |path|
-          @steps_dirs.map do |steps_dir|
+        dir_to_search = @steps_dirs.map do |steps_dir|
+          resolved_global['include_steps'].map do |path|
             [File.join(steps_dir, section.name, path),
               File.join(steps_dir, path)]
           end

data/version.txt

@@ -1 +1 @@
-2.3.4
+2.3.5

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors:
 - Salem Harrache
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess