rake-deveiate 0.17.2 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 315be1a6a89185867bf0ef5c09de66fdc41bfe4df4230df1f0c47de922151671
-  data.tar.gz: e54f8cc9ba45127139a2ad4bd9ad1280070decd786297a3044aaaff31f0c8b54
+  metadata.gz: 30f1b99b224177ae3b0852d218eb2c87b7db5b238d0ba798a0027d95ae86c07c
+  data.tar.gz: 3a00d194c0e884023097ece28b745a76d1b3813d841ef47c353342321b194f5d
 SHA512:
-  metadata.gz: edb7daef99f49351429ce5c21e51382ac362e75cb0ccad613bcc3ae851824536e26d8c761895f4512d5e4c44f5c3ca62444c587b02cc019c0c2b121a77652add
-  data.tar.gz: ca3b9dbc8eeb4a437ff6a6dff1b13b55a89363d754dd9d96873f54c6e206f57bcfddb22e8d4bc0c3342f4f43fdeb6088dd819aafc570d12991c5b2f593b533c3
+  metadata.gz: 67556073f0dfa06cc25f4722b4d282828bf745ce298b61308ef83c1a2d546311e72b4fd23205c91fc4360e4115d7a0073f8e038e083771f7a93092078cace1df
+  data.tar.gz: f18009897928c10448b8c131eed16deee4a3fde6492ac7992a6effff8f9a64c1cf1a5043e616007a7e54ed2d8e23c41d210e81076e53ff567aa39041ab27dfb4

data/History.md

@@ -1,6 +1,46 @@
 # Release History for rake-deveiate
 
 ---
+## v0.19.1 [2021-05-08] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+
+- Fix version and version_from.
+
+
+## v0.19.0 [2021-03-08] Michael Granger <ged@FaerieMUD.org>
+
+Enhancements:
+
+- Add support for SCP gem pushing.
+
+Bugfixes:
+
+- Push git repos with tags.
+
+
+## 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:
+
+- Ignore prerelease tags when checking history file.
+
+
+## v0.17.3 [2021-01-01] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+
+- Fix maintainer task of extensions lib.
+
 
 ## v0.17.2 [2020-12-29] Michael Granger <ged@FaerieMUD.org>
 

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.2'
+	VERSION = '0.19.1'
 
 	# The server to release to by default
 	DEFAULT_GEMSERVER = 'https://rubygems.org/'
@@ -211,11 +211,6 @@ class Rake::DevEiate < Rake::TaskLib
 	# The summary description of the gem.
 	attr_accessor :summary
 
-	##
-	# The Gem::Version of the current library, extracted from the top-level
-	# namespace.
-	attr_reader :version
-
 	##
 	# The README of the project as an RDoc::Markup::Document
 	attr_accessor :readme
@@ -285,6 +280,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 +296,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
@@ -445,7 +448,7 @@ class Rake::DevEiate < Rake::TaskLib
 
 	### Extract a summary from the README if possible. Returns +nil+ if not.
 	def extract_summary
-		return self.description.split( /(?<=\.)\s+/ ).first.gsub( /\n/, ' ' )
+		return self.description.split( /(?<=\.)\s+/ ).first&.gsub( /\n/, ' ' )
 	end
 
 
@@ -474,7 +477,8 @@ class Rake::DevEiate < Rake::TaskLib
 		content = readme.parts.grep_v( RDoc::Markup::BlankLine )
 
 		heading, list = content.each_cons( 2 ).find do |heading, list|
-			heading.is_a?( RDoc::Markup::Heading ) && heading.text =~ /^authors?/i &&
+			heading.is_a?( RDoc::Markup::Heading ) &&
+				heading.text =~ /^(author|maintainer)s?/i &&
 				list.is_a?( RDoc::Markup::List )
 		end
 
@@ -794,6 +798,10 @@ class Rake::DevEiate < Rake::TaskLib
 			self.prompt.say( table.render(:unicode, padding: [0,1]) )
 		end
 		self.prompt.say( "\n" )
+
+		self.prompt.say( "Version from:" )
+		self.prompt.say( "  " + self.version_from.to_s, color: :bold )
+		self.prompt.say( "\n" )
 	end
 
 

