roadworker 0.2.4 → 0.2.5

data/README.md

@@ -76,3 +76,10 @@ info.winebarrel.jp. A:
   actual=127.0.0.1(300),127.0.0.2(300)
 5 examples, 1 failure
 ```
+## CI
+[drone.io](https://drone.io/bitbucket.org/winebarrel/roadworker)
+
+[![Build Status](https://drone.io/bitbucket.org/winebarrel/roadworker/status.png)](https://drone.io/bitbucket.org/winebarrel/roadworker/latest)
+
+## Link
+* [RubyGems.org site](http://rubygems.org/gems/roadworker)

data/lib/roadworker/client.rb

@@ -111,7 +111,7 @@ module Roadworker
       collection.each do |item|
         key_list = keys.map do |k|
           value = item.send(k)
-          (k == :name && value) ? value.downcase.gsub(/\.\Z/, '') : value
+          (k == :name && value) ? value.downcase.sub(/\.\Z/, '') : value
         end
 
         hash[key_list] = item

data/lib/roadworker/dsl.rb

@@ -68,7 +68,7 @@ module Roadworker
       private
 
       def resource_record_set(rrset_name, type, &block)
-        if rrset_name.gsub(/\.\Z/, '') !~ /#{Regexp.escape(@name.gsub(/\.\Z/, ''))}\Z/i
+        if rrset_name.sub(/\.\Z/, '') !~ /#{Regexp.escape(@name.sub(/\.\Z/, ''))}\Z/i
           raise "Invalid ResourceRecordSet Name: #{rrset_name}"
         end
 

data/lib/roadworker/route53-ext.rb

@@ -4,7 +4,7 @@ module AWS
   class Route53
 
     def dns_name_to_alias_target(name)
-      name = name.gsub(/\.\Z/, '')
+      name = name.sub(/\.\Z/, '')
 
       unless name =~ /([^.]+)\.elb\.amazonaws.com\Z/i
         raise "Invalid DNS Name: #{name}"

data/lib/roadworker/route53-wrapper.rb

@@ -50,6 +50,7 @@ module Roadworker
           zone = OpenStruct.new({:name => name, :rrsets => []}.merge(opts))
         else
           zone = @hosted_zones.create(name, opts)
+          @options.hosted_zone_name = name
           @options.updated = true
         end
 
@@ -163,8 +164,8 @@ module Roadworker
           elsif expected and actual
             case attr
             when :dns_name
-              expected = expected.downcase.gsub(/\.\Z/, '')
-              actual = actual.downcase.gsub(/\.\Z/, '')
+              expected = expected.downcase.sub(/\.\Z/, '')
+              actual = actual.downcase.sub(/\.\Z/, '')
             end
 
             (expected == actual)
@@ -207,8 +208,10 @@ module Roadworker
       end
 
       def delete
-        if @resource_record_set.name == @hosted_zone.name and type =~ /\A(SOA|NS)\Z/i
-          return
+        if self.type =~ /\A(SOA|NS)\Z/i
+          hz_name = (@hosted_zone.name || @options.hosted_zone_name).downcase.sub(/\.\Z/, '')
+          rrs_name = @resource_record_set.name.downcase.sub(/\.\Z/, '')
+          return if hz_name == rrs_name
         end
 
         log(:info, 'Delete ResourceRecordSet', :red) do

data/lib/roadworker/version.rb

@@ -1,5 +1,5 @@
 module Roadworker
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end
 
 Version = Roadworker::VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roadworker
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors: