clutil 2010.127.0 → 2010.129.0

data/cl/util/smtp.rb

@@ -1,7 +1,7 @@
 # $Id: smtp.rb,v 1.4 2008/12/09 06:58:56 chrismo Exp $
 =begin
 --------------------------------------------------------------------------
-Copyright (c) 2001-2005, Chris Morris
+Copyright (c) 2001-2010, Chris Morris
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -32,100 +32,120 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 =end
 require 'net/smtp'
 require 'time'
-                            
-def get_filedata(filename)
-  data = nil
-  File.open(filename, 'rb') do |f|
-    data = f.read()
+
+module ClUtil
+  class Attachment
+    def self.load_from_file(filename)
+      data = nil
+      File.open(filename, 'rb') do |f|
+        data = f.read()
+      end
+      data = [data].pack("m*")
+      Attachment.new(File.basename(filename), data)
+    end
+
+    attr_reader :name, :data
+
+    def initialize(name, data)
+      @name = name
+      @data = data
+    end
   end
-  data = [data].pack("m*")
-  data
-end
 
-def create_boundary()
-  return "_____clabs_smtp_boundary______#{Time.new.to_i.to_s}___"
+  class Smtp
+    attr_reader :attachments
+    attr_accessor :from, :subj, :body, :extra_headers
+
+    def initialize(smtpsrv='localhost')
+      @smtpsrv = smtpsrv
+      @attachments = []
+    end
+
+    def to
+      @to
+    end
+
+    def to=(value)
+      @to = [value].flatten
+    end
+
+    def sendmail
+      msg = build_message
+      Net::SMTP.start(@smtpsrv) do |smtp|
+        smtp.sendmail(msg, @from, @to)
+      end
+    end
+
+    def build_message
+      msg = format_headers
+      boundary = create_boundary
+
+      if !@attachments.empty?
+        msg << [
+          "Content-Type: multipart/mixed; boundary=\"#{boundary}\"\n",
+          "\n",
+          "This is a multi-part message in MIME format.\n",
+          "\n"
+        ]
+      end
+
+      if @body
+        msg << [ "--#{boundary}\n" ] if !@attachments.empty?
+        msg << [
+          "Content-Type: text/plain; charset=\"iso-8859-1\"\n",
+          "Content-Transfer-Encoding: 8bit\n",
+          "\n",
+          "#{@body}\n",
+          "\n"
+        ]
+      end
+
+      @attachments.each do |attachment|
+        basename = attachment.name
+        msg << [
+          "--#{boundary}\n",
+          "Content-Type: application/octet-stream; name=\"#{basename}\"\n",
+          "Content-Transfer-Encoding: base64\n",
+          "Content-Disposition: attachment; filename=\"#{basename}\"\n",
+          "\n",
+          "#{attachment.data}",  # no \n needed
+          "\n"
+        ]
+      end
+
+      msg << ["--#{boundary}--\n"] if !@attachments.empty?
+
+      msg.flatten!
+    end
+
+    def create_boundary()
+      return "_____clabs_smtp_boundary______#{Time.new.to_i.to_s}___"
+    end
+
+    def format_headers
+      headers = ["Subject: #{subj}", "From: #{from}", "To: #{to.join(";")}", "Date: #{Time.now.rfc2822}", "MIME-Version: 1.0" ]
+      headers << @extra_headers if @extra_headers
+      headers.flatten!
+      headers.collect! { |hdr| hdr.strip << "\n" }
+      [headers].flatten
+    end
+  end
 end
 
+# deprecated - use ClUtil::Smtp instead. The attachments argument is designed
+# to be either a single filename or an array of filenames.
 def sendmail(to, from, subj, body, smtpsrv=nil, attachments=nil, extra_headers=nil)
   smtpsrv = 'localhost' if !smtpsrv
+  smtp = ClUtil::Smtp.new(smtpsrv)
+  smtp.to = to
+  smtp.from = from
+  smtp.subj = subj
+  smtp.body = body
+  smtp.extra_headers = extra_headers
   attachments = [attachments].flatten
   attachments.compact!
-  attachments = nil if attachments.empty?
-  to = [to].flatten
-  
-  headers = ["Subject: #{subj}", "From: #{from}", "To: #{to.join(";")}", "Date: #{Time.now.rfc2822}", "MIME-Version: 1.0" ]
-  headers << extra_headers if !extra_headers.nil?
-  headers.flatten!
-  headers.collect! { |hdr| hdr.strip << "\n" }
-  msg = [ headers ].flatten
-  
-  boundary = create_boundary
-  
-  if attachments
-    msg << [
-      "Content-Type: multipart/mixed; boundary=\"#{boundary}\"\n",
-      "\n",
-      "This is a multi-part message in MIME format.\n",
-      "\n"
-    ]
+  attachments.each do |attachment_fn|
+    smtp.attachments << ClUtil::Attachment.load_from_file(attachment_fn)    
   end 
-  
-  if body
-    msg << [ "--#{boundary}\n" ] if attachments
-    msg << [
-      "Content-Type: text/plain; charset=\"iso-8859-1\"\n",
-      "Content-Transfer-Encoding: 8bit\n",  
-      "\n", 
-      "#{body}\n",
-      "\n"
-    ]
-  end
-  
-  attachments.each do |filename|
-    basename = File.basename(filename)
-    filedata = get_filedata(filename)
-    msg << [
-      "--#{boundary}\n",
-      "Content-Type: application/octet-stream; name=\"#{basename}\"\n",
-      "Content-Transfer-Encoding: base64\n",
-      "Content-Disposition: attachment; filename=\"#{basename}\"\n",
-      "\n",
-      "#{filedata}",  # no \n needed
-      "\n"
-    ]
-  end if attachments
-
-  msg << ["--#{boundary}--\n"] if attachments
-
-  msg.flatten!
-
-  Net::SMTP.start(smtpsrv) do |smtp|
-    smtp.sendmail(msg, from, to)
-  end
+  smtp.sendmail
 end
-
-if __FILE__ == $0
-  require 'test/unit'
-  
-  class TestSendMail < Test::Unit::TestCase
-    def testsendmail
-      addr = 'chrismo@clabs.org'
-      sendmail(addr, addr, 'unit test', 'this is a unit test')
-      sendmail([addr, addr], addr, 'unit test', 'this is a unit test')
-    end
-    
-    def testattachment
-      File.open('test.txt', 'w+') do |f| f.print "test attachment\n" end
-      addr = 'chrismo@clabs.org'
-      sendmail(addr, addr, 'unit test', 'this is a unit test', nil, 'test.txt')
-      sendmail(addr, addr, 'unit test', 'this is a unit test', nil, ['test.txt', 'smtp.rb'])
-    end
-    
-    def test_thread
-      addr = 'chrismo@clabs.org'
-      headers = ["In-Reply-To: <foo@clabs.org>"]
-      sendmail(addr, addr, 'smtp.rb thread test', 'body', nil, nil, headers)
-      sendmail(addr, addr, 'smtp.rb thread test', 'body', nil, nil, headers)
-    end
-  end
-end

data/cl/util/test.rb

@@ -41,7 +41,7 @@ class TempDirTest < Test::Unit::TestCase
     @tempDir = '/tmp/tests'
   end
 
-  def set_up
+  def setup
     @fileNameInc = 0
     setTempDir
     File.makedirs(@tempDir) if !FileTest.directory?(@tempDir)
@@ -51,9 +51,6 @@ class TempDirTest < Test::Unit::TestCase
     ClUtilFile.delTree(@tempDir)
   end
 
-  alias setup set_up
-  alias teardown tear_down
-  
   # to ward off the new Test::Unit detection of classes with no test
   # methods
   def default_test

data/cl/util/test/dirsizetest.rb

@@ -48,91 +48,91 @@ TestData = Struct.new("TestData",
 )
 
 class TestDirSize < TempDirTest
-  def set_up
+  def setup
     super
-    @testData = TestData.new
+    @test_data = TestData.new
   end
 
-  def testLargerSingleton
+  def test_larger_singleton
     makeSampleTextFile('', 5000)
-    @testData.clusterSize = 4096
-    @testData.expectedFileSize = 5000
-    @testData.expectedDiskSpace = (4096 * 2)
-    @testData.expectedFileSizeIncludeSubs = 5000
-    @testData.expectedDiskSpaceIncludeSubs = (4096 * 2)
-    @testData.expectedFileCount = 1
-    @testData.expectedAvgFileSize = 5000
-    @testData.expectedFileCountIncludeSubs = 1
-    @testData.expectedAvgFileSizeIncludeSubs = 5000
-    doTestDirSize(@testData)
+    @test_data.clusterSize = 4096
+    @test_data.expectedFileSize = 5000
+    @test_data.expectedDiskSpace = (4096 * 2)
+    @test_data.expectedFileSizeIncludeSubs = 5000
+    @test_data.expectedDiskSpaceIncludeSubs = (4096 * 2)
+    @test_data.expectedFileCount = 1
+    @test_data.expectedAvgFileSize = 5000
+    @test_data.expectedFileCountIncludeSubs = 1
+    @test_data.expectedAvgFileSizeIncludeSubs = 5000
+    do_test_dir_size(@test_data)
   end
 
-  def doTestDirSize(testData)
-    dirSize = DirSize.new
-    dirSize.directory = @tempDir
-    dirSize.clusterSize = testData.clusterSize
-    dirSize.getSize
-    assert_equal(testData.expectedFileSize, dirSize.fileSize(false))
-    assert_equal(testData.expectedDiskSpace, dirSize.diskSpace(false))
-    assert_equal(testData.expectedFileSizeIncludeSubs, dirSize.fileSize(true))
-    assert_equal(testData.expectedDiskSpaceIncludeSubs,
-      dirSize.diskSpace(true))
-    assert_equal(testData.expectedDiskSpace - testData.expectedFileSize,
-      dirSize.unusedDiskSpace(false))
+  def do_test_dir_size(test_data)
+    dir_size = DirSize.new
+    dir_size.directory = @tempDir
+    dir_size.clusterSize = test_data.clusterSize
+    dir_size.getSize
+    assert_equal(test_data.expectedFileSize, dir_size.fileSize(false))
+    assert_equal(test_data.expectedDiskSpace, dir_size.diskSpace(false))
+    assert_equal(test_data.expectedFileSizeIncludeSubs, dir_size.fileSize(true))
+    assert_equal(test_data.expectedDiskSpaceIncludeSubs,
+      dir_size.diskSpace(true))
+    assert_equal(test_data.expectedDiskSpace - test_data.expectedFileSize,
+      dir_size.unusedDiskSpace(false))
     assert_equal(
-      (testData.expectedDiskSpaceIncludeSubs -
-        testData.expectedFileSizeIncludeSubs), dirSize.unusedDiskSpace(true))
-    assert_equal(testData.expectedFileCount, dirSize.fileCount(false))
-    assert_equal(testData.expectedAvgFileSize, dirSize.avgFileSize(false))
-    assert_equal(testData.expectedFileCountIncludeSubs,
-      dirSize.fileCount(true))
-    assert_equal(testData.expectedAvgFileSizeIncludeSubs,
-      dirSize.avgFileSize(true))
+      (test_data.expectedDiskSpaceIncludeSubs -
+        test_data.expectedFileSizeIncludeSubs), dir_size.unusedDiskSpace(true))
+    assert_equal(test_data.expectedFileCount, dir_size.fileCount(false))
+    assert_equal(test_data.expectedAvgFileSize, dir_size.avgFileSize(false))
+    assert_equal(test_data.expectedFileCountIncludeSubs,
+      dir_size.fileCount(true))
+    assert_equal(test_data.expectedAvgFileSizeIncludeSubs,
+      dir_size.avgFileSize(true))
   end
 
-  def testSmallSingleton
+  def test_small_singleton
     makeSampleTextFile('', 1000)
-    @testData.clusterSize = 4096
-    @testData.expectedFileSize = 1000
-    @testData.expectedDiskSpace = (4096 * 1)
-    @testData.expectedFileSizeIncludeSubs = 1000
-    @testData.expectedDiskSpaceIncludeSubs = (4096 * 1)
-    @testData.expectedFileCount = 1
-    @testData.expectedAvgFileSize = 1000
-    @testData.expectedFileCountIncludeSubs = 1
-    @testData.expectedAvgFileSizeIncludeSubs = 1000
-    doTestDirSize(@testData)
+    @test_data.clusterSize = 4096
+    @test_data.expectedFileSize = 1000
+    @test_data.expectedDiskSpace = (4096 * 1)
+    @test_data.expectedFileSizeIncludeSubs = 1000
+    @test_data.expectedDiskSpaceIncludeSubs = (4096 * 1)
+    @test_data.expectedFileCount = 1
+    @test_data.expectedAvgFileSize = 1000
+    @test_data.expectedFileCountIncludeSubs = 1
+    @test_data.expectedAvgFileSizeIncludeSubs = 1000
+    do_test_dir_size(@test_data)
   end
 
-  def testSubDir
+  def test_sub_dir
     makeSubDir('suba')
     makeSubDir("suba\\suba1")
     makeSampleTextFile('', 1000)
     makeSampleTextFile('suba', 1000)
     makeSampleTextFile("suba\\suba1", 1000)
     makeSampleTextFile("suba\\suba1", 2000)
-    @testData.clusterSize = 4096
-    @testData.expectedFileSize = 1000
-    @testData.expectedDiskSpace = (4096 * 1)
-    @testData.expectedFileSizeIncludeSubs = 5000
-    @testData.expectedDiskSpaceIncludeSubs = (4096 * 4)
-    @testData.expectedFileCount = 1
-    @testData.expectedAvgFileSize = 1000
-    @testData.expectedFileCountIncludeSubs = 4
-    @testData.expectedAvgFileSizeIncludeSubs = 1250
-    doTestDirSize(@testData)
+    @test_data.clusterSize = 4096
+    @test_data.expectedFileSize = 1000
+    @test_data.expectedDiskSpace = (4096 * 1)
+    @test_data.expectedFileSizeIncludeSubs = 5000
+    @test_data.expectedDiskSpaceIncludeSubs = (4096 * 4)
+    @test_data.expectedFileCount = 1
+    @test_data.expectedAvgFileSize = 1000
+    @test_data.expectedFileCountIncludeSubs = 4
+    @test_data.expectedAvgFileSizeIncludeSubs = 1250
+    do_test_dir_size(@test_data)
   end
 
-  def testEmptyDir
-    @testData.clusterSize = 4096
-    @testData.expectedFileSize = 0
-    @testData.expectedDiskSpace = 0
-    @testData.expectedFileCount = 0
-    @testData.expectedAvgFileSize = 0
-    @testData.expectedFileCountIncludeSubs = 0
-    @testData.expectedAvgFileSizeIncludeSubs = 0
-    @testData.expectedFileSizeIncludeSubs = 0
-    @testData.expectedDiskSpaceIncludeSubs = 0
-    doTestDirSize(@testData)
+  def test_empty_dir
+    @test_data.clusterSize = 4096
+    @test_data.expectedFileSize = 0
+    @test_data.expectedDiskSpace = 0
+    @test_data.expectedFileCount = 0
+    @test_data.expectedAvgFileSize = 0
+    @test_data.expectedFileCountIncludeSubs = 0
+    @test_data.expectedAvgFileSizeIncludeSubs = 0
+    @test_data.expectedFileSizeIncludeSubs = 0
+    @test_data.expectedDiskSpaceIncludeSubs = 0
+    do_test_dir_size(@test_data)
   end
 end

data/cl/util/test/filetest.rb

@@ -51,13 +51,13 @@ class TestUtilFile < Test::Unit::TestCase
     File.chmod(attr, fileName)
   end
 
-  def set_up
+  def setup
     @files = []
   end
 
   def teardown
     @files.each { | filename | File.delete_all(filename) if File.exists?(filename) }
-    @dirs.reverse_each { | dirname | Dir.delete(dirname) if File.exists?(dirname) }
+    @dirs.reverse_each { | dirname | Dir.delete(dirname) if File.exists?(dirname) } if @dirs
   end
 
   def doTestDelTree(attr)

data/cl/util/util.rb

@@ -3,8 +3,8 @@ require 'cl/util/version'
 # VERSION auto generated section
 begin                                                                  
   require 'cl/util/version'                                            
-  VERSION = CLabs::Version.new('2010', '127', '0')
+  VERSION = CLabs::Version.new('2010', '129', '0')
 rescue LoadError                                                       
-  VERSION = '2010.127.0'                                                  
+  VERSION = '2010.129.0'                                                  
 end                                                                    
 # END_VERSION

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: clutil
 version: !ruby/object:Gem::Version 
-  version: 2010.127.0
+  prerelease: false
+  segments: 
+  - 2010
+  - 129
+  - 0
+  version: 2010.129.0
 platform: ruby
 authors: 
 - chrismo
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-07 00:00:00 -05:00
+date: 2010-05-09 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -62,18 +67,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
-  version: 
 requirements: []
 
 rubyforge_project: scrapware
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: cLabs Ruby Utilities