rake-deveiate 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92bf631868593851bd733a1102e24a3bf553a87018ee4284a1fe2bfc081353fe
-  data.tar.gz: 53294b8535ad90a139e6b616a653feb0d4ccf21073ae0c50a8bc7784ac819d62
+  metadata.gz: ca916329db64034754baa05ffe9b5409e7e3ce989b83a436b381d332f91ef0aa
+  data.tar.gz: 4a1738172f9813c309571699fb03dfd53a70bf9ffc6a7ddb09b1a3cc24eb282b
 SHA512:
-  metadata.gz: f322129d7543cab98b8967ec4ae6abb9f82183f965b3e7687331fbd91d5a882fd04cecb6de7bc68af7c39f50d6b6babc442c48f7c87b7e55829c5109128d689d
-  data.tar.gz: 6cd76671dece7ab4c4bfea8e1f549709c54616f83cd0c3b50a9b9aec9124805a6f44d55cfadf3ad38cc9d47c24d8d0af0597b75d640d34932fafa344dff0cbe1
+  metadata.gz: 3e967a920200ca1b7c06af8ddca8bed8d76acf289b7270e086bb4dd1bd27f46d37b6e631fd999867819e5afcc9097c4ead61ccbefb25213f69c57734916d82fc
+  data.tar.gz: cc00532e226df4c5b66399f2e484470305ab693ab26ccc9ea288fbaa2008a1ee611bd09babe8ff4e16ed1171806e049a64a6de4db032b5a1f583c97d75081970

data/History.md

@@ -2,6 +2,17 @@
 
 ---
 
+## 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:

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.1'
+	VERSION = '0.13.0'
 
 	# The server to release to by default
 	DEFAULT_GEMSERVER = 'https://rubygems.org/'
@@ -73,6 +73,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 +146,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" % [ name.gsub(/-/, '/') ]
 
 		@docs_dir      = DOCS_DIR.dup
 
@@ -159,6 +164,7 @@ class Rake::DevEiate < Rake::TaskLib
 		@summary       = nil
 		@dependencies  = self.find_dependencies
 
+		@version       = nil
 		@publish_to    = nil
 		@required_ruby_version = nil
 
@@ -209,6 +215,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
@@ -487,10 +497,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 +795,15 @@ 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
+
 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 )
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-deveiate
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Michael Granger
@@ -34,7 +34,7 @@ cert_chain:
   jBZSA+N+xUTgUWpXjjwsLZjzJkhWATJWq+krNXcqpwXo6HsjmdUxoFMt63RBb+sI
   XrxOxp8o0uOkU7FdLSGsyqJ2LzsR4obN
   -----END CERTIFICATE-----
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -98,14 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement