bones 3.7.1 → 3.7.2

data/History.txt

@@ -1,3 +1,14 @@
+== 3.7.2 / 2011-11-17
+
+Enhancements
+  - remove SMTP TLS patch for Ruby 1.8.6
+  - cleaning up rubygems deprecation warnings
+  - updating the default project skeleton
+  - ignore the .rvmrc file
+  - cleanup of comment lines
+  - minor tweak to the discovery of the root directory
+  - updating Rakefile
+
 == 3.7.1 / 2011-08-10
 
 Enhancements

data/Rakefile

@@ -5,14 +5,13 @@ require 'bones'
 task :default => 'spec:run'
 task 'gem:release' => 'spec:run'
 
-begin gem('rspec', '~> 2.6.0'); rescue LoadError; end
+begin gem('rspec', '~> 2.6'); rescue LoadError; end
 
 Bones {
   name         'bones'
   authors      'Tim Pease'
   email        'tim.pease@gmail.com'
   url          'http://rubygems.org/gems/bones'
-  ruby_opts    %w[-W0]
 
   spec.opts.concat %w[--color --format documentation]
   notes.exclude %w[^README\.rdoc$ ^data/]
@@ -31,10 +30,11 @@ Bones {
   depend_on  'little-plugger'
   depend_on  'loquacious'
 
-  depend_on  'rspec', '~> 2.6.0', :development => true
+  depend_on  'rspec', '~> 2.6', :development => true
 
-  # These are commented out to avoid circular dependencies when install
+  # These are commented out to avoid circular dependencies when installing
   # bones-git or bones-rspec in development mode
+  ####
   # depend_on  'bones-git',   :development => true
   # depend_on  'bones-rspec', :development => true
 }

data/bin/bones

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+root = File.expand_path('../..', __FILE__)
 
 begin
   require File.join(root, %w[lib bones])
@@ -11,4 +11,3 @@ end
 Bones::App.initialize_plugins
 Bones::App.run
 
-# EOF

data/default/bin/NAME.bns

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(
-    File.join(File.dirname(__FILE__), %w[.. lib <%= name %>]))
+root = File.expand_path('../..', __FILE__)
+require File.join(root, %w[lib <%= name %>])
 
 # Put your code here
 

data/default/lib/NAME.rb.bns

@@ -2,7 +2,7 @@
 module <%= classname %>
 
   # :stopdoc:
-  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
+  LIBPATH = ::File.expand_path('..', __FILE__) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   VERSION = ::File.read(PATH + 'version.txt').strip
   # :startdoc:

data/lib/bones.rb

@@ -90,7 +90,6 @@ Bones.libpath {
   require 'bones/rake_override_task'
   require 'bones/gem_package_task'
   require 'bones/annotation_extractor'
-  require 'bones/smtp_tls'
   require 'bones/app'
   require 'bones/app/command'
   require 'bones/app/file_manager'

data/lib/bones/app.rb

@@ -119,4 +119,3 @@ DESCRIPTION
   end  # class Main
 end  # module Bones::App
 
-# EOF

data/lib/bones/app/file_manager.rb

@@ -7,7 +7,8 @@ class FileManager
 
   Error = Class.new(StandardError)
 
-  attr_accessor :source, :destination, :archive, :verbose
+  attr_reader :destination
+  attr_accessor :source, :archive, :verbose
   alias :verbose? :verbose
 
   #

data/lib/bones/app/plugins.rb

@@ -13,7 +13,7 @@ those gems. Passing in the 'all' flag will show plugins even if the related
 gems are not installed.
     __
 
-    option('-a', '--all', 'Show all plugins.', lambda { config[:all] = true })
+    option('-a', '--all', 'Show all plugins.', lambda { |_| config[:all] = true })
     option(standard_options[:colorize])
   end
 
@@ -27,6 +27,7 @@ gems are not installed.
     if all?
       plugins.each { |name, version| show_plugin(name, version) }
     else
+      gemspecs = find_gemspecs
       plugins.each { |name, version|
         gemspecs.each { |gem_name, gem_version|
           next unless name.downcase == gem_name.downcase
@@ -52,11 +53,14 @@ gems are not installed.
 
 private
 
-  def gemspecs
-    specs = Gem.source_index.map { |_, spec| spec }
+  def find_gemspecs
+    if Gem::Specification.respond_to? :map
+      specs = Gem::Specification.map { |spec| spec }
+    else
+      specs = Gem.source_index.map { |_, spec| spec }
+    end
 
     specs.map! { |s| [s.name, s.version.segments.first] }
-
     specs.sort! { |a, b|
       names = a.first <=> b.first
       next names if names.nonzero?
@@ -68,7 +72,12 @@ private
   end
 
   def find_bones_plugins
-    dep = Gem::Dependency.new(%r/^bones/i, Gem::Requirement.default)
+    if Gem.const_defined? :Deprecate
+      # FIXME: this needs to change when rubygems removes the option to pass a regular expression to the Gem::Dependency initializer
+      dep = Gem::Deprecate.skip_during { Gem::Dependency.new(%r/^bones/i, Gem::Requirement.default) }
+    else
+      dep = Gem::Dependency.new(%r/^bones/i, Gem::Requirement.default)
+    end
 
     fetcher = Gem::SpecFetcher.fetcher
     specs = fetcher.find_matching dep
@@ -84,8 +93,18 @@ private
   end
 
   def installed?( name, version = Gem::Requirement.default )
-    dep = Gem::Dependency.new name, version
-    !Gem.source_index.search(dep).empty?
+    # FIXME: check for rubygems version 1.8.X
+    if Gem::Specification.respond_to? :find_by_name
+      begin
+        Gem::Specification.find_by_name(name, version)
+        true
+      rescue Gem::LoadError => err
+        false
+      end
+    else
+      dep = Gem::Dependency.new name, version
+      !Gem.source_index.search(dep).empty?
+    end
   end
 
 end  # class Plugins

data/lib/bones/plugins/ann.rb

@@ -1,4 +1,7 @@
 
+require 'net/smtp'
+require 'time'
+
 module Bones::Plugins::Ann
   include ::Bones::Helpers
   extend self
@@ -73,6 +76,11 @@ module Bones::Plugins::Ann
             one of :plain, :login, or :cram_md5. See the documentation on the
             Net::SMTP class for more information.
           __
+
+          enable_starttls_auto  true, :desc => <<-__
+            When set to true, detects if STARTTLS is enabled in your SMTP server
+            and starts to use it. It works only on Ruby >= 1.8.7 and Ruby >= 1.9.
+          __
         }
       }
     }
@@ -143,15 +151,18 @@ module Bones::Plugins::Ann
         rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{email.domain}>\n\n"
         rfc822msg << File.read(ann.file)
 
-        params = [:server, :port, :domain, :username, :password, :authtype].map { |key| email[key] }
-
-        if params[4].nil?
-          STDOUT.write "Please enter your e-mail password (#{params[3]}): "
-          params[4] = STDIN.gets.chomp
+        params = [:domain, :username, :password, :authtype].map { |key| email[key] }
+        if params[2].nil?
+          STDOUT.write "Please enter your e-mail password (#{params[1]}): "
+          params[2] = STDIN.gets.chomp
         end
 
         ### send email
-        Net::SMTP.start(*params) {|smtp| smtp.sendmail(rfc822msg, from, to)}
+        smtp = Net::SMTP.new(email[:server], email[:port])
+        smtp.enable_starttls_auto if email[:enable_starttls_auto] and smtp.respond_to?(:enable_starttls_auto)
+        smtp.start(*params) { |_smtp_|
+          _smtp_.sendmail(rfc822msg, from, to)
+        }
       end
     end  # namespace :ann
 

data/lib/bones/plugins/gem.rb

@@ -18,7 +18,6 @@ module Bones::Plugins::Gem
       development = opts.key?(:development) ? opts[:development] : opts.key?(:dev) ? opts[:dev] : false
 
       spec = nil
-      # FIXME: check for rubygems version 1.8.X
       if Gem::Specification.respond_to? :find_by_name
         begin
           spec = Gem::Specification.find_by_name(name)

data/spec/bones/app/file_manager_spec.rb

@@ -17,30 +17,30 @@ describe Bones::App::FileManager do
     @fm.source.should be_nil
 
     @fm.source = '/home/user/.mrbones/default'
-    @fm.source.should == '/home/user/.mrbones/default'
+    @fm.source.should be == '/home/user/.mrbones/default'
   end
 
   it "should have a configurable destination" do
     @fm.destination.should be_nil
 
     @fm.destination = 'my_new_app'
-    @fm.destination.should == 'my_new_app'
+    @fm.destination.should be == 'my_new_app'
   end
 
   it "should set the archive directory when the destination is set" do
     @fm.archive.should be_nil
 
     @fm.destination = 'my_new_app'
-    @fm.archive.should == 'my_new_app.archive'
+    @fm.archive.should be == 'my_new_app.archive'
   end
 
   it "should return a list of files to copy" do
     @fm.source = Bones.path %w[spec data default]
 
     ary = @fm._files_to_copy
-    ary.length.should == 8
+    ary.length.should be == 8
 
-    ary.should == %w[
+    ary.should be == %w[
       .bnsignore
       .rvmrc.bns
       History
@@ -54,13 +54,13 @@ describe Bones::App::FileManager do
 
   it "should archive the destination directory if it exists" do
     @fm.destination = Bones.path(%w[spec data bar])
-    test(?e, @fm.destination).should == false
-    test(?e, @fm.archive).should == false
+    test(?e, @fm.destination).should be == false
+    test(?e, @fm.archive).should be == false
 
     FileUtils.mkdir @fm.destination
     @fm.archive_destination
-    test(?e, @fm.destination).should == false
-    test(?e, @fm.archive).should == true
+    test(?e, @fm.destination).should be == false
+    test(?e, @fm.archive).should be == true
   end
 
   it "should rename files and folders containing 'NAME'" do
@@ -71,8 +71,8 @@ describe Bones::App::FileManager do
     @fm._rename(File.join(@fm.destination, 'NAME'), 'tirion')
 
     dir = File.join(@fm.destination, 'tirion')
-    test(?d, dir).should == true
-    test(?f, File.join(dir, 'tirion.rb.bns')).should == true
+    test(?d, dir).should be == true
+    test(?f, File.join(dir, 'tirion.rb.bns')).should be == true
   end
 
   it "should raise an error when renaming an existing file or folder" do
@@ -90,18 +90,18 @@ describe Bones::App::FileManager do
     @fm.template('foo_bar')
 
     dir = @fm.destination
-    test(?e, File.join(dir, 'Rakefile.bns')).should == false
-    test(?e, File.join(dir, 'README.md.bns')).should == false
-    test(?e, File.join(dir, %w[foo_bar foo_bar.rb.bns])).should == false
-    test(?e, File.join(dir, '.rvmrc.bns')).should == false
+    test(?e, File.join(dir, 'Rakefile.bns')).should be == false
+    test(?e, File.join(dir, 'README.md.bns')).should be == false
+    test(?e, File.join(dir, %w[foo_bar foo_bar.rb.bns])).should be == false
+    test(?e, File.join(dir, '.rvmrc.bns')).should be == false
 
-    test(?e, File.join(dir, 'Rakefile')).should == true
-    test(?e, File.join(dir, 'README.md')).should == true
-    test(?e, File.join(dir, %w[foo_bar foo_bar.rb])).should == true
-    test(?e, File.join(dir, '.rvmrc')).should == true
+    test(?e, File.join(dir, 'Rakefile')).should be == true
+    test(?e, File.join(dir, 'README.md')).should be == true
+    test(?e, File.join(dir, %w[foo_bar foo_bar.rb])).should be == true
+    test(?e, File.join(dir, '.rvmrc')).should be == true
 
     txt = File.read(File.join(@fm.destination, %w[foo_bar foo_bar.rb]))
-    txt.should == <<-TXT
+    txt.should be == <<-TXT
 module FooBar
   def self.foo_bar
     p 'just a test'
@@ -116,8 +116,8 @@ end
     @fm.template('foo_bar')
 
     dir = @fm.destination
-    test(?e, File.join(dir, 'bin/foo_bar')).should == true
-    test(?x, File.join(dir, 'bin/foo_bar')).should == true
+    test(?e, File.join(dir, 'bin/foo_bar')).should be == true
+    test(?x, File.join(dir, 'bin/foo_bar')).should be == true
   end
 
   # ------------------------------------------------------------------------
@@ -125,32 +125,32 @@ end
 
     it "should recognize a git repository" do
       @fm.source = 'git://github.com/TwP/bones.git'
-      @fm.repository.should == :git
+      @fm.repository.should be == :git
 
       @fm.source = 'git://github.com/TwP/bones.git/'
-      @fm.repository.should == :git
+      @fm.repository.should be == :git
     end
 
     it "should recognize an svn repository" do
       @fm.source = 'file:///home/user/svn/ruby/trunk/apc'
-      @fm.repository.should == :svn
+      @fm.repository.should be == :svn
 
       @fm.source = 'http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8'
-      @fm.repository.should == :svn
+      @fm.repository.should be == :svn
 
       @fm.source = 'https://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8'
-      @fm.repository.should == :svn
+      @fm.repository.should be == :svn
 
       @fm.source = 'svn://10.10.10.10/project/trunk'
-      @fm.repository.should == :svn
+      @fm.repository.should be == :svn
 
       @fm.source = 'svn+ssh://10.10.10.10/project/trunk'
-      @fm.repository.should == :svn
+      @fm.repository.should be == :svn
     end
 
     it "should return nil if the source is not a repository" do
       @fm.source = '/some/directory/on/your/hard/drive'
-      @fm.repository.should == nil
+      @fm.repository.should be_nil
     end
   end
 

data/spec/bones/app_spec.rb

@@ -37,22 +37,22 @@ describe Bones::App do
 
   it 'should provide a create command' do
     @app.run %w[create]
-    @runner.name.should == :create
+    @runner.name.should be == :create
   end
 
   it 'should provide a freeze command' do
     @app.run %w[freeze]
-    @runner.name.should == :freeze
+    @runner.name.should be == :freeze
   end
 
   it 'should provide an unfreeze command' do
     @app.run %w[unfreeze]
-    @runner.name.should == :unfreeze
+    @runner.name.should be == :unfreeze
   end
 
   it 'should provide an info command' do
     @app.run %w[info]
-    @runner.name.should == :info
+    @runner.name.should be == :info
   end
 
   it 'should provide a help command' do
@@ -74,17 +74,17 @@ describe Bones::App do
 
   it 'should report an error for unrecognized commands' do
     lambda {@app.run %w[foo]}.should raise_error(SystemExit)
-    @err.readline.should == "\e[37m\e[41mERROR\e[0m:  While executing bones ..."
-    @err.readline.should == '    Unknown command "foo"'
+    @err.readline.should be == "\e[37m\e[41mERROR\e[0m:  While executing bones ..."
+    @err.readline.should be == '    Unknown command "foo"'
   end
 
   it 'should report a version number' do
     @app.run %w[--version]
-    @out.readline.should == "Mr Bones v#{Bones.version}"
+    @out.readline.should be == "Mr Bones v#{Bones.version}"
     @out.clear
 
     @app.run %w[-v]
-    @out.readline.should == "Mr Bones v#{Bones.version}"
+    @out.readline.should be == "Mr Bones v#{Bones.version}"
   end
 
 end  # describe Bones::App

data/spec/bones/helpers_spec.rb

@@ -10,12 +10,12 @@ describe Bones::Helpers do
   describe 'when given a list of files' do
     it 'finds the one that exists on the filesystem' do
       filename = Bones::Helpers.find_file(*%w[foo.txt bar.txt README History.txt baz buz])
-      filename.should == 'History.txt'
+      filename.should be == 'History.txt'
     end
 
     it 'returns the first file if none exist' do
       filename = Bones::Helpers.find_file(*%w[foo.txt bar.txt README History baz buz])
-      filename.should == 'foo.txt'
+      filename.should be == 'foo.txt'
     end
   end
 
@@ -24,39 +24,39 @@ describe Bones::Helpers do
       filename = Bones.path %w[spec data rdoc.txt]
 
       ary = Bones::Helpers.paragraphs_of(filename, 'install')
-      ary.length.should == 6
-      ary.first.should == '* gem install bones'
-      ary.last.should == %Q{The 'bones-git' gem provides command line options for generating a git\nrepository and pushing to github upon creation. Rake tasks for working with\nthe git repository are also provided.}
+      ary.length.should be == 6
+      ary.first.should be == '* gem install bones'
+      ary.last.should be == %Q{The 'bones-git' gem provides command line options for generating a git\nrepository and pushing to github upon creation. Rake tasks for working with\nthe git repository are also provided.}
 
       ary = Bones::Helpers.paragraphs_of(filename, 'description')
-      ary.length.should == 1
+      ary.length.should be == 1
 
       ary = Bones::Helpers.paragraphs_of(filename, 'license')
-      ary.length.should == 4
+      ary.length.should be == 4
     end
 
     it 'recognizes Markdown headers by title' do
       filename = Bones.path %w[spec data markdown.txt]
 
       ary = Bones::Helpers.paragraphs_of(filename, 'install')
-      ary.length.should == 5
-      ary.first.should == '* gem install bones'
-      ary.last.should == %Q{The 'bones-extras' gem provides rake tasks for running Rspec tests, running\nRcov on your source code, and pushing releases to RubyForge. You will need to\nhave the corresponding gems installed for these tasks to be loaded.}
+      ary.length.should be == 5
+      ary.first.should be == '* gem install bones'
+      ary.last.should be == %Q{The 'bones-extras' gem provides rake tasks for running Rspec tests, running\nRcov on your source code, and pushing releases to RubyForge. You will need to\nhave the corresponding gems installed for these tasks to be loaded.}
 
       ary = Bones::Helpers.paragraphs_of(filename, 'mr bones')
-      ary.length.should == 1
+      ary.length.should be == 1
 
       ary = Bones::Helpers.paragraphs_of(filename, 'license')
-      ary.length.should == 4
+      ary.length.should be == 4
     end
 
     it 'uses paragraph numbers' do
       filename = Bones.path %w[spec data markdown.txt]
 
       ary = Bones::Helpers.paragraphs_of(filename, 0, 1..3)
-      ary.length.should == 4
-      ary.first.should == %Q{Mr Bones is a handy tool that creates new Ruby projects from a code\nskeleton. The skeleton contains some starter code and a collection of rake\ntasks to ease the management and deployment of your source code. Several Mr\nBones plugins are available for creating git repositories, creating GitHub\nprojects, running various test suites and source code analysis tools.}
-      ary.last.should == %Q{When working with Rake, Mr Bones provides a set of tasks that help simplify\ncommon development tasks. These tasks include ...}
+      ary.length.should be == 4
+      ary.first.should be == %Q{Mr Bones is a handy tool that creates new Ruby projects from a code\nskeleton. The skeleton contains some starter code and a collection of rake\ntasks to ease the management and deployment of your source code. Several Mr\nBones plugins are available for creating git repositories, creating GitHub\nprojects, running various test suites and source code analysis tools.}
+      ary.last.should be == %Q{When working with Rake, Mr Bones provides a set of tasks that help simplify\ncommon development tasks. These tasks include ...}
     end
   end
 

data/version.txt

@@ -1 +1 @@
-3.7.1
+3.7.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bones
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-10 00:00:00.000000000Z
+date: 2011-11-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2165990200 !ruby/object:Gem::Requirement
+  requirement: &2152697060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *2165990200
+  version_requirements: *2152697060
 - !ruby/object:Gem::Dependency
   name: little-plugger
-  requirement: &2165989480 !ruby/object:Gem::Requirement
+  requirement: &2152695600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,29 +32,29 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2165989480
+  version_requirements: *2152695600
 - !ruby/object:Gem::Dependency
   name: loquacious
-  requirement: &2165982300 !ruby/object:Gem::Requirement
+  requirement: &2152694360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 1.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165982300
+  version_requirements: *2152694360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165981760 !ruby/object:Gem::Requirement
+  requirement: &2152693360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2165981760
+  version_requirements: *2152693360
 description: ! 'Mr Bones is a handy tool that creates new Ruby projects from a code
 
   skeleton. The skeleton contains some starter code and a collection of rake
@@ -111,7 +111,6 @@ files:
 - lib/bones/plugins/rdoc.rb
 - lib/bones/plugins/test.rb
 - lib/bones/rake_override_task.rb
-- lib/bones/smtp_tls.rb
 - spec/bones/app/file_manager_spec.rb
 - spec/bones/app_spec.rb
 - spec/bones/helpers_spec.rb
@@ -152,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: bones
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Mr Bones is a handy tool that creates new Ruby projects from a code skeleton.

data/lib/bones/smtp_tls.rb

@@ -1,81 +0,0 @@
-
-# This code enables SMTPTLS authentication requireed for sending mail
-# via the gmail servers. I found this code via a blog entry from James
-# Britt.
-#
-# http://d.hatena.ne.jp/zorio/20060416
-# http://www.jamesbritt.com/2007/12/18/sending-mail-through-gmail-with-ruby-s-net-smtp
-
-begin
-  require "openssl"
-  require "net/smtp"
-  require 'time'
-
-  Net::SMTP.class_eval do
-    private
-    def do_start(helodomain, user, secret, authtype)
-      raise IOError, 'SMTP session already started' if @started
-
-      if user or secret
-        if 3 == self.method(:check_auth_args).arity
-          check_auth_args(user, secret, authtype)
-        else
-          check_auth_args(user, secret)
-        end
-      end
-
-      sock = timeout(@open_timeout) { TCPSocket.open(@address, @port) }
-      @socket = Net::InternetMessageIO.new(sock)
-      @socket.read_timeout = 60 #@read_timeout
-      @socket.debug_output = STDERR #@debug_output
-
-      check_response(critical { recv_response() })
-      do_helo(helodomain)
-
-      raise 'openssl library not installed' unless defined?(OpenSSL)
-      starttls
-      ssl = OpenSSL::SSL::SSLSocket.new(sock)
-      ssl.sync_close = true
-      ssl.connect
-      @socket = Net::InternetMessageIO.new(ssl)
-      @socket.read_timeout = 60 #@read_timeout
-      @socket.debug_output = STDERR #@debug_output
-      do_helo(helodomain)
-
-      authenticate user, secret, authtype if user
-      @started = true
-    ensure
-      unless @started
-        # authentication failed, cancel connection.
-          @socket.close if not @started and @socket and not @socket.closed?
-        @socket = nil
-      end
-    end
-
-    def do_helo(helodomain)
-      begin
-        if @esmtp
-          ehlo helodomain
-        else
-          helo helodomain
-        end
-      rescue Net::ProtocolError
-        if @esmtp
-          @esmtp = false
-          @error_occured = false
-          retry
-        end
-        raise
-      end
-    end
-
-    def starttls
-      getok('STARTTLS')
-    end
-  end
-
-# We cannot do TLS if we do not have 'openssl'
-rescue LoadError
-end
-
-# EOF