rake-deveiate 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db3d42996110ac399012a986a20781e0894319bfb34c2074cbafcd3f74b9e495
-  data.tar.gz: 556ce77876797033960824329500c5794c715bb77a1bd665b0c5289b78f149e3
+  metadata.gz: 411dba3c0a85a488b5cc196c1cc431914baa1e8a361a338518a7c6d90997a86e
+  data.tar.gz: 6261595cce321454eb95f6ecd775ca294b732cde735997a17ed4e7d436701033
 SHA512:
-  metadata.gz: dc84754776dc27a67d0ab8e8db5d2f7d697fc69001da7f385b1cac997955a8b011f5138182f5abbcdfd6f169797a73c1cf0f96358ef6e1448a3e8dcd0962ade9
-  data.tar.gz: de8fcaf36c1c8a6f9ca1e688bf0c763cc58300b17e772d9562261a18136ec02b93ac071355d5a2778befc59bd3ad1cf24e5d6debfa785d592cfcd0d7a1811838
+  metadata.gz: 1862a49ef4b0966deaddaec18e4ac0b2b217a9ece1f06129e5e26b374c34ba09f0416f596d76e3eb2c52fbebee933033816e13fb98f60afe706e9cba63b8028c
+  data.tar.gz: 4e6bf0717bf50f656709890b2e50ad8b761a7c768549365c36cb88675dc72a9e4201c5d09e909f4a4cbc0ed2e0d59c3b9fae4316931acc4dbfc5934a4da03b03

data/History.md

@@ -2,6 +2,15 @@
 
 ---
 
+## v0.3.0 [2019-10-14] Michael Granger <ged@FaerieMUD.org>
+
+Improvements:
+
+- Add a `diff_manifest` task
+- Run checkin tasks in an order that makes more sense
+- Fix the sign/tag sequence in `release` to allow `sigcheck`ing the tag.
+
+
 ## v0.2.0 [2019-10-12] Michael Granger <ged@FaerieMUD.org>
 
 Improvements:

data/lib/rake/deveiate/gemspec.rb

@@ -66,7 +66,7 @@ module Rake::DevEiate::Gemspec
 
 		CLEAN.include( gemspec_file.to_s )
 
-		task :checkin => :gemspec
+		task :precheckin => :gemspec
 
 		task( :gemspec_debug, &method(:do_gemspec_debug) )
 		task :debug => :gemspec_debug

data/lib/rake/deveiate/generate.rb

@@ -1,6 +1,7 @@
 # -*- ruby -*-
 # frozen_string_literal: true
 
+require 'tempfile'
 require 'erb'
 
 require 'rake/deveiate' unless defined?( Rake::DevEiate )
@@ -38,6 +39,7 @@ module Rake::DevEiate::Generate
 		task( RUBY_VERSION_FILE, &method(:do_generate_ruby_version_file) )
 		task( GEMSET_FILE, &method(:do_generate_gemset_file) )
 
+		desc "Generate any missing project files."
 		task :generate => [
 			self.readme_file,
 			self.history_file,
@@ -45,6 +47,9 @@ module Rake::DevEiate::Generate
 			RUBY_VERSION_FILE,
 			GEMSET_FILE,
 		]
+
+		desc "Diff the manifest file against the default set of project files."
+		task( :diff_manifest, &method(:do_diff_manifest) )
 	end
 
 
@@ -89,6 +94,18 @@ module Rake::DevEiate::Generate
 	end
 
 
+	### Task body for the `diff_manifest` task
+	def do_diff_manifest( task, args )
+		Tempfile.open( ['Manifest','.txt'], Rake::DevEiate::PROJECT_DIR ) do |io|
+			file_list = self.default_manifest.to_a
+			io.puts( *file_list )
+			io.flush
+
+			sh 'diff', '-ub', self.manifest_file.to_s, io.path
+		end
+	end
+
+
 	### Generate the given +filename+ from the template filed at +template_path+.
 	def generate_from_template( filename, template_path )
 		self.prompt.ok "Generating #{filename}..."

data/lib/rake/deveiate/hg.rb

@@ -61,7 +61,14 @@ module Rake::DevEiate::Hg
 		return unless File.directory?( '.hg' )
 
 		file COMMIT_MSG_FILE.to_s do |task|
-			edit_commit_log( task.name )
+			commit_log = Pathname( task.name )
+
+			edit_commit_log( commit_log )
+			unless commit_log.size?
+				self.prompt.error "Empty commit message; aborting."
+				commit_log.unlink if commit_log.exist?
+				abort
+			end
 		end
 
 		CLEAN.include( COMMIT_MSG_FILE.to_s )
@@ -88,14 +95,14 @@ module Rake::DevEiate::Hg
 			task( :update_and_clobber, &method(:do_hg_update_and_clobber) )
 
 			desc "Mercurial-specific pre-checkin hook"
-			task :precheckin
+			task :precheckin => [ :pull, :newfiles, :check_for_changes ]
+
+			desc "Check the current code in if tests pass"
+			task( :checkin => COMMIT_MSG_FILE.to_s, &method(:do_hg_checkin) )
 
 			desc "Mercurial-specific pre-release hook"
 			task :prerelease => 'hg:check_history'
 
-			desc "Check the current code in if tests pass"
-			task( :checkin => [:pull, :newfiles, :precheckin, COMMIT_MSG_FILE.to_s], &method(:do_hg_checkin) )
-
 			desc "Mercurial-specific post-release hook"
 			task( :postrelease, &method(:do_hg_postrelease) )
 
