hoe-deveiate 0.0.8 → 0.1.0

data/ChangeLog

@@ -0,0 +1,146 @@
+2012-03-29  Michael Granger  <ged@FaerieMUD.org>
+
+	* .gems:
+	Remove leftover .gems file.
+	[612bd34cef11] [tip]
+
+	* Rakefile, lib/hoe/deveiate.rb:
+	Disable the builtin hoe 'announce' task (for now)
+	[f8fc8f61ee53]
+
+	* .hoerc, History.rdoc, Rakefile, lib/hoe/deveiate.rb:
+	Finished up retooling of the 'announce' email task.
+	[8df2a8d41552]
+
+2012-03-28  Michael Granger  <ged@FaerieMUD.org>
+
+	* .gems, .hoerc, .rvm.gems, .rvmrc, README.rdoc, Rakefile,
+	lib/hoe/deveiate.rb:
+	Fix the :announce task/convert to Mail
+	[8088fc2c4575]
+
+2012-01-24  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.0.8 for changeset 88f4a8c85cd8
+	[d5d871aff5e3]
+
+	* .hgsigs:
+	Added signature for changeset 420e3ec19614
+	[88f4a8c85cd8] [v0.0.8]
+
+	* History.md, History.rdoc, Manifest.txt, README.md, README.rdoc,
+	Rakefile:
+	Markdown -> RDoc
+	[420e3ec19614]
+
+2012-01-23  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/hoe/deveiate.rb:
+	Remove YARDism
+	[98f8f38e70cf]
+
+	* Rakefile, lib/hoe/deveiate.rb:
+	Bump the version to 0.0.8, add dependencies.
+	[c697de3c49ce]
+
+2011-09-28  Michael Granger  <ged@FaerieMUD.org>
+
+	* Manifest.txt:
+	Update the manifest.
+	[99788534c637]
+
+	* Rakefile, lib/hoe/deveiate.rb:
+	Check history and the manifest before releases.
+	[a39843bbd81c]
+
+2011-06-03  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.0.7 for changeset e82501828cb2
+	[8943a6295cc8]
+
+	* .hgsigs:
+	Added signature for changeset 989a77b09844
+	[e82501828cb2] [v0.0.7]
+
+	* lib/hoe/deveiate.rb:
+	Bump patch version.
+	[989a77b09844]
+
+	* lib/hoe/deveiate.rb:
+	Removed explicit requires of 'highline' and 'mercurial' to avoid
+	constant redefinition warnings.
+	[c05d40203e0a]
+
+2011-05-16  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.0.6 for changeset 50185b4698a1
+	[58a82b8ebf90]
+
+	* .hgsigs:
+	Added signature for changeset 42f399487f3c
+	[50185b4698a1] [v0.0.6]
+
+	* README.md:
+	Fixed the README.
+	[42f399487f3c]
+
+	* Rakefile, lib/hoe/deveiate.rb:
+	Cleanup, version bump before first public release.
+	[ce18441aa813]
+
+2011-04-07  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/hoe/deveiate.rb:
+	Undo the double-init safeguards, which were causing more harm than
+	good.
+	[4b4713c1f9e4]
+
+	* lib/hoe/deveiate.rb:
+	Bumped patch version, ensure the @email_to Array is always declared.
+	[b61ae31f692b]
+
+	* lib/hoe/deveiate.rb:
+	Avoid double-initializing; register the highline and mercurial
+	plugins with Hoe.
+	[28a27f19668d]
+
+	* lib/hoe/deveiate.rb:
+	Bump the patch version.
+	[dc6c7b755fe5]
+
+	* lib/hoe/deveiate.rb:
+	Force loading of hoe-mercurial and hoe-highline, avoid doubling the
+	:pre task if it's already defined.
+	[d0fdfe132adf]
+
+2011-04-06  Michael Granger  <ged@FaerieMUD.org>
+
+	* lib/hoe/deveiate.rb:
+	Bump the version to 0.0.2.
+	[16c817b7efcf]
+
+	* Rakefile, lib/hoe/deveiate.rb:
+	Don't upload to rubygems.org, fix the :pre task, run specs before
+	checkin.
+	[79e16e7998bf]
+
+2011-03-22  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgignore, Rakefile:
+	Adding missing tmail dependency.
+	[a1d3c0eb16c2]
+
+2011-03-14  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgignore, ChangeLog, Rakefile, lib/hoe/deveiate.rb:
+	Ignoring generated stuff, removing ChangeLog, fixed the :send_email
+	task.
+	[12d1961b4934]
+
+	* ChangeLog, History.md, Manifest.txt, README.md, Rakefile,
+	lib/hoe/deveiate.rb:
+	Initial version
+	[eb077ae7ff6c]

