kameleon-builder 2.3.4 → 2.3.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.rst +8 -0
- data/contrib/kameleon_bashrc.sh +1 -1
- data/lib/kameleon/recipe.rb +18 -22
- data/version.txt +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3ea210f8c92d3cd72c918c27a6dcbee74d846ebf
|
|
4
|
+
data.tar.gz: 752f7e7eb4ce29d5523eadb1aae91f9b78b32585
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: d551b0e06eff56805b1b341061b7503c20f65904798a04f695c782d187a1a3d8c7598aee365ae5d5fa308b215127633a0b1d640e1b448e88036f71922762b94e
|
|
7
|
+
data.tar.gz: 04166cc72eba05897f6441716169ceb16feab23be9418e963dc726662d80cbf3354ae9e9b699b85363594d9bd3becea0af7f82f9cfcb22bc1effb991422e4089
|
data/CHANGELOG.rst
CHANGED
data/contrib/kameleon_bashrc.sh
CHANGED
|
@@ -140,7 +140,7 @@ fi
|
|
|
140
140
|
function __download {
|
|
141
141
|
echo "Downloading: $1..."
|
|
142
142
|
if which wget >/dev/null; then
|
|
143
|
-
wget --progress=bar:force "$1" -O "$2" 2>&1
|
|
143
|
+
wget --retry-connrefused --progress=bar:force "$1" -O "$2" 2>&1
|
|
144
144
|
else
|
|
145
145
|
fail "wget is missing, trying with curl..."
|
|
146
146
|
if which curl >/dev/null; then
|
data/lib/kameleon/recipe.rb
CHANGED
|
@@ -39,28 +39,28 @@ module Kameleon
|
|
|
39
39
|
Kameleon.ui.debug("Initialize new recipe (#{path})")
|
|
40
40
|
@base_recipes_files = [@path]
|
|
41
41
|
@steps_dirs = []
|
|
42
|
-
steps_dir = get_default_steps_dir
|
|
43
|
-
@steps_dirs.push(steps_dir) unless steps_dir.nil?
|
|
44
42
|
load! :strict => false
|
|
45
43
|
end
|
|
46
44
|
|
|
47
|
-
def
|
|
48
|
-
relative_path =
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
subdirs
|
|
54
|
-
|
|
45
|
+
def get_steps_dirs(recipe_path)
|
|
46
|
+
relative_path = recipe_path.to_path.gsub(Kameleon.env.root_dir.to_path + '/', '')
|
|
47
|
+
if relative_path.eql? recipe_path.to_path
|
|
48
|
+
subdirs = [recipe_path.dirname]
|
|
49
|
+
else
|
|
50
|
+
last_dir = Kameleon.env.root_dir
|
|
51
|
+
subdirs = [last_dir]
|
|
52
|
+
relative_path.split("/")[0...-1].each do |p|
|
|
53
|
+
subdir = last_dir.join(p)
|
|
54
|
+
subdirs.push(subdir)
|
|
55
|
+
last_dir = subdir
|
|
56
|
+
end
|
|
55
57
|
end
|
|
56
58
|
steps_dirs = []
|
|
57
59
|
subdirs.reverse_each do |p|
|
|
58
60
|
steps_dirs.push(File.expand_path(File.join(p.to_path, 'steps')))
|
|
59
61
|
steps_dirs.push(File.expand_path(File.join(p.to_path, '.steps')))
|
|
60
62
|
end
|
|
61
|
-
steps_dirs.
|
|
62
|
-
return p if File.exist? p
|
|
63
|
-
end
|
|
63
|
+
steps_dirs.select! { |x| File.exists? x }
|
|
64
64
|
end
|
|
65
65
|
|
|
66
66
|
def load!(kwargs = {})
|
|
@@ -77,13 +77,9 @@ module Kameleon
|
|
|
77
77
|
yaml_recipe.delete("extend")
|
|
78
78
|
|
|
79
79
|
# Where we can find steps
|
|
80
|
-
@base_recipes_files.
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
dir = File.expand_path(File.join(dirname, p))
|
|
84
|
-
@steps_dirs.push(dir) if File.exists? dir
|
|
85
|
-
end
|
|
86
|
-
end
|
|
80
|
+
@steps_dirs = @base_recipes_files.map do |recipe_path|
|
|
81
|
+
get_steps_dirs(recipe_path)
|
|
82
|
+
end.flatten!
|
|
87
83
|
@steps_dirs.uniq!
|
|
88
84
|
|
|
89
85
|
# Load Global variables
|
|
@@ -101,8 +97,8 @@ module Kameleon
|
|
|
101
97
|
resolved_global['include_steps'].flatten!
|
|
102
98
|
resolved_global['include_steps'].compact!
|
|
103
99
|
@sections.values.each do |section|
|
|
104
|
-
dir_to_search =
|
|
105
|
-
|
|
100
|
+
dir_to_search = @steps_dirs.map do |steps_dir|
|
|
101
|
+
resolved_global['include_steps'].map do |path|
|
|
106
102
|
[File.join(steps_dir, section.name, path),
|
|
107
103
|
File.join(steps_dir, path)]
|
|
108
104
|
end
|
data/version.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
2.3.
|
|
1
|
+
2.3.5
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: kameleon-builder
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.3.
|
|
4
|
+
version: 2.3.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Salem Harrache
|
|
@@ -12,7 +12,7 @@ authors:
|
|
|
12
12
|
autorequire:
|
|
13
13
|
bindir: bin
|
|
14
14
|
cert_chain: []
|
|
15
|
-
date: 2014-
|
|
15
|
+
date: 2014-12-02 00:00:00.000000000 Z
|
|
16
16
|
dependencies:
|
|
17
17
|
- !ruby/object:Gem::Dependency
|
|
18
18
|
name: childprocess
|