rake-deveiate 0.17.4 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75429da7cdad951ae72e7dcb020a5b7c96dbc0fe61e9c440061e426122081679
-  data.tar.gz: ed1113af4145ba0eec87f020a7db97877e9c119c7a68a682dc574522fdae4e6d
+  metadata.gz: ddcff2d4dd59a477b6105e7841c52d732553e6c21266a18d8ecc1a9fdb14c2b9
+  data.tar.gz: 4848059cbf391eb6700fbc83b9aaf7dec1aecde24f993261816569a06c6b1f0a
 SHA512:
-  metadata.gz: b608212076021421b83d5fb0e13676da66729e8f82aa1885667a42a0a9d60650f1a9e4c24d6ef8438e4a31eb3328742657e32dd901b753609de7b17b2f1f6b5e
-  data.tar.gz: 9e0e5373d7a3cb71601d0f86f3326fca517cc7d9a1bac94180aa451fa6a73d29e2b4cf704d8ecf4e838ed91658987d4dc82b54cfb403441135633dcf04f9631c
+  metadata.gz: f443f21c87d6a642a88fa87515f316a7813de4ad28f511023d2a4eeb83ce70f7c824a8b5ed0b7b7fbaf218172d8a5fc1cf97b843ef37b78a8e07276203224067
+  data.tar.gz: eb94a0d1f699704a6e2549bcb99036afbd9da183f737fc3351d78bc2944369a94cf2b3ca1165cdfe2be35deec65a2077bba5edce710ec97e417d4fb5869ba7e1

data/History.md

@@ -2,6 +2,15 @@
 
 ---
 
+## v0.18.0 [2021-01-07] Michael Granger <ged@FaerieMUD.org>
+
+Improvements:
+
+- Add gem push key setting
+- Add release branch check
+- Fix a bunch of git functionality
+
+
 ## v0.17.4 [2021-01-02] 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.17.4'
+	VERSION = '0.18.0'
 
 	# The server to release to by default
 	DEFAULT_GEMSERVER = 'https://rubygems.org/'
@@ -285,6 +285,10 @@ class Rake::DevEiate < Rake::TaskLib
 	# The gemserver to push gems to
 	attr_accessor :allowed_push_host
 
+	##
+	# An alternative key to use for pushing gems (private gemserver)
+	attr_accessor :gem_push_key
+
 	##
 	# The rsync-compatible target to publish documentation to.
 	attr_accessor :publish_to
@@ -297,6 +301,10 @@ class Rake::DevEiate < Rake::TaskLib
 	# The prefix to use for version tags
 	attr_accessor :release_tag_prefix
 
+	##
+	# The name of the branch to release from
+	attr_accessor :release_branch
+
 
 	#
 	# Task definition

data/lib/rake/deveiate/git.rb

@@ -25,16 +25,26 @@ module Rake::DevEiate::Git
 	STATUS_COLORS = {
 		'M' => [:blue],                  # modified
 		'A' => [:bold, :green],          # added
-		'R' => [:bold, :black],          # removed
+		'D' => [:bold, :black],          # deleted
 		'C' => [:white],                 # clean
 		'!' => [:bold, :white, :on_red], # missing
 		'?' => [:yellow],                # not tracked
 		'I' => [:dim, :white],           # ignored
 	}
 
+	STATUS_DESCRIPTIONS = {
+		'M' => 'modified',
+		'D' => 'deleted',
+		'?' => 'untracked',
+		'A' => 'new',
+	}
+
 	# File indentation
 	FILE_INDENT = " • "
 
+	# The name of the branch releases should be created from
+	DEFAULT_RELEASE_BRANCH = 'master'
+
 
 	### Define version-control tasks
 	def define_tasks
@@ -42,6 +52,8 @@ module Rake::DevEiate::Git
 
 		return unless self.is_git_working_copy?
 
+		self.release_branch = DEFAULT_RELEASE_BRANCH
+
 		# :TODO: Should be refactored up with the same code in the hg lib.
 		file COMMIT_MSG_FILE.to_s do |task|
 			commit_log = Pathname( task.name )
@@ -133,9 +145,17 @@ module Rake::DevEiate::Git
 
 	### The body of the git:prerelease task.
 	def do_git_prerelease( task, args )
-		uncommitted_files = self.git.status( n: true )
-		unless uncommitted_files.empty?
-			self.show_git_file_statuses( uncommitted_files )
+		if self.release_branch
+			current_branch = self.git.cmd( 'branch --show-current' )
+			unless self.release_branch == current_branch
+				self.prompt.warn "Releasing from a non-release branch (%s)." % [ current_branch ]
+				fail unless self.prompt.yes?( "Release anyway?" )
+			end
+		end
+
+		status = self.git.status
+		unless status.untracked.empty? && status.changed.empty?
+			self.show_git_file_statuses( status )
 
 			fail unless self.prompt.yes?( "Release anyway?" ) do |q|
 				q.default( false )
@@ -145,7 +165,7 @@ module Rake::DevEiate::Git
 		end
 
 		pkg_version_tag = self.current_git_version_tag
-		rev = self.git.identity.id
+		rev = self.git.revparse( 'HEAD' )
 
 		# Look for a tag for the current release version, and if it exists abort
 		if self.git.tags.find {|tag| tag.name == pkg_version_tag }
@@ -155,35 +175,17 @@ module Rake::DevEiate::Git
 
 		# Tag the current rev
 		self.prompt.ok "Tagging rev %s as %s" % [ rev, pkg_version_tag ]
-		self.git.tag( pkg_version_tag, rev: rev )
-
-		# Sign the tag
-		if self.git.extension_enabled?( :gpg )
-			if self.prompt.yes?( "Sign %s?" % [pkg_version_tag] )
-				self.git.sign( pkg_version_tag, message: "Signing %s" % [pkg_version_tag] )
-			end
-		end
+		self.git.cmd "tag -s -m 'Tagging for release %s' %s %s" %
+			[ pkg_version_tag, pkg_version_tag, rev ]
 	end
 
 
 	### The body of the git:postrelease task.
 	def do_git_postrelease( task, args )
-		if self.git.status( 'checksum', unknown: true ).any?
+		if self.git.status.untracked.keys.any? {|path| path.start_with?('checksum/') }
 			self.prompt.say "Adding release artifacts..."
 			self.git.add( 'checksum' )
-			self.git.commit( 'checksum', message: "Adding release checksum." )
-		end
-
-		if self.prompt.yes?( "Move released changesets to public phase?" )
-			self.prompt.say "Publicising changesets..."
-			self.git.phase( public: true )
-		end
-
-		if self.git.extension_enabled?( :topic )
-			current_topic = self.git.topic
-			if current_topic && self.prompt.yes?( "Clear the current topic (%s)?" %[current_topic] )
-				self.git.topic( clear: true )
-			end
+			self.git.commit( "Adding release checksum." )
 		end
 
 		Rake::Task['git:push'].invoke
@@ -371,7 +373,7 @@ module Rake::DevEiate::Git
 		header_char = self.header_char_for( self.history_file )
 		ext = self.history_file.extname
 		log_entries = if previous_tag
-				self.git.log( rev: "#{previous_tag}~-2::" )
+				self.git.log.between( previous_tag )
 			else
 				self.git.log
 			end
@@ -455,11 +457,14 @@ module Rake::DevEiate::Git
 	### Given a +status_hash+ like that returned by Git::Repo.status, return a
 	### string description of the files and their status.
 	def show_git_file_statuses( statuses )
-		lines = statuses.map do |entry|
-			status_color = STATUS_COLORS[ entry.status ]
+		entries = statuses.select( &:type ) + statuses.untracked.values
+
+		lines = entries.map do |entry|
+			status = entry.type || '?'
+			status_color = STATUS_COLORS[ status ]
 			"	%s: %s" % [
-				self.pastel.white( entry.path.to_s ),
-				self.pastel.decorate( entry.status_description, *status_color ),
+				self.pastel.bold.white( entry.path.to_s ),
+				self.pastel.decorate( STATUS_DESCRIPTIONS[status], *status_color ),
 			]
 		end
 

data/lib/rake/deveiate/hg.rb

@@ -32,6 +32,9 @@ module Rake::DevEiate::Hg
 	# File indentation
 	FILE_INDENT = " • "
 
+	# The name of the branch releases should be created from
+	DEFAULT_RELEASE_BRANCH = 'default'
+
 
 	### Define version-control tasks
 	def define_tasks
@@ -39,6 +42,10 @@ module Rake::DevEiate::Hg
 
 		return unless self.is_hg_working_copy?
 
+		# :TODO: Actually check for this? Doesn't make much as much sense given my
+		# Mercurial workflow.
+		self.release_branch = DEFAULT_RELEASE_BRANCH
+
 		file COMMIT_MSG_FILE.to_s do |task|
 			commit_log = Pathname( task.name )
 

data/lib/rake/deveiate/releases.rb

@@ -42,7 +42,10 @@ module Rake::DevEiate::Releases
 		gemserver = self.allowed_push_host || Rake::DevEiate::DEFAULT_GEMSERVER
 
 		if self.prompt.yes?( "Push a new gem to #{gemserver}?" ) {|q| q.default(false) }
-			sh( Gem.ruby, "-S", "gem", "push", self.gem_path.to_s )
+			push_args = [ "push", self.gem_path.to_s ]
+			push_args << '-k' << self.gem_push_key if self.gem_push_key
+
+			sh( Gem.ruby, "-S", "gem", *push_args )
 		end
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-deveiate
 version: !ruby/object:Gem::Version
-  version: 0.17.4
+  version: 0.18.0
 platform: ruby
 authors:
 - Michael Granger
@@ -33,7 +33,7 @@ cert_chain:
   MCh97sQ/Z/MOusb5+QddBmB+k8EicXyGNl4b5L4XpL7fIQu+Y96TB3JEJlShxFD9
   k9FjI4d9EP54gS/4
   -----END CERTIFICATE-----
-date: 2021-01-02 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake