roadworker 0.5.15 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 163707e7a36317de25bda9f1c0af701729fbf6cbb67bcabf51f7fed86e5f97a9
-  data.tar.gz: 044bbcd3a3c89be69d86be7b16f183588865770122001023ad11576409408267
+  metadata.gz: 6fe3c3b469bf155ece1d643b31b9764c78e79b956a9a997cc8083095eb420402
+  data.tar.gz: '08c0e358e87b67b924eb4f520502054582003557228a56d873ef2490c34c5cc0'
 SHA512:
-  metadata.gz: 7049cb4fb2254a360eafe3f54a53d923faa1d042e7533aab9c54d61a06899d7bc55805263ae672bf01d17c880af32ebe8a5afe2c7e2fa1ec2efd653942473696
-  data.tar.gz: c323c0eef4acebe24f9dc04e261e4434a0c814913d678ba563aa93a47a0d0c5f741bca039767314ef023cb140abeae9e623e0c47ec5356aec0736d828849b797
+  metadata.gz: e3bf37aaa9b995361ce3a6da9f5ddb5678169da9cb85acfc46ef54bf294b53bcbacc2c4055d20c718dfff06f24649fdb19e7323354f887e363c91ffa09d631d0
+  data.tar.gz: e6e8ef9da9646ad49aec454cd87ba6dbc54111fb41a5578e0f740af3c19847b3b5fa4688a3283ff06277d430ee7d722fefa6a00bf791a000149bf185ccbc79e2

data/README.md

@@ -1,5 +1,7 @@
 # Roadworker
 
+__Note:__ This software is just transferred from https://github.com/codenize-tools (maintained by [@winebarrel](https://github.com/winebarrel]) which was archived. [Cookpad](https://github.com/cookpad) and [@sorah](https://github.com/sorah) asked @winebarrel for inheriting this project and took its ownership as a new maintainer.
+
 Roadworker is a tool to manage Route53.
 
 It defines the state of Route53 using DSL, and updates Route53 according to DSL.

data/bin/roadwork

@@ -80,9 +80,6 @@ ARGV.options do |opt|
     end
     aws_opts[:region] = region
     Aws.config.update(aws_opts)
-  rescue => e
-    $stderr.puts e
-    exit 1
   end
 end
 
@@ -164,9 +161,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,15 +177,8 @@ 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
-rescue => e
-  if options[:debug]
-    raise e
-  else
-    $stderr.puts("[ERROR] #{e.class}: #{e.message}".red)
-    exit 1
-  end
 end

data/lib/roadworker/batch.rb

@@ -355,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/route53-wrapper.rb

@@ -214,6 +214,10 @@ module Roadworker
 
                 actual[0].sub!(/\Adualstack\./i, '')
               end
+            when :resource_records
+              if self.type == 'AAAA'
+                return expected.map { |v| IPAddr.new(v.value, Socket::AF_INET6) } == actual.map { |v| IPAddr.new(v.value, Socket::AF_INET6) }
+              end
             end
 
             (expected == actual)

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.15"
+  VERSION = "0.6.0"
 end

data/lib/roadworker.rb

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

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.5.15
+  version: 0.6.0
 platform: ruby
 authors:
 - winebarrel
+- Cookpad Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2025-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-route53
@@ -108,6 +109,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ipaddr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -192,9 +221,25 @@ 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
+email:
+- sgwr_dts@yahoo.co.jp
+- kaihatsu@cookpad.com
 executables:
 - roadwork
 extensions: []
@@ -214,12 +259,12 @@ 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
 - lib/roadworker/version.rb
-homepage: https://github.com/winebarrel/roadworker
+homepage: https://github.com/cookpad/roadworker
 licenses:
 - MIT
 metadata: {}
@@ -238,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.19
 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