zonesync 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58c4f6168ca0355c6aa7f0580ede2f8c080b04b44f196a24ecb827b38a3edda8
-  data.tar.gz: 9064bdd19540cc12d5cc48dfd93cbbb4a940c3e4cb4423255a0f66c9b282287a
+  metadata.gz: b070a5e3abcb48ba61c4b751babd7e0cd96bce294de28bebdd2a32af9f0e8104
+  data.tar.gz: 0b947cfa076f5ece8f69d093fc3c8512820369f3df2c85ea505517fb6b8aefb0
 SHA512:
-  metadata.gz: 3e06ff17f120b42693ca00fd27fcd3c56501bb01abb2b72c9dea149ef8173f3f3f02765767805b03210d6df1a40dee0c84f872d5f07f549ec7ccc95b9d250c6c
-  data.tar.gz: 8ddf71739ae861c356f27162484e9a1f006e841bbe8900471a1c098046db4287efae357df715b78f60154df7d54e03247892726e8156f68ba8400560951c2147
+  metadata.gz: bb90f015f8692698c7a922640cdc0b35e67d0e81298201ff4eda130a8c52cde32cabaf86c7bb10e1d92e7c4365079ebaa9d701933e6d73f79aa0350531ee0287
+  data.tar.gz: 3239bb7f0b41cdbd61a4a0c6b0b73d8452ec732eb34deae66ed16788e96a7d66fd4a780bef79a033fd72634e63005445985222f6babd014565ebb89e30958948

data/lib/zonesync/cli.rb

@@ -2,28 +2,13 @@ require "thor"
 
 module Zonesync
   class CLI < Thor
-    def self.exit_on_failure?
-      true
-    end
-
     default_command :sync
     desc "sync", "syncs the contents of Zonefile to the DNS server configured in Rails.application.credentials.zonesync"
     method_option :dry_run, type: :boolean, default: false, aliases: :n, desc: "log operations to STDOUT but don't perform the sync"
     def sync
-      Zonesync.call credentials: default_credentials, dry_run: options[:dry_run]
+      Zonesync.call dry_run: options[:dry_run]
     end
 
-    private
-
-    def default_credentials
-      if defined?(Rails.application.credentials)
-        Rails.application.credentials.zonesync
-      else
-        require "active_support/encrypted_configuration"
-        require "active_support/core_ext/hash/keys"
-        credentials = ActiveSupport::EncryptedConfiguration.new(config_path: "config/credentials.yml.enc", key_path: "config/master.key", raise_if_missing_key: true, env_key: "RAILS_MASTER_KEY")
-        credentials.zonesync
-      end
-    end
+    def self.exit_on_failure? = true
   end
 end

data/lib/zonesync/cloudflare.rb

@@ -35,18 +35,31 @@ module Zonesync
       @records ||= begin
         response = http.get(nil)
         response["result"].reduce({}) do |map, attrs|
-          map.merge attrs["id"] => Record.new(
-            attrs["name"] + ".", # normalize to trailing period
-            attrs["type"],
-            attrs["ttl"].to_i,
-            attrs["content"],
-          ).to_h
-        end.invert
+          map.merge to_record(attrs) => attrs["id"]
+        end
       end
     end
 
     private
 
+    def to_record attrs
+      rdata = attrs["content"]
+      if %w[CNAME MX].include?(attrs["type"])
+        rdata = normalize_trailing_period(rdata)
+      end
+
+      Record.new(
+        normalize_trailing_period(attrs["name"]),
+        attrs["type"],
+        attrs["ttl"].to_i,
+        rdata,
+      ).to_h
+    end
+
+    def normalize_trailing_period value
+      value =~ /\.$/ ? value : value + "."
+    end
+
     def http
       return @http if @http
       @http = HTTP.new("https://api.cloudflare.com/client/v4/zones/#{credentials[:zone_id]}/dns_records")

data/lib/zonesync/rake.rb

@@ -0,0 +1,5 @@
+require "rake"
+
+task :zonesync => :environment do
+  Zonesync.call
+end

data/lib/zonesync/version.rb

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

data/lib/zonesync.rb

@@ -2,12 +2,24 @@ require "zonesync/provider"
 require "zonesync/diff"
 require "zonesync/logger"
 require "zonesync/cli"
+require "zonesync/rake"
 
 module Zonesync
-  def self.call zonefile: "Zonefile", credentials:, dry_run: false
+  def self.call zonefile: "Zonefile", credentials: default_credentials, dry_run: false
     Sync.new({ provider: "Filesystem", path: zonefile }, credentials).call(dry_run: dry_run)
   end
 
+  def self.default_credentials
+    require "active_support/encrypted_configuration"
+    require "active_support/core_ext/hash/keys"
+    ActiveSupport::EncryptedConfiguration.new(
+      config_path: "config/credentials.yml.enc",
+      key_path: "config/master.key",
+      env_key: "RAILS_MASTER_KEY",
+      raise_if_missing_key: true,
+    ).zonesync
+  end
+
   class Sync < Struct.new(:source, :destination)
     def call dry_run: false
       source = Provider.from(self.source)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zonesync
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Micah Geisel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-29 00:00:00.000000000 Z
+date: 2024-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dns-zonefile
@@ -118,6 +118,7 @@ files:
 - lib/zonesync/http.rb
 - lib/zonesync/logger.rb
 - lib/zonesync/provider.rb
+- lib/zonesync/rake.rb
 - lib/zonesync/record.rb
 - lib/zonesync/version.rb
 - log/.keep