cloudflare-dns-update 2.4.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d4a239d0b54697dda4f730ced2d6c8b50427ff8fb785e4faed3989a6e01fe23
-  data.tar.gz: 575dd25d15ac7a5bfdda9769b7509d83dfce33faffa9d8c8f3986f75da681824
+  metadata.gz: 84fada8eb1262bb18ed4a1e7d0392f958abe2a311f9fcba6a1703d6cea946634
+  data.tar.gz: b51bd44936abe2811def5ddbc0d9afcc5c74e2c447d4c36d2185904e1f8365b3
 SHA512:
-  metadata.gz: 52987d3da7c1c91471d011679b9537c499015a3a9ef9bdb2b6d9e1467e3241fcadb41714924ec62cb757af363860133b98f38288d8116870f2e0ae3b63aa1e34
-  data.tar.gz: 4dbb0599360c063ebd27628663488249aadb380ff891e173a966a1fd183c50f6a75f11772e186b7bf12be55f5982974cc88ae09a5908969fdd20bf158d756835
+  metadata.gz: 1df9331da1630b9eacf84167a68b893dd2002496e70cb03e2d55d731deb91b1eeeea66441cbf2ac29adeb2853edd962d544715a9cfb4965cf79db48ad352bd87
+  data.tar.gz: a0d4cfadca21c79211029fd65731f54739c0ba45b45f587ed7b746cf3d8b8c5d8a5c98725656efcd62441968e21adab3e9b1966ba94dad48eeaf995c6733a00c

data/bin/cloudflare-dns-update

@@ -20,6 +20,13 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'cloudflare/dns/update/command'
+require_relative '../lib/cloudflare/dns/update/command'
 
-Cloudflare::DNS::Update::Command.parse(ARGV).invoke
+begin
+	Cloudflare::DNS::Update::Command.call
+rescue Interrupt
+	# Ignore.
+rescue => error
+	Async.logger.error(Falcon::Command) {error}
+	exit! 1
+end

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

@@ -30,8 +30,8 @@ require_relative 'version'
 
 module Cloudflare::DNS::Update
 	module Command
-		def self.parse(*args)
-			Top.parse(*args)
+		def self.call(*arguments)
+			Top.call(*arguments)
 		end
 		
 		# The top level utopia command.
@@ -41,19 +41,9 @@ module Cloudflare::DNS::Update
 			options do
 				option '-c/--configuration <path>', "Use the specified configuration file.", default: 'dns.conf'
 				option '-f/--force', "Force push updates to cloudflare even if content hasn't changed.", default: false
-				option '--verbose | --quiet', "Verbosity of output for debugging.", key: :logging
-				option '-h/--help', "Print out help information."
 				option '-v/--version', "Print out the application version."
 			end
 			
-			def verbose?
-				@options[:logging] == :verbose
-			end
-
-			def quiet?
-				@options[:logging] == :quiet
-			end
-
 			def logger
 				@logger ||= Async.logger
 			end
@@ -70,16 +60,12 @@ module Cloudflare::DNS::Update
 			
 			def connect!
 				configuration_store.transaction do |configuration|
-					unless configuration[:key]
-						prompt.puts "This configuration file appears to be new, we require some details."
-						configuration[:key] = prompt.mask("Cloudflare Key:")
-						configuration[:email] = prompt.ask("Cloudflare Email:")
+					unless configuration[:token]
+						prompt.puts "This configuration does not contain authorization token, we require some details."
+						configuration[:token] = prompt.mask("Cloudflare token:")
 					end
 					
-					key = configuration[:key]
-					email = configuration[:email]
-					
-					@connection = Cloudflare.connect(key: key, email: email)
+					@connection = Cloudflare.connect(token: configuration[:token])
 				end
 				
 				return @connection unless block_given?
@@ -175,19 +161,13 @@ module Cloudflare::DNS::Update
 				return content
 			end
 			
-			def invoke(program_name: File.basename($0))
+			def call
 				if @options[:version]
 					puts VERSION
 				elsif @options[:help]
-					print_usage(program_name)
+					print_usage
 				else
-					if verbose?
-						Async.logger.debug!
-					elsif quiet?
-						Async.logger.warn!
-					end
-					
-					Async do
+					Sync do
 						connect! do
 							initialize_zone
 							initialize_domains
@@ -195,7 +175,7 @@ module Cloudflare::DNS::Update
 							
 							update_domains
 						end
-					end.wait
+					end
 				end
 			end
 		end

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

@@ -22,7 +22,7 @@
 module Cloudflare
 	module DNS
 		module Update
-			VERSION = "2.4.1"
+			VERSION = "3.0.0"
 		end
 	end
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: cloudflare-dns-update
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-09 00:00:00.000000000 Z
+date: 2020-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: samovar
+  name: cloudflare
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: tty-prompt
+  name: samovar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: cloudflare
+  name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: covered
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,60 +95,50 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: "\tProvides a client tool for updating Cloudflare records, with a specific\n\temphasis
-  on updating IP addresses for domain records. This provides\n\tdyndns-like functionality.\n"
+        version: '3.6'
+description:
 email:
-- samuel.williams@oriontransfer.co.nz
 executables:
 - cloudflare-dns-update
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
-- README.md
-- Rakefile
 - bin/cloudflare-dns-update
-- cloudflare-dns-update.gemspec
+- lib/.DS_Store
 - lib/cloudflare/dns/update.rb
 - lib/cloudflare/dns/update/command.rb
 - lib/cloudflare/dns/update/version.rb
-- spec/cloudflare/dns/update/command_spec.rb
-- spec/spec_helper.rb
-homepage: ''
+homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,17 +146,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A dyndns client for Cloudflare.
-test_files:
-- spec/cloudflare/dns/update/command_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.gitignore

@@ -1,20 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-
-.rspec_status
-spec/**/test.yaml

data/.rspec

@@ -1,4 +0,0 @@
---format documentation
---backtrace
---warnings
---require spec_helper

data/.travis.yml

@@ -1,24 +0,0 @@
-language: ruby
-dist: xenial
-cache: bundler
-
-matrix:
-  include:
-    - rvm: 2.3
-    - rvm: 2.4
-    - rvm: 2.5
-    - rvm: 2.6
-    - rvm: 2.6
-      env: COVERAGE=BriefSummary,Coveralls
-    - rvm: jruby-head
-      env: JRUBY_OPTS="--debug -X+O"
-    - rvm: truffleruby
-    - rvm: ruby-head
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: truffleruby
-
-env:
-  global:
-    secure: LU7mGKnIrWrnrdtq7Ug7HTxzqJoB+NbLHwT8dPmGf4GIfNosO4Jx+G4JLzUd/sCHzUR+XXrsMd7El8WkTVV28+nt6Cv2JvO4EJRIplnAL8Yauc0YSWRwA9nGYhcc2TJc5czbL0mZkJSOv4B+aWco0VWerJfgLYurIA05XrQFGGY=

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in utopia.gemspec
-gemspec

data/README.md

