dns-zone 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: ce394f29889d56814fe99dee138535282dc7031f
-  data.tar.gz: bee58379e2fdc3d33219b7dc95c0c6a4156f557f
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MmY5NGU3NjIwYmU4ZDg1NjcyNGZkOTgwYjQ4ZGVmZmE5MjIzOTZiZQ==
+  data.tar.gz: !binary |-
+    OTVkNzhjM2MyZjIzOWMzNTBmZjFhNjBiOTNjOTZiNjY3YmY0NzIzMA==
 SHA512:
-  metadata.gz: b323d369cd33d0bdc2e2ad82b1cd9d4a39681ea1f7676cc25f048f0d3e946fc3d7d45c1cb2febe1aed622f2912ca484dc17d3459541617fd8cbb1f657752e1c8
-  data.tar.gz: 5560b853bf4ffb3883e842c6c90b7dd2dd6c2aa4163339afe16a3e085a75594b8a5c3aaddfb2244dc6a81d0ac6a82be126944f215c802a4553f35530df5c7f57
+  metadata.gz: !binary |-
+    YWFhZDY4OTc3YzYwM2E0OWUwZTIwY2E2YjRlYjM3MTEwZWRlNjljZmEzZGE1
+    YmQ2YzhjYWQyYTg0MzMzNDNkMWE5MWY5ZGVjODAwNjlmZWRjZmIyNGIwODZm
+    MGNlMjgzOTU2YWUyNzAzYjhjNzNlMjg5MTYxZTU4NDBhZmJlOTE=
+  data.tar.gz: !binary |-
+    OGRjMWExODhlZTFhMTE5ZTI4MjllYWNmZjAxZTg3NDk4NzQ4YmUxNGY3Njhk
+    YjE4NmMxNDRlNDFmODE2OTEzNjYyMmRmZjQ2MDI0ZDlkOWJjMmNlNTk0OWUy
+    Yzk3M2NmNjEwMjY4MGZmYmZmNTMyZWMyODFkMGNkZjUxOThjMjU=

data/HISTORY.md

@@ -1,5 +1,10 @@
 ## HEAD
 
