bones 2.4.1 → 2.4.2

data/History.txt

@@ -1,3 +1,9 @@
+== 2.4.2 / 2009-03-02
+
+* 2 bug fixes
+  - SMTP/TLS will not be used if openssl is not present
+  - fixed rdoc title generation
+
 == 2.4.1 / 2009-03-02
 
 * 1 minor enhancement

data/lib/bones.rb

@@ -4,7 +4,7 @@ require 'rbconfig'
 module Bones
 
   # :stopdoc:
-  VERSION = '2.4.1'
+  VERSION = '2.4.2'
   PATH = File.expand_path(File.join(File.dirname(__FILE__), '..'))
   HOME = File.expand_path(ENV['HOME'] || ENV['USERPROFILE'])
   DEV_NULL = File.exist?('/dev/null') ? '/dev/null' : 'NUL:'

data/lib/bones/smtp_tls.rb

@@ -6,70 +6,75 @@
 # http://d.hatena.ne.jp/zorio/20060416
 # http://www.jamesbritt.com/2007/12/18/sending-mail-through-gmail-with-ruby-s-net-smtp
 
-require "openssl"
-require "net/smtp"
+begin
+  require "openssl"
+  require "net/smtp"
 
-Net::SMTP.class_eval do
-  private
-  def do_start(helodomain, user, secret, authtype)
-    raise IOError, 'SMTP session already started' if @started
+  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)
+      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
-    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
+      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)
+      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)
+      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
+      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
-  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
+    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
-      raise
     end
-  end
 
-  def starttls
-    getok('STARTTLS')
+    def starttls
+      getok('STARTTLS')
+    end
   end
+
+# We cannot do TLS if we do not have 'openssl'
+rescue LoadError
 end
 
 # EOF

data/lib/bones/tasks/rdoc.rake

@@ -19,10 +19,11 @@ namespace :doc do
             end
     rd.rdoc_files.push(*files)
 
-    title = "#{PROJ.name}-#{PROJ.version} Documentation"
-
+    name    = PROJ.name
     rf_name = PROJ.rubyforge.name
-    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != title
+
+    title = "#{name}-#{PROJ.version} Documentation"
+    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != name
 
     rd.options << "-t #{title}"
     rd.options.concat(rdoc.opts)

data/tasks/rdoc.rake

@@ -19,10 +19,11 @@ namespace :doc do
             end
     rd.rdoc_files.push(*files)
 
-    title = "#{PROJ.name}-#{PROJ.version} Documentation"
-
+    name    = PROJ.name
     rf_name = PROJ.rubyforge.name
-    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != title
+
+    title = "#{name}-#{PROJ.version} Documentation"
+    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != name
 
     rd.options << "-t #{title}"
     rd.options.concat(rdoc.opts)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bones
 version: !ruby/object:Gem::Version 
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors: 
 - Tim Pease