@@ -1,79 +0,0 @@
-# Cloudflare::DNS::Update
-
-This gem provides a simple executable tool for managing Cloudflare records to provide dynamic DNS like functionality. You need to add it to whatever `cron` system your host system uses.
-
-[![Build Status](https://secure.travis-ci.org/ioquatix/cloudflare-dns-update.svg)](http://travis-ci.org/ioquatix/cloudflare-dns-update)
-[![Coverage Status](https://coveralls.io/repos/socketry/cloudflare-dns-update/badge.svg)](https://coveralls.io/r/socketry/cloudflare-dns-update)
-
-[![Cloudflare DNS Update Introduction](http://img.youtube.com/vi/lQK6bWuQllM/maxresdefault.jpg)](https://www.youtube.com/watch?v=lQK6bWuQllM&feature=youtu.be&hd=1 "Cloudflare DNS Update Introduction")
-
-## Installation
-
-Install it yourself as:
-
-	$ gem install cloudflare-dns-update
-
-## Usage
-
-Run the included `cloudflare-dns-update` tool and you will be walked through the configuration process. You might want to specify a specific configuration file, using the `--configuration /path/to/configuration.yml` option.
-
-### Daily updates using CRON
-
-Simply set up configurations for each domain you wish to update, and add to `/etc/cron.daily/dyndns`, e.g.:
-
-	#!/usr/bin/env sh
-
-	cloudflare-dns-update --configuration /srv/dyndns/example.A.yml
-	cloudflare-dns-update --configuration /srv/dyndns/example.AAAA.yml
-
-Note that in case you want to update more than one domains in a zone with the same IP address, you can have multiple domains in a configuration file. Follow instructions of the configuration process. Just to note, each domain would be updated with the same content. Having both IPv4 and IPv6 records in the same configuration file is not possible nor recommended. Please create separate configuration files.
-
-The configuration file would end up looking something like this:
-
-	---
-	:key: b10_NOT_A_REAL_KEY_fe5
-	:email: cloudflare-account@example.com
-	:zone: example.com
-	:content_command: curl ipinfo.io/ip
-
-### IPv6 Support
-
-It is possible to update IPv6 when you have a dynamically allocated prefix. To get your current IPv6 address, the following command can be used:
-
-	/sbin/ip -6 addr | awk -F '[ \t]+|/' '$3 == "::1" { next;} $3 ~ /^fe80::/ { next ; } /inet6/ {print $3}'
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-## See Also
-
-- [cloudflare](https://github.com/ioquatix/cloudflare) – Provides access to Cloudflare.
-
-## License
-
-Released under the MIT license.
-
-Copyright, 2017, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/cloudflare-dns-update.gemspec

@@ -1,35 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'cloudflare/dns/update/version'
-
-Gem::Specification.new do |spec|
-	spec.name          = "cloudflare-dns-update"
-	spec.version       = Cloudflare::DNS::Update::VERSION
-	spec.authors       = ["Samuel Williams"]
-	spec.email         = ["samuel.williams@oriontransfer.co.nz"]
-	spec.description   = <<-EOF
-	Provides a client tool for updating Cloudflare records, with a specific
-	emphasis on updating IP addresses for domain records. This provides
-	dyndns-like functionality.
-	EOF
-	spec.summary       = "A dyndns client for Cloudflare."
-	spec.homepage      = ""
-	spec.license       = "MIT"
-
-	spec.files         = `git ls-files`.split($/)
-	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-	spec.require_paths = ["lib"]
-
-	spec.add_dependency "samovar", "~> 1.3"
-	spec.add_dependency "tty-prompt", "~> 0.16.0"
-	spec.add_dependency "cloudflare", "~> 4.0"
-	
-	spec.add_development_dependency 'async-rspec'
-	
-	spec.add_development_dependency "covered"
-	spec.add_development_dependency "bundler"
-	spec.add_development_dependency "rspec", "~> 3.6"
-	spec.add_development_dependency "rake"
-end

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

@@ -1,40 +0,0 @@
-
-require 'cloudflare/dns/update/command'
-
-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.first}
-	let!(:name) {"dyndns#{ENV['TRAVIS_JOB_ID']}"}
-	let!(:qualified_name) {"#{name}.#{zone.name}"}
-	
-	it "should create dns record" do
-		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)}
-	
-	it "should update dns record" do
-		subject.connection = connection
-		
-		subject.configuration_store.transaction do |configuration|
-			configuration[:content_command] = 'curl -s ipinfo.io/ip'
-			configuration[:zone] = zone.value
-			configuration[:domains] = [dns_record.value]
-		end
-		
-		content = subject.update_domains
-		
-		response = dns_record.get
-		
-		expect(response.result[:content]).to be == content
-	end
-	
-	it "should delete dns record" do
-		expect(dns_record.delete).to be_success
-	end
-end

data/spec/spec_helper.rb

@@ -1,12 +0,0 @@
-
-require 'covered/rspec'
-require "cloudflare/rspec/connection"
-
-RSpec.configure do |config|
-	# Enable flags like --only-failures and --next-failure
-	config.example_status_persistence_file_path = ".rspec_status"
-
-	config.expect_with :rspec do |c|
-		c.syntax = :expect
-	end
-end