tokenr 0.1.4 → 0.1.5
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/tokenr/tokens.rb +33 -20
- data/lib/tokenr/tokens_checker.rb +1 -1
- metadata +3 -3
data/lib/tokenr/tokens.rb
CHANGED
@@ -19,38 +19,49 @@ class Tokens
|
|
19
19
|
puts
|
20
20
|
|
21
21
|
find_master_files_in(path).each do |file|
|
22
|
-
|
23
|
-
|
24
|
-
@globals = @environments.dup
|
25
|
-
|
26
|
-
# Read file variables
|
27
|
-
read_tokens(file.gsub('.master' + File.extname(file), '.tokens.rb'))
|
22
|
+
read_global_variables
|
23
|
+
read_file_variables(file)
|
28
24
|
only_use_environments_defined_in_tokens_rb
|
29
25
|
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
@checker.check(@environments)
|
34
|
-
|
35
|
-
if !@environments.has_key?(default_environment)
|
36
|
-
puts "Unable to find default environment #{default_environment}"
|
37
|
-
puts "Setting default environment to #{@environments.keys.first}"
|
38
|
-
default_environment = @environments.keys.first
|
39
|
-
end
|
26
|
+
@checker.check_for_duplicates(@environments)
|
27
|
+
default = set_default_environment(default_environment)
|
28
|
+
@environments.each_pair { |environment, values| values[:Environment] = environment }
|
40
29
|
|
41
30
|
# Write out a file for each environment
|
42
|
-
@environments.
|
43
|
-
|
44
|
-
|
31
|
+
if(@environments.keys.length > 1)
|
32
|
+
@environments.each_pair do |environment, values|
|
33
|
+
@writer.write_for(environment, file, values, @globals[environment], true)
|
34
|
+
end
|
45
35
|
end
|
46
36
|
|
47
37
|
# Write out a file for the default environment
|
48
|
-
@writer.write_for('', file, @environments[
|
38
|
+
@writer.write_for('', file, @environments[default], @globals[default])
|
49
39
|
end
|
50
40
|
end
|
51
41
|
|
52
42
|
private
|
53
43
|
|
44
|
+
def read_global_variables
|
45
|
+
read_tokens(@globals_file)
|
46
|
+
@globals = @environments.dup
|
47
|
+
end
|
48
|
+
|
49
|
+
def read_file_variables(file)
|
50
|
+
read_tokens(file.gsub('.master' + File.extname(file), '.tokens.rb'))
|
51
|
+
end
|
52
|
+
|
53
|
+
def set_default_environment(environment)
|
54
|
+
default = environment
|
55
|
+
|
56
|
+
if !@environments.has_key?(environment)
|
57
|
+
puts "Unable to find default environment #{environment}"
|
58
|
+
puts "Setting default environment to #{@environments.keys.first}"
|
59
|
+
default = @environments.keys.first.to_s
|
60
|
+
end
|
61
|
+
|
62
|
+
return default
|
63
|
+
end
|
64
|
+
|
54
65
|
def find_master_files_in(path)
|
55
66
|
return Dir.glob("#{path}/**/#{@tokens_pattern}", File::FNM_CASEFOLD)
|
56
67
|
end
|
@@ -73,5 +84,7 @@ class Tokens
|
|
73
84
|
@globals.each_key do |key|
|
74
85
|
@globals.delete(key) if !@environments.has_key?(key)
|
75
86
|
end
|
87
|
+
|
88
|
+
puts "Environments found - #{@environments.keys.join(', ')}"
|
76
89
|
end
|
77
90
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: tokenr
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.5
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2013-12-
|
12
|
+
date: 2013-12-18 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rake
|
@@ -185,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
185
185
|
version: '0'
|
186
186
|
segments:
|
187
187
|
- 0
|
188
|
-
hash:
|
188
|
+
hash: 1531302702138502920
|
189
189
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
190
190
|
none: false
|
191
191
|
requirements:
|