cloudflare-dns-update 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 64b3a3163bf2e4812153fa6814b6247b03d8c032
-  data.tar.gz: 0be12003d1e9810de4ad1924d026d900c2a42f4e
+SHA256:
+  metadata.gz: e6409c6fe221e5dc21eee10b9f2596347b3efc04fd067bbacefe71ca2b63d211
+  data.tar.gz: b60b29f36731b746f7a2a25efd2dce823280d0a711a313a5d1573cb47bd3c82f
 SHA512:
-  metadata.gz: ef0cd00df6d06b716e629108761d8dac69ce3de2928e06c1d1d391c0cb5675b3471052b6f305dd39c4c42fa582b8eb57e818166c369729da5c967a21349e0f87
-  data.tar.gz: 2aef4729871a2d9f7400322057722827159708edc8176de68df843b922bf9a5e5b45034896cc30fe9ab5fc247143977da2d8cb7360e09b295ca16372321ae993
+  metadata.gz: 5c9ced0e278352962f1efbe644df9d9eb05f8534edc0a62b8a8dcaa63231bf1e0c4903a02b65e4c22f033bc8f6f1a85d4a5741f40b04201a6f33ba92dbd18274
+  data.tar.gz: 9eeb1f04daaa93faaa8c3d1dcb82536e5905afac22be61e835f722323ca14ef561316e102b0347e900fd6d2755ca6ac047c7a3985363fa1648ee96a2146d380f

data/.travis.yml

@@ -1,19 +1,22 @@
 language: ruby
-sudo: false
-dist: trusty
+dist: xenial
 cache: bundler
-rvm:
-- 2.0
-- 2.1
-- 2.2
-- 2.3
-- 2.4
-- jruby-head
-- ruby-head
+
 matrix:
+  include:
+    - rvm: 2.3
+    - rvm: 2.4
+    - rvm: 2.5
+    - rvm: 2.6
+    - rvm: jruby-head
+      env: JRUBY_OPTS="--debug -X+O"
+    - rvm: truffleruby
+    - rvm: ruby-head
   allow_failures:
-  - rvm: ruby-head
-  - rvm: jruby-head
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: truffleruby
+
 env:
   global:
     secure: LU7mGKnIrWrnrdtq7Ug7HTxzqJoB+NbLHwT8dPmGf4GIfNosO4Jx+G4JLzUd/sCHzUR+XXrsMd7El8WkTVV28+nt6Cv2JvO4EJRIplnAL8Yauc0YSWRwA9nGYhcc2TJc5czbL0mZkJSOv4B+aWco0VWerJfgLYurIA05XrQFGGY=

data/cloudflare-dns-update.gemspec

@@ -23,10 +23,12 @@ Gem::Specification.new do |spec|
 	spec.require_paths = ["lib"]
 
 	spec.add_dependency "samovar", "~> 1.3"
-	spec.add_dependency "tty-prompt", "~> 0.12.0"
-	spec.add_dependency "cloudflare", "~> 3.0"
-
+	spec.add_dependency "tty-prompt", "~> 0.12"
+	spec.add_dependency "cloudflare", "~> 4.0"
+	
+	spec.add_development_dependency 'async-rspec'
+	
 	spec.add_development_dependency "rspec", "~> 3.6"
-	spec.add_development_dependency "bundler", "~> 1.3"
+	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rake"
 end

data/lib/cloudflare/dns/update/command.rb

@@ -55,15 +55,7 @@ module Cloudflare::DNS::Update
 			end
 
 			def logger
-				@logger ||= Logger.new($stderr).tap do |logger|
-					if verbose?
-						logger.level = Logger::DEBUG
-					elsif quiet?
-						logger.level = Logger::WARN
-					else
-						logger.level = Logger::INFO
-					end
-				end
+				@logger ||= Async.logger
 			end
 			
 			def prompt
@@ -94,9 +86,9 @@ module Cloudflare::DNS::Update
 			def initialize_zone
 				configuration_store.transaction do |configuration|
 					unless configuration[:zone]
-						zone = prompt.select("What zone do you want to update?", @connection.zones.all)
+						zone = prompt.select("What zone do you want to update?", @connection.zones)
 						
-						configuration[:zone] = zone.record
+						configuration[:zone] = zone.value
 					end
 				end
 			end
@@ -111,9 +103,9 @@ module Cloudflare::DNS::Update
 						zone_id = configuration[:zone][:id]
 						zone = @connection.zones.find_by_id(zone_id)
 						
-						dns_records = prompt.multi_select("What records do you want to update (select 1 or more)?", zone.dns_records.all)
+						dns_records = prompt.multi_select("What records do you want to update (select 1 or more)?", zone.dns_records)
 						
-						domains = configuration[:domains] = dns_records.map(&:record)
+						domains = configuration[:domains] = dns_records.map(&:value)
 					end
 				end
 			end
@@ -126,6 +118,25 @@ module Cloudflare::DNS::Update
 				end
 			end
 			
+			def update_domain(zone, record, content)
+				if content != record[:content] || @options[:force]
+					logger.info "Content changed #{content.inspect}, updating records..."
+					
+					domain = zone.dns_records.find_by_id(record[:id])
+						
+					begin
+						domain.update_content(content)
+						
+						logger.info "Updated domain: #{record[:name]} #{record[:type]} #{content}"
+						record[:content] = content
+					rescue => error
+						logger.warn("Failed to update domain: #{record[:name]} #{record[:type]} #{content}") {error}
+					end
+				else
+					logger.debug "Content hasn't changed: #{record[:name]} #{record[:type]} #{content}"
+				end
+			end
+			
 			def update_domains(content = nil)
 				configuration_store.transaction do |configuration|
 					unless content
@@ -136,40 +147,18 @@ module Cloudflare::DNS::Update
 							raise RuntimeError.new("Content command failed with non-zero output: #{status}")
 						end
 						
-						unless zone = @connection.zones.find_by_id(configuration[:zone][:id])
-							raise RuntimeError.new("Couldn't load zone #{configuration[:zone].inspect} from API!")
-						end
-						
 						# Make sure there is no trailing space:
 						content.chomp!
-					end
-					
-					if content != configuration[:content] || @options[:force]
-						logger.info "Content changed #{content.inspect}, updating records..."
 						
-						configuration[:domains].each do |record|
-							domain = zone.dns_records.find_by_id(record[:id])
-							
-							changes = {
-								type: domain.record[:type],
-								name: domain.record[:name],
-								content: content
-							}
-							
-							response = domain.put(changes.to_json, content_type: 'application/json')
-							
-							if response.successful?
-								logger.info "Updated domain content to #{content}."
-								record[:content] = content
-							else
-								logger.warn "Failed to update domain content to #{content}: #{response.errors.join(', ')}!"
-							end
-						end
-						
-						# Save the last value of content:
 						configuration[:content] = content
-					else
-						logger.debug "Content hasn't changed."
+					end
+					
+					unless zone = @connection.zones.find_by_id(configuration[:zone][:id])
+						raise RuntimeError.new("Couldn't load zone #{configuration[:zone].inspect} from API!")
+					end
+					
+					configuration[:domains].each do |record|
+						update_domain(zone, record, content)
 					end
 				end
 				
@@ -182,6 +171,12 @@ module Cloudflare::DNS::Update
 				elsif @options[:help]
 					print_usage(program_name)
 				else
+					if verbose?
+						Async.logger.debug!
+					elsif quiet?
+						Async.logger.warn!
+					end
+					
 					connect!
 					
 					initialize_zone

data/lib/cloudflare/dns/update/version.rb

@@ -22,7 +22,7 @@
 module Cloudflare
 	module DNS
 		module Update
-			VERSION = "2.3.0"
+			VERSION = "2.4.0"
 		end
 	end
 end

data/spec/cloudflare/dns/update/command_spec.rb

@@ -1,27 +1,19 @@
 
 require 'cloudflare/dns/update/command'
 
-RSpec.describe Cloudflare::DNS::Update::Command::Top, order: :defined do
+RSpec.describe Cloudflare::DNS::Update::Command::Top, order: :defined, timeout: 60 do
 	include_context Cloudflare::RSpec::Connection
 	
 	let(:configuration_path) {File.join(__dir__, 'test.yaml')}
 	
 	subject{described_class.new(["-c", configuration_path])}
 	
-	let(:zone) {connection.zones.all.first}
+	let(:zone) {connection.zones.first}
 	let!(:name) {"dyndns#{ENV['TRAVIS_JOB_ID']}"}
-	let!(:qualified_name) {"#{name}.#{zone.record[:name]}"}
+	let!(:qualified_name) {"#{name}.#{zone.name}"}
 	
 	it "should create dns record" do
-		response = zone.dns_records.post({
-			type: "A",
-			name: name,
-			content: "127.0.0.1",
-			ttl: 240,
-			proxied: false
-		}.to_json, content_type: 'application/json')
-		
-		expect(response).to be_successful
+		zone.dns_records.create("A", name, "127.0.0.1", ttl: 240, proxied: false)
 	end
 	
 	let(:dns_record) {zone.dns_records.find_by_name(qualified_name)}
@@ -31,8 +23,8 @@ RSpec.describe Cloudflare::DNS::Update::Command::Top, order: :defined do
 		
 		subject.configuration_store.transaction do |configuration|
 			configuration[:content_command] = 'curl -s ipinfo.io/ip'
-			configuration[:zone] = zone.record
-			configuration[:domains] = [dns_record.record]
+			configuration[:zone] = zone.value
+			configuration[:domains] = [dns_record.value]
 		end
 		
 		content = subject.update_domains
@@ -43,6 +35,6 @@ RSpec.describe Cloudflare::DNS::Update::Command::Top, order: :defined do
 	end
 	
 	it "should delete dns record" do
-		expect(dns_record.delete).to be_successful
+		expect(dns_record.delete).to be_success
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudflare-dns-update
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-12 00:00:00.000000000 Z
+date: 2019-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: samovar
@@ -30,28 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: cloudflare
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: async-rspec
+  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
@@ -70,16 +84,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -135,8 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A dyndns client for Cloudflare.