data/lib/rake/deveiate/extensions.rb

@@ -80,7 +80,8 @@ module Rake::DevEiate::Extension
 		task :spec => :compile
 
 		task :maint do
-			ENV['V'] = 1
+			ENV['V'] = '1'
+			ENV['MAINTAINER_MODE'] = 'yes'
 		end
 	end
 

data/lib/rake/deveiate/gemspec.rb

@@ -208,6 +208,10 @@ module Rake::DevEiate::Gemspec
 				bt_uri = source_uri.dup
 				bt_uri.path += '-/issues'
 				metadata['bug_tracker_uri'] = bt_uri.to_s
+			when /\.github\.com/
+				bt_uri = source_uri.dup
+				bt_uri.path += '/issues'
+				metadata['bug_tracker_uri'] = bt_uri.to_s
 			else
 				self.trace "No idea what bug tracker URIs for %s look like!" % [ source_uri.host ]
 			end

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 )
@@ -120,7 +132,7 @@ module Rake::DevEiate::Git
 
 		task :debug => 'git:debug'
 	rescue ::Exception => err
-		$stderr.puts "%s while defining Git tasks: %s" % [ err.class.name, err.message ]
+		$stderr.puts "%s while defining Git tasks: %s" % [ err.class.name, err.full_message(order: :bottom) ]
 		raise
 	end
 
@@ -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
@@ -300,7 +302,7 @@ module Rake::DevEiate::Git
 					end
 				end
 
-				git.push( 'origin', git.current_branch )
+				git.push( 'origin', git.current_branch, tags: true )
 				self.prompt.ok "Done."
 			else
 				abort
@@ -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
 
@@ -483,7 +488,7 @@ module Rake::DevEiate::Git
 	### Fetch the list of names of tags that match the versioning scheme of this
 	### project.
 	def get_git_version_tag_names
-		tag_pattern = self.release_tag_pattern
+		tag_pattern = /#{self.release_tag_pattern}$/
 		return self.git.tags.map( &:name ).grep( tag_pattern )
 	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 )
 
@@ -470,7 +477,7 @@ module Rake::DevEiate::Hg
 	### Fetch the list of names of tags that match the versioning scheme of this
 	### project.
 	def get_hg_version_tag_names
-		tag_pattern = self.release_tag_pattern
+		tag_pattern = /#{self.release_tag_pattern}$/
 		return self.hg.tags.map( &:name ).grep( tag_pattern )
 	end
 

data/lib/rake/deveiate/releases.rb

@@ -41,8 +41,37 @@ module Rake::DevEiate::Releases
 	def do_release_gem( task, args )
 		gemserver = self.allowed_push_host || Rake::DevEiate::DEFAULT_GEMSERVER
 
+		case gemserver
+		when /\Ascp:/
+			self.do_scp_push( gemserver )
+		else
+			self.do_gem_push( gemserver )
+		end
+	end
+
+
+	### Push a new gem via a gemserver.
+	def do_gem_push( 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
+
+
+	### Push a new gem via scp.
+	def do_scp_push( gemserver )
+		gemserver_url = URI( gemserver )
+
+		if self.prompt.yes?( "Push a new gem with scp to #{gemserver_url.host}?" ) {|q| q.default(false) }
+			require 'net/scp'
+
+			# Strip off one leading '/' if one is present
+			remote_path = gemserver_url.path[ %r{/(.*)}, 1 ]
+
+			Net::SCP.upload!( gemserver_url.host, gemserver_url.user, self.gem_path.to_s, remote_path )
 		end
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-deveiate
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.19.1
 platform: ruby
 authors:
 - Michael Granger
@@ -33,7 +33,7 @@ cert_chain:
   MCh97sQ/Z/MOusb5+QddBmB+k8EicXyGNl4b5L4XpL7fIQu+Y96TB3JEJlShxFD9
   k9FjI4d9EP54gS/4
   -----END CERTIFICATE-----
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2021-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -175,6 +175,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
+- !ruby/object:Gem::Dependency
+  name: net-scp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: ed25519
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: bcrypt_pbkdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rdoc-generator-fivefish
   requirement: !ruby/object:Gem::Requirement