dev 1.0.194 → 1.0.195
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/dev/Dep.rb +8 -6
- data/lib/dev/cmd/Setup.rb +5 -2
- metadata +1 -1
data/lib/dev/Dep.rb
CHANGED
@@ -84,12 +84,14 @@ class Dep < Hash
|
|
84
84
|
array << get_export_command(get_dep_dir)
|
85
85
|
array << "<%puts ' #{get_dep_dir} exists.' if File.exist?('#{get_dep_dir}')%>"
|
86
86
|
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
87
|
+
rake=true
|
88
|
+
rake=false if !self.get_value("no_rake").nil? && File.exists?(self.get_value("no_rake"))
|
89
|
+
if(rake)
|
90
|
+
unless self[:rake].nil?
|
91
|
+
array << "{cmd: 'rake #{self.get_value("rake").to_s}', dir: '#{get_dep_dir}', cache:'true', capture_output: true, capture_error: true, auto: true}" unless self.get_value("cache").nil?
|
92
|
+
array << "{cmd: 'rake #{self.get_value("rake").to_s}', dir: '#{get_dep_dir}', capture_output: true, capture_error: true , auto: true}" if self.get_value("cache").nil?
|
93
|
+
end
|
94
|
+
end
|
93
95
|
|
94
96
|
return array
|
95
97
|
end
|
data/lib/dev/cmd/Setup.rb
CHANGED
@@ -7,9 +7,12 @@ class Setup < Array
|
|
7
7
|
strip_auto_entries
|
8
8
|
# auto generate setup entry based on dep values
|
9
9
|
dep_hash.each{ |k,v|
|
10
|
-
if !v.nil? && v.kind_of?(Hash)
|
10
|
+
if !v.nil? && v.kind_of?(Hash) #&& !set.has_key?(k)
|
11
11
|
dep=Dev::Dep.new(v)
|
12
|
-
|
12
|
+
commands = dep.setup_commands
|
13
|
+
commands.each{|cmd|
|
14
|
+
self << cmd if !self.include?(cmd)
|
15
|
+
}
|
13
16
|
end
|
14
17
|
}
|
15
18
|
|