dns-zonefile 1.1.9 → 1.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4edd1610f1ecdf845654917cd1f3ea2aa83f1196a87be9bf97c59a34d10392ec
-  data.tar.gz: cf115e357d4763424d310592ebf0eb5d18366fff4a2bb451c61a80371317b62e
+  metadata.gz: a9ce2af524f4611e9802321af562f83cefd8fb248519c4f99fa4e69f97c716f1
+  data.tar.gz: 7b9d23678c4dd551d3dc7a957bb87a74582c9da621f5df591be7653fcc041a5a
 SHA512:
-  metadata.gz: 3416c7cc446f189fe4c03e128f37c2b2b9b886c911a7a11345ade49c6ae6bc2a138cf95cc76f77721950ff820bd5817d1e874b9fc90420af42333f54572b4592
-  data.tar.gz: e0ee661f673016703e919225b9fc04b3e40ce59effbba2417c0f5489c9db6109f4c8aac23ffed06f2252fbb08c5d65f6c4f5860bd8caa4ccb384adbccc0d178b
+  metadata.gz: 59a5277698e65091e76c6b776dbcf6097ae0f2ff520fbb74e5fca402fd77269c04b982edeb0157d94ba7062429c679a78f37322dd2358a890fc1c1cbf80a3b6e
+  data.tar.gz: 4c08474f6611f3edce68acaf0c5080a42fbddc63b8185737b7cdc17116d29acb059829030147b336994620f8744ee64b48e5df735e0a87880d17df34b44158a5

data/.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

data/.github/workflows/ci.yml

@@ -0,0 +1,31 @@
+name: CI
+
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+  push:
+    branches: [ main ]
+
+concurrency:
+  group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
+  cancel-in-progress: true
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-20.04, ubuntu-latest]
+        ruby: ['2.7', '3.0', '3.1', head, jruby, truffleruby]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }} 
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - run: bundle exec rake

data/CONTRIBUTING.md

@@ -33,4 +33,4 @@ Submit unit tests for your changes. You can test your changes on your machine by
 
 ## Publishing
 
-Once a PR is merged into master, bump the version in `lib/dns/zonefile/version.rb` and commit that change. Next, add a new tag with that version number and push the tag to GitHub. Finally, if you are a maintainer with access rights for rubygems.org, run `gem build dnsimple-zonefile.gemspec` followed by `gem push dnsimple-zonefile-x.x.x.gem` where x.x.x is the version number you just set.
+Once a PR is merged into master, bump the version in `lib/dns/zonefile/version.rb` and commit that change. Next, add a new tag with that version number 'git tag vx.x.x' and push the tag to GitHub 'git push origin vx.x.x'. Finally, if you are a maintainer with access rights for rubygems.org, run `gem build dns-zonefile.gemspec` followed by `gem push dns-zonefile-x.x.x.gem` where x.x.x is the version number you just set.

data/README.md

@@ -24,28 +24,32 @@ Okay, you're ready to move onto the examples now.
 Using raw data from the parser. Note that "@" isn't translated in this mode.
 Nor are inherited TTLs interpreted.
 
-    zonefile = "/path/to/file.zone"
-    zone_string = File.read(zonefile)
-    zone = DNS::Zonefile.parse(zone_string)
+```ruby
+zonefile = "/path/to/file.zone"
+zone_string = File.read(zonefile)
+zone = DNS::Zonefile.parse(zone_string)
 
-    puts zone.soa.origin.to_s
-    puts zone.soa.ns.to_s
-    puts zone.rr[0].to_s
+puts zone.soa.origin.to_s
+puts zone.soa.ns.to_s
+puts zone.rr[0].to_s
+```
 
 Using more structure data. @, TTLs, and empty hostname inheritance are all
 handled in this mode.
 
-    zonefile = "/path/to/file.zone"
-    zone_string = File.read(zonefile)
-    zone = DNS::Zonefile.load(zone_string)
-    # or, if no $origin is in the zone file
-    zone = DNS::Zonefile.load(zone_string, 'example.com.')
+```ruby
+zonefile = "/path/to/file.zone"
+zone_string = File.read(zonefile)
+zone = DNS::Zonefile.load(zone_string)
+# or, if no $origin is in the zone file
+zone = DNS::Zonefile.load(zone_string, 'example.com.')
 
-    puts zone.soa.origin
-    puts zone.soa.nameserver
-    puts zone.records[1]
-    # get all MX records
-    puts zone.records_of(DNS::Zonefile::MX)
+puts zone.soa.origin
+puts zone.soa.nameserver
+puts zone.records[1]
+# get all MX records
+puts zone.records_of(DNS::Zonefile::MX)
+```
 
 Open the examples in the `./examples` directory to see more examples.
 
