cloudflare 4.0.1 → 4.2.0

data/spec/cloudflare/zone_spec.rb

@@ -1,23 +1,25 @@
 
 RSpec.describe Cloudflare::Zones, order: :defined, timeout: 30 do
 	include_context Cloudflare::Zone
-	
-	it "can delete existing domain if exists" do
-		if zone = zones.find_by_name(name)
-			expect(zone.delete).to be_success
+
+	if ENV['CLOUDFLARE_TEST_ZONE_MANAGEMENT'] == 'true'
+		it "can delete existing domain if exists" do
+			if zone = zones.find_by_name(name)
+				expect(zone.delete).to be_success
+			end
+		end
+
+		it "can create a zone" do
+			zone = zones.create(name, account)
+			expect(zone.value).to include(:id)
 		end
 	end
-	
-	it "can create zone" do
-		zone = zones.create(name, account)
-		expect(zone.value).to include(:id)
-	end
-	
+
 	it "can list zones" do
 		matching_zones = zones.select{|zone| zone.name == name}
 		expect(matching_zones).to_not be_empty
 	end
-	
+
 	it "can get zone by name" do
 		found_zone = zones.find_by_name(name)
 		expect(found_zone.name).to be == name

data/spec/spec_helper.rb

@@ -1,3 +1,19 @@
+# frozen_string_literal: true
+
+AUTH_EMAIL = ENV['CLOUDFLARE_EMAIL']
+AUTH_KEY = ENV['CLOUDFLARE_KEY']
+
+if AUTH_EMAIL.nil? || AUTH_EMAIL.empty? || AUTH_KEY.nil? || AUTH_KEY.empty?
+	puts 'Please make sure you have defined CLOUDFLARE_EMAIL and CLOUDFLARE_KEY in your environment'
+	puts 'You can also specify CLOUDFLARE_ZONE_NAME to test with your own zone and'
+	puts 'CLOUDFLARE_ACCOUNT_ID to use a specific account'
+	exit(1)
+end
+
+ACCOUNT_ID = ENV['CLOUDFLARE_ACCOUNT_ID']
+NAMES = ['testing', 'horse', 'cat', 'dog', 'fish', 'dolphin', 'lion', 'tiger'].freeze
+JOB_ID = ENV.fetch('TRAVIS_JOB_ID', 0).to_i
+ZONE_NAME = ENV['CLOUDFLARE_ZONE_NAME'] || "#{NAMES[JOB_ID % NAMES.size]}.com"
 
 require 'covered/rspec'
 require 'async/rspec'
@@ -5,18 +21,30 @@ require 'async/rspec'
 require 'cloudflare/rspec/connection'
 require 'cloudflare/zones'
 
-RSpec.shared_context Cloudflare::Zone do
+RSpec.shared_context Cloudflare::Account do
 	include_context Cloudflare::RSpec::Connection
-	
-	let(:job_id) {ENV.fetch('TRAVIS_JOB_ID', 0).to_i}
-	let(:names) {['testing', 'horse', 'cat', 'dog', 'fish', 'dolphin', 'lion', 'tiger']}
-	let(:name) {"#{names[job_id % names.size]}.com"}
-	
-	let(:account) {connection.accounts.first}
+
+	let(:account) do
+		if ACCOUNT_ID
+			connection.accounts.find_by_id(ACCOUNT_ID)
+		else
+			connection.accounts.first
+		end
+	end
+
+end
+
+RSpec.shared_context Cloudflare::Zone do
+	include_context Cloudflare::Account
+
+	let(:job_id) { JOB_ID }
+	let(:names) { NAMES.dup }
+	let(:name) { ZONE_NAME.dup }
+
 	let(:zones) {connection.zones}
-	
+
 	let(:zone) {@zone = zones.find_by_name(name) || zones.create(name, account)}
-	
+
 	# after do
 	# 	if defined? @zone
 	# 		@zone.delete
@@ -31,4 +59,27 @@ RSpec.configure do |config|
 	config.expect_with :rspec do |c|
 		c.syntax = :expect
 	end
+
+	disabled_specs = {}
+
+	# Check for features the current account has enabled
+	Cloudflare.connect(key: AUTH_KEY, email: AUTH_EMAIL) do |conn|
+		begin
+			account = if ACCOUNT_ID
+				conn.accounts.find_by_id(ACCOUNT_ID)
+			else
+				conn.accounts.first
+			end
+			account.kv_namespaces.to_a
+		rescue Cloudflare::RequestError => e
+			if e.message.include?('your account is not entitled')
+				puts 'Disabling KV specs due to no access'
+				disabled_specs[:kv_spec] = true
+			else
+				raise
+			end
+		end
+	end
+
+	config.filter_run_excluding disabled_specs unless disabled_specs.empty?
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudflare
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Marcin Prokop
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-09 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-rest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -113,8 +113,12 @@ files:
 - lib/cloudflare.rb
 - lib/cloudflare/accounts.rb
 - lib/cloudflare/connection.rb
+- lib/cloudflare/custom_hostname/ssl_attribute.rb
+- lib/cloudflare/custom_hostname/ssl_attribute/settings.rb
+- lib/cloudflare/custom_hostnames.rb
 - lib/cloudflare/dns.rb
 - lib/cloudflare/firewall.rb
+- lib/cloudflare/kv/namespaces.rb
 - lib/cloudflare/logs.rb
 - lib/cloudflare/paginate.rb
 - lib/cloudflare/representation.rb
@@ -122,8 +126,13 @@ files:
 - lib/cloudflare/user.rb
 - lib/cloudflare/version.rb
 - lib/cloudflare/zones.rb
+- spec/cloudflare/accounts_spec.rb
+- spec/cloudflare/custom_hostname/ssl_attribute/settings_spec.rb
+- spec/cloudflare/custom_hostname/ssl_attribute_spec.rb
+- spec/cloudflare/custom_hostnames_spec.rb
 - spec/cloudflare/dns_spec.rb
 - spec/cloudflare/firewall_spec.rb
+- spec/cloudflare/kv/namespaces_spec.rb
 - spec/cloudflare/zone_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/b4k3r/cloudflare
@@ -145,12 +154,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A Ruby wrapper for the Cloudflare API.
 test_files:
+- spec/cloudflare/accounts_spec.rb
+- spec/cloudflare/custom_hostname/ssl_attribute/settings_spec.rb
+- spec/cloudflare/custom_hostname/ssl_attribute_spec.rb
+- spec/cloudflare/custom_hostnames_spec.rb
 - spec/cloudflare/dns_spec.rb
 - spec/cloudflare/firewall_spec.rb
+- spec/cloudflare/kv/namespaces_spec.rb
 - spec/cloudflare/zone_spec.rb
 - spec/spec_helper.rb