kennethkalmer-daemon-kit 0.1.7.3 → 0.1.7.4

data/History.txt

@@ -1,3 +1,11 @@
+== 0.1.7.4 (Not released)
+
+* Enhanced deploy.rb template to check for current dk gem verion,
+  unless vendored
+* Fix bug in capistrano recipe for restarting daemons
+* Added log:truncate rake task
+* Error mails now handled by TMail
+
 == 0.1.7.3 2009-05-31
 
 * Removed dependency on daemons gem, now handled in house

data/Manifest.txt

@@ -75,6 +75,7 @@ lib/daemon_kit/tasks.rb
 lib/daemon_kit/tasks/environment.rake
 lib/daemon_kit/tasks/framework.rake
 lib/daemon_kit/tasks/god.rake
+lib/daemon_kit/tasks/log.rake
 lib/daemon_kit/tasks/monit.rake
 rubygems_generators/install_rspec/USAGE
 rubygems_generators/install_rspec/install_rspec_generator.rb
@@ -89,6 +90,7 @@ script/txt2html
 spec/argument_spec.rb
 spec/config_spec.rb
 spec/daemon_kit_spec.rb
+spec/error_handlers_spec.rb
 spec/fixtures/env.yml
 spec/fixtures/noenv.yml
 spec/initializer_spec.rb
@@ -106,3 +108,31 @@ test/test_generator_helper.rb
 test/test_helper.rb
 test/test_jabber_generator.rb
 test/test_nanite_agent_generator.rb
+vendor/tmail-1.2.3/tmail.rb
+vendor/tmail-1.2.3/tmail/address.rb
+vendor/tmail-1.2.3/tmail/attachments.rb
+vendor/tmail-1.2.3/tmail/base64.rb
+vendor/tmail-1.2.3/tmail/compat.rb
+vendor/tmail-1.2.3/tmail/config.rb
+vendor/tmail-1.2.3/tmail/core_extensions.rb
+vendor/tmail-1.2.3/tmail/encode.rb
+vendor/tmail-1.2.3/tmail/header.rb
+vendor/tmail-1.2.3/tmail/index.rb
+vendor/tmail-1.2.3/tmail/interface.rb
+vendor/tmail-1.2.3/tmail/loader.rb
+vendor/tmail-1.2.3/tmail/mail.rb
+vendor/tmail-1.2.3/tmail/mailbox.rb
+vendor/tmail-1.2.3/tmail/main.rb
+vendor/tmail-1.2.3/tmail/mbox.rb
+vendor/tmail-1.2.3/tmail/net.rb
+vendor/tmail-1.2.3/tmail/obsolete.rb
+vendor/tmail-1.2.3/tmail/parser.rb
+vendor/tmail-1.2.3/tmail/port.rb
+vendor/tmail-1.2.3/tmail/quoting.rb
+vendor/tmail-1.2.3/tmail/require_arch.rb
+vendor/tmail-1.2.3/tmail/scanner.rb
+vendor/tmail-1.2.3/tmail/scanner_r.rb
+vendor/tmail-1.2.3/tmail/stringio.rb
+vendor/tmail-1.2.3/tmail/utils.rb
+vendor/tmail-1.2.3/tmail/version.rb
+vendor/tmail.rb

data/app_generators/daemon_kit/templates/bin/daemon.erb

@@ -4,4 +4,4 @@
 
 require File.dirname(__FILE__) + '/../config/environment'
 
-DaemonKit::Application.run( DAEMON_ROOT + '/libexec/<%= daemon_name %>-daemon.rb' )
+DaemonKit::Application.exec( DAEMON_ROOT + '/libexec/<%= daemon_name %>-daemon.rb' )

data/daemon_generators/amqp/templates/config/amqp.yml

@@ -4,8 +4,8 @@
 # omitted will let the gem use it's own defaults.
 
 # The configuration specifies the following keys:
-# * username - Username for the broker
-# * password - Password for the broker
+# * user - Username for the broker
+# * pass - Password for the broker
 # * host     - Hostname where the broker is running
 # * vhost    - Vhost to connect to
 # * port     - Port where the broker is running
@@ -13,8 +13,8 @@
 # * timeout  - Timeout
 
 defaults: &defaults
-  username: guest
-  password: guest
+  user: guest
+  pass: guest
   host: localhost
   vhost: /
 
@@ -25,4 +25,4 @@ test:
   <<: *defaults
 
 production:
-  <<: *defaults
+  <<: *defaults

data/daemon_generators/deploy_capistrano/templates/config/deploy.rb

@@ -34,7 +34,9 @@ set :config_files, %w{}
 set :shared_children, %w{log tmp}
 
 # Record our dependencies
-depend :remote, :gem, "daemon-kit", ">=0.0.0"
+unless File.directory?( "#{DaemonKit.root}/vendor/daemon_kit" )
+  depend :remote, :gem, "daemon-kit", ">=#{DaemonKit::VERSION}"
+end
 
 # Hook into capistrano's events
 before "deploy:update_code", "deploy:check"

data/lib/daemon_kit/amqp.rb

@@ -30,7 +30,8 @@ module DaemonKit
       DaemonKit.trap('INT') { ::AMQP.stop { ::EM.stop } }
       DaemonKit.trap('TERM') { ::AMQP.stop { ::EM.stop } }
 
-      # Start our event loop
+      # Start our event loop and AMQP client
+      DaemonKit.logger.debug("AMQP.start(#{@config.inspect})")
       ::AMQP.start(@config, &block)
     end
   end

data/lib/daemon_kit/application.rb

@@ -50,6 +50,7 @@ module DaemonKit
         @pid_file = PidFile.new( DaemonKit.configuration.pid_file )
 
         unless @pid_file.running?
+          @pid_file.cleanup
           puts "Nothing to stop"
           exit
         end

data/lib/daemon_kit/deployment/capistrano.rb

@@ -305,18 +305,15 @@ namespace :deploy do
   end
 
   desc <<-DESC
-    Restarts your application. This works by calling the bin/:application \
-    script under the current path with 'restart'
+    Restarts your application. This works by calling 'stop' task, \
+    followed by the 'start' task.
 
-    By default, this will be invoked via sudo as the `app' user. If \
-    you wish to run it as a different user, set the :runner variable to \
-    that user. If you are in an environment where you can't use sudo, set \
-    the :use_sudo variable to false:
-
-      set :use_sudo, false
+    See the descriptions for the 'start' and 'stop' tasks for any \
+    additional info.
   DESC
   task :restart, :except => { :no_release => true } do
-    try_runner "/usr/bin/env DAEMON_ENV=#{fetch(:daemon_env)} #{current_path}/bin/#{application} restart"
+    stop
+    start
   end
 
   namespace :rollback do

data/lib/daemon_kit/error_handlers/mail.rb

@@ -1,33 +1,66 @@
+require DaemonKit.framework_root + '/vendor/tmail'
 require 'net/smtp'
 
 module DaemonKit
   module ErrorHandlers
-    # Send an email notification of the exception via SMTP
+    # Send an email notification of the exception via SMTP.
     class Mail < Base
-      
+
       # SMTP hostname
       @host = 'localhost'
-      attr_accessor :host
-      
+
+      # SMTP port
+      @port = 25
+
       # Recipients of the notification
       @recipients = []
-      attr_accessor :recipients
 
       # Subject prefix
       @prefix = '[DAEMON-KIT]'
-      attr_accessor :prefix
 
       # Sender address
       @sender = 'daemon-kit'
-      attr_accessor :sender
+
+      # SMTP username
+      @username = nil
+
+      # SMTP password
+      @password = nil
+
+      # Authentication mechanism (:plain, :login, or :cram_md5)
+      @authentication = nil
+
+      # Use TLS?
+      @tls = false
+
+      # Domain used when talking to SMTP server
+      @domain = 'localhost.localdomain'
+
+      class << self
+        attr_accessor :host, :port, :recipients, :prefix, :sender, :username,
+        :password, :authentication, :tls, :domain
+      end
+
+      [ :host, :port, :recipients, :prefix, :sender, :username, :password,
+        :authentication, :tls, :domain ].each do |cm|
+        class_eval(<<-EOM, __FILE__, __LINE__)
+          def #{cm}=( val )
+            self.class.#{cm} = val
+          end
+        EOM
+      end
 
       def handle_exception( exception )
-        email = <<EOF
-To: #{self.recipients.map { |r| '<' + r + '>' }.join(', ')}
-From: <#{self.sender}>
-Subject: #{self.prefix} #{exception.message}
-Date: #{Time.now}
 
+        mail = TMail::Mail.new
+        mail.to = self.class.recipients
+        mail.from = self.class.sender
+        mail.subject = "#{self.class.prefix} #{exception.message}"
+        mail.set_content_type 'text', 'plain'
+        mail.mime_version = '1.0'
+        mail.date = Time.now
+
+        mail.body = <<EOF
 DaemonKit caught an exception inside #{DaemonKit.configuration.daemon_name}.
 
 Message: #{exception.message}
@@ -37,10 +70,14 @@ Backtrace:
 Environment: #{ENV.inspect}
 EOF
         begin
-          Net::SMTP.start( self.host ) do |smtp|
-            smtp.send_message( email, self.sender, self.recipients )
+          smtp = Net::SMTP.new( self.class.host, self.class.port )
+          smtp.enable_starttls_auto if self.class.tls && smtp.respond_to?(:enable_starttls_auto)
+          smtp.start( self.class.domain, self.class.username, self.class.password,
+                      self.class.authentication ) do |smtp|
+            smtp.sendmail( mail.to_s, mail.from, mail.to )
           end
-        rescue
+        rescue => e
+          DaemonKit.logger.error "Failed to send exception mail: #{e.message}" if DaemonKit.logger
         end
       end
     end

data/lib/daemon_kit/initializer.rb

@@ -18,14 +18,6 @@ module DaemonKit
 
   class << self
 
-    def logger
-      @logger
-    end
-
-    def logger=( logger )
-      @logger = logger
-    end
-
     def configuration
       @configuration
     end
@@ -46,17 +38,6 @@ module DaemonKit
       self.configuration.trap( *args, &block )
     end
 
-    def framework_root
-      @framework_root ||= File.join( File.dirname(__FILE__), '..', '..' ).to_absolute_path
-    end
-
-    def root
-      DAEMON_ROOT
-    end
-
-    def env
-      DAEMON_ENV
-    end
   end
 
 
@@ -81,7 +62,7 @@ module DaemonKit
     end
 
     def self.shutdown
-      DaemonKit.logger.warn "Shutting down"
+      DaemonKit.logger.warn "Shutting down #{DaemonKit.configuration.daemon_name}"
       exit
     end
 
@@ -107,6 +88,8 @@ module DaemonKit
       load_postdaemonize_configs
 
       set_process_name
+
+      DaemonKit.logger.info( "DaemonKit (#{DaemonKit::VERSION}) booted, now running #{DaemonKit.configuration.daemon_name}" )
     end
 
     def set_load_path
@@ -158,6 +141,8 @@ module DaemonKit
 
       DaemonKit.logger = logger
 
+      DaemonKit.logger.info "DaemonKit (#{DaemonKit::VERSION}) booting in #{DAEMON_ENV} mode"
+
       configuration.trap("USR1") {
         DaemonKit.logger.level = DaemonKit.logger.debug? ? Logger::INFO : Logger::DEBUG
         DaemonKit.logger.info "Log level changed to #{DaemonKit.logger.debug? ? 'DEBUG' : 'INFO' }"
@@ -166,8 +151,6 @@ module DaemonKit
         DaemonKit.logger.level = Logger::DEBUG
         DaemonKit.logger.info "Log level changed to DEBUG"
       }
-
-      DaemonKit.logger.info "DaemonKit up and running in #{DAEMON_ENV} mode"
     end
 
     def initialize_signal_traps
@@ -281,6 +264,8 @@ module DaemonKit
     end
 
     def parse_arguments!
+      return unless own_args?
+
       configs = Arguments.configuration( ARGV ).first
       @unused_arguments = {}
 
@@ -352,6 +337,13 @@ module DaemonKit
         STDERR.puts msg
       end
     end
+
+    # If we are executed with any of these commands, don't allow
+    # arguments to be parsed cause they will interfere with the
+    # script encapsulating DaemonKit, like capistrano
+    def own_args?
+      ![ 'cap' ].include?( File.basename( $0 ) )
+    end
   end
 
 

data/lib/daemon_kit/tasks/log.rake

@@ -0,0 +1,8 @@
+namespace :log do
+  desc "Truncate all log files found in DAEMON_ROOT/log/"
+  task :truncate => 'environment' do
+    Dir[ "#{DaemonKit.root}/log/*.log" ].each do |l|
+      File.open( l, 'w+' ) { |f| f.write('') }
+    end
+  end
+end

data/lib/daemon_kit.rb

@@ -7,7 +7,7 @@ $:.unshift( File.dirname(__FILE__).to_absolute_path ) unless
   $:.include?( File.dirname(__FILE__).to_absolute_path )
 
 module DaemonKit
-  VERSION = '0.1.7.3'
+  VERSION = '0.1.7.4'
 
   autoload :Initializer, 'daemon_kit/initializer'
   autoload :Application, 'daemon_kit/application'
@@ -20,4 +20,26 @@ module DaemonKit
   autoload :Jabber,      'daemon_kit/jabber'
   autoload :AMQP,        'daemon_kit/amqp'
   autoload :Nanite,      'daemon_kit/nanite'
+
+  class << self
+    def logger
+      @logger
+    end
+
+    def logger=( logger )
+      @logger = logger
+    end
+
+    def root
+      DAEMON_ROOT
+    end
+
+    def env
+      DAEMON_ENV
+    end
+
+    def framework_root
+      @framework_root ||= File.join( File.dirname(__FILE__), '..' ).to_absolute_path
+    end
+  end
 end

data/spec/error_handlers_spec.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe DaemonKit::Safety do
+end
+
+describe DaemonKit::ErrorHandlers::Mail do
+  it "should send an email report" do
+    conf = Object.new
+    conf.stubs(:daemon_name).returns('test')
+    DaemonKit.stubs(:configuration).returns(conf)
+
+    fake_smtp = Object.new
+    fake_smtp.expects(:start).with('localhost.localdomain', nil, nil, nil)
+    Net::SMTP.expects(:new).with('localhost', 25).returns(fake_smtp)
+
+    begin
+      raise RuntimeError, "specs don't fail :)"
+    rescue => e
+      handler = DaemonKit::ErrorHandlers::Mail.instance
+      handler.handle_exception( e )
+    end
+  end
+end

data/vendor/tmail-1.2.3/tmail/address.rb

@@ -0,0 +1,426 @@
+=begin rdoc
+
+= Address handling class
+
+=end
+#--
+# Copyright (c) 1998-2003 Minero Aoki <aamine@loveruby.net>
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
+# with permission of Minero Aoki.
+#++
+
+require 'tmail/encode'
+require 'tmail/parser'
+
+
+module TMail
+
+  # = Class Address
+  # 
+  # Provides a complete handling library for email addresses. Can parse a string of an
+  # address directly or take in preformatted addresses themselves.  Allows you to add
+  # and remove phrases from the front of the address and provides a compare function for
+  # email addresses.
+  # 
+  # == Parsing and Handling a Valid Address:
+  # 
+  # Just pass the email address in as a string to Address.parse:
+  # 
+  #  email = TMail::Address.parse('Mikel Lindsaar <mikel@lindsaar.net>)
+  #  #=> #<TMail::Address mikel@lindsaar.net>
+  #  email.address
+  #  #=> "mikel@lindsaar.net"
+  #  email.local
+  #  #=> "mikel"
+  #  email.domain
+  #  #=> "lindsaar.net"
+  #  email.name             # Aliased as phrase as well
+  #  #=> "Mikel Lindsaar"
+  # 
+  # == Detecting an Invalid Address
+  # 
+  # If you want to check the syntactical validity of an email address, just pass it to
+  # Address.parse and catch any SyntaxError:
+  # 
+  #  begin
+  #    TMail::Mail.parse("mikel   2@@@@@ me .com")
+  #  rescue TMail::SyntaxError
+  #    puts("Invalid Email Address Detected")
+  #  else
+  #    puts("Address is valid")
+  #  end
+  #  #=> "Invalid Email Address Detected"
+  class Address
+
+    include TextUtils #:nodoc:
+    
+    # Sometimes you need to parse an address, TMail can do it for you and provide you with
+    # a fairly robust method of detecting a valid address.
+    # 
+    # Takes in a string, returns a TMail::Address object.
+    # 
+    # Raises a TMail::SyntaxError on invalid email format
+    def Address.parse( str )
+      Parser.parse :ADDRESS, special_quote_address(str)
+    end
+    
+    def Address.special_quote_address(str) #:nodoc:
+      # Takes a string which is an address and adds quotation marks to special
+      # edge case methods that the RACC parser can not handle.
+      #
+      # Right now just handles two edge cases:
+      #
+      # Full stop as the last character of the display name:
+      #   Mikel L. <mikel@me.com>
+      # Returns:
+      #   "Mikel L." <mikel@me.com>
+      #
+      # Unquoted @ symbol in the display name:
+      #   mikel@me.com <mikel@me.com>
+      # Returns:
+      #   "mikel@me.com" <mikel@me.com>
+      #
+      # Any other address not matching these patterns just gets returned as is. 
+      case
+      # This handles the missing "" in an older version of Apple Mail.app
+      # around the display name when the display name contains a '@'
+      # like 'mikel@me.com <mikel@me.com>'
+      # Just quotes it to: '"mikel@me.com" <mikel@me.com>'
+      when str =~ /\A([^"].+@.+[^"])\s(<.*?>)\Z/
+        return "\"#{$1}\" #{$2}"
+      # This handles cases where 'Mikel A. <mikel@me.com>' which is a trailing
+      # full stop before the address section.  Just quotes it to
+      # '"Mikel A. <mikel@me.com>"
+      when str =~ /\A(.*?\.)\s(<.*?>)\Z/
+        return "\"#{$1}\" #{$2}"
+      else
+        str
+      end
+    end
+
+    def address_group? #:nodoc:
+      false
+    end
+
+    # Address.new(local, domain)
+    # 
+    # Accepts:
+    # 
+    # * local - Left of the at symbol
+    # 
+    # * domain - Array of the domain split at the periods.
+    # 
+    # For example:
+    # 
+    #  Address.new("mikel", ["lindsaar", "net"])
+    #  #=> "#<TMail::Address mikel@lindsaar.net>"
+    def initialize( local, domain )
+      if domain
+        domain.each do |s|
+          raise SyntaxError, 'empty word in domain' if s.empty?
+        end
+      end
+      
+      # This is to catch an unquoted "@" symbol in the local part of the
+      # address.  Handles addresses like <"@"@me.com> and makes sure they
+      # stay like <"@"@me.com> (previously were becoming <@@me.com>)
+      if local && (local.join == '@' || local.join =~ /\A[^"].*?@.*?[^"]\Z/)
+        @local = "\"#{local.join}\""
+      else
+        @local = local
+      end
+
+      @domain = domain
+      @name   = nil
+      @routes = []
+    end
+
+    # Provides the name or 'phrase' of the email address.
+    # 
+    # For Example:
+    # 
+    #  email = TMail::Address.parse("Mikel Lindsaar <mikel@lindsaar.net>")
+    #  email.name
+    #  #=> "Mikel Lindsaar"
+    def name
+      @name
+    end
+
+    # Setter method for the name or phrase of the email
+    # 
+    # For Example:
+    # 
+    #  email = TMail::Address.parse("mikel@lindsaar.net")
+    #  email.name
+    #  #=> nil
+    #  email.name = "Mikel Lindsaar"
+    #  email.to_s
+    #  #=> "Mikel Lindsaar <mikel@me.com>"
+    def name=( str )
+      @name = str
+      @name = nil if str and str.empty?
+    end
+
+    #:stopdoc:
+    alias phrase  name
+    alias phrase= name=
+    #:startdoc:
+    
+    # This is still here from RFC 822, and is now obsolete per RFC2822 Section 4.
+    # 
+    # "When interpreting addresses, the route portion SHOULD be ignored."
+    # 
+    # It is still here, so you can access it.
+    # 
+    # Routes return the route portion at the front of the email address, if any.
+    # 
+    # For Example:
+    #  email = TMail::Address.parse( "<@sa,@another:Mikel@me.com>")
+    #  => #<TMail::Address Mikel@me.com>
+    #  email.to_s
+    #  => "<@sa,@another:Mikel@me.com>"
+    #  email.routes
+    #  => ["sa", "another"]
+    def routes
+      @routes
+    end
+    
+    def inspect #:nodoc:
+      "#<#{self.class} #{address()}>"
+    end
+
+    # Returns the local part of the email address
+    # 
+    # For Example:
+    # 
+    #  email = TMail::Address.parse("mikel@lindsaar.net")
+    #  email.local
+    #  #=> "mikel"
+    def local
+      return nil unless @local
+      return '""' if @local.size == 1 and @local[0].empty?
+      # Check to see if it is an array before trying to map it
+      if @local.respond_to?(:map)
+        @local.map {|i| quote_atom(i) }.join('.')
+      else
+        quote_atom(@local)
+      end
+    end
+
+    # Returns the domain part of the email address
+    # 
+    # For Example:
+    # 
+    #  email = TMail::Address.parse("mikel@lindsaar.net")
+    #  email.local
+    #  #=> "lindsaar.net"
+    def domain
+      return nil unless @domain
+      join_domain(@domain)
+    end
+
+    # Returns the full specific address itself
+    # 
+    # For Example:
+    # 
+    #  email = TMail::Address.parse("mikel@lindsaar.net")
+    #  email.address
+    #  #=> "mikel@lindsaar.net"
+    def spec
+      s = self.local
+      d = self.domain
+      if s and d
+        s + '@' + d
+      else
+        s
+      end
+    end
+
+    alias address spec
+
+    # Provides == function to the email.  Only checks the actual address
+    # and ignores the name/phrase component
+    # 
+    # For Example
+    # 
+    #  addr1 = TMail::Address.parse("My Address <mikel@lindsaar.net>")
+    #  #=> "#<TMail::Address mikel@lindsaar.net>"
+    #  addr2 = TMail::Address.parse("Another <mikel@lindsaar.net>")
+    #  #=> "#<TMail::Address mikel@lindsaar.net>"
+    #  addr1 == addr2
+    #  #=> true
+    def ==( other )
+      other.respond_to? :spec and self.spec == other.spec
+    end
+
+    alias eql? ==
+
+    # Provides a unique hash value for this record against the local and domain
+    # parts, ignores the name/phrase value
+    # 
+    #  email = TMail::Address.parse("mikel@lindsaar.net")
+    #  email.hash
+    #  #=> 18767598
+    def hash
+      @local.hash ^ @domain.hash
+    end
+
+    # Duplicates a TMail::Address object returning the duplicate
+    # 
+    #  addr1 = TMail::Address.parse("mikel@lindsaar.net")
+    #  addr2 = addr1.dup
+    #  addr1.id == addr2.id
+    #  #=> false
+    def dup
+      obj = self.class.new(@local.dup, @domain.dup)
+      obj.name = @name.dup if @name
+      obj.routes.replace @routes
+      obj
+    end
+
+    include StrategyInterface #:nodoc:
+
+    def accept( strategy, dummy1 = nil, dummy2 = nil ) #:nodoc:
+      unless @local
+        strategy.meta '<>'   # empty return-path
+        return
+      end
+
+      spec_p = (not @name and @routes.empty?)
+      if @name
+        strategy.phrase @name
+        strategy.space
+      end
+      tmp = spec_p ? '' : '<'
+      unless @routes.empty?
+        tmp << @routes.map {|i| '@' + i }.join(',') << ':'
+      end
+      tmp << self.spec
+      tmp << '>' unless spec_p
+      strategy.meta tmp
+      strategy.lwsp ''
+    end
+
+  end
+
+
+  class AddressGroup
+
+    include Enumerable
+
+    def address_group?
+      true
+    end
+
+    def initialize( name, addrs )
+      @name = name
+      @addresses = addrs
+    end
+
+    attr_reader :name
+    
+    def ==( other )
+      other.respond_to? :to_a and @addresses == other.to_a
+    end
+
+    alias eql? ==
+
+    def hash
+      map {|i| i.hash }.hash
+    end
+
+    def []( idx )
+      @addresses[idx]
+    end
+
+    def size
+      @addresses.size
+    end
+
+    def empty?
+      @addresses.empty?
+    end
+
+    def each( &block )
+      @addresses.each(&block)
+    end
+
+    def to_a
+      @addresses.dup
+    end
+
+    alias to_ary to_a
+
+    def include?( a )
+      @addresses.include? a
+    end
+
+    def flatten
+      set = []
+      @addresses.each do |a|
+        if a.respond_to? :flatten
+          set.concat a.flatten
+        else
+          set.push a
+        end
+      end
+      set
+    end
+
+    def each_address( &block )
+      flatten.each(&block)
+    end
+
+    def add( a )
+      @addresses.push a
+    end
+
+    alias push add
+    
+    def delete( a )
+      @addresses.delete a
+    end
+
+    include StrategyInterface
+
+    def accept( strategy, dummy1 = nil, dummy2 = nil )
+      strategy.phrase @name
+      strategy.meta ':'
+      strategy.space
+      first = true
+      each do |mbox|
+        if first
+          first = false
+        else
+          strategy.meta ','
+        end
+        strategy.space
+        mbox.accept strategy
+      end
+      strategy.meta ';'
+      strategy.lwsp ''
+    end
+
+  end
+
+end   # module TMail