tokenr 0.0.4 → 0.0.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (2) hide show
  1. data/lib/tokenr/tokens.rb +14 -14
  2. metadata +20 -20
data/lib/tokenr/tokens.rb CHANGED
@@ -11,14 +11,13 @@ class Tokens
11
11
  end
12
12
 
13
13
  def replace(path, default_environment='local')
14
- puts 'Tokenising'.cyan
15
- puts '############'.cyan
14
+ puts 'Tokenising', '############'
16
15
 
17
- find_files_in(path).each do |file|
16
+ find_master_files_in(path).each do |file|
18
17
  @environments = {}
19
18
 
20
- read_tokens_for_file(file)
21
- save_current_environments
19
+ read_tokens_for_master_file(file)
20
+ save_token_file_environments
22
21
 
23
22
  read_tokens(@globals_file)
24
23
  remove_global_only_environments
@@ -27,26 +26,27 @@ class Tokens
27
26
  raise InvalidEnvironment, "Environment #{default_environment} is not recognised. Possible environments are #{@environments.keys.join(', ')}".red
28
27
  end
29
28
 
30
- @environments.each_pair { |environment, values| @writer.write_for(environment, file, values, @globals, true) }
29
+ @environments.each_pair do |environment, values|
30
+ @writer.write_for(environment, file, values, @globals, true)
31
+ end
32
+
31
33
  @writer.write_for('', file, @environments[default_environment], @globals, false)
34
+
32
35
  puts
33
36
  end
34
37
  end
35
38
 
36
39
  private
37
40
 
38
- def find_files_in(path)
41
+ def find_master_files_in(path)
39
42
  files = Dir.glob("#{path}/**/#{@tokens_pattern}", File::FNM_CASEFOLD)
40
43
  puts "#{files.length} config(s) found for tokenising", ''
41
44
  files
42
45
  end
43
46
 
44
- def read_tokens_for_file(file)
45
- file.gsub!('.master.', '.tokens.')
46
- file.gsub!(File.extname(file), '.rb')
47
-
48
- read_tokens(file.gsub('.master.', '.tokens.'))
49
- puts "Tokensing - #{file}", "Environments - #{@environments.keys.join(', ')}"
47
+ def read_tokens_for_master_file(file)
48
+ read_tokens(file.gsub('.master.', '.tokens.').gsub(File.extname(file), '.rb'))
49
+ puts "Tokensing - #{file}", "Environments - #{@environments.keys.join(', ')}"
50
50
  end
51
51
 
52
52
  def read_tokens(path)
@@ -61,7 +61,7 @@ class Tokens
61
61
  end
62
62
  end
63
63
 
64
- def save_current_environments
64
+ def save_token_file_environments
65
65
  @temp_environments = @environments.dup
66
66
  end
67
67
 
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.0.4
4
+ version: 0.0.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-07-11 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake
16
- requirement: &23665940 !ruby/object:Gem::Requirement
16
+ requirement: &18136980 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 0.9.2.2
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *23665940
24
+ version_requirements: *18136980
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: term-ansicolor
27
- requirement: &23665360 !ruby/object:Gem::Requirement
27
+ requirement: &18136440 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.0.7
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *23665360
35
+ version_requirements: *18136440
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: logger
38
- requirement: &23664860 !ruby/object:Gem::Requirement
38
+ requirement: &18135920 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 1.2.8
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *23664860
46
+ version_requirements: *18135920
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rspec
49
- requirement: &23662140 !ruby/object:Gem::Requirement
49
+ requirement: &18135380 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - =
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 2.9.0
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *23662140
57
+ version_requirements: *18135380
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: mocha
60
- requirement: &23661640 !ruby/object:Gem::Requirement
60
+ requirement: &18134780 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - =
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: 0.10.5
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *23661640
68
+ version_requirements: *18134780
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rdoc
71
- requirement: &23661100 !ruby/object:Gem::Requirement
71
+ requirement: &18134300 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - =
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '3.12'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *23661100
79
+ version_requirements: *18134300
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: bundler
82
- requirement: &23660400 !ruby/object:Gem::Requirement
82
+ requirement: &18107220 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - =
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: 1.1.3
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *23660400
90
+ version_requirements: *18107220
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: jeweler
93
- requirement: &23659880 !ruby/object:Gem::Requirement
93
+ requirement: &18106560 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - =
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: 1.8.3
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *23659880
101
+ version_requirements: *18106560
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: simplecov
104
- requirement: &23659340 !ruby/object:Gem::Requirement
104
+ requirement: &18105900 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *23659340
112
+ version_requirements: *18105900
113
113
  description: Find and tokenise files!
114
114
  email: robertbeal@gmail.com
115
115
  executables: []
@@ -139,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
139
139
  version: '0'
140
140
  segments:
141
141
  - 0
142
- hash: 2241134511515759119
142
+ hash: 2335418822748191407
143
143
  required_rubygems_version: !ruby/object:Gem::Requirement
144
144
  none: false
145
145
  requirements: