podgraph 0.0.5 → 0.1.5

data/NEWS

@@ -1,5 +1,12 @@
 -*- text -*-
 
+0.1.5
+-----
+
+Fri Apr 29 00:31:16 EEST 2011
+
+- Added '--to' & '--from' command line options.
+
 0.0.5
 -----
 

data/README.rdoc

@@ -5,7 +5,7 @@ posterous.com.
 
 = Synopsis
 
-podgraph [-Sv] [-m ARG] [file.html]
+podgraph [options] [file.html]
 
 = Description
 
@@ -15,9 +15,11 @@ local MTA.
 
 The options are as follows:
 
- -v           Be more verbose.
- -S           Don't send, just dump the mail to stdout.
- -m ARG       1 of modes: related, mixed.
+ -v              Be more verbose.
+ -S              Don't send, just dump the mail to stdout.
+ -m ARG          1 of modes: related, mixed.
+ --from EMAIL    'From' address
+ --to EMAIL      'To' address
 
 The file is supposed to be a XHTML generated by python's docutils from
 reStructuredText. The idea is:
@@ -54,6 +56,8 @@ example:
  :to: post@posterous.com
  :from: me@example.org
 
+('--to' & '--from' command line options override values in config.yaml.)
+
 Start writing a .rest file:
 
  % emacsclient 0001.rest &

data/Rakefile

@@ -1,3 +1,5 @@
+# -*-ruby-*-
+
 require 'rake'
 require 'rake/gempackagetask'
 require 'rake/clean'
@@ -23,7 +25,7 @@ spec = Gem::Specification.new do |s|
   s.test_files = FileList['test/test_*.rb']
   s.rdoc_options << '-m' << 'Podgraph'
   
-  s.add_dependency('mail', '~> 2.2.17')
+  s.add_dependency('mail', '~> 2.3.0')
   s.add_development_dependency('git', '>= 1.2.5')
 end
 

data/TODO

@@ -1,8 +1,5 @@
 -*-org-*-
 
-* 0.1.0
-- CL options for email
-
 * 0.0.1
 
 + rewrite README.rdoc to make it look more like a manpage

data/bin/podgraph

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby19
+#!/usr/bin/env ruby
 # -*- ruby -*-
 
 require_relative '../lib/podgraph/posterous'
@@ -15,23 +15,36 @@ $conf[:from] = nil
 $conf[:banner] = "#{File.basename($0)} [options] [file.html]\nType 'ri #{Podgraph::Meta::NAME.capitalize}' for the help."
 $conf[:input] = nil
 
-def mailconfig_load()
+def mailconfig_load
   begin
     myconf = YAML.load_file($conf[:mailconfig])
   rescue
     abort("cannot parse #{$conf[:mailconfig]} in the current directory")
   end
   %w(to from).each { |i|
-    Trestle.errx(1, "missing #{i} in #{$conf[:mailconfig]}") if ! myconf.key?(i.to_sym)
+    if ! $conf[i.to_sym]
+      Trestle.errx(1, "missing #{i} in #{$conf[:mailconfig]}") if ! myconf.key?(i.to_sym)
+      $conf[i.to_sym] = myconf[i.to_sym]
+    end
   }
-  $conf.merge!(myconf)
 end
 
+def mail_addr_valid?(t)
+  return false if t =~ /^\s*$/  # why Mail::Address doesn't handle this?
+  begin
+    Mail::Address.new t
+  rescue
+    return false
+  end
+  return true
+end
 
 # ---
 
 u.config_parse(['foobar']) {|src|
   o = u.cl_parse(src) # create an OptionParser object
+  o.on('--from EMAIL', "'From' address") { |v| $conf[:from] = v if mail_addr_valid?(v) }
+  o.on('--to EMAIL', "'To' address") { |v| $conf[:to] = v if mail_addr_valid?(v) }
   o.on('-c ARG', "Use another configuration file instead of",
        $conf[:mailconfig]) { |v| $conf[:mailconfig] = v }
   o.on('-S', "Don't send, just dump the mail to stdout") { |v| $conf[:send?] = false }
@@ -39,8 +52,10 @@ u.config_parse(['foobar']) {|src|
   u.cl_parse(src, o) # run cl parser
 }
 
+#pp $conf
+
 ARGV.size < 1 ? $conf[:input] = STDIN : $conf[:input] = ARGV[0]
-mailconfig_load
+mailconfig_load if (!$conf[:from] || !$conf[:to])
 
 begin
   p = Podgraph::Posterous.new(u, $conf[:input], $conf[:to], $conf[:from], $conf[:mode])

data/lib/podgraph/meta.rb

@@ -1,7 +1,7 @@
 module Podgraph
   module Meta
     NAME = 'podgraph'
-    VERSION = '0.0.5'
+    VERSION = '0.1.5'
     AUTHOR = 'Alexander Gromnitsky'
     EMAIL = 'alexander.gromnitsky@gmail.com'
     HOMEPAGE = 'http://github.com/gromnitsky/' + NAME

data/test/test_mime.rb

@@ -69,7 +69,7 @@ class TestMime < MiniTest::Unit::TestCase
   
   # NOTE: run
   #
-  # ../bin/podgraph -S simple.html | grep -v -e ^To: -e '^Date:' -e ^Message-ID: -e '^user-agent:'|md5
+  # ../bin/podgraph -S simple.html | grep -i -v -e ^To: -e '^Date:' -e ^Message-ID: -e '^user-agent:'|md5
   #
   # to get a new hash for this test.
   def test_simple
@@ -78,10 +78,10 @@ class TestMime < MiniTest::Unit::TestCase
     mail.sub!(/^Date: .+$\n/, '')
     mail.sub!(/^To: .+$\n/, '')
     mail.sub!(/^Message-ID: .+$\n/, '')
-    mail.sub!(/^user-agent: .+$\n/, '')
+    mail.sub!(/^User-Agent: .+$\n/, '')
 #    p mail
 #    puts mail
-    assert_equal('c7ac3a5797496efd323c7017c4516cb1',
+    assert_equal('54c07d54f21efd28cc4634bd6b61efaf',
                  Digest::MD5.hexdigest(mail + "\n"))
   end
 

metadata

@@ -2,7 +2,7 @@
 name: podgraph
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Alexander Gromnitsky
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 Z
+date: 2011-04-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mail
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.2.17
+        version: 2.3.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency