clutil 2010.132.1 → 2010.141.0

data/cl/util/smtp.rb

@@ -54,11 +54,16 @@ module ClUtil
 
   class Smtp
     attr_reader :attachments
-    attr_accessor :from, :subj, :body, :extra_headers
+    attr_accessor :from, :subj, :body, :extra_headers, :username, :password, :auth_type, :enable_starttls, :port
 
-    def initialize(smtpsrv='localhost')
+    def initialize(smtpsrv='localhost', port=25)
       @smtpsrv = smtpsrv
+      @port = port
       @attachments = []
+      @username = nil
+      @password = nil
+      @auth_type = :login
+      @enable_starttls = false
     end
 
     def to
@@ -71,11 +76,21 @@ module ClUtil
 
     def sendmail
       msg = build_message
-      Net::SMTP.start(@smtpsrv) do |smtp|
+      @smtp = Net::SMTP.new(@smtpsrv, @port)
+      start_tls_if_needed
+      @smtp.start('localhost.localdomain', @username, @password, @auth_type) do |smtp|
         smtp.sendmail(msg, @from, @to)
       end
     end
 
+    def start_tls_if_needed
+      return if !@enable_starttls
+      require 'rubygems'
+      gem 'smtp_tls'
+      require 'smtp_tls'
+      @smtp.enable_starttls
+    end
+
     def build_message
       msg = format_headers
       boundary = create_boundary

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2010
-  - 132
-  - 1
-  version: 2010.132.1
+  - 141
+  - 0
+  version: 2010.141.0
 platform: ruby
 authors: 
 - chrismo
@@ -14,10 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-12 00:00:00 -05:00
+date: 2010-05-21 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: smtp_tls
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: a mish-mash of spare utility libs for Ruby. All BSD license.
 email: 
 - chrismo@clabs.org
@@ -42,15 +53,12 @@ files:
 - cl/util/string.rb
 - cl/util/test.rb
 - cl/util/time.rb
-- cl/util/util.rb
-- cl/util/version.rb
 - cl/util/win.rb
 - cl/util/doc/License
 - cl/util/doc/Readme
 - cl/util/test/dirsizetest.rb
 - cl/util/test/filetest.rb
 - cl/util/test/installtest.rb
-- cl/util/test/nettest.rb
 - cl/util/test/progresstest.rb
 - cl/util/test/stringtest.rb
 - cl/util/test/versiontest.rb

data/cl/util/test/nettest.rb

@@ -1,13 +0,0 @@
-require "test/unit"
-
-class NetUseTest < Test::Unit::TestCase
-  def setup
-  end
-
-  def teardown
-  end
-
-  def test_net_use
-    # net_use = NetUse.new()    
-  end
-end

data/cl/util/util.rb

@@ -1,10 +0,0 @@
-require 'cl/util/version'
-
-# VERSION auto generated section
-begin                                                                  
-  require 'cl/util/version'                                            
-  VERSION = CLabs::Version.new('2010', '132', '1')
-rescue LoadError                                                       
-  VERSION = '2010.132.1'                                                  
-end                                                                    
-# END_VERSION

data/cl/util/version.rb

@@ -1,115 +0,0 @@
-# $Id: version.rb,v 1.6 2005/06/02 03:39:31 chrismo Exp $
-=begin
---------------------------------------------------------------------------
-Copyright (c) 2002-2005, Chris Morris
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
-3. Neither the names Chris Morris, cLabs nor the names of contributors to this
-software may be used to endorse or promote products derived from this software
-without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---------------------------------------------------------------------------------
-Contributors: Dan Butler
-=end
-begin
-  require 'cl/xmlserial'
-rescue LoadError
-  $NO_XMLS = true
-end
-
-module CLabs
-  class Version
-    include Comparable
-    include XmlSerialization if !$NO_XMLS
-
-    attr_accessor :major, :minor, :release
-
-    def initialize(maj=0, min=0, rel=0)
-      @major = maj
-      @minor = min
-      @release = rel
-    end
-
-    def <=>(other_ver)
-      res = (@major <=> other_ver.major)
-      res = (@minor <=> other_ver.minor) if res == 0
-      res = (@release <=> other_ver.release) if res == 0        
-      res
-    end
-    
-    def Version.header_start
-      '# VERSION auto generated section'
-    end
-
-    def Version.header_end
-      '# END_VERSION'
-    end
-
-    def version_header_code(indent=0)
-      ' ' * indent + Version.header_start                                                 + "\n" +
-      ' ' * indent + "begin                                                                  \n" +
-      ' ' * indent + "  require 'cl/util/version'                                            \n" +
-      ' ' * indent + "  VERSION = CLabs::Version.new('#{@major}', '#{@minor}', '#{@release}')\n" +
-      ' ' * indent + "rescue LoadError                                                       \n" +
-      ' ' * indent + "  VERSION = '#{to_s}'                                                  \n" +
-      ' ' * indent + "end                                                                    \n" +
-      ' ' * indent + Version.header_end                                                   + "\n"
-    end
-
-    def write_version_header(fn)
-      newfn = fn + '.new'
-      File.open(fn, 'r') do |fin|
-        File.open(newfn, 'w+') do |fout|
-          lines = fin.readlines
-          begindex = nil; endindex = nil; indent = 0
-          lines.each do |ln|
-            if ln =~ /^\s*#{Version.header_start}/
-              begindex = lines.index(ln)
-              indent = ln.scan(/^\s*/).to_s.length
-            end
-            endindex = lines.index(ln) if ln =~ /^\s*#{Version.header_end}/
-          end
-          if begindex && endindex
-            lines = lines[0..begindex-1]        <<
-                    version_header_code(indent) <<
-                    lines[endindex+1..-1]
-          else
-            raise 'VERSION section not found in ' + fn
-          end
-          fout.puts lines
-        end
-      end
-      File.delete(fn)
-      File.rename(newfn, fn)
-    end
-
-    def to_s
-      @major.to_s + '.' + @minor.to_s + '.' + @release.to_s
-    end
-  end
-end
-
-if __FILE__ == $0
-  v = CLabs::Version.new
-  puts v.version_header_code
-end