roadworker 0.5.14 → 0.5.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33bb9bbc3a38db10787d008687b4e2b9cb38a5114140fe3a95b78b19fe269900
-  data.tar.gz: 757ac4a3621ff48effbde3be06debef5ce1f1206546ecc0f115d75f7148e0dc5
+  metadata.gz: 3668f2c1e88bb9bb0094afd9c0bdc2521eb1dd496357f1fbcd655502e258aaa7
+  data.tar.gz: c40a29d0329c4ecae501b8563213fdbfe56e85bac67cc6dce6ae2a2db225f5be
 SHA512:
-  metadata.gz: 4e874e443ee768389d3cc0eacc164d270d4169b55d0c8169500956b895085f7bd5f10c6e1571ff4d786981b3d4adf569462964ba3e8dafc15ed2f6029fc92f3c
-  data.tar.gz: 148572096e1e293beb9b1ddc0687ef5ec6a97d52b0a72de6942b7d049425d1a57b56f1fbcb2955e9e8c89a00903e1595075a8dfee5d456b96f54469874ba3092
+  metadata.gz: cc4096d507f7c487efe8f7a261f42fd5297f086a3720188c84fda0cce623152847995974ce2b454937310552b5101fca2244d42751cac0c5e8cbace1cc6ebffb
+  data.tar.gz: f8b3d161ade57d208682bcfd3fead73773aa5616c78a4cba34e97a3b2145f22e15f9e3fa4a76b135a37adac2f0372e85c725f0e6b9d5abd7651f85cabbd09a3e

data/bin/roadwork

@@ -164,9 +164,9 @@ begin
     result_message = [examples_message, failures_message].join(', ')
 
     if failures.zero?
-      logger.info(result_message.green)
+      logger.info(Roadworker::StringHelper.green(result_message))
     else
-      logger.info(result_message.red)
+      logger.info(Roadworker::StringHelper.red(result_message))
       exit 1
     end
   when :apply
@@ -180,7 +180,7 @@ begin
 
     updated = client.apply(file)
 
-    logger.info('No change'.intense_blue) unless updated
+    logger.info(Roadworker::StringHelper.intense_blue('No change')) unless updated
   else
     raise 'must not happen'
   end
@@ -188,7 +188,7 @@ rescue => e
   if options[:debug]
     raise e
   else
-    $stderr.puts("[ERROR] #{e.class}: #{e.message}".red)
+    $stderr.puts(Roadworker::StringHelper.red("[ERROR] #{e.class}: #{e.message}"))
     exit 1
   end
 end

data/lib/roadworker/batch.rb

@@ -85,10 +85,10 @@ module Roadworker
       total_ops = 0
       ops.slice_before do |op|
         total_value_size += op.value_size
-        total_ops += 1
+        total_ops += op.op_size
         if total_value_size > 32000 || total_ops > 1000
           total_value_size = op.value_size
-          total_ops = 1
+          total_ops = op.op_size
           true
         else
           false
@@ -150,6 +150,8 @@ module Roadworker
       end
 
       # Count total length of RR "Value" included in changes
+      # https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DNSLimitations.html#limits-api-requests-changeresourcerecordsets
+      #
       # See also: Batch#slice_operations
       # @return [Integer]
       def value_size
@@ -163,6 +165,17 @@ module Roadworker
         end.sum || 0
       end
 
+      # Count of operational size
+      # https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DNSLimitations.html#limits-api-requests-changeresourcerecordsets
+      #
+      # See also: Batch#slice_operations
+      # @return [Integer]
+      def op_size
+        changes.map do |change|
+          change[:action] == 'UPSERT' ? 2 : 1
+        end.sum || 0
+      end
+
       # @return [Array<Hash>]
       def changes
         raise NotImplementedError
@@ -342,8 +355,8 @@ module Roadworker
           end
 
           if desired != present
-            color = String.colorize # XXX:
-            log(:info, "  #{attribute}:\n".green + Roadworker::Utils.diff(present, desired, color: color, indent: '    '), false)
+            color = Roadworker::StringHelper.colorize # XXX:
+            log(:info, Roadworker::StringHelper.green("  #{attribute}:\n") + Roadworker::Utils.diff(present, desired, color: color, indent: '    '), false)
           end
         end
       end

data/lib/roadworker/client.rb

@@ -6,7 +6,7 @@ module Roadworker
     def initialize(options = {})
       @options = OpenStruct.new(options)
       @options.logger ||= Logger.new($stdout)
-      String.colorize = @options.color
+      Roadworker::StringHelper.colorize = @options.color
       @options.route53 = Aws::Route53::Client.new
       @health_checks = HealthCheck.health_checks(@options.route53, :extended => true)
       @options.health_checks = @health_checks

data/lib/roadworker/dsl-tester.rb

@@ -323,11 +323,11 @@ module Roadworker
       end
 
       def print_success
-        print '.'.intense_green unless @options.debug
+        print Roadworker::StringHelper.intense_green('.') unless @options.debug
       end
 
       def print_failure
-        print 'F'.intense_red unless @options.debug
+        print Roadworker::StringHelper.intense_red('F') unless @options.debug
       end
 
       def fetch_dns_name(dns_name)

data/lib/roadworker/log.rb

@@ -5,7 +5,7 @@ module Roadworker
       log_id = yield if block_given?
       message = "#{message}: #{log_id}" if log_id
       message << ' (dry-run)' if dry_run
-      message = message.send(color) if color
+      message = Roadworker::StringHelper.public_send(color, message) if color
       logger.send(level, message)
     end
 

data/lib/roadworker/string_helper.rb

@@ -0,0 +1,27 @@
+require 'term/ansicolor'
+
+module Roadworker
+  module StringHelper
+    @colorize = false
+
+    class << self
+      def colorize=(value)
+        @colorize = value
+      end
+
+      def colorize
+        @colorize
+      end
+
+      Term::ANSIColor::Attribute.named_attributes.map do |attribute|
+        define_method(attribute.name) do |str|
+          if colorize
+            Term::ANSIColor.public_send(attribute.name, str)
+          else
+            str
+          end
+        end
+      end
+    end
+  end
+end

data/lib/roadworker/version.rb

@@ -1,3 +1,3 @@
 module Roadworker
-  VERSION = "0.5.14"
+  VERSION = "0.5.16"
 end

data/lib/roadworker.rb

@@ -8,7 +8,7 @@ require 'uuid'
 require 'diffy'
 require 'hashie'
 
-require 'roadworker/string-ext'
+require 'roadworker/string_helper'
 require 'roadworker/struct-ext'
 require 'roadworker/route53-ext'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.16
 platform: ruby
 authors:
 - winebarrel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2023-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-route53
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Roadworker is a tool to manage Route53. It defines the state of Route53
   using DSL, and updates Route53 according to DSL.
 email: sgwr_dts@yahoo.co.jp
@@ -214,7 +228,7 @@ files:
 - lib/roadworker/route53-ext.rb
 - lib/roadworker/route53-health-check.rb
 - lib/roadworker/route53-wrapper.rb
-- lib/roadworker/string-ext.rb
+- lib/roadworker/string_helper.rb
 - lib/roadworker/struct-ext.rb
 - lib/roadworker/template-helper.rb
 - lib/roadworker/utils.rb
@@ -238,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Roadworker is a tool to manage Route53.

data/lib/roadworker/string-ext.rb

@@ -1,28 +0,0 @@
-require 'term/ansicolor'
-
-class String
-  @@colorize = false
-
-  class << self
-    def colorize=(value)
-      @@colorize = value
-    end
-
-    def colorize
-      @@colorize
-    end
-  end # of class method
-
-  Term::ANSIColor::Attribute.named_attributes.map do |attribute|
-    class_eval(<<-EOS, __FILE__, __LINE__ + 1)
-      def #{attribute.name}
-        if @@colorize
-          Term::ANSIColor.send(#{attribute.name.inspect}, self)
-        else
-          self
-        end
-      end
-    EOS
-  end
-
-end