@@ -113,21 +120,22 @@ module Rake::DevEiate::Hg
 			desc "Generate and edit a new version entry in the history file"
 			task( :update_history, &method(:do_hg_update_history) )
 
+			task( :check_for_changes, &method(:do_hg_check_for_changes) )
 			task( :debug, &method(:do_hg_debug) )
 		end
 
 
 		# Hook some generic tasks to the mercurial-specific ones
-		task :ci => 'hg:checkin'
+		task :checkin => 'hg:checkin'
+		task :precheckin => 'hg:precheckin'
 
 		task :prerelease => 'hg:prerelease'
-		task :precheckin => 'hg:precheckin'
-		task :debug => 'hg:debug'
 		task :postrelease => 'hg:postrelease'
 
 		desc "Update the history file with the changes since the last version tag."
 		task :update_history => 'hg:update_history'
 
+		task :debug => 'hg:debug'
 	rescue ::Exception => err
 		$stderr.puts "%s while defining Mercurial tasks: %s" % [ err.class.name, err.message ]
 		raise
@@ -148,6 +156,7 @@ module Rake::DevEiate::Hg
 		end
 
 		pkg_version_tag = self.current_version_tag
+		rev = self.hg.identity.id
 
 		# Look for a tag for the current release version, and if it exists abort
 		if self.hg.tags.find {|tag| tag.name == pkg_version_tag }
@@ -156,15 +165,14 @@ module Rake::DevEiate::Hg
 		end
 
 		if self.sign_tags
-			message = "Signing %s" % [ pkg_version_tag ]
+			message = "Signing %s" % [ rev ]
 			self.prompt.ok( message )
-			self.hg.sign( message: message )
+			self.hg.sign( rev, message: message )
 		end
 
 		# Tag the current rev
-		rev = self.hg.identify
 		self.prompt.ok "Tagging rev %s as %s" % [ rev, pkg_version_tag ]
-		self.hg.tag( pkg_version_tag )
+		self.hg.tag( pkg_version_tag, rev: rev )
 	end
 
 
@@ -310,6 +318,16 @@ module Rake::DevEiate::Hg
 	end
 
 
+	### Check the status of the repo and ensure there are outstanding changes. If there
+	### are no changes, abort.
+	def do_hg_check_for_changes( task, args )
+		unless self.hg.dirty?
+			self.prompt.error "Working copy is clean."
+			abort
+		end
+	end
+
+
 	### Generate a new history file entry for the current version.
 	def do_hg_update_history( task, args ) # Needs refactoring
 		unless self.history_file.readable?

data/lib/rake/deveiate.rb

@@ -34,7 +34,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.2.0'
+	VERSION = '0.3.0'
 
 	# The server to release to by default
 	DEFAULT_GEMSERVER = 'https://rubygems.org/'
@@ -61,13 +61,18 @@ class Rake::DevEiate < Rake::TaskLib
 	DEFAULT_MANIFEST_FILE = PROJECT_DIR + 'Manifest.txt'
 	DEFAULT_README_FILE = PROJECT_DIR + 'README.md'
 	DEFAULT_HISTORY_FILE = PROJECT_DIR + 'History.md'
+
 	DEFAULT_PROJECT_FILES = Rake::FileList[
 		'*.{rdoc,md,txt}',
 		'bin/*',
-		'lib/*.rb', 'lib/**/*.rb',
+		'lib/**/*.rb',
 		'ext/*.[ch]', 'ext/**/*.[ch]',
-		'data/**/*'
+		'data/**/*',
+		'spec/**/*.rb',
 	]
+	DEFAULT_PROJECT_FILES.exclude( 'Manifest*.txt' )
+
+
 
 	# The default license for the project in SPDX form: https://spdx.org/licenses
 	DEFAULT_LICENSE = 'BSD-3-Clause'
@@ -291,10 +296,10 @@ class Rake::DevEiate < Rake::TaskLib
 		task( :default => :spec )
 
 		desc "Check in the current changes"
-		task :checkin => :precheckin
+		task :checkin => [ :precheckin, :check, :test ]
 		task :commit => :checkin
 		task :ci => :checkin
-		task :precheckin => [ :check, :gemspec, :spec ]
+		task :precheckin
 
 		desc "Sanity-check the project"
 		task :check
@@ -463,11 +468,18 @@ class Rake::DevEiate < Rake::TaskLib
 		else
 			self.prompt.warn "No manifest (%s): falling back to a default list" %
 				[ self.manifest_file ]
-			return DEFAULT_PROJECT_FILES.dup
+			return self.default_manifest
 		end
 	end
 
 
+	### Return the Rake::FileList that's used in lieu of the manifest file if it
+	### isn't present.
+	def default_manifest
+		return DEFAULT_PROJECT_FILES.dup
+	end
+
+
 	### Make a Rake::FileList of the files that should be used to generate
 	### documentation.
 	def make_rdoc_filelist

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-deveiate
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Michael Granger
@@ -34,7 +34,7 @@ cert_chain:
   jBZSA+N+xUTgUWpXjjwsLZjzJkhWATJWq+krNXcqpwXo6HsjmdUxoFMt63RBb+sI
   XrxOxp8o0uOkU7FdLSGsyqJ2LzsR4obN
   -----END CERTIFICATE-----
-date: 2019-10-12 00:00:00.000000000 Z
+date: 2019-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,14 +84,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: This is a collection of Rake tasks I use for development.