+## 0.3.0 (2015-12-23)
+
+* Requires Ruby version >= 2.0
+* Ability to parse zone file with multiple `ORIGIN` directives.
+
 ## 0.2.0 (2015-10-20)
 
 Development sponsored by Peter J. Philipp [centroid.eu](http://centroid.eu)

data/README.md

@@ -116,7 +116,6 @@ Special thanks to Peter J. Philipp [centroid.eu](http://centroid.eu) for sponsor
 
 ## Would be nice
 
-    [ ] Handle parsing a zone file that uses more then one $ORIGIN directive.
     [ ] Basic validation, error checking:
         [ ] Only one SOA per zone.
         [ ] CNAMEs can't use a label of `@`.

data/dns-zone.gemspec

@@ -19,7 +19,7 @@ spec = Gem::Specification.new do |s|
   #s.default_executable  = 'dns-zone'
 
   # min ruby version
-  #s.required_ruby_version = ::Gem::Requirement.new(">= 1.9")
+  s.required_ruby_version = ::Gem::Requirement.new(">= 2.0")
 
   # cross platform gem dependencies
   #s.add_dependency('gli')

data/lib/dns/zone.rb

@@ -92,7 +92,11 @@ module DNS
         # read in special statments like $TTL and $ORIGIN
         if entry =~ /\$(ORIGIN|TTL)\s+(.+)/
           instance.ttl    = $2 if $1 == 'TTL'
-          instance.origin = $2 if $1 == 'ORIGIN'
+          if $1 == 'ORIGIN'
+            instance.origin ||= $2
+            options[:origin] ||= $2
+            options[:last_origin] = $2
+          end
           next
         end
 

data/lib/dns/zone/rr/record.rb

@@ -75,6 +75,10 @@ class DNS::Zone::RR::Record
       @label = captures[:label]
     end
 
+    # unroll records nested under other origins
+    unrolled_origin = options[:last_origin].sub(options[:origin], '').chomp('.') if options[:last_origin]
+    @label = "#{@label}.#{unrolled_origin}" if unrolled_origin && !unrolled_origin.empty?
+
     @ttl = captures[:ttl]
     captures[:rdata]
   end

data/lib/dns/zone/version.rb

@@ -1,6 +1,6 @@
 module DNS
   class Zone
     # Version number (major.minor.tiny)
-    Version = '0.2.0'
+    Version = '0.3.0'
   end
 end

data/test/zone_test.rb

@@ -57,6 +57,36 @@ EOL
 @ IN MX 99 mx.fakemx.net.
 @ IN A 78.47.253.85
 mail IN A 78.47.253.85
+EOL
+
+  # zone file with multiple zones
+  ZONE_FILE_MULTIPLE_ORIGINS_EXAMPLE =<<-EOL
+$ORIGIN lividpenguin.com.
+$TTL 3d
+@           IN  SOA  ns0.lividpenguin.com. luke.lividpenguin.com. (
+                           2013101406 ; zone serial number
+                           12h        ; refresh ttl
+                           15m        ; retry ttl
+                           3w         ; expiry ttl
+                           3h         ; minimum ttl
+                         )
+
+@           IN  NS    ns0.lividpenguin.com.
+@           IN  NS    ns1.lividpenguin.com.
+@           IN  NS    ns2.lividpenguin.com.
+
+@           IN  A     78.47.253.85
+www         IN  A     78.47.253.85
+
+foo         IN  TXT   "part1""part2"
+
+$ORIGIN sub.lividpenguin.com.
+app1                    60 A     1.2.3.4
+app2                    60 A     1.2.3.5
+app3                    60 A     1.2.3.6
+$ORIGIN another.lividpenguin.com.
+app1                    60 A     4.3.2.1
+
 EOL
 
   def test_create_new_instance
@@ -101,6 +131,14 @@ EOL
     assert_equal 'lividpenguin.com.', zone.origin, 'origin should come from test zone, not passed param'
   end
 
+  def test_load_zone_labels_are_correct
+    zone = DNS::Zone.load(ZONE_FILE_BASIC_EXAMPLE, 'lividpenguin.com.')
+    assert_equal 'mail', zone.records[5].label, 'check label is correct'
+
+    zone = DNS::Zone.load(ZONE_FILE_EXAMPLE)
+    assert_equal 'ns0', zone.records[7].label, 'check label is correct'
+  end
+
   def test_load_zone
     # load example dns master zone file.
     zone = DNS::Zone.load(ZONE_FILE_EXAMPLE)
@@ -149,6 +187,16 @@ EOL
     assert_equal '78.47.253.85', record.address
   end
 
+  def test_load_multiple_origins
+    zone = DNS::Zone.load(ZONE_FILE_MULTIPLE_ORIGINS_EXAMPLE)
+    assert_equal 'lividpenguin.com.', zone.origin
+    assert_equal 11, zone.records.length, 'we should have multiple records (including SOA)'
+    assert_equal 'app1.sub', zone.records[7].label
+    assert_equal '1.2.3.4', zone.records[7].address
+    assert_equal 'app1.another', zone.records[10].label
+    assert_equal '4.3.2.1', zone.records[10].address
+  end
+
   def test_extract_entry_from_one_line
     entries = DNS::Zone.extract_entries(%Q{maiow IN TXT "purr"})
     assert_equal 1, entries.length, 'we should have 1 entry'

metadata

@@ -1,130 +1,132 @@
 --- !ruby/object:Gem::Specification
 name: dns-zone
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Luke Antins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '9.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '9.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: inch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
-description: |
-  A Ruby library for building and parsing DNS zone files for use with
+description: ! 'A Ruby library for building and parsing DNS zone files for use with
+
   Bind and PowerDNS (with Bind backend) DNS servers.
+
+'
 email:
 - luke@lividpenguin.com
 executables: []
@@ -199,19 +201,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Ruby library for building and parsing DNS zone files.
 test_files: []
-has_rdoc: