roadworker 0.5.5.beta5 → 0.5.5.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 292c907fb987acc0bbb3062ff2ebcb35142e7cf9
-  data.tar.gz: 2e45b43a43831f14fa42f6e127e7b6d98251d4ed
+  metadata.gz: 5bae16b7e11e639856bfb16ad7153ae2804ffb76
+  data.tar.gz: 495fa3ec71b3174dc41c86642d290b908e7d4b96
 SHA512:
-  metadata.gz: b76aefef72d4d62356ba3bd6ea52f1eba5545b97bb765d9899e6d7aa81c3f900ff45153bb061672e81584525811683aae2740e0c4a34ff8ceab4e414080a7d19
-  data.tar.gz: 6e82becf01cc502f8d1ff35fbeb0b96ba8b59b1bcff1bcadea45376e8d639c794a839a9be89460c0f1ab3af59d306fb6e2aa44b553e73e5ee06532887dc09210
+  metadata.gz: 4c1c7e2a0cf2e03c8c7ec716d413a204a4cf2cefe7b988aee9570f75fb48c2ae6e9ec0bac9c75e79dea8cea4b2fc5d1f2a3b0edaeb21bbefc1583caaaddf4dd0
+  data.tar.gz: 7172d5fac966080e75df126495b8f30833f39e940b3157e6a335ea587021630bc8068ffc683eed3d5259f975bc5188a8bd958fa1de85756189714de15938a499

data/README.md

@@ -15,6 +15,7 @@ It defines the state of Route53 using DSL, and updates Route53 according to DSL.
 * `>= 0.5.5`
   * **Disable Divided HostedZone**
   * **Use aws-sdk v2** [PR#20](https://github.com/winebarrel/roadworker/pull/20)
+  * Support Cross Account ELB Alias PR#21](https://github.com/winebarrel/roadworker/pull/21)
 
 ## Installation
 

data/lib/roadworker.rb

@@ -1,11 +1,14 @@
 require 'logger'
 require 'ostruct'
 require 'socket'
+require 'pp'
 require 'tempfile'
 require 'uri'
 require 'uuid'
+require 'diffy'
 
 require 'roadworker/string-ext'
+require 'roadworker/struct-ext'
 require 'roadworker/route53-ext'
 
 require 'roadworker/version'

data/lib/roadworker/log.rb

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

data/lib/roadworker/route53-ext.rb

@@ -40,7 +40,7 @@ module Aws
 
         if name =~ /([^.]+)\.elb\.amazonaws.com\Z/i
           region = $1.downcase
-          alias_target = elb_dns_name_to_alias_target(name, region)
+          alias_target = elb_dns_name_to_alias_target(name, region, options)
 
           # XXX:
           alias_target.merge(options)
@@ -58,28 +58,36 @@ module Aws
 
       private
 
-      def elb_dns_name_to_alias_target(name, region)
-        elb = Aws::ElasticLoadBalancing::Client.new(:region => region)
-
-        load_balancer = nil
-        elb.describe_load_balancers.each do |page|
-          page.load_balancer_descriptions.each do |lb|
-            if lb.dns_name == name
-              load_balancer = lb
+      def elb_dns_name_to_alias_target(name, region, options)
+        if options[:hosted_zone_id]
+          {
+            :hosted_zone_id => options[:hosted_zone_id],
+            :dns_name       => name,
+            :evaluate_target_health => false, # XXX:
+          }
+        else
+          elb = Aws::ElasticLoadBalancing::Client.new(:region => region)
+
+          load_balancer = nil
+          elb.describe_load_balancers.each do |page|
+            page.load_balancer_descriptions.each do |lb|
+              if lb.dns_name == name
+                load_balancer = lb
+              end
             end
+            break if load_balancer
           end
-          break if load_balancer
-        end
 
-        unless load_balancer
-          raise "Cannot find ELB: #{name}"
-        end
+          unless load_balancer
+            raise "Cannot find ELB: #{name}"
+          end
 
-        {
-          :hosted_zone_id         => load_balancer.canonical_hosted_zone_name_id,
-          :dns_name               => load_balancer.dns_name,
-          :evaluate_target_health => false, # XXX:
-        }
+          {
+            :hosted_zone_id         => load_balancer.canonical_hosted_zone_name_id,
+            :dns_name               => load_balancer.dns_name,
+            :evaluate_target_health => false, # XXX:
+          }
+        end
       end
 
       def s3_dns_name_to_alias_target(name, region, hosted_zone_id)

data/lib/roadworker/route53-wrapper.rb

@@ -253,13 +253,13 @@ module Roadworker
           actual = nil if actual.kind_of?(Array) && actual.empty?
 
           if (expected and !actual) or (!expected and actual)
-            log(:info, "  set #{attribute}=#{expected.inspect}" , :green)
+            log(:info, "  #{attribute}:\n".green + Roadworker::Utils.diff(actual, expected, :color => @options.color, :indent => '    '), false)
             unless @options.dry_run
               self.send(:"#{attribute}=", expected)
             end
           elsif expected and actual
             if expected != actual
-              log(:info, "  set #{attribute}=#{expected.inspect}" , :green)
+              log(:info, "  #{attribute}:\n".green + Roadworker::Utils.diff(actual, expected, :color => @options.color, :indent => '    '), false)
               unless @options.dry_run
                 self.send(:"#{attribute}=", expected)
               end

data/lib/roadworker/struct-ext.rb

@@ -0,0 +1,9 @@
+class Struct
+  def pretty_print(q)
+    self.to_h.pretty_print(q)
+  end
+
+  def pretty_print_cycle(q)
+    self.to_h.pretty_print_cycle(q)
+  end
+end

data/lib/roadworker/utils.rb

@@ -14,6 +14,20 @@ module Roadworker
 
         result
       end
+    end
+
+    class << self
+      def diff(obj1, obj2, options = {})
+        diffy = Diffy::Diff.new(
+          obj1.pretty_inspect,
+          obj2.pretty_inspect,
+          :diff => '-u'
+        )
+
+        out = diffy.to_s(options[:color] ? :color : :text).gsub(/\s+\z/m, '')
+        out.gsub!(/^/, options[:indent]) if options[:indent]
+        out
+      end
     end # of class methods
   end
 end

data/lib/roadworker/version.rb

@@ -1,3 +1,3 @@
 module Roadworker
-  VERSION = "0.5.5.beta5"
+  VERSION = "0.5.5.beta6"
 end

metadata

@@ -1,181 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.5.5.beta5
+  version: 0.5.5.beta6
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2015-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   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: net-dns2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.6
 - !ruby/object:Gem::Dependency
   name: uuid
   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: systemu
   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: diffy
+  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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-instafail
   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'
 - !ruby/object:Gem::Dependency
   name: rubydns
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.5
 - !ruby/object:Gem::Dependency
   name: coveralls
   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'
 - !ruby/object:Gem::Dependency
   name: transpec
   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
@@ -188,6 +202,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/roadwork
+- lib/roadworker.rb
 - lib/roadworker/client.rb
 - lib/roadworker/collection.rb
 - lib/roadworker/dsl-converter.rb
@@ -199,9 +214,9 @@ files:
 - lib/roadworker/route53-health-check.rb
 - lib/roadworker/route53-wrapper.rb
 - lib/roadworker/string-ext.rb
+- lib/roadworker/struct-ext.rb
 - lib/roadworker/utils.rb
 - lib/roadworker/version.rb
-- lib/roadworker.rb
 homepage: http://roadworker.codenize.tools/
 licenses:
 - MIT
@@ -212,17 +227,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Roadworker is a tool to manage Route53.