data/History.rdoc

@@ -1,3 +1,9 @@
+== v0.1.0 [2012-03-29] Michael Granger <ged@FaerieMUD.org>
+
+- Updated for Hoe 3.
+- Replaced tmail with Mail, now that it doesn't require activesupport.
+
+
 == v0.0.8 [2012-01-24] Michael Granger <ged@FaerieMUD.org>
 
 - Add dependencies for rspec and rdoc for one-hit gemset

data/README.rdoc

@@ -1,7 +1,7 @@
 = hoe-deveiate
 
-* http://deveiate.org/hoe-deveiate
-
+home  :: http://deveiate.org/hoe-deveiate
+code  :: http://repo.deveiate.org/hoe-deveiate
 
 == Description
 
@@ -17,8 +17,8 @@ them.
 
 == Contributing
 
-You can check out the current development source from 
-[my Mercurial repo](http://repo.deveiate.org/hoe-deveiate).
+You can check out the current development source from
+{my Mercurial repo}[http://repo.deveiate.org/hoe-deveiate].
 
 After checking out the source, run:
 
@@ -29,7 +29,7 @@ to install any missing dependencies.
 
 == License
 
-Copyright (c) 2011, Michael Granger
+Copyright (c) 2011-2012, Michael Granger
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/Rakefile

@@ -7,6 +7,7 @@ Hoe.add_include_dirs 'lib'
 Hoe.plugin :mercurial
 Hoe.plugin :signing
 
+# Hoe.plugins.delete :publish
 Hoe.plugins.delete :rubyforge
 
 hoespec = Hoe.spec 'hoe-deveiate' do
@@ -17,16 +18,20 @@ hoespec = Hoe.spec 'hoe-deveiate' do
 	self.developer 'Michael Granger', 'ged@FaerieMUD.org'
 
 	self.dependency 'hoe-highline', '~> 0.0'
-	self.dependency 'hoe-mercurial', '~> 1.3'
-	self.dependency 'tmail', '~> 1.2'
-	self.dependency 'rspec', '~> 2.8'
-	self.dependency 'rdoc', '~> 3.11'
+	self.dependency 'hoe-mercurial', '~> 1.4'
+	self.dependency 'mail', '~> 2.4'
+	self.dependency 'rspec', '~> 2.9'
+	self.dependency 'rdoc', '~> 3.12'
 
 	self.spec_extras[:licenses] = ["BSD"]
 	self.require_ruby_version( '>=1.8.7' )
-	self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
+	# self.rdoc_locations << "deveiate:/usr/local/www/public/code/#{remote_rdoc_dir}"
+end
 
-	self.email_to.replace([ 'ged@FaerieMUD.org' ]) if self.respond_to?( :email_to )
+task :test_email, [:address] do |task, args|
+	args.with_defaults( :address => 'rubymage@gmail.com' )
+	hoespec.email_to.replace([ args.address ])
+	Rake::Task[:send_email].execute
 end
 
 ENV['VERSION'] ||= hoespec.spec.version.to_s

data/lib/hoe/deveiate.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'hoe'
-require 'tmail'
+require 'mail'
 require 'net/smtp'
 require 'openssl'
 
@@ -13,10 +13,10 @@ Hoe.plugin( :highline, :mercurial )
 module Hoe::Deveiate
 
 	# Library version constant
-	VERSION = '0.0.8'
+	VERSION = '0.1.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: 98f8f38e70cf $
+	REVISION = %q$Revision: 0f4c2dd5f035 $
 
 
 	### Set up defaults
@@ -40,6 +40,36 @@ module Hoe::Deveiate
 	end
 
 
+	def generate_mail
+		$stderr.puts "Generating an announcement email."
+		abort "no email config in your ~/.hoerc" unless defined?( @email_config )
+
+	    changes = self.changes
+	    subject = "#{self.name} #{self.version} Released"
+	    title   = "#{self.name} version #{self.version} has been released!"
+	    body    = "#{self.description}\n\nChanges:\n\n#{self.changes}"
+	    urls    = self.urls.map do |url|
+			case url
+			when Array
+				"* <#{url[1].strip}> (#{url[0]})"
+			when String
+				"* <#{url.strip}>"
+			else
+				"* %p" % [ url ]
+			end
+		end
+
+		$stderr.puts "  returning a new Mail::Message."
+		mail         = Mail.new
+		mail.from    = @email_config['from'] || "%s <%s>" % self.developer.first
+		mail.to      = @email_to.join(", ")
+		mail.subject = "[ANN] #{subject}"
+		mail.body    = [ title, urls.join($/), body ].join( $/ * 2 )
+
+		return mail
+	end
+
+
 	# Where to send announcement emails
 	attr_reader :email_to
 
@@ -51,9 +81,10 @@ module Hoe::Deveiate
 	def define_deveiate_tasks
 
 		task 'hg:precheckin' => [:spec] if File.directory?( 'spec' )
-		task 'hg:prep_release' => :check_manifest
+		task 'hg:prep_release' => [ :check_manifest, :check_history ]
 
 		# Rebuild the ChangeLog immediately before release
+		task :check_manifest => 'ChangeLog'
 		task :prerelease => 'ChangeLog'
 
 		### Task: prerelease
@@ -82,25 +113,25 @@ module Hoe::Deveiate
 			end
 		end
 
-		# Announcement tasks, mostly stolen from hoe-seattlerb
+		# Avoid broken Hoe 3.0 task
+		Rake::Task[:announce].clear
 
+		desc "Announce a new release"
 		task :announce => :send_email
 
 		desc "Send a release announcement to: %p" % [ @email_to ]
 		task :send_email do
-			abort "no email config in your ~/.hoerc" unless defined?( @email_config )
+			mail = generate_mail()
+
+			say "<%= color 'About to send this email:', :subheader %>"
+			say( mail.to_s )
 
-			@email_from = @email_config['from'] ||= "%s <%s>" % self.developer.first
 			smtp_host = @email_config['host'] || ask( "Email host: " )
 			smtp_port = @email_config['port'] || 'smtp'
 			smtp_port = Socket.getservbyname( smtp_port.to_s )
 			smtp_user = @email_config['user']
 
-			message = generate_email( :full )
-			say "<%= color 'About to send this email:', :subheader %>"
-			say( message )
-
-			if agree( "\n<%= color 'Okay to send it?', :warning %> " )
+			if agree( "\n<%= color 'Okay to send it?', :warning %> ")
 				require 'socket'
 				require 'net/smtp'
 				require 'etc'
@@ -124,8 +155,11 @@ module Hoe::Deveiate
 
 				helo = Socket.gethostname
 				smtp.start( helo, username, password, :plain ) do |smtp|
-					smtp.send_message( message, self.email_from, *self.email_to )
+					mail.delivery_method( :smtp_connection, :connection => smtp )
+					mail.deliver
 				end
+
+
 			else
 				abort "Okay, aborting."
 			end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hoe-deveiate
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,50 +9,38 @@ authors:
 autorequire: 
 bindir: bin
 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: 2012-01-25 00:00:00.000000000 Z
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURMRENDQWhTZ0F3SUJB
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREE4TVF3d0NnWURWUVFEREFOblpX
+  UXgKRnpBVkJnb0praWFKay9Jc1pBRVpGZ2RmWVdWeWFXVmZNUk13RVFZS0Na
+  SW1pWlB5TEdRQkdSWURiM0puTUI0WApEVEV3TURreE5qRTBORGcxTVZvWERU
+  RXhNRGt4TmpFME5EZzFNVm93UERFTU1Bb0dBMVVFQXd3RFoyVmtNUmN3CkZR
+  WUtDWkltaVpQeUxHUUJHUllIWDJGbGNtbGxYekVUTUJFR0NnbVNKb21UOGl4
+  a0FSa1dBMjl5WnpDQ0FTSXcKRFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURD
+  Q0FRb0NnZ0VCQUx5Ly9CRnhDMWYvY1BTbnd0SkJXb0ZpRnJpcgpoN1JpY0kr
+  am9xL29jVlhRcUk0VERXUHlGLzh0cWt2dCtyRDk5WDlxczJZZVI4Q1UvWWlJ
+  cExXclFPWVNUNzBKCnZEbjdVdmhiMm11RlZxcTYrdm9iZVRrSUxCRU82cGlv
+  bldERzhqU2JvM3FLbTFSaktKRHdnOXA0d05LaFB1dTgKS0d1ZS9CRmI2N0tm
+  bHF5QXBQbVBlYjNWZGQ5Y2xzcHpxZUZxcDdjVUJNRXBGUzZMV3h5NEdrK3F2
+  RkZKQkpMQgpCVUhFL0xaVkpNVnpmcEM1VXErUW1ZN0IrRkgvUXFObmRuM3RP
+  SGdzUGFkTFROaW11QjFzQ3VMMWE0ejNQZXBkClRlTEJFRm1FYW81RGszSy9R
+  OG84dmxiSUIvakJEVFV4NkRqYmd4dzc3OTA5eDZnSTlkb1U0TEQ1WE1jQ0F3
+  RUEKQWFNNU1EY3dDUVlEVlIwVEJBSXdBREFMQmdOVkhROEVCQU1DQkxBd0hR
+  WURWUjBPQkJZRUZKZW9Ha09yOWw0Qgorc2FNa1cvWlhUNFVlU3ZWTUEwR0NT
+  cUdTSWIzRFFFQkJRVUFBNElCQVFCRzJLT2J2WUkyZUh5eUJVSlNKM2pOCnZF
+  blUzZDYwem5BWGJyU2QycWIzcjFsWTFFUEREM2JjeTBNZ2dDZkdkZzNYdTU0
+  ejIxb3F5SWRrOHVHdFdCUEwKSElhOUVnZkZHU1VFZ3ZjSXZhWXFpTjRqVFV0
+  aWRmRUZ3K0x0anM4QVA5Z1dnU0lZUzZHcjM4VjBXR0ZGTnpJSAphT0Qyd211
+  OW9vL1JmZlc0aFMvOEd1dmZNemN3N0NRMzU1d0ZSNEtCL255emUrRXNaMVk1
+  RGVyQ0FhZ01WdURRClUwQkxtV0RGelBHR1dsUGVRQ3JZSENyK0FjSnorTlJu
+  YUhDS0xaZFNLai9SSHVUT3QrZ2JsUmV4OEZBaDhOZUEKY21saFhlNDZwWk5K
+  Z1dLYnhaYWg4NWpJang5NWhSOHZPSStOQU01aUg5a09xSzEzRHJ4YWNUS1Bo
+  cWo1UGp3RgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-highline
-  requirement: &70358323258740 !ruby/object:Gem::Requirement
+  requirement: &70291041188700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,95 +48,62 @@ dependencies:
         version: '0.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70358323258740
+  version_requirements: *70291041188700
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
-  requirement: &70358323258260 !ruby/object:Gem::Requirement
+  requirement: &70291041188080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70358323258260
+  version_requirements: *70291041188080
 - !ruby/object:Gem::Dependency
-  name: tmail
-  requirement: &70358323257760 !ruby/object:Gem::Requirement
+  name: mail
+  requirement: &70291041187300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70358323257760
+  version_requirements: *70291041187300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70358323257260 !ruby/object:Gem::Requirement
+  requirement: &70291041186720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '2.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70358323257260
+  version_requirements: *70291041186720
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70358323256700 !ruby/object:Gem::Requirement
+  requirement: &70291041186040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.12'
   type: :runtime
   prerelease: false
-  version_requirements: *70358323256700
-- !ruby/object:Gem::Dependency
-  name: hoe-mercurial
-  requirement: &70358323256220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :development
-  prerelease: false
-  version_requirements: *70358323256220
-- !ruby/object:Gem::Dependency
-  name: hoe-highline
-  requirement: &70358323255660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :development
-  prerelease: false
-  version_requirements: *70358323255660
+  version_requirements: *70291041186040
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70358323255140 !ruby/object:Gem::Requirement
+  requirement: &70291041185420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70358323255140
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70358323560960 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
-  type: :development
-  prerelease: false
-  version_requirements: *70358323560960
+  version_requirements: *70291041185420
 description: ! 'A collection of Rake tasks and utility functions I use to maintain
   my Open
 
@@ -160,8 +115,8 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- Manifest.txt
 - History.rdoc
+- Manifest.txt
 - README.rdoc
 files:
 - ChangeLog
@@ -193,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: hoe-deveiate
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: A collection of Rake tasks and utility functions I use to maintain my Open