record_store 5.0.3 → 5.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20f615c4e0d831a68c4512a476a6f1b92726d553
-  data.tar.gz: e2999c24c3e3511840c509a9c1b86fc287eeacf8
+  metadata.gz: 3e8f21e1bb405e185727380fc0c7760116ef5deb
+  data.tar.gz: 29bed06e5aa2e8a4e3f78690015ee3bcc5f96c92
 SHA512:
-  metadata.gz: afac206b2589b07b923ac23ab02611e2674f14a93513e87605ee2e791304cd10eea6d941cf6182315614484cade3dbdfba3d07b145d535ee6a7e2b577e31a5b9
-  data.tar.gz: 90beeda20787c602529e65b626cd5f985b11c5467cc2e20ba84d6066baafc61c18c1a5ab88f0321ded54ca2d33b413b27e5d34f672a5344f8d8c24979fab168b
+  metadata.gz: d72af6c709460b9b81c44722e6ddd13cfa7f89f18659c7341f7512a6486c44e28364f512d49fee9f16d21240db229d16df07936447f6214356e76a64df862a02
+  data.tar.gz: 35ae3d3718486153cdd9d763de16ca4ef478e0a58f283fd43f6a39a537455547a75687f02daacc8add2db21c3415df42a26308fe08d7ba6691816eb8a551cdb5

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# CHANGELOG
+
+## 5.0.4
+- Replaces fog-dnsimple with dnsimple-ruby gem.
+
+## ¯\_(ツ)_/¯

data/lib/record_store/provider/dnsimple.rb

@@ -1,4 +1,4 @@
-require 'fog/dnsimple'
+require 'dnsimple'
 
 module RecordStore
   class Provider::DNSimple < Provider
@@ -9,14 +9,7 @@ module RecordStore
 
       def add(record, zone)
         record_hash = api_hash(record, zone)
-        res = session.create_record(
-          zone,
-          record_hash.fetch(:name),
-          record.type,
-          record_hash.fetch(:content),
-          ttl: record_hash.fetch(:ttl),
-          priority: record_hash.fetch(:priority, nil)
-        )
+        res = session.zones.create_record(account_id, zone, record_hash)
 
         if record.type == 'ALIAS'
           txt_alias = retrieve_current_records(zone: zone).detect do |rr|
@@ -29,20 +22,20 @@ module RecordStore
       end
 
       def remove(record, zone)
-        session.delete_record(zone, record.id)
+        session.zones.delete_record(account_id, zone, record.id)
       end
 
       def update(id, record, zone)
-        session.update_record(zone, id, api_hash(record, zone))
+        session.zones.update_record(account_id, zone, id, api_hash(record, zone))
       end
 
       # returns an array of Record objects that match the records which exist in the provider
       def retrieve_current_records(zone:, stdout: $stdout)
-        session.list_records(zone).body["data"].map do |record_body|
+        session.zones.all_records(account_id, zone).data.map do |record|
           begin
-            build_from_api(record_body, zone)
+            build_from_api(record, zone)
           rescue StandardError
-            stdout.puts "Cannot build record: #{record_body}"
+            stdout.puts "Cannot build record: #{record}"
             raise
           end
         end.compact
@@ -50,21 +43,20 @@ module RecordStore
 
       # Returns an array of the zones managed by provider as strings
       def zones
-        session.zones.map(&:domain)
+        session.zones.all_zones(account_id).data.map(&:name)
       end
 
       private
 
       def session
-        @dns ||= Fog::DNS.new(session_params)
+        @dns ||= Dnsimple::Client.new(
+          base_url: secrets.fetch('base_url'),
+          access_token: secrets.fetch('api_token')
+        )
       end
 
-      def session_params
-        {
-          provider: 'DNSimple',
-          dnsimple_token: secrets.fetch('api_token'),
-          dnsimple_account: secrets.fetch('account_id'),
-        }
+      def account_id
+        @account_id ||= secrets.fetch('account_id')
       end
 
       def secrets
@@ -72,33 +64,33 @@ module RecordStore
       end
 
       def build_from_api(api_record, zone)
-        record_type = api_record.fetch('type')
+        record_type = api_record.type
         record = {
-          record_id: api_record.fetch('id'),
-          ttl: api_record.fetch('ttl'),
-          fqdn: api_record.fetch('name').present? ? "#{api_record.fetch('name')}.#{zone}" : zone,
+          record_id: api_record.id,
+          ttl: api_record.ttl,
+          fqdn: api_record.name.present? ? "#{api_record.name}.#{zone}" : zone,
         }
 
         return if record_type == 'SOA'
 
         case record_type
         when 'A', 'AAAA'
-          record.merge!(address: api_record.fetch('content'))
+          record.merge!(address: api_record.content)
         when 'ALIAS'
-          record.merge!(alias: api_record.fetch('content'))
+          record.merge!(alias: api_record.content)
         when 'CNAME'
-          record.merge!(cname: api_record.fetch('content'))
+          record.merge!(cname: api_record.content)
         when 'MX'
-          record.merge!(preference: api_record.fetch('priority'), exchange: api_record.fetch('content'))
+          record.merge!(preference: api_record.priority, exchange: api_record.content)
         when 'NS'
-          record.merge!(nsdname: api_record.fetch('content'))
+          record.merge!(nsdname: api_record.content)
         when 'SPF', 'TXT'
-          record.merge!(txtdata: api_record.fetch('content').gsub(';', '\;'))
+          record.merge!(txtdata: api_record.content.gsub(';', '\;'))
         when 'SRV'
-          weight, port, host = api_record.fetch('content').split(' ')
+          weight, port, host = api_record.content.split(' ')
 
           record.merge!(
-            priority: api_record.fetch('priority').to_i,
+            priority: api_record.priority,
             weight: weight.to_i,
             port: port.to_i,
             target: Record.ensure_ends_with_dot(host),

data/lib/record_store/version.rb

@@ -1,3 +1,3 @@
 module RecordStore
-  VERSION = '5.0.3'.freeze
+  VERSION = '5.0.4'.freeze
 end

data/record_store.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'fog-json'
   spec.add_runtime_dependency 'fog-xml'
   spec.add_runtime_dependency 'fog-dynect', '~> 0.2.0'
-  spec.add_runtime_dependency 'fog-dnsimple', '~> 2.0.0'
+  spec.add_runtime_dependency 'dnsimple-ruby', '~> 2.0'
   spec.add_runtime_dependency 'google-cloud-dns'
 
   spec.add_development_dependency 'rake'

data/template/secrets.json

@@ -5,6 +5,7 @@
     "password": "dynect_password"
   },
   "dnsimple": {
+    "base_url": "base_url",
     "account_id": "dnsimple_account_id",
     "api_token": "dnsimple_api_token"
   },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: record_store
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.0.4
 platform: ruby
 authors:
 - Willem van Bergen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -124,19 +124,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: fog-dnsimple
+  name: dnsimple-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: google-cloud-dns
   requirement: !ruby/object:Gem::Requirement
@@ -246,6 +246,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md