roadworker 0.5.15 → 0.5.16

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 163707e7a36317de25bda9f1c0af701729fbf6cbb67bcabf51f7fed86e5f97a9
4
- data.tar.gz: 044bbcd3a3c89be69d86be7b16f183588865770122001023ad11576409408267
3
+ metadata.gz: 3668f2c1e88bb9bb0094afd9c0bdc2521eb1dd496357f1fbcd655502e258aaa7
4
+ data.tar.gz: c40a29d0329c4ecae501b8563213fdbfe56e85bac67cc6dce6ae2a2db225f5be
5
5
  SHA512:
6
- metadata.gz: 7049cb4fb2254a360eafe3f54a53d923faa1d042e7533aab9c54d61a06899d7bc55805263ae672bf01d17c880af32ebe8a5afe2c7e2fa1ec2efd653942473696
7
- data.tar.gz: c323c0eef4acebe24f9dc04e261e4434a0c814913d678ba563aa93a47a0d0c5f741bca039767314ef023cb140abeae9e623e0c47ec5356aec0736d828849b797
6
+ metadata.gz: cc4096d507f7c487efe8f7a261f42fd5297f086a3720188c84fda0cce623152847995974ce2b454937310552b5101fca2244d42751cac0c5e8cbace1cc6ebffb
7
+ data.tar.gz: f8b3d161ade57d208682bcfd3fead73773aa5616c78a4cba34e97a3b2145f22e15f9e3fa4a76b135a37adac2f0372e85c725f0e6b9d5abd7651f85cabbd09a3e
data/bin/roadwork CHANGED
@@ -164,9 +164,9 @@ begin
164
164
  result_message = [examples_message, failures_message].join(', ')
165
165
 
166
166
  if failures.zero?
167
- logger.info(result_message.green)
167
+ logger.info(Roadworker::StringHelper.green(result_message))
168
168
  else
169
- logger.info(result_message.red)
169
+ logger.info(Roadworker::StringHelper.red(result_message))
170
170
  exit 1
171
171
  end
172
172
  when :apply
@@ -180,7 +180,7 @@ begin
180
180
 
181
181
  updated = client.apply(file)
182
182
 
183
- logger.info('No change'.intense_blue) unless updated
183
+ logger.info(Roadworker::StringHelper.intense_blue('No change')) unless updated
184
184
  else
185
185
  raise 'must not happen'
186
186
  end
@@ -188,7 +188,7 @@ rescue => e
188
188
  if options[:debug]
189
189
  raise e
190
190
  else
191
- $stderr.puts("[ERROR] #{e.class}: #{e.message}".red)
191
+ $stderr.puts(Roadworker::StringHelper.red("[ERROR] #{e.class}: #{e.message}"))
192
192
  exit 1
193
193
  end
194
194
  end
@@ -355,8 +355,8 @@ module Roadworker
355
355
  end
356
356
 
357
357
  if desired != present
358
- color = String.colorize # XXX:
359
- log(:info, " #{attribute}:\n".green + Roadworker::Utils.diff(present, desired, color: color, indent: ' '), false)
358
+ color = Roadworker::StringHelper.colorize # XXX:
359
+ log(:info, Roadworker::StringHelper.green(" #{attribute}:\n") + Roadworker::Utils.diff(present, desired, color: color, indent: ' '), false)
360
360
  end
361
361
  end
362
362
  end
@@ -6,7 +6,7 @@ module Roadworker
6
6
  def initialize(options = {})
7
7
  @options = OpenStruct.new(options)
8
8
  @options.logger ||= Logger.new($stdout)
9
- String.colorize = @options.color
9
+ Roadworker::StringHelper.colorize = @options.color
10
10
  @options.route53 = Aws::Route53::Client.new
11
11
  @health_checks = HealthCheck.health_checks(@options.route53, :extended => true)
12
12
  @options.health_checks = @health_checks
@@ -323,11 +323,11 @@ module Roadworker
323
323
  end
324
324
 
325
325
  def print_success
326
- print '.'.intense_green unless @options.debug
326
+ print Roadworker::StringHelper.intense_green('.') unless @options.debug
327
327
  end
328
328
 
329
329
  def print_failure
330
- print 'F'.intense_red unless @options.debug
330
+ print Roadworker::StringHelper.intense_red('F') unless @options.debug
331
331
  end
