zonesync 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8092e718a86bb6aecf07937b02b5d7e2dfc3afb130b0e34d5caaa2e5ca7454d3
-  data.tar.gz: 6f5f7c405a4a5eb13dfc2caf6276bdde907a48b3226ad356efc2793768b2d304
+  metadata.gz: 4483586b922fcb40130de86a415fdf440dd46afa556dfa45e87e0d6d398f52d7
+  data.tar.gz: 88cbb6f82331655a9f78d49ee9b4013c2011bd94c3bb04831b6ebd58b4b968e5
 SHA512:
-  metadata.gz: 02da529d99feab4932cd07da8426308dbecf93cc5f1cfb5465241b097cbc46207f93ff74bb85d50332de03dec950338897078f063ffed539b58fbb3a891b7fc5
-  data.tar.gz: 3b4c687eb3f84e5f6c096ab101da99cec73c2064c218f8551d76c301f67edb707e82c58c5e06587c114b5ca8f34af4216977521f5d16ef2f315ceaaf82d4f8a7
+  metadata.gz: 8bdd45b0a0d43e91856f488a53f8880c3946f6ab566f9e13a54209a76b295ca76f3f6fb1e62e607594d0abea3963ddefd9576c593e804832bd2580e3b51e18fc
+  data.tar.gz: d5afd17873627c461936dfd62038bd471fa7c83296981daca019ba9b2614c269cfa68b865d69a54dfd543c6b9a5d9c537bfe88c12cdca4885898b7db433bfa6a

data/README.md

@@ -1,4 +1,6 @@
-# zonesync
+# Zonesync
+
+[![CI Status](https://github.com/botandrose/zonesync/workflows/CI/badge.svg?branch=master)](https://github.com/botandrose/zonesync/actions?query=workflow%3ACI+branch%3Amaster)
 
 Sync your DNS host with your DNS zone file, making it easy to version your zone file and sync changes.
 

data/lib/zonesync/cloudflare.rb

@@ -36,7 +36,7 @@ module Zonesync
         response = http.get(nil)
         response["result"].reduce({}) do |map, attrs|
           map.merge attrs["id"] => Record.new(
-            attrs["name"],
+            attrs["name"] + ".", # normalize to trailing period
             attrs["type"],
             attrs["ttl"].to_i,
             attrs["content"],

data/lib/zonesync/provider.rb

@@ -8,11 +8,19 @@ module Zonesync
     end
 
     def diffable_records
-      DNS::Zonefile.load(read).records.map do |record|
+      zonefile.records.map do |record|
         Record.from_dns_zonefile_record(record)
       end.select do |record|
         %w[A AAAA CNAME MX TXT SPF NAPTR PTR].include?(record.type)
+      end.sort
+    end
+
+    private def zonefile
+      body = read
+      if body !~ /\sSOA\s/ # insert dummy SOA to trick parser if needed
+        body.sub!(/\n([^$])/, "\n@ 1 SOA example.com example.com ( 2000010101 1 1 1 1 )\n\\1")
       end
+      DNS::Zonefile.load(body)
     end
 
     def read record

data/lib/zonesync/record.rb

@@ -25,6 +25,18 @@ module Zonesync
         rdata,
       )
     end
+
+    def <=> other
+      to_sortable <=> other.to_sortable
+    end
+
+    def to_sortable
+      [type, name, rdata, ttl]
+    end
+
+    def to_s
+      values.join(" ")
+    end
   end
 end
 

data/lib/zonesync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zonesync
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/zonesync.rb

@@ -3,17 +3,17 @@ require "zonesync/diff"
 
 module Zonesync
   def self.call zonefile:, credentials:
-    Sync.new(zonefile, credentials).call
+    Sync.new({ provider: "Filesystem", path: zonefile }, credentials).call
   end
 
-  class Sync < Struct.new(:zonefile, :credentials)
+  class Sync < Struct.new(:source, :destination)
     def call
-      local = Provider.from({ provider: "Filesystem", path: zonefile })
-      remote = Provider.from(credentials)
-      operations = Diff.call(from: remote, to: local)
+      source = Provider.from(self.source)
+      destination = Provider.from(self.destination)
+      operations = Diff.call(from: destination, to: source)
       operations.each do |method, args|
         puts [method, args].inspect
-        remote.send(method, args)
+        destination.send(method, args)
       end
     end
   end

data/zonesync.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dns-zonefile", "~>1.0"
   spec.add_dependency "diff-lcs", "~>1.4"
 
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "webmock"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zonesync
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Micah Geisel
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !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