rake-deveiate 0.12.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c82c9f76fc2792d7c73c6343234fa7bf2ddd898e16f6fd5bcf5889e3e1a2b3e8
-  data.tar.gz: d12fa1ea8df3bfab3cde2d3ba5b51c0d7e3a194a33e57987fcc8ab42fa453c44
+  metadata.gz: 8c2bb0778d27418700022a963c18f81a16cae82f69e09688fd2a8e13b6096eb4
+  data.tar.gz: 31304d8589879cf4d72125462820ae71409628381e8728a3d21ef96039797cdb
 SHA512:
-  metadata.gz: 9b48f19a65ff709311f5c0db3fc09db4c1cc66a9209f04c46f596e21f28f35fb70317c222044222486c0e4d36e72ecd3bc2ef9e7f1cd13f7c85ecf58d1ae0511
-  data.tar.gz: 2fc376b80482c3e48368c7f0e2f3df5ed9fcb5e2c9fcb1e1660c72f09fa4362f5a53f7c81b1a04f6679077b3e11e116bc3f22a2a7d1ae037452a6ba00ede92e4
+  metadata.gz: da94940cf35b7adc4a51f42aa42f6768fb2665d56d364fea128a1f5a2430f166e44a5ecb4c39559f70029dacb3c3f488cf7197f48158e7a2becceb0c485f9f4d
+  data.tar.gz: 9cad415102523353cefbb8539d20e6919b9816216cbf6ba8744ee8c3d9a21414ce94b68f888e6c700798d48e313a3e65df52627aebb4bcd87ee8a1d5d14d75d9

data/History.md

@@ -1,6 +1,44 @@
 # Release History for rake-deveiate
 
 ---
+## v0.15.0 [2020-10-29] Michael Granger <ged@FaerieMUD.org>
+
+Improvements:
+
+- Added support for extensions
+
+
+## v0.14.1 [2020-10-01] Michael Granger <ged@FaerieMUD.org>
+
+Improvements:
+
+- Support changes in latest tty-editor.
+
+
+## v0.14.0 [2020-04-02] Michael Granger <ged@FaerieMUD.org>
+
+Improvements:
+
+- Handle gem names like 'ruby-pf', fixup untracked gem deps files
+
+
+## v0.13.0 [2020-03-09] Michael Granger <ged@FaerieMUD.org>
+
+Improvements:
+
+- Allow file that version is read from to be overridden
+
+Bugfixes:
+
+- Bump the hglib dependency
+
+
+## v0.12.1 [2020-03-04] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+
+- Stop truncating the description extracted from the README.
+
 
 ## v0.12.0 [2020-03-04] Michael Granger <ged@FaerieMUD.org>
 

data/README.md

@@ -3,6 +3,9 @@
 home
 : https://hg.sr.ht/~ged/rake-deveiate
 
+code
+: https://hg.sr.ht/~ged/rake-deveiate/browse
+
 github
 : https://github.com/ged/rake-deveiate
 

data/lib/rake/deveiate.rb

@@ -35,7 +35,7 @@ class Rake::DevEiate < Rake::TaskLib
 	VERSION_PATTERN = /VERSION\s*=\s*(?<quote>['"])(?<version>\d+(\.\d+){2}.*)\k<quote>/
 
 	# The version of this library
-	VERSION = '0.12.0'
+	VERSION = '0.15.0'
 
 	# The server to release to by default
 	DEFAULT_GEMSERVER = 'https://rubygems.org/'
@@ -46,6 +46,10 @@ class Rake::DevEiate < Rake::TaskLib
 	# The version to use if one cannot be read from the source
 	DEFAULT_VERSION = '0.1.0'
 
+	# Words in the package/gem name that should not be included in deriving paths,
+	# file names, etc.
+	PACKAGE_IGNORE_WORDS = %w[ruby]
+
 	# Paths
 	PROJECT_DIR  = Pathname( '.' )
 
@@ -73,6 +77,10 @@ class Rake::DevEiate < Rake::TaskLib
 	]
 	DEFAULT_PROJECT_FILES.exclude( 'Manifest*.txt' )
 
+	# Environment variable overrides for settings
+	ENV_SETTING_NAME = {
+		version_from: 'VERSION_FROM',
+	}
 
 
 	# The default license for the project in SPDX form: https://spdx.org/licenses
@@ -142,13 +150,14 @@ class Rake::DevEiate < Rake::TaskLib
 		@manifest_file = DEFAULT_MANIFEST_FILE.dup
 		@project_files = self.read_manifest
 		@executables   = self.find_executables
-		@version       = self.find_version || DEFAULT_VERSION
 		@readme_file   = self.find_readme
 		@history_file  = self.find_history_file
 		@readme        = self.parse_readme
 		@rdoc_files    = self.make_rdoc_filelist
 		@cert_files    = Rake::FileList[ CERTS_DIR + '*.pem' ]
 		@licenses      = [ DEFAULT_LICENSE ]
+		@version_from  = env( :version_from, as_pathname: true ) ||
+			LIB_DIR + "%s.rb" % [ version_file_from(name) ]
 
 		@docs_dir      = DOCS_DIR.dup
 
@@ -158,7 +167,9 @@ class Rake::DevEiate < Rake::TaskLib
 		@description   = self.extract_description || DEFAULT_DESCRIPTION
 		@summary       = nil
 		@dependencies  = self.find_dependencies
+		@extensions    = Rake::FileList.new
 
+		@version       = nil
 		@publish_to    = nil
 		@required_ruby_version = nil
 
@@ -209,6 +220,10 @@ class Rake::DevEiate < Rake::TaskLib
 	# The title of the library for things like docs, gemspec, etc.
 	attr_accessor :title
 
+	##
+	# The pathname of the file to read the version from
+	attr_pathname :version_from
+
 	##
 	# The project's Rakefile
 	attr_pathname :rakefile
@@ -258,6 +273,10 @@ class Rake::DevEiate < Rake::TaskLib
 	# The Gem::RequestSet that describes the gem's dependencies
 	attr_accessor :dependencies
 
+	##
+	# A FileMap of the paths to this project's extension config scripts.
+	attr_reader :extensions
+
 	##
 	# The gemserver to push gems to
 	attr_accessor :allowed_push_host
@@ -421,7 +440,7 @@ class Rake::DevEiate < Rake::TaskLib
 	def extract_description
 		parts = self.readme&.parts or return nil
 		desc_para = parts.find {|part| part.is_a?(RDoc::Markup::Paragraph) }&.text or return nil
-		formatter = RDoc::Markup::ToHtmlSnippet.new( RDoc::Options.new )
+		formatter = RDoc::Markup::ToHtml.new( RDoc::Options.new )
 		html = formatter.convert( desc_para )
 
 		return html.gsub( /<.*?>/, '' ).strip
@@ -487,10 +506,17 @@ class Rake::DevEiate < Rake::TaskLib
 	end
 
 
+	### Return the project version as a Gem::Version, reading it from the
+	### #version_from file if it's not set yet.
+	def version
+		return @version ||= self.find_version
+	end
+
+
 	### Find the file that contains the VERSION constant and return it as a
 	### Gem::Version.
 	def find_version
-		version_file = LIB_DIR + "%s.rb" % [ self.name.gsub(/-/, '/') ]
+		version_file = self.version_from
 
 		unless version_file.readable?
 			self.prompt.warn "Version could not be read from %s" % [ version_file ]
@@ -778,4 +804,24 @@ class Rake::DevEiate < Rake::TaskLib
 		return nil
 	end
 
+
+	### Convenience mapping -- fetch a value for the setting of the given +name+
+	### from the appropriate environment variable. Returns +nil+ if that variable is
+	### undefined or blank.
+	def env( name, as_pathname: false )
+		env_name = ENV_SETTING_NAME[ name ] or return nil
+		val = ENV[ env_name ] or return nil
+		return val unless as_pathname
+		return PROJECT_DIR + val
+	end
+
+
+	### Return the path to the file that should contain the VERSION constant.
+	def version_file_from( name )
+		return name.
+			split( /-/ ).
+			reject {|word| PACKAGE_IGNORE_WORDS.include?(word) }.
+			join( '/' )
+	end
+
 end # class Rake::DevEiate

data/lib/rake/deveiate/fixup.rb

@@ -93,7 +93,7 @@ module Rake::DevEiate::Fixup
 		fixups << "De-hoeify the Rakefile" if self.rakefile_needs_hoe_fixup?
 		fixups << "Remove cruft from the manifest" if self.manifest_needs_fixup?
 		fixups << "Remove bundler files" if self.bundler_files_present?
-		fixups << "Convery legacy dependency files" if self.legacy_deps_files_present?
+		fixups << "Convert legacy dependency files" if self.legacy_deps_files_present?
 
 		self.prompt.say( "Fixups available:", color: :bright_green )
 
@@ -209,8 +209,12 @@ module Rake::DevEiate::Fixup
 
 				raise "Failed to read dependencies from %s!" % [ depsfile ] if depnames.empty?
 
-				self.trace "Recording move of %s to %s" % [ depsfile, new_depsfile ]
-				self.hg.mv( depsfile, new_depsfile )
+				if self.hg.tracked?( depsfile )
+					self.trace "Recording move of %s to %s" % [ depsfile, new_depsfile ]
+					self.hg.mv( depsfile, new_depsfile )
+				else
+					depsfile.rename( new_depsfile )
+				end
 
 				newest_deps = self.find_latest_versions( *depnames ).
 					reject {|tuple| tuple.name.include?('hoe') }

data/lib/rake/deveiate/gemspec.rb

@@ -124,6 +124,7 @@ module Rake::DevEiate::Gemspec
 		spec.summary      = self.summary || self.extract_summary
 		spec.files        = self.project_files
 		spec.executables  = self.executables
+		spec.extensions   = self.extensions.to_a
 		spec.signing_key  = self.resolve_signing_key.to_s
 		spec.cert_chain   = [ self.find_signing_cert ].compact
 		spec.version      = self.version

data/lib/rake/deveiate/hg.rb

@@ -517,7 +517,7 @@ module Rake::DevEiate::Hg
 	def edit_commit_log( logfile )
 		diff = self.hg.diff
 
-		TTY::Editor.open( logfile, content: diff )
+		TTY::Editor.open( logfile, text: diff )
 	end
 
 

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: rake-deveiate
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Michael Granger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIENDCCApygAwIBAgIBATANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
-  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0xOTEwMDkwMDM2NTdaFw0yMDEwMDgwMDM2
-  NTdaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
+  MIID+DCCAmCgAwIBAgIBAjANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQDDBdnZWQv
+  REM9RmFlcmllTVVEL0RDPW9yZzAeFw0xOTEyMjQyMDE5NTFaFw0yMDEyMjMyMDE5
+  NTFaMCIxIDAeBgNVBAMMF2dlZC9EQz1GYWVyaWVNVUQvREM9b3JnMIIBojANBgkq
   hkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAvyVhkRzvlEs0fe7145BYLfN6njX9ih5H
   L60U0p0euIurpv84op9CNKF9tx+1WKwyQvQP7qFGuZxkSUuWcP/sFhDXL1lWUuIl
   M4uHbGCRmOshDrF4dgnBeOvkHr1fIhPlJm5FO+Vew8tSQmlDsosxLUx+VB7DrVFO
@@ -21,20 +21,19 @@ cert_chain:
   vQ66lts4alKC69TE5cuKasWBm+16A4aEe3XdZBRNmtOu/g81gvwA7fkJHKllJuaI
   dXzdHqq+zbGZVSQ7pRYHYomD0IiDe1DbIouFnPWmagaBnGHwXkDT2bKKP+s2v21m
   ozilJg4aar2okb/RA6VS87o+d7g6LpDDMMQjH4G9OPnJENLdhu8KnPw/ivSVvQw7
-  N2I4L/ZOIe2DIVuYH7aLHfjZDQv/mNgpAgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYD
-  VR0PBAQDAgSwMB0GA1UdDgQWBBRyjf55EbrHagiRLqt5YAd3yb8k4DAcBgNVHREE
-  FTATgRFnZWRARmFlcmllTVVELm9yZzAcBgNVHRIEFTATgRFnZWRARmFlcmllTVVE
-  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
+  N2I4L/ZOIe2DIVuYH7aLHfjZDQv/mNgpAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYD
+  VR0PBAQDAgSwMB0GA1UdDgQWBBRyjf55EbrHagiRLqt5YAd3yb8k4DANBgkqhkiG
+  9w0BAQsFAAOCAYEAifxlz7x0EfT3fjhM520ZEIrWa+tLMuLKNefkY18u8tZnx4EX
+  Xxwh3tna3fvNfrOrdY5leIj1dbv4FTRg+gIBnIxAySqvpGvI/Axg5EdYbwninCLL
+  LAKCmRo+5QwaPMYN2zdHIjGrp8jg1neCo5zy6tVvyTv0DMI6FLrydVJYduMMDFSy
+  gQKR1rVOcCJtnBnLCF9+kKEUKohAHOmGsE7OBZFnjMIpH5yUDUVJKByv0gIipFt0
+  1T6zff6oVU0w8WBiNKR381+6sF3wIZVnVY0XeJg6hNL+YecE8ILxLhHTmtT/BO0S
+  3xPze9uXDR+iD6HYl8KU5QEg/dXFPhfQb512vVkTJDZvMcwu6PxDUjHFChLjAji/
+  AZXjg1C5E9znTkeUR8ieU9F1MOKoiH57a5lYSTI8Ga8PpsNXTxNeXc16Ob26CqrJ
+  83uuAYSy65yXDGXXPVBeKPVnYrqp91pqpS5Nh7wfuiCrE8lgU8PATh7K4BV1UhAT
+  0MHbAT42wTYkfUj3
   -----END CERTIFICATE-----
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -98,14 +97,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
@@ -126,14 +131,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: tty-table
   requirement: !ruby/object:Gem::Requirement
@@ -177,7 +182,9 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.4'
 description: This is a collection of Rake tasks I use for development. I distribute
-  them as a gem mostly so people …
+  them as a gem mostly so people who wish to contribute to the other Open Source libraries
+  I maintain can do so easily, but of course you're welcome to use them yourself
+  if you find them useful.
 email:
 - ged@FaerieMUD.org
 executables: []
@@ -208,7 +215,9 @@ metadata:
   homepage_uri: https://hg.sr.ht/~ged/rake-deveiate
   documentation_uri: https://deveiate.org/code/rake-deveiate/
   changelog_uri: https://deveiate.org/code/rake-deveiate/History_md.html
-post_install_message: 
+  source_uri: https://hg.sr.ht/~ged/rake-deveiate/browse
+  bug_tracker_uri: https://todo.sr.ht/~ged/rake-deveiate/browse
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -224,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: This is a collection of Rake tasks I use for development.
 test_files: []