configurability 3.4.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bffc85b1e06ae1afa837e3afe896d1f41bef255dd37e08e1fa68c239a54fba4f
-  data.tar.gz: d0b186c667bcd6ac4dc424dcbd76800b39197d5aa9e0e81955f00381bb07f97d
+  metadata.gz: efc3714f0ce8a75574f4850ab886d79b52953333f93542a205bbc5b2a0e5c9c1
+  data.tar.gz: 9a27d42bd4d637c9866f9e2f764c307a9e9df0081aaf839c6441d50eaad1c6c8
 SHA512:
-  metadata.gz: ffc199167905d9e0c8f753a4b47e0d9f07d2e007e6431cc888f07ef227051829a63319c1fb5ea62faacbb08853e494df12bc0f4e43de4d67404f040e07d96217
-  data.tar.gz: 6468f8987950e9a4c03e2bd8f03ed556eaf5564cb3cb3f3ac9de9598ad8dcb806f8da16a9ba0d10602022ae5d62e69d245f4966797dcd13464d2b03db68211df
+  metadata.gz: ebf734283d52e1c93127fb3f2d24e1fb8a7a9bce01895384c5ac626d8fb7e43064492a2251a27d8f5dd9b06e2cde1aee643661a15e485b7004b6630b1e69bc4a
+  data.tar.gz: aa92af53f1d07a2260f7ddbf78927b622e4724af8593a2316353b5b2f3a9b705112f1dd465651eb8e0f0da5838469e33ad1faff3fb1f94f7ad8c885d4e85e6b9

data/History.md

@@ -1,3 +1,19 @@
+# Release History for configurability
+
+---
+
+
+## v4.0.0 [2020-01-08] Michael Granger <ged@faeriemud.org>
+
+Breaking changes:
+
+- Remove tainting, which is deprecated in 2.7 and beyond.
+
+Enhancements:
+
+- Enable SafeYAML if it's loaded
+
+
 ## v3.4.1 [2019-09-03] Michael Granger <ged@FaerieMUD.org>
 
 Bugfixes:
@@ -12,6 +28,8 @@ Documentation:
 
 ## v3.4.0 [2019-09-01] Michael Granger <ged@FaerieMUD.org>
 
+(Yanked due to inaccurate minimum Ruby version)
+
 Bugfixes:
 
 - Remove old command that depended on Trollop

data/README.md

@@ -435,9 +435,15 @@ This task will install any missing dependencies, run the tests/specs,
 and generate the API documentation.
 
 
+## Authors
+
+- Michael Granger <ged@faeriemud.org>
+- Mahlon E. Smith <mahlon@martini.nu>
+
+
 ## License
 
-Copyright (c) 2010-2019 Michael Granger and Mahlon E. Smith
+Copyright (c) 2010-2020 Michael Granger and Mahlon E. Smith
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/Rakefile

@@ -1,89 +1,8 @@
-#!/usr/bin/env rake
+#!/usr/bin/env ruby -S rake
 
-begin
-	require 'hoe'
-rescue LoadError
-	abort "This Rakefile requires 'hoe' (gem install hoe)"
-end
-
-GEMSPEC = 'configurability.gemspec'
-
-Hoe.plugin :mercurial
-Hoe.plugin :signing
-Hoe.plugin :deveiate
-
-Hoe.plugins.delete :rubyforge
-
-Encoding.default_internal = Encoding::UTF_8
-
-hoespec = Hoe.spec 'configurability' do |spec|
-	spec.readme_file = 'README.md'
-	spec.history_file = 'History.md'
-	spec.extra_rdoc_files = FileList[ '*.rdoc', '*.md' ]
-	spec.license 'BSD-3-Clause'
-	spec.urls = {
-		home:   'https://configur.ability.guide/',
-		code:   'https://hg.sr.ht/ged/Configurability',
-		docs:   'https://deveiate.org/code/configurability',
-		github: 'https://github.com/ged/configurability',
-	}
+require 'rake/deveiate'
 
-	spec.developer 'Michael Granger', 'ged@FaerieMUD.org'
-	spec.developer 'Mahlon E. Smith', 'mahlon@martini.nu'
-
-	spec.dependency 'loggability', '~> 0.14'
-
-	spec.dependency 'hoe-deveiate', '~> 0.8', :developer
-	spec.dependency 'simplecov', '~> 0.12', :developer
-	spec.dependency 'rspec', '~> 3.8', :developer
-
-	spec.require_ruby_version( '>= 2.5.0' )
-
-	spec.hg_sign_tags = true if spec.respond_to?( :hg_sign_tags= )
-	spec.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
+Rake::DevEiate.setup( 'configurability' ) do |project|
+	project.publish_to = 'deveiate:/usr/local/www/public/code'
 end
 
-ENV['VERSION'] ||= hoespec.spec.version.to_s
-
-# Ensure the specs pass before checking in
-task 'hg:precheckin' => [ :check_history, :check_manifest, :gemspec, :spec ]
-
-
-desc "Build a coverage report"
-task :coverage do
-	ENV["COVERAGE"] = 'yes'
-	Rake::Task[:spec].invoke
-end
-
-
-# Use the fivefish formatter for docs generated from development checkout
-if File.directory?( '.hg' )
-	require 'rdoc/task'
-
-	Rake::Task[ 'docs' ].clear
-	RDoc::Task.new( 'docs' ) do |rdoc|
-	    rdoc.main = "README.md"
-	    rdoc.rdoc_files.include( "*.rdoc", "*.md", "ChangeLog", "lib/**/*.rb" )
-	    rdoc.generator = :fivefish
-		rdoc.title = 'Configurability'
-	    rdoc.rdoc_dir = 'doc'
-	end
-end
-
-
-task :gemspec => [ 'ChangeLog', GEMSPEC ]
-file GEMSPEC => __FILE__ do |task|
-	spec = $hoespec.spec
-	spec.files.delete( '.gemtest' )
-	spec.files.delete( 'LICENSE' )
-	spec.signing_key = nil
-	spec.version = "#{spec.version.bump}.0.pre#{Time.now.strftime("%Y%m%d%H%M%S")}"
-	spec.cert_chain = [ 'certs/ged.pem' ]
-	File.open( task.name, 'w' ) do |fh|
-		fh.write( spec.to_ruby )
-	end
-end
-CLOBBER.include( GEMSPEC )
-
-task :default => :gemspec
-

data/lib/configurability.rb

@@ -14,7 +14,7 @@ module Configurability
 
 
 	# Library version constant
-	VERSION = '3.4.1'
+	VERSION = '4.0.0'
 
 	# Version-control revision constant
 	REVISION = %q$Revision$
@@ -301,8 +301,7 @@ module Configurability
 			@config.each_pair do |key, value|
 				Configurability.log.debug "Looking for %p config attribute" % [ key ]
 				next unless self.respond_to?( "#{key}=" )
-				Configurability.log.debug "  setting %p to %p via attr_writer" %
-					[ key, value ]
+				Configurability.log.debug "  setting %p to %p" % [ key, value ]
 				self.public_send( "#{key}=", value )
 			end
 		else

data/lib/configurability/config.rb

@@ -43,6 +43,10 @@ class Configurability::Config
 	log_to :configurability
 
 
+	# Make safe loading the default if SafeYAML is loaded
+	SafeYAML::OPTIONS[:default_mode] = :safe if defined?( SafeYAML )
+
+
 	#############################################################
 	###	C L A S S   M E T H O D S
 	#############################################################
@@ -256,7 +260,7 @@ class Configurability::Config
 			   end
 		end
 
-		ihash = symbolify_keys( untaint_hash(hash) )
+		ihash = symbolify_keys( hash )
 		idefaults = symbolify_keys( defaults )
 		mergedhash = idefaults.merge( ihash, &mergefunc )
 
@@ -285,41 +289,9 @@ class Configurability::Config
 
 
 	# A collection of data-structure-manipulation functions.
+	# :TODO: Replace with #transform_keys after 2.4's EOL
 	module DataUtilities
 
-		### Return a copy of the specified +hash+ with all of its values
-		### untainted.
-		def untaint_hash( hash )
-			newhash = {}
-			hash.each_key do |key|
-				newhash[ key ] = untaint_value( hash[key] )
-			end
-			return newhash
-		end
-
-
-		### Return an untainted copy of the specified +val+.
-		def untaint_value( val )
-			case val
-			when Hash
-				return untaint_hash( val )
-
-			when Array
-				return val.collect {|v| untaint_value(v) }
-
-			when NilClass, TrueClass, FalseClass, Numeric, Symbol, Encoding
-				return val
-
-			else
-				if val.respond_to?( :dup ) && val.respond_to?( :untaint )
-					return val.dup.untaint
-				else
-					return val
-				end
-			end
-		end
-
-
 		### Return a duplicate of the given +hash+ with its identifier-like keys
 		### transformed into symbols from whatever they were before.
 		def symbolify_keys( hash )
@@ -400,7 +372,7 @@ class Configurability::Config
 		# Return the value associated with the specified +key+, or another
 		# Configurability::Config::ConfigStruct if +key+ is a section name.
 		def []( key )
-			key = key.untaint.to_sym if key.respond_to?( :to_sym )
+			key = key.to_sym if key.respond_to?( :to_sym )
 
 			# Convert Hashes to Struct on the fly for subsections
 			@hash[ key ] = self.class.new( @hash[key] ) if @hash[ key ].is_a?( Hash )
@@ -411,7 +383,7 @@ class Configurability::Config
 
 		### Set the value associated with the specified +key+ to +value+.
 		def []=( key, value )
-			key = key.untaint.to_sym
+			key = key.to_sym
 			self.mark_dirty if @hash[ key ] != value
 			@hash[ key ] = value
 		end

data/spec/configurability/config_spec.rb

@@ -119,13 +119,6 @@ describe Configurability::Config do
 	end
 
 
