zonify 0.4.1 → 0.4.2

data/README

@@ -81,14 +81,14 @@ DESCRIPTION
        disable them for pre-processing the YAML and then adding them with nor-
        malize. For example:
 
-       The  --[no-]srv-singleton  options  also  control  creation of weighted
-       round-robin CNAMEs, an infelicity in nomenclature.
-
        zonify r53 amz.example.com > r53.yaml
        zonify ec2 --no-srv-singleton > ec2.yaml
        my-yaml-rewriter < ec2.yaml > adjusted.yaml
        zonify normalize amz.example.com < adjusted.yaml > normed.yaml
-       zonify diff r53.yaml normed.yaml | zonify apply
+       zonify diff --types CNAME,SRV r53.yaml normed.yaml | zonify apply
+
+       The  --[no-]srv-singleton  options  also  control  creation of weighted
+       round-robin CNAMEs, an infelicity in nomenclature.
 
 SYNC POLICY
        Zonify assumes the domain given on the command line is  entirely  under

data/lib/zonify.rb

@@ -433,11 +433,18 @@ end
 LDH_RE = /^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])$/
 def string_to_ldh_component(s)
   LDH_RE.match(s) ? s.downcase : s.downcase.gsub(/[^a-z0-9-]/, '-').
-                                            sub(/(^[-]+|[-]+$)/, '')[0,63]
+                                            sub(/(^[-]+|[-]+$)/, '')[0...64]
 end
 
 def string_to_ldh(s)
-  s.split('.').map{|s| string_to_ldh_component(s) }.join('.')
+  head, *tail = s.split('.')
+  tail_ = tail.map{|s| string_to_ldh_component(s) }
+  head_ = case head
+          when '*' then '*'
+          when nil then ''
+          else          string_to_ldh_component(head)
+          end
+  [head_, tail_].flatten.select{|c| not (c.empty? or c.nil?) }.join('.')
 end
 
 def _dot(s)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zonify
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Airbnb
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-13 00:00:00 Z
+date: 2012-10-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fog