rake-deveiate 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 411dba3c0a85a488b5cc196c1cc431914baa1e8a361a338518a7c6d90997a86e
-  data.tar.gz: 6261595cce321454eb95f6ecd775ca294b732cde735997a17ed4e7d436701033
+  metadata.gz: 53d2d65094f33a266aaf7338ffd4e33178effaafa636f3115ebd8630a782d27c
+  data.tar.gz: ed8012a605d3e2b65dc913e74fd15135fc182de4ae1bfa999f764df997546e53
 SHA512:
-  metadata.gz: 1862a49ef4b0966deaddaec18e4ac0b2b217a9ece1f06129e5e26b374c34ba09f0416f596d76e3eb2c52fbebee933033816e13fb98f60afe706e9cba63b8028c
-  data.tar.gz: 4e6bf0717bf50f656709890b2e50ad8b761a7c768549365c36cb88675dc72a9e4201c5d09e909f4a4cbc0ed2e0d59c3b9fae4316931acc4dbfc5934a4da03b03
+  metadata.gz: babb3715b2eb746f6080fd488633d488568d5591dd1a75877bfc2c6b12312ff42dc26ec9826d2d44fcc56cfa1bb5a5fd906586e5b7647974913ff0bab953888f
+  data.tar.gz: 78960238a8b42a80d6253be560ab4231491d006987a02d0fd8d3c1e0756e12b19484b46fc76d2de7cf2b5df18e3688fd052357631f7bbbdd3126baefb3cd2f80

data/History.md

@@ -2,6 +2,18 @@
 
 ---
 
+## v0.4.0 [2019-10-16] Michael Granger <ged@FaerieMUD.org>
+
+Improvements:
+
+- Offer to clear the current topic on release
+- Add support for the `allowed_push_host` gem attribute
+
+Bugfixes:
+
+- Only try to sign if the gpg extension is loaded
+
+
 ## v0.3.0 [2019-10-14] Michael Granger <ged@FaerieMUD.org>
 
 Improvements:

data/lib/rake/deveiate/docs.rb

@@ -27,7 +27,6 @@ module Rake::DevEiate::Docs
 			rdoc.rdoc_dir = Rake::DevEiate::DOCS_DIR.to_s
 		end
 
-
 		if self.publish_to
 			target = self.publish_to
 
@@ -38,6 +37,20 @@ module Rake::DevEiate::Docs
 			end
 		end
 
+		task :debug => :docs_debug
+		task( :docs_debug, &method(:do_docs_debug) )
+	end
+
+
+	### Task body for the :docs_debug task
+	def do_docs_debug( task, args )
+		self.prompt.say( "Docs are published to:", color: :bright_green )
+		if ( publish_url = self.publish_to )
+			self.prompt.say( self.indent(publish_url, 4) )
+		else
+			self.prompt.say( self.indent("n/a"), color: :bright_yellow )
+		end
+		self.prompt.say( "\n" )
 	end
 
 end # module Rake::DevEiate::Docs

data/lib/rake/deveiate/gemspec.rb

@@ -79,7 +79,7 @@ module Rake::DevEiate::Gemspec
 		gemspec_src = gemspec.to_yaml
 
 		self.prompt.say( "Gemspec:", color: :bright_green )
-		self.prompt.say( indent(gemspec_src, 4) )
+		self.prompt.say( self.indent(gemspec_src, 4) )
 		self.prompt.say( "\n" )
 	end
 
@@ -112,6 +112,8 @@ module Rake::DevEiate::Gemspec
 		spec.licenses     = self.licenses
 		spec.date         = Date.today
 
+		spec.allowed_push_host = self.allowed_push_host if self.allowed_push_host
+
 		self.authors.each do |author|
 			if ( m = author.match(AUTHOR_PATTERN) )
 				spec.authors ||= []
@@ -161,17 +163,6 @@ module Rake::DevEiate::Gemspec
 		return path
 	end
 
-
-	#######
-	private
-	#######
-
-	### Return a copy of the given text prefixed by +spaces+ number of spaces.
-	def indent( text, spaces=4 )
-		prefix = ' ' * spaces
-		return text.gsub( /(?<=\A|\n)/m, prefix )
-	end
-
 end # module Rake::DevEiate::Gemspec
 
 

data/lib/rake/deveiate/hg.rb

@@ -41,7 +41,6 @@ module Rake::DevEiate::Hg
 		super if defined?( super )
 
 		@release_tag_prefix = options[:release_tag_prefix] || DEFAULT_RELEASE_TAG_PREFIX
-		@sign_tags          = options[:sign_tags] || true
 	end
 
 
@@ -49,10 +48,6 @@ module Rake::DevEiate::Hg
 	# The prefix to use for version tags
 	attr_accessor :release_tag_prefix
 
-	##
-	# Boolean: if true, sign tags after creating them
-	attr_accessor :sign_tags
-
 
 	### Define version-control tasks
 	def define_tasks
@@ -164,15 +159,17 @@ module Rake::DevEiate::Hg
 			fail
 		end
 
-		if self.sign_tags
-			message = "Signing %s" % [ rev ]
-			self.prompt.ok( message )
-			self.hg.sign( rev, message: message )
-		end
-
 		# Tag the current rev
 		self.prompt.ok "Tagging rev %s as %s" % [ rev, pkg_version_tag ]
 		self.hg.tag( pkg_version_tag, rev: rev )
+
+		# Sign the tag
+		if self.hg.extension_enabled?( :gpg )
+			message = "Sign %s?" % [ pkg_version_tag ]
+			if self.prompt.yes?( message )
+				self.hg.sign( pkg_version_tag, message: message )
+			end
+		end
 	end
 
 
@@ -189,6 +186,13 @@ module Rake::DevEiate::Hg
 			self.hg.phase( public: true )
 		end
 
+		if self.hg.extension_enabled?( :topic )
+			current_topic = self.hg.topic
+			if current_topic && self.prompt.yes?( "Clear the current topic (%s)?" %[current_topic] )
+				self.hg.topic( clear: true )
+			end
+		end
+
 		Rake::Task['hg:push'].invoke
 	end
 

data/lib/rake/deveiate/releases.rb

@@ -21,10 +21,10 @@ module Rake::DevEiate::Releases
 		file( checksum_path => [self.gem_path, checksum_dir], &method(:do_make_release_checksum) )
 		task :add_release_checksum => checksum_path
 
-		task :release_gem => :add_release_checksum do
-			sh( Gem.ruby, "-S", "gem", "push", self.gem_path.to_s )
-		end
+		task( :release_gem => :add_release_checksum, &method(:do_release_gem) )
 
+		task :debug => :release_debug
+		task( :release_debug, &method(:do_release_debug) )
 	end
 
 
@@ -36,5 +36,25 @@ module Rake::DevEiate::Releases
 		end
 	end
 
+
+	### Body of the release_gem task.
+	def do_release_gem( task, args )
+		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 )
+		end
+	end
+
+
+	### Body of the release_debug task.
+	def do_release_debug( task, args )
+		gemserver = self.allowed_push_host || Rake::DevEiate::DEFAULT_GEMSERVER
+
+		self.prompt.say( "Releases will be pushed to:", color: :bright_green )
+		self.prompt.say( self.indent(gemserver, 4) )
+		self.prompt.say( "\n" )
+	end
+
 end # module Rake::DevEiate::Releases
 

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.3.0'
+	VERSION = '0.4.0'
 
 	# The server to release to by default
 	DEFAULT_GEMSERVER = 'https://rubygems.org/'
@@ -147,8 +147,6 @@ class Rake::DevEiate < Rake::TaskLib
 		@summary       = nil
 		@dependencies  = self.find_dependencies
 
-		@gemserver     = DEFAULT_GEMSERVER
-
 		@publish_to    = nil
 
 		super()
@@ -241,7 +239,7 @@ class Rake::DevEiate < Rake::TaskLib
 
 	##
 	# The gemserver to push gems to
-	attr_accessor :gemserver
+	attr_accessor :allowed_push_host
 
 	##
 	# The rsync-compatible target to publish documentation to.
@@ -326,7 +324,6 @@ class Rake::DevEiate < Rake::TaskLib
 			self.output_documentation_debugging
 			self.output_project_files_debugging
 			self.output_dependency_debugging
-			self.output_release_debugging
 		end
 
 		task :debug => :base_debug
@@ -666,11 +663,10 @@ class Rake::DevEiate < Rake::TaskLib
 	end
 
 
-	### Output debugging regarding where releases will be posted.
-	def output_release_debugging
-		self.prompt.say( "Will push releases to:", color: :bright_green )
-		self.prompt.say( "  #{self.gemserver}" )
-		self.prompt.say( "\n" )
+	### Return a copy of the given text prefixed by +spaces+ number of spaces.
+	def indent( text, spaces=4 )
+		prefix = ' ' * spaces
+		return text.gsub( /(?<=\A|\n)/m, prefix )
 	end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-deveiate
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Michael Granger
@@ -34,7 +34,7 @@ cert_chain:
   jBZSA+N+xUTgUWpXjjwsLZjzJkhWATJWq+krNXcqpwXo6HsjmdUxoFMt63RBb+sI
   XrxOxp8o0uOkU7FdLSGsyqJ2LzsR4obN
   -----END CERTIFICATE-----
-date: 2019-10-14 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: This is a collection of Rake tasks I use for development.