332
332
 
333
333
  def fetch_dns_name(dns_name)
@@ -5,7 +5,7 @@ module Roadworker
5
5
  log_id = yield if block_given?
6
6
  message = "#{message}: #{log_id}" if log_id
7
7
  message << ' (dry-run)' if dry_run
8
- message = message.send(color) if color
8
+ message = Roadworker::StringHelper.public_send(color, message) if color
9
9
  logger.send(level, message)
10
10
  end
11
11
 
@@ -0,0 +1,27 @@
1
+ require 'term/ansicolor'
2
+
3
+ module Roadworker
4
+ module StringHelper
5
+ @colorize = false
6
+
7
+ class << self
8
+ def colorize=(value)
9
+ @colorize = value
10
+ end
11
+
12
+ def colorize
13
+ @colorize
14
+ end
15
+
16
+ Term::ANSIColor::Attribute.named_attributes.map do |attribute|
17
+ define_method(attribute.name) do |str|
18
+ if colorize
19
+ Term::ANSIColor.public_send(attribute.name, str)
20
+ else
21
+ str
22
+ end
23
+ end
24
+ end
25
+ end
26
+ end
27
+ end
@@ -1,3 +1,3 @@
1
1
  module Roadworker
2
- VERSION = "0.5.15"
2
+ VERSION = "0.5.16"
3
3
  end
data/lib/roadworker.rb CHANGED
@@ -8,7 +8,7 @@ require 'uuid'
8
8
  require 'diffy'
9
9
  require 'hashie'
10
10
 
11
- require 'roadworker/string-ext'
11
+ require 'roadworker/string_helper'
12
12
  require 'roadworker/struct-ext'
13
13
  require 'roadworker/route53-ext'
14
14
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: roadworker
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.15
4
+ version: 0.5.16
5
5
  platform: ruby
6
6
  authors:
7
7
  - winebarrel
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-06-16 00:00:00.000000000 Z
11
+ date: 2023-11-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sdk-route53
@@ -192,6 +192,20 @@ dependencies:
192
192
  - - ">="
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0'
195
+ - !ruby/object:Gem::Dependency
196
+ name: nokogiri
197
+ requirement: !ruby/object:Gem::Requirement
198
+ requirements:
199
+ - - ">="
200
+ - !ruby/object:Gem::Version
201
+ version: '0'
202
+ type: :development
203
+ prerelease: false
204
+ version_requirements: !ruby/object:Gem::Requirement
205
+ requirements:
206
+ - - ">="
207
+ - !ruby/object:Gem::Version
208
+ version: '0'
195
209
  description: Roadworker is a tool to manage Route53. It defines the state of Route53
196
210
  using DSL, and updates Route53 according to DSL.
197
211
  email: sgwr_dts@yahoo.co.jp
@@ -214,7 +228,7 @@ files:
214
228
  - lib/roadworker/route53-ext.rb
215
229
  - lib/roadworker/route53-health-check.rb
216
230
  - lib/roadworker/route53-wrapper.rb
217
- - lib/roadworker/string-ext.rb
231
+ - lib/roadworker/string_helper.rb
218
232
  - lib/roadworker/struct-ext.rb
219
233
  - lib/roadworker/template-helper.rb
220
234
  - lib/roadworker/utils.rb
@@ -238,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
238
252
  - !ruby/object:Gem::Version
239
253
  version: '0'
240
254
  requirements: []
241
- rubygems_version: 3.1.4
255
+ rubygems_version: 3.4.1
242
256
  signing_key:
243
257
  specification_version: 4
244
258
  summary: Roadworker is a tool to manage Route53.
@@ -1,28 +0,0 @@
1
- require 'term/ansicolor'
2
-
3
- class String
4
- @@colorize = false
5
-
6
- class << self
7
- def colorize=(value)
8
- @@colorize = value
9
- end
10
-
11
- def colorize
12
- @@colorize
13
- end
14
- end # of class method
15
-
16
- Term::ANSIColor::Attribute.named_attributes.map do |attribute|
17
- class_eval(<<-EOS, __FILE__, __LINE__ + 1)
18
- def #{attribute.name}
19
- if @@colorize
20
- Term::ANSIColor.send(#{attribute.name.inspect}, self)
21
- else
22
- self
23
- end
24
- end
25
- EOS
26
- end
27
-
28
- end