hoe-mercurial 1.2.2 → 1.3.0

data.tar.gz.sig

@@ -0,0 +1,2 @@
+R�x�BU��"��k�*�%�A\y�]h��`�=m&G��c���c�
��<��_͏�7ho��DTF]�H&P�
+ew8�b��~��^e�G5�*,R��L�~TXH��3<�+�[&�yP[(q'|��z���'�#H�5F�<l���Ih������g�����*Ygś����ݗ�p׷|-��j����`��:�l{?���>�Տ��|`z���RJ�6�i[�;�T�A�5*%��ɣ��-^�k[

data/History.md

@@ -1,4 +1,15 @@
-## 1.2.1 [2011-02-01] Michael Granger <ged@FaerieMUD.org>
+## v1.3.0 [2011-09-19] Michael Granger <ged@FaerieMUD.org>
+
+Added a new task :check_history, and a new config option 'check_history_on_release'
+for ensuring the History file is updated before releasing.
+
+
+## v1.2.2 [2011-08-22] Michael Granger <ged@FaerieMUD.org>
+
+Don't overlay existing mercurial tasks if an 'hg:checkin' task already exists.
+
+
+## v1.2.1 [2011-02-01] Michael Granger <ged@FaerieMUD.org>
 
 Bugfixes:
 
@@ -7,7 +18,8 @@ Bugfixes:
 * Fixed the add_include_dirs call, describe the 'ci' task
 * Updated hoe dependency
 
-## 1.2.0 [2011-01-05] Michael Granger <ged@FaerieMUD.org>
+
+## v1.2.0 [2011-01-05] Michael Granger <ged@FaerieMUD.org>
 
 Removed old attributes:
 
@@ -19,12 +31,12 @@ Enhancements:
 * hoe-mercurial now injects itself as a dev dependency.
 
 
-## 1.1.1 [2011-01-04] Michael Granger <ged@FaerieMUD.org>
+## v1.1.1 [2011-01-04] Michael Granger <ged@FaerieMUD.org>
 
 Simplified the hg:checkin task.
 
 
-## 1.1.0 [2010-12-14] Michael Granger <ged@FaerieMUD.org>
+## v1.1.0 [2010-12-14] Michael Granger <ged@FaerieMUD.org>
 
 Initial release after forking from hoe-hg.
 

data/README.md

@@ -46,6 +46,21 @@ uncommitted files, it also verifies that you want to release with
 uncommitted changes, and ensures you've bumped the version number by 
 checking for an existing tag with the same version.
 
+If you also wish to check the History file to ensure that you have an 
+entry for each release tag, add this to your hoespec:
+
+    self.check_history_on_release = true
+
+You can also invoke or add the ':check_history' task as a dependency
+yourself if you wish to check it at other times.
+
+It expects lines like:
+
+    == v1.3.0 <other stuff>
+
+to be in your History file. Markdown, RDoc, and Textile headers are
+all supported.
+
 To sign tagged revisions using 'hg sign', do this in your hoespec:
 
 	self.hg_sign_tags = true

data/Rakefile

@@ -21,6 +21,7 @@ hoespec = Hoe.spec "hoe-mercurial" do
 
 	self.spec_extras[:licenses] = ["BSD"]
 	self.hg_sign_tags = true
+	self.check_history_on_release = true
 
 	self.dependency 'hoe', "~> #{Hoe::VERSION[ /\d+\.\d+/ ]}"
 end
@@ -55,6 +56,7 @@ file 'ChangeLog' => '.hg/branch' do |task|
 end
 
 # Rebuild the ChangeLog immediately before release
-task :prerelease => 'ChangeLog'
+task :prerelease => [ :check_history, 'ChangeLog' ]
+
 
 

data/lib/hoe/mercurial.rb

@@ -438,26 +438,50 @@ class Hoe
 		include Hoe::RakeHelpers,
 		        Hoe::MercurialHelpers
 
-		VERSION = '1.2.2'
+		VERSION = '1.3.0'
 
 		# The name of the file to edit for the commit message
 		COMMIT_MSG_FILE = 'commit-msg.txt'
 
 		attr_accessor :hg_release_tag_prefix
 		attr_accessor :hg_sign_tags
+		attr_accessor :check_history_on_release
 
 
 		### Set up defaults
 		def initialize_mercurial
 			# Follow semantic versioning tagging specification (http://semver.org/)
-			self.hg_release_tag_prefix = "v"
-			self.hg_sign_tags          = false
+			self.hg_release_tag_prefix    = "v"
+			self.hg_sign_tags             = false
+			self.check_history_on_release = false
 
-			self.extra_dev_deps << ['hoe-mercurial', "~> #{VERSION}"] unless
+			self.dependency( 'hoe-mercurial', "~> #{VERSION}", :developer ) unless
 				self.name == 'hoe-mercurial'
 		end
 
 
+		### Read the list of tags and return any that don't have a corresponding section
+		### in the history file.
+		def get_unhistoried_version_tags( include_pkg_version=true )
+			prefix = self.hg_release_tag_prefix
+			tag_pattern = /#{prefix}\d+(\.\d+)+/
+			release_tags = get_tags().grep( /^#{tag_pattern}$/ )
+
+			release_tags << "#{prefix}#{version}" if include_pkg_version
+
+			IO.readlines( self.history_file ).each do |line|
+				if line =~ /^(?:h\d\.|#+|=+)\s+(#{tag_pattern})\s+/
+					trace "  found an entry for tag %p: %p" % [ $1, line ]
+					release_tags.delete( $1 )
+				else
+					trace "  no tag on line %p" % [ line ]
+				end
+			end
+
+			return release_tags
+		end
+
+
 		### Hoe hook -- Define Rake tasks when the plugin is loaded.
 		def define_mercurial_tasks
 			return unless File.exist?( ".hg" ) &&
@@ -490,6 +514,9 @@ class Hoe
 						fail
 					end
 
+					# Ensure that the History file contains an entry for every release
+					Rake::Task[ 'check_history' ].invoke if self.check_history_on_release
+
 					# Sign the current rev
 					if self.hg_sign_tags
 						log "Signing rev #{rev}"
@@ -620,6 +647,17 @@ class Hoe
 			# Hook the release task and prep the repo first
 			task :prerelease => 'hg:prep_release'
 
+			desc "Check the history file to ensure it contains an entry for each release tag"
+			task :check_history do
+				log "Checking history..."
+				missing_tags = get_unhistoried_version_tags()
+
+				unless missing_tags.empty?
+					abort "%s needs updating; missing entries for tags: %p" %
+				 		[ self.history_file, missing_tags ]
+				end
+			end
+
 		rescue ::Exception => err
 			$stderr.puts "%s while defining Mercurial tasks: %s" % [ err.class.name, err.message ]
 			raise

metadata

@@ -5,17 +5,37 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 2
-  version: 1.2.2
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Michael Granger
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDLDCCAhSgAwIBAgIBADANBgkqhkiG9w0BAQUFADA8MQwwCgYDVQQDDANnZWQx
+  FzAVBgoJkiaJk/IsZAEZFgdfYWVyaWVfMRMwEQYKCZImiZPyLGQBGRYDb3JnMB4X
+  DTEwMDkxNjE0NDg1MVoXDTExMDkxNjE0NDg1MVowPDEMMAoGA1UEAwwDZ2VkMRcw
+  FQYKCZImiZPyLGQBGRYHX2FlcmllXzETMBEGCgmSJomT8ixkARkWA29yZzCCASIw
+  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALy//BFxC1f/cPSnwtJBWoFiFrir
+  h7RicI+joq/ocVXQqI4TDWPyF/8tqkvt+rD99X9qs2YeR8CU/YiIpLWrQOYST70J
+  vDn7Uvhb2muFVqq6+vobeTkILBEO6pionWDG8jSbo3qKm1RjKJDwg9p4wNKhPuu8
+  KGue/BFb67KflqyApPmPeb3Vdd9clspzqeFqp7cUBMEpFS6LWxy4Gk+qvFFJBJLB
+  BUHE/LZVJMVzfpC5Uq+QmY7B+FH/QqNndn3tOHgsPadLTNimuB1sCuL1a4z3Pepd
+  TeLBEFmEao5Dk3K/Q8o8vlbIB/jBDTUx6Djbgxw77909x6gI9doU4LD5XMcCAwEA
+  AaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFJeoGkOr9l4B
+  +saMkW/ZXT4UeSvVMA0GCSqGSIb3DQEBBQUAA4IBAQBG2KObvYI2eHyyBUJSJ3jN
+  vEnU3d60znAXbrSd2qb3r1lY1EPDD3bcy0MggCfGdg3Xu54z21oqyIdk8uGtWBPL
+  HIa9EgfFGSUEgvcIvaYqiN4jTUtidfEFw+Ltjs8AP9gWgSIYS6Gr38V0WGFFNzIH
+  aOD2wmu9oo/RffW4hS/8GuvfMzcw7CQ355wFR4KB/nyze+EsZ1Y5DerCAagMVuDQ
+  U0BLmWDFzPGGWlPeQCrYHCr+AcJz+NRnaHCKLZdSKj/RHuTOt+gblRex8FAh8NeA
+  cmlhXe46pZNJgWKbxZah85jIjx95hR8vOI+NAM5iH9kOqK13DrxacTKPhqj5PjwF
+  -----END CERTIFICATE-----
 
-date: 2011-08-22 00:00:00 Z
+date: 2011-09-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -33,9 +53,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: hoe-highline
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 0
+        - 0
+        - 1
+        version: 0.0.1
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,7 +82,7 @@ dependencies:
         - 12
         version: "2.12"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: |-
   This is a fork of the [hoe-hg](https://bitbucket.org/mml/hoe-hg) 
   plugin. I forked it because I use quite a few additional Mercurial