tmail 1.2.0 → 1.2.1

data/log/History.txt

@@ -8,7 +8,7 @@
   * Closed 16025 - TMail scanner.rb would not parse ATOM chars correctly making it fail tests where the C version passed them.  Fixed this by updating the Scanner.rb version to be in step with the C version (there was an extra @ symbol in the ATOM CHARS definition that was not in the C version.) (mikel)
   * Fixed scanner.rb so that it would pass the same tests that the C version does - had a sundry @ symbol inside of the ATOM CHARS
 * 3 minor enhancements:
-  * Renamed scanner_c.c to mailscanner.c (trans)
+  * Renamed scanner_c.c to tmailscanner.c (trans)
   * Changed TMail::Mail#sender to have a default "default" value of nil to be in alignment with all the other interface methods (mikel)
   * Made base64_decode and base64_encode into ! versions as they are destructive on the mail body (encodes the body to base64 or decodes it), made aliases for base64_decode and base64_encode to point back to the bang versions.  Doing this with a view to change base64_encode to a non destructive version (returns the encoded body) in future versions. (mikel)
 

data/meta/MANIFEST

@@ -5,12 +5,12 @@ NOTES
 README
 ext
 ext/Makefile
-ext/mailscanner
-ext/mailscanner/tmail
-ext/mailscanner/tmail/MANIFEST
-ext/mailscanner/tmail/depend
-ext/mailscanner/tmail/extconf.rb
-ext/mailscanner/tmail/mailscanner.c
+ext/tmailscanner
+ext/tmailscanner/tmail
+ext/tmailscanner/tmail/MANIFEST
+ext/tmailscanner/tmail/depend
+ext/tmailscanner/tmail/extconf.rb
+ext/tmailscanner/tmail/tmailscanner.c
 lib
 lib/tmail
 lib/tmail/Makefile
@@ -44,9 +44,10 @@ lib/tmail/version.rb
 lib/tmail.rb
 meta
 meta/MANIFEST
-meta/ROLLRC
+meta/config.yaml
 meta/icli.yaml
 meta/project.yaml
+meta/tmail.roll
 sample
 sample/bench_base64.rb
 sample/data
@@ -67,18 +68,26 @@ script/clobber
 script/clobber/distclean
 script/clobber/package
 script/compile
-script/config.yaml
+script/pack
+script/pack/gem
+script/pack/tgz
+script/pack/zip
 script/prepare
 script/publish
 script/rdoc
 script/release
 script/setup
+script/stamp
 script/stats
 script/tag
 script/test
 test
 test/extctrl.rb
 test/fixtures
+test/fixtures/mailbox
+test/fixtures/mailbox_without_any_from_or_sender
+test/fixtures/mailbox_without_from
+test/fixtures/mailbox_without_return_path
 test/fixtures/raw_base64_decoded_string
 test/fixtures/raw_base64_email
 test/fixtures/raw_base64_encoded_string
@@ -114,5 +123,6 @@ test/test_helper.rb
 test/test_mail.rb
 test/test_mbox.rb
 test/test_port.rb
+test/test_quote.rb
 test/test_scanner.rb
 test/test_utils.rb

data/{script → meta}/config.yaml

@@ -4,5 +4,5 @@ publish:
 
 rdoc:
   output: doc/rdoc
-  main: README.txt
+  main: README
 

data/meta/tmail.roll

@@ -0,0 +1,3 @@
+tmail 1.2.1 stable 2007-12-25
+lib/tmail
+ext/tmailscanner/tmail

data/script/clobber/distclean

@@ -1,7 +1,7 @@
 #!/usr/bin/env ratch
 
 main :distclean do
-  cd 'ext/mailscanner/tmail' do
+  cd 'ext/tmailscanner/tmail' do
     make 'distclean'
   end
 end

data/script/compile

@@ -8,11 +8,11 @@ end
 
 task :compile_scanner do
   file = nil
-  cd("ext/mailscanner/tmail") do
+  cd("ext/tmailscanner/tmail") do
     ruby "extconf.rb"
     make
 
-    #file = glob("mailscanner.#{dlext}").first
+    #file = glob("tmailscanner.#{dlext}").first
     #file = File.expand_path(file) if file
   end
 

data/script/pack/gem

@@ -0,0 +1,93 @@
+#!/usr/bin/env ratch
+
+# generate gem package
+
+# TODO: Should this use staging too, like zip/tgz?
+
+begin
+  require 'rubygems/specification'
+  Gem::manage_gems
+rescue LoadError
+  raise LoadError, "RubyGems is not installed?"
+end
+
+# Create a Gem package.
+
+main 'pack/gem' do
+  status "Creating .gem package"
+
+  config = configuration['pack'] || {}
+  config = config['gem'] || {}
+
+  package = package().clone
+  package.update(config)
+
+  store = config[:store] || 'pkg'
+
+  #dir  = Dir.pwd
+
+  file = nil
+  #cd(dir) do
+    #status "vi #{metadata.name}.gemspec"
+    builder = ::Gem::Builder.new(gemspec(package))
+    status "gem build #{package.name}"
+    unless dryrun?
+      file = builder.build
+      file = File.expand_path(file)
+    end
+  #end
+
+  transfer(file, store)
+end
+
+# Transfer package file to storage location.
+
+def transfer(file, store)
+  dest = File.join(store, File.basename(file))    # move to store, unless already there
+  dest = File.expand_path(dest)
+  mv(file, store) unless file == dest
+end
+
+# Create Gem::Specification.
+
+def gemspec(package)
+  distribute = package.filelist
+  #distribute = Dir.multiglob_with_default( '**/*', distribute )
+
+  ::Gem::Specification.new do |spec|
+    spec.name              = package.name
+    spec.version           = package.version
+    spec.summary           = package.brief
+    spec.description       = package.description
+    spec.author            = [package.author].flatten
+    spec.email             = package.email
+    spec.rubyforge_project = package.development if /rubyforge.org/ =~ package.development
+    spec.homepage          = package.homepage
+
+    # Platform: ruby, mswin32, i586-linux, powerpc-darwin, current
+    spec.platform = 'ruby'  # TODO current support!
+
+    spec.require_paths = [package.gem_path].flatten.reverse
+
+    #if package.platform != 'ruby'
+    #  spec.require_paths.concat(spec.require_paths.collect{ |d| File.join(d, platform) })
+    #end
+
+    spec.bindir = "bin"
+    spec.executables  = package.executables
+    spec.requirements = package.requirements
+    spec.has_rdoc     = package.document
+
+    if package.dependencies
+      package.dependencies.each do |d,v|
+        spec.add_dependency(*[d,v].compact)
+      end
+    end
+
+    spec.extensions = package.compile
+
+    spec.files = distribute
+
+    spec.test_files = distribute.select{ |f| f =~ /^test\// }  # TODO make test_files configurable
+  end
+end

data/script/pack/tgz

@@ -0,0 +1,41 @@
+#!/usr/bin/env ratch
+
+# generate tar gzip package
+
+main 'pack/tgz' do
+  status "Creating .tgz package"
+
+  config = configuration['pack'] || {}
+  config = config['tgz'] || {}
+
+  package = package().clone
+  package.update(config)
+
+  store = config[:store] || 'pkg'
+  templ = config[:template]
+
+  name  = package.stage_name(templ)
+  stage = File.join(store, name)
+  files = package.filelist
+
+  stage(stage, files)
+
+  if dryrun?
+    status "tar -cxf #{name}.tgz"
+  else
+    file = nil
+    cd(store) do
+      file = tgz(name)
+    end
+    transfer(file, store)
+  end
+end
+
+# Transfer package file to storage location.
+
+def transfer(file, store)
+  # move to store, unless already there
+  dest = File.join(store, File.basename(file))
+  dest = File.expand_path(dest)
+  mv(file, store) unless file == dest
+end

data/script/pack/zip

@@ -0,0 +1,41 @@
+#!/usr/bin/env ratch
+
+# generate zip package
+
+main 'pack/zip' do
+  status "Creating .zip package"
+
+  config = configuration['pack'] || {}
+  config = config['zip'] || {}
+
+  package = package().clone
+  package.update(config)
+
+  store = config[:store] || 'pkg'
+  templ = config[:template]
+
+  name  = package.stage_name(templ)
+  stage = File.join(store, name)
+  files = package.filelist
+
+  stage(stage, files)
+
+  if dryrun?
+    status "tar -cxf #{name}.zip"
+  else
+    file = nil
+    cd(store) do
+      file = zip(name)
+    end
+    transfer(file, store)
+  end
+end
+
+# Transfer package file to storage location.
+
+def transfer(file, store)
+  # move to store, unless already there
+  dest = File.join(store, File.basename(file))
+  dest = File.expand_path(dest)
+  mv(file, store) unless file == dest
+end

data/script/prepare

@@ -1,10 +1,15 @@
+#!/usr/bin/env ratch
+
 # prepare for release
 #
 # This updates the manifest file 
 # and generates the packages.
 
 main :prepare do
+  stamp
   manifest "up"
-  box "up"
+  pack.gem
+  pack.zip
+  pack.tgz
 end
 

data/script/publish

@@ -16,7 +16,7 @@ main :publish do
   exclude     = %w{.svn}
 
   abort "no project"  unless project
-  abort "no username" unless username
+  abort "no username (you can also set RUBYFORGE_USERNAME evironament variable)" unless username
 
   if subdir
     destination = File.join(project, subdir)
@@ -27,7 +27,7 @@ main :publish do
   dir = source.chomp('/') + '/'
   url = "#{username}@rubyforge.org:/var/www/gforge-projects/#{destination}"
 
-  op = ['-rLvz', '--delete']  # maybe -p ?
+  op = ['-rLvz', '--delete-after']  # maybe -p ?
 
   # add filter options. The commandline version didn't seem
   # to work, so I opted for creating an .rsync_filter file for

data/script/rdoc

@@ -0,0 +1,42 @@
+#!/usr/bin/env ratch
+
+# generate rdocs
+#
+# Generate Rdoc documentation. Settings are
+# the same as the rdoc command's options.
+
+main :rdoc do
+  # Load rdoc configuration.
+
+  config = configuration['rdoc']
+
+  config['op'] = config.delete('output') if config['output']
+
+  config = {
+    'template'       => 'html',
+    'op'             => 'doc/rdoc',
+    'merge'          => true,
+    'inline-source'  => true,
+    'exclude'        => %w{MANIFEST, Manifest.txt},
+    'include'        => %w{[A-Z]* lib ext}
+  }.update(config)
+
+  output = config['op']
+
+  # Check for parent directory.
+  # (Helps to ensure we're in the right place.)
+
+  dir!(File.dirname(output))
+
+  # Prepare command arguments.
+
+  vector = config.command_vector('include')
+
+  # Remove old rdocs, if any.
+
+  rm_r(output) if File.exist?(output)
+
+  # Document.
+
+  rdoc(*vector)
+end

data/script/release

@@ -3,9 +3,7 @@
 # release packages
 
 main :release do
-  fname = Dir.glob('meta/*.roll').first
-  pname = File.basename(fname).chomp('.roll')
-  name, version = *pname.split('-')
+  version = rollrc.version
 
   icli "rubyforge release --version=#{version}"
 end

data/script/stamp

@@ -0,0 +1,33 @@
+#!/usr/bin/env ratch
+
+# update version stamps
+
+# You can change these via the command line.
+version = commandline['version'] || release.version
+status  = commandline['status']  || release.status
+
+# Update ROLLRC file.
+
+main :stamp do
+  if version != release.version or status != release.status
+    build release.file
+  end
+end
+
+#
+
+file release.file do
+  w = ''
+  w << "#{release.name} #{version} #{status} #{Time.now.strftime('%Y-%m-%d')}"
+  w << " #{release.default}" if release.default
+  w << "\n"
+  w << release.libpath.join("\n")
+
+  if dryrun?
+    puts release.file + ":"
+    puts w
+  else
+    File.open(release.file, 'w'){|f| f << w}
+    puts "#{release.file} updated."
+  end
+end

data/script/test

@@ -13,7 +13,7 @@ main :test do
 
   unless live
     $LOAD_PATH.unshift(File.expand_path('lib'))
-    $LOAD_PATH.unshift(File.expand_path('ext/mailscanner')) unless pure
+    $LOAD_PATH.unshift(File.expand_path('ext/tmailscanner')) unless pure
   end
 
   if find

data/test/fixtures/mailbox

@@ -0,0 +1,13 @@
+From mike@envelope_sender.com.au
+Return-Path: <mikel@return_path.com>
+Received: from mikel091a by oaamta05sl.mx.bigpond.com with SMTP id 
+  <20071021093820.JFMT24025.oaamta05sl.mx.bigpond.com@mikel091a> for 
+  <mikel@nowhere.com.else>; Sun, 21 Oct 2007 19:38:20 +1000
+Date: Sun, 21 Oct 2007 19:38:13 +1000
+From: Mikel Lindsaar <mikel@from_address.com>
+To: Mikel <mikel@somewhere.com>
+Message-Id: <009601c813c6$19df3510$0437d30a@mikel091a>
+Subject: Testing outlook
+
+Hello Mikel
+

data/test/fixtures/mailbox_without_any_from_or_sender

@@ -0,0 +1,10 @@
+Received: from mikel091a by oaamta05sl.mx.bigpond.com with SMTP id 
+  <20071021093820.JFMT24025.oaamta05sl.mx.bigpond.com@mikel091a> for 
+  <mikel@nowhere.com.else>; Sun, 21 Oct 2007 19:38:20 +1000
+Date: Sun, 21 Oct 2007 19:38:13 +1000
+To: Mikel <mikel@somewhere.com>
+Message-Id: <009601c813c6$19df3510$0437d30a@mikel091a>
+Subject: Testing outlook
+
+Hello Mikel
+