@@ -64,5 +68,3 @@ Craig R Webster <http://barkingiguana.com/>
 ## Contributing
 
 See the TODO. Read CONTRIBUTING.md for more details on how to contribute to this project.
-
-[![Build Status](https://secure.travis-ci.org/craigw/dns-zonefile.png)](http://travis-ci.org/craigw/dns-zonefile)

data/lib/dns/zonefile/version.rb

@@ -1,5 +1,5 @@
 module DNS
   module Zonefile
-    VERSION = "1.1.9"
+    VERSION = "1.1.11"
   end
 end

data/lib/dns/zonefile.treetop

@@ -43,7 +43,10 @@ grammar Zonefile
   end
 
   rule soa
-    origin space ttl klass "SOA" space ns space rp space "("?  multiline_comment* space_or_break* serial multiline_comment* space_or_break refresh multiline_comment* space_or_break reretry multiline_comment* space_or_break expiry multiline_comment* space_or_break nxttl multiline_comment* space_or_break* ")"? {
+    (
+     origin space ttl klass "SOA" space ns space "("? multiline_comment* space_or_break* rp multiline_comment* space_or_break* "("?  multiline_comment* space_or_break* serial multiline_comment* space_or_break refresh multiline_comment* space_or_break reretry multiline_comment* space_or_break expiry multiline_comment* space_or_break nxttl multiline_comment* space_or_break* ")"? /
+     origin space klass ttl "SOA" space ns space "("? multiline_comment* space_or_break* rp multiline_comment* space_or_break* "("?  multiline_comment* space_or_break* serial multiline_comment* space_or_break refresh multiline_comment* space_or_break reretry multiline_comment* space_or_break expiry multiline_comment* space_or_break nxttl multiline_comment* space_or_break* ")"?
+    ) {
       def to_s
         "#{origin} #{ttl} #{klass} SOA #{ns} #{rp} (#{serial} #{refresh} #{reretry} #{expiry} #{nxttl})"
       end
@@ -89,7 +92,10 @@ grammar Zonefile
   end
 
   rule a_record
-    host space ms_age ttl klass "A" space ip_address {
+    (
+     host space ms_age ttl klass "A" space ip_address /
+     host space ms_age klass ttl "A" space ip_address
+    ) {
       def to_s
         "#{host} #{ms_age} #{ttl} #{klass} A #{ip_address}"
       end
@@ -109,7 +115,10 @@ grammar Zonefile
   end
   
   rule aaaa_record
-    host space ms_age ttl klass "AAAA" space ip_address:ip6_address {
+    (
+     host space ms_age ttl klass "AAAA" space ip_address:ip6_address /
+     host space ms_age klass ttl "AAAA" space ip_address:ip6_address
+    ) {
       def to_s
         "#{host} #{ttl} #{klass} AAAA #{ip_address}"
       end
@@ -130,7 +139,8 @@ grammar Zonefile
 
   rule caa_record
     (
-      host space ms_age ttl klass "CAA" space flags:integer space tag:unquoted_string space value:caa_value
+      host space ms_age ttl klass "CAA" space flags:integer space tag:unquoted_string space value:caa_value /
+      host space ms_age klass ttl "CAA" space flags:integer space tag:unquoted_string space value:caa_value
     ) {
       def to_s
         "#{host} #{ttl} #{klass} CAA #{flags} #{tag} #{value}"
@@ -168,7 +178,10 @@ grammar Zonefile
   end
 
   rule mx_record
-    host space ttl klass "MX" space priority:integer space exchanger:host {
+    (
+     host space ttl klass "MX" space priority:integer space exchanger:host /
+     host space klass ttl "MX" space priority:integer space exchanger:host
+    ) {
       def to_s
         "#{host} #{ttl} #{klass} MX #{priority} #{exchanger}"
       end
@@ -180,7 +193,10 @@ grammar Zonefile
   end
   
   rule naptr_record
-    host space ms_age ttl klass "NAPTR" space data {
+    (
+     host space ms_age ttl klass "NAPTR" space data /
+     host space ms_age klass ttl "NAPTR" space data
+    ) {
       def to_s
         "#{host} #{ttl} #{klass} NAPTR #{data}"
       end
@@ -192,7 +208,10 @@ grammar Zonefile
   end
 
   rule ns_record
-    host space ms_age ttl klass "NS" space nameserver:host {
+    (
+     host space ms_age ttl klass "NS" space nameserver:host /
+     host space ms_age klass ttl "NS" space nameserver:host
+    ) {
       def to_s
         "#{host} #{ttl} #{klass} NS #{nameserver}"
       end
@@ -204,7 +223,10 @@ grammar Zonefile
   end
 
   rule ptr_record
-    host space ms_age ttl klass "PTR" space target:host {
+    (
+     host space ms_age ttl klass "PTR" space target:host /
+     host space ms_age klass ttl "PTR" space target:host
+    ) {
       def to_s
         "#{host} #{ttl} #{klass} PTR #{target}"
       end
@@ -216,7 +238,10 @@ grammar Zonefile
   end
 
   rule soa_record
-    origin space ms_age ttl klass "SOA" space ns space rp space data {
+    (
+     origin space ms_age ttl klass "SOA" space ns space rp space data /
+     origin space ms_age klass ttl "SOA" space ns space rp space data
+    ) {
       def to_s
         "#{origin} #{ttl} #{klass} SOA #{ns} #{rp} (#{space})"
       end
@@ -245,7 +270,10 @@ grammar Zonefile
   end
 
   rule spf_record
-    host space ms_age ttl klass "SPF" space data:txt_data {
+    (
+     host space ms_age ttl klass "SPF" space data:txt_data /
+     host space ms_age klass ttl "SPF" space data:txt_data 
+    ) {
       def to_s
         "#{host} #{ttl} #{klass} SPF #{data}"
       end
@@ -257,7 +285,10 @@ grammar Zonefile
   end
 
   rule sshfp_record
-    host space ms_age ttl klass "SSHFP" space alg:integer space fptype:integer space fp:fingerprint {
+    (
+     host space ms_age ttl klass "SSHFP" space alg:integer space fptype:integer space fp:fingerprint / 
+     host space ms_age klass ttl "SSHFP" space alg:integer space fptype:integer space fp:fingerprint 
+    ) {
       def to_s
         "#{host} #{ttl} #{klass} SSHFP #{alg} #{fptype} #{fp}"
       end
@@ -269,7 +300,10 @@ grammar Zonefile
   end
 
   rule txt_record
-    host space ms_age ttl klass "TXT" space data:ms_txt_data {
+    (
+     host space ms_age ttl klass "TXT" space data:ms_txt_data /
+     host space ms_age klass ttl "TXT" space data:ms_txt_data
+    ) {
       def to_s
         "#{host} #{ttl} #{klass} TXT #{data}"
       end
@@ -345,7 +379,15 @@ grammar Zonefile
   end
 
   rule rp
-    (("\\." / [+a-zA-Z0-9\-)])* ".")+ {
+    rp_value comment* {
+      def to_s
+       "#{rp_value}"
+      end
+    }
+  end
+
+  rule rp_value
+    ("." / (("\\." / [a-zA-Z0-9\-)])+ "."?)+) {
       def to_s
         text_value
       end
@@ -527,7 +569,7 @@ grammar Zonefile
   end
 
   rule unquoted_string
-    [a-zA-Z0-9=_]+ {
+    '[a-zA-Z0-9=_\.\-\@\:]+'r {
       def to_s
         text_value
       end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dns-zonefile
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.11
 platform: ruby
 authors:
 - Craig R Webster
 - Anthony Eden
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-10 00:00:00.000000000 Z
+date: 2022-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -96,9 +96,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CONTRIBUTING.md
 - Dockerfile
 - Gemfile
@@ -108,7 +109,6 @@ files:
 - TODO
 - bin/console
 - bin/setup
-- circle.yml
 - dns-zonefile.gemspec
 - doc/example.com.zone
 - doc/example2.com.zone
@@ -126,7 +126,7 @@ homepage: https://github.com/craigw/dns-zonefile
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,8 +141,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Work with zonefiles (RFC 1035 section 5 and RFC 1034 section 3.6.1)
 test_files: []

data/.travis.yml

@@ -1,10 +0,0 @@
-language: ruby
-
-before_install:
-  - yes | gem update --system --force
-  - gem install bundler
-
-rvm:
-  - 2.5
-  - 2.6
-  - 2.7

data/circle.yml

@@ -1,6 +0,0 @@
-dependencies:
-  pre:
-    - gem install bundler --version 1.11
-machine:
-  ruby:
-    version: 2.3.0