# HG changeset patch # User Mahlon E. Smith # Date 1586383377 25200 # Wed Apr 08 15:02:57 2020 -0700 # Node ID 323a85ae9a8c4651c630b1a8394c89eb84e47754 # Parent a5f164df031fa6761b5118f3c26dda2d149ae891 Unhoeify, update to v1.3.0. diff --git a/.gems b/.gems deleted file mode 100644 --- a/.gems +++ /dev/null @@ -1,15 +0,0 @@ -highline -hoe -hoe-bundler -hoe-deveiate -hoe-highline -hoe-mercurial -loggability -rack-test -rdoc -simplecov -sinatra -sysexits -tilt -trollop -rspec-wait diff --git a/Gemfile b/Gemfile deleted file mode 100644 --- a/Gemfile +++ /dev/null @@ -1,2 +0,0 @@ -source "https://rubygems.org/" -gemspec diff --git a/History.rdoc b/History.rdoc --- a/History.rdoc +++ b/History.rdoc @@ -1,3 +1,11 @@ + +== v1.3.0 [2020-04-08] Mahlon E. Smith + +- Use safe_yaml when deserializing config tag contents. +- Un-hoeify. +- Updates for Ruby 2.7. + + == v1.2.0 [2019-05-14] Michael Granger Enhancements: diff --git a/Manifest.txt b/Manifest.txt --- a/Manifest.txt +++ b/Manifest.txt @@ -1,4 +1,3 @@ -ChangeLog Examples.rdoc GettingStarted.rdoc Guide.rdoc diff --git a/README.rdoc b/README.rdoc --- a/README.rdoc +++ b/README.rdoc @@ -1,8 +1,9 @@ = inversion -home :: http://deveiate.org/projects/Inversion -code :: http://repo.deveiate.org/Inversion -github :: http://github.com/ged/inversion.git +home:: https://hg.sr.ht/~ged/Inversion +code:: https://hg.sr.ht/~ged/Inversion/browse +github:: https://github.com/ged/inversion +docs:: http://deveiate.org/code/Inversion == Description @@ -116,10 +117,15 @@ This task will install any missing dependencies, run the tests/specs, and generate the API documentation. +== Authors + +* Michael Granger +* Mahlon E. Smith + == License -Copyright © 2011-2015, Michael Granger and Mahlon E. Smith +Copyright © 2011-2020, Michael Granger and Mahlon E. Smith All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/Rakefile b/Rakefile --- a/Rakefile +++ b/Rakefile @@ -1,98 +1,7 @@ -#!/usr/bin/env rake - -require 'rake/clean' -require 'rdoc/task' - -begin - require 'hoe' -rescue LoadError - abort "This Rakefile requires hoe (gem install hoe)" -end - -GEMSPEC = 'inversion.gemspec' - -Hoe.plugin :mercurial -Hoe.plugin :publish -Hoe.plugin :signing - -Hoe.plugins.delete :rubyforge - -hoespec = Hoe.spec 'inversion' do - self.readme_file = 'README.rdoc' - self.history_file = 'History.rdoc' - self.extra_rdoc_files << 'README.rdoc' << 'History.rdoc' - self.license "BSD" - - self.developer 'Michael Granger', 'ged@FaerieMUD.org' - self.developer 'Mahlon E. Smith', 'mahlon@martini.nu' - - self.dependency 'loggability', '~> 0.12' - self.dependency 'safe_yaml', '~> 1.0' - - self.dependency 'highline', '~> 1.6', :development - self.dependency 'hoe-deveiate', '~> 0.9', :development - self.dependency 'rack-test', '~> 0.6', :development - self.dependency 'simplecov', '~> 0.8', :development - self.dependency 'sinatra', '~> 1.4', :development - self.dependency 'tilt', '~> 1.4', :development - self.dependency 'sysexits', '~> 1.0', :development - self.dependency 'trollop', '~> 2.0', :development - self.dependency 'rdoc', '~> 5.1', :development - self.dependency 'rdoc-generator-fivefish', '~> 0.3', :development - self.dependency 'configurability', '~> 3.1', :development - self.dependency 'rspec-wait', '~> 0.0', :development +# -*- ruby -*- +# frozen_string_literal: true - self.require_ruby_version( '>=2.4.0' ) - self.hg_sign_tags = true if self.respond_to?( :hg_sign_tags= ) - self.check_history_on_release = true if self.respond_to?( :check_history_on_release= ) - self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}" -end - -ENV['VERSION'] ||= hoespec.spec.version.to_s - -# Ensure the specs pass before checking in -task 'hg:precheckin' => [:check_history, :check_manifest, :gemspec, :spec] - -if Rake::Task.task_defined?( '.gemtest' ) - Rake::Task['.gemtest'].clear - task '.gemtest' do - $stderr.puts "Not including a .gemtest until I'm confident the test suite is idempotent." - end -end - -desc "Build a coverage report" -task :coverage do - ENV["COVERAGE"] = 'yes' - Rake::Task[:spec].invoke -end - +require 'rake/deveiate' -# 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.rdoc" - rdoc.rdoc_files.include( "*.rdoc", "ChangeLog", "lib/**/*.rb" ) - rdoc.generator = :fivefish - rdoc.title = "Inversion Templating" - rdoc.rdoc_dir = 'doc' - end -end +Rake::DevEiate.setup( 'inversion' ) -task :gemspec => GEMSPEC -file GEMSPEC => __FILE__ -task GEMSPEC do |task| - spec = $hoespec.spec - spec.files.delete( '.gemtest' ) - spec.signing_key = nil - spec.cert_chain = ['certs/ged.pem'] - spec.version = "#{spec.version.bump}.0.pre#{Time.now.strftime("%Y%m%d%H%M%S")}" - File.open( task.name, 'w' ) do |fh| - fh.write( spec.to_ruby ) - end -end - -CLOBBER.include( GEMSPEC.to_s ) -task :default => :gemspec diff --git a/certs/ged.pem b/certs/ged.pem new file mode 100644 --- /dev/null +++ b/certs/ged.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIENDCCApygAwIBAgIBATANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv +REM9RmFlcmllTVVEL0RDPW9yZzAeFw0xODExMjAxODI5NTlaFw0xOTExMjAxODI5 +NTlaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq +hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAvyVhkRzvlEs0fe7145BYLfN6njX9ih5H +L60U0p0euIurpv84op9CNKF9tx+1WKwyQvQP7qFGuZxkSUuWcP/sFhDXL1lWUuIl +M4uHbGCRmOshDrF4dgnBeOvkHr1fIhPlJm5FO+Vew8tSQmlDsosxLUx+VB7DrVFO +5PU2AEbf04GGSrmqADGWXeaslaoRdb1fu/0M5qfPTRn5V39sWD9umuDAF9qqil/x +Sl6phTvgBrG8GExHbNZpLARd3xrBYLEFsX7RvBn2UPfgsrtvpdXjsHGfpT3IPN+B +vQ66lts4alKC69TE5cuKasWBm+16A4aEe3XdZBRNmtOu/g81gvwA7fkJHKllJuaI +dXzdHqq+zbGZVSQ7pRYHYomD0IiDe1DbIouFnPWmagaBnGHwXkDT2bKKP+s2v21m +ozilJg4aar2okb/RA6VS87o+d7g6LpDDMMQjH4G9OPnJENLdhu8KnPw/ivSVvQw7 +N2I4L/ZOIe2DIVuYH7aLHfjZDQv/mNgpAgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYD +VR0PBAQDAgSwMB0GA1UdDgQWBBRyjf55EbrHagiRLqt5YAd3yb8k4DAcBgNVHREE +FTATgRFnZWRARmFlcmllTVVELm9yZzAcBgNVHRIEFTATgRFnZWRARmFlcmllTVVE +Lm9yZzANBgkqhkiG9w0BAQsFAAOCAYEAP9Ffkvg4e8CjIWi8SykQ8oJSS8jbmbgF +abke3vXWLG6V9kFiObuJd5wZRBluJANu7bEtjgc3fFaGVP2XxVdCpVjNbmMDg4Qp +ovvczP53X6pQP2RSZgxF6Lblvy8y11RziUTVRG/Z2aJHsElo6gI7vQznE/OSDrhC +gEhr8uaIUt7D+HZWRbU0+MkKPpL5uMqaFuJbqXEvSwPTuUuYkDfNfsjQO7ruWBac +bxHCrvpZ6Tijc0nrlyXi6gPOCLeaqhau2xFnlvKgELwsGYSoKBJyDwqtQ5kwrOlU +tkSyLrfZ+RZcH535Hyvif7ZxB0v5OxXXoec+N2vrUsEUMRDL9dg4/WFdN8hIOixF +3IPKpZ1ho0Ya5q7yhygtBK9/NBFHw+nbJjcltfPDBXleRe8u73gnQo8AZIhStYSP +v4qqqa27Bs468d6SoPxjSm8a2mM9HZ4OdWhq4tFsbTeXDVquCfi64OTEaTt2xQdR +JnC4lpJfCP6aCXa5h2XAQfPSH636cQap +-----END CERTIFICATE----- diff --git a/certs/mahlon.pem b/certs/mahlon.pem new file mode 100644 --- /dev/null +++ b/certs/mahlon.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIENDCCApygAwIBAgIBATANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdtYWhs +b24vREM9bWFydGluaS9EQz1udTAeFw0yMDAyMTkyMTU4NDBaFw0yMTAyMTgyMTU4 +NDBaMCIxIDAeBgNVBAMMF21haGxvbi9EQz1tYXJ0aW5pL0RDPW51MIIBojANBgkq +hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEA3cz7ILM8n+Y5nvz7mVRVqE8LusWdT8NX +nlnETynDndenI+a2S3j22DR+U4ooGUjuCHE3iR1CVmTDGbxFfNRfmnC1AN9Hybat +ewW+onvMBye7yfO0bJB5vkqaW5vd35rzquOffgBtJMo7rPRu6pX8RkL34Wnew4J7 +POooUcYbWSAO934HSCUC8wVm6b4v/ejVF1Lk44Dz45jtMqtR7KTAtpipdbTXAarO +HQy3eVes/0oTqhk4CP50r1KP09nUHTn2lzVaCN9vmNE/Jwe0AuQ9ImvZXPpCsMMl +V03/tuJ++48sVmOIusJkASPupXcdI6zqsjYw2vLMFtuYNskRSvwbn6Wm6x9hLWWj +IRp5FvHPORLRCHFizXRmXZ3PyFHqbv6m4yG0SyfMzOXPk3Hn5dqqmK+BFCihTZIN +fqpBmuxyNEE21fSO9ALLlWeW9ffg9Ye5Sc1n3yEyv8rPb9VDvi1B5N6xIcDFMNVs +RiCamNbET4Sq9VIYwYtcB1f6EataqFEhAgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYD +VR0PBAQDAgSwMB0GA1UdDgQWBBR8KtAhZIhe2uPQHCgU5HurIG7crTAcBgNVHREE +FTATgRFtYWhsb25AbWFydGluaS5udTAcBgNVHRIEFTATgRFtYWhsb25AbWFydGlu +aS5udTANBgkqhkiG9w0BAQsFAAOCAYEAHXlLXIKQUjd0VYj2mPgMheMjLEtmhHu+ +7NdIv8Bz4rpKAdhypy30xjukGLTOKBp1C0TjfHXowW/icK0bv9CO9Chbc09/+Ed2 +K5IsyENen+YLeLfE8dguq5tHlfocbFilRGHt8BHHO9BpPpAYoPt/76SCC2NaU5vN +33YTCpaVP0raS6E4i+xtx5PNdKoeTdrgwCQtUBhGf3L9YbZy1UaSeAyng5keuOzV +Mu2osihEB0GE0pOZJNpI6ow+0emwN/XvBKHpN9D2bjbvKetyQSrm0OniaZBXIGzW +Bg0JmajxUaGYWnz+QFADT+HLPmekxF3mB4+0ymZCHKPC+04h6RDjvkEOji6Jm+VB +JHjnceUEejSXTkZAKAmiOAtnX4j1MM1DLiFMlZ5Wbt7hbiOiO5HoN9p9snZhYqSU +JyAQQloqY/KyzQqxPlKdMNmBxRU+Cdarp05lEI6Sfj9MdrndoIL6MT/f6PgoCWZQ +xEarK1Fn47yS4UZqRi6VgKc3JHscX9x4 +-----END CERTIFICATE----- diff --git a/gem.deps.rb b/gem.deps.rb new file mode 100644 --- /dev/null +++ b/gem.deps.rb @@ -0,0 +1,18 @@ +source 'https://rubygems.org/' + +gem 'highline', '~> 2.0' +gem 'loggability', '~> 0.17' +gem 'sysexits', '~> 1.2' +gem 'trollop', '~> 2.9' + +group :development do + gem 'rack-test', '~> 1.1' + gem 'rake-deveiate', '~> 0.14' + gem 'rdoc', '~> 6.2' + gem 'rdoc-generator-fivefish', '~> 0.4' + gem 'rspec-wait', '~> 0.0' + gem 'simplecov', '~> 0.18' + gem 'sinatra', '~> 2.0' + gem 'tilt', '~> 2.0' +end + diff --git a/lib/inversion.rb b/lib/inversion.rb --- a/lib/inversion.rb +++ b/lib/inversion.rb @@ -26,7 +26,7 @@ warn ">>> Inversion requires Ruby 2.4.0 or later. <<<" if RUBY_VERSION < '2.4.0' # Library version constant - VERSION = '1.2.0' + VERSION = '1.3.0' # Version-control revision constant REVISION = %q$Revision$