-	it "untaints values loaded from a config" do
-		yaml = TEST_CONFIG.dup.taint
-		config = described_class.new( yaml )
-		expect( config.listsection.first ).to_not be_tainted
-		expect( config.textsection ).to_not be_tainted
-	end
-
 
 	context "a config with nil keys" do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configurability
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Michael Granger
@@ -12,8 +12,8 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIENDCCApygAwIBAgIBATANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
-  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0xODExMjAxODI5NTlaFw0xOTExMjAxODI5
-  NTlaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
+  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0xOTEwMDkwMDM2NTdaFw0yMDEwMDgwMDM2
+  NTdaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
   hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAvyVhkRzvlEs0fe7145BYLfN6njX9ih5H
   L60U0p0euIurpv84op9CNKF9tx+1WKwyQvQP7qFGuZxkSUuWcP/sFhDXL1lWUuIl
   M4uHbGCRmOshDrF4dgnBeOvkHr1fIhPlJm5FO+Vew8tSQmlDsosxLUx+VB7DrVFO
@@ -25,17 +25,17 @@ cert_chain:
   N2I4L/ZOIe2DIVuYH7aLHfjZDQv/mNgpAgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYD
   VR0PBAQDAgSwMB0GA1UdDgQWBBRyjf55EbrHagiRLqt5YAd3yb8k4DAcBgNVHREE
   FTATgRFnZWRARmFlcmllTVVELm9yZzAcBgNVHRIEFTATgRFnZWRARmFlcmllTVVE
-  Lm9yZzANBgkqhkiG9w0BAQsFAAOCAYEAP9Ffkvg4e8CjIWi8SykQ8oJSS8jbmbgF
-  abke3vXWLG6V9kFiObuJd5wZRBluJANu7bEtjgc3fFaGVP2XxVdCpVjNbmMDg4Qp
-  ovvczP53X6pQP2RSZgxF6Lblvy8y11RziUTVRG/Z2aJHsElo6gI7vQznE/OSDrhC
-  gEhr8uaIUt7D+HZWRbU0+MkKPpL5uMqaFuJbqXEvSwPTuUuYkDfNfsjQO7ruWBac
-  bxHCrvpZ6Tijc0nrlyXi6gPOCLeaqhau2xFnlvKgELwsGYSoKBJyDwqtQ5kwrOlU
-  tkSyLrfZ+RZcH535Hyvif7ZxB0v5OxXXoec+N2vrUsEUMRDL9dg4/WFdN8hIOixF
-  3IPKpZ1ho0Ya5q7yhygtBK9/NBFHw+nbJjcltfPDBXleRe8u73gnQo8AZIhStYSP
-  v4qqqa27Bs468d6SoPxjSm8a2mM9HZ4OdWhq4tFsbTeXDVquCfi64OTEaTt2xQdR
-  JnC4lpJfCP6aCXa5h2XAQfPSH636cQap
+  Lm9yZzANBgkqhkiG9w0BAQsFAAOCAYEAFqsr6o0SvQRgjQVmhbQvExRnCMCoW1yb
+  FJiN7A5RA2Iy2E61OG1Ul5nGmaDmx/PNB/6JIbIV3B9Uq8aTZx4uOjK7r8vMl1/t
+  ZfY7r6HejJfXlcO2m6JDMbpdyEVv916LncBkzZRz6vnnNCx+31f15FKddxujpAFd
+  qpn3JRQY+oj7ZkoccL/IUiDpxQWeS3oOoz9qr2kVTp8R50InZimt79FqCl/1m66W
+  kdOuf+wM3DDx7Rt4IVNHrhGlyfMr7xjKW1Q3gll+pMN1DT6Ajx/t3JDSEg7BnnEW
+  r7AciSO6J4ApUdqyG+coLFlGdtgFTgRHv7ihbQtDI7Z/LV7A4Spn1j2PK3j0Omri
+  kSl1hPVigRytfgdVGiLXzvkkrkgj9EknCaj5UHbac7XvVBrljXj9hsnnqTANaKsg
+  jBZSA+N+xUTgUWpXjjwsLZjzJkhWATJWq+krNXcqpwXo6HsjmdUxoFMt63RBb+sI
+  XrxOxp8o0uOkU7FdLSGsyqJ2LzsR4obN
   -----END CERTIFICATE-----
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2020-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loggability
@@ -43,56 +43,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
-  name: hoe-mercurial
+  name: rake-deveiate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: hoe-deveiate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: hoe-highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -113,48 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.18'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.18'
+        version: '3.9'
 description: |-
   Configurability is a unified, non-intrusive, assume-nothing configuration system
   for Ruby. It lets you keep the configuration for multiple objects in a single
@@ -162,14 +100,11 @@ description: |-
   configuration when you're ready, sending it everywhere it needs to go with a
   single action.
 email:
-- ged@FaerieMUD.org
+- ged@faeriemud.org
 - mahlon@martini.nu
 executables: []
 extensions: []
-extra_rdoc_files:
-- History.md
-- Manifest.txt
-- README.md
+extra_rdoc_files: []
 files:
 - ChangeLog
 - History.md
@@ -194,25 +129,23 @@ licenses:
 - BSD-3-Clause
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "--main"
-- README.md
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Configurability is a unified, non-intrusive, assume-nothing configuration
-  system for Ruby
+  system for Ruby.
 test_files: []