podgraph 0.0.3 → 0.0.5

data/NEWS

@@ -1,12 +1,34 @@
 -*- text -*-
 
+0.0.5
+-----
+
+Wed Apr 20 21:58:27 EEST 2011
+
+- If no input file is specified, read stdin.
+
+- Repackaged under RVM in fedora.
+
+0.0.4
+-----
+
+Tue Apr 19 19:01:14 EEST 2011
+
+- Fixed one RE to support https:// images.
+
+- Dropped activesupport dependency.
+
+- Injected falsework's naive template.
+
 0.0.3
+-----
 
-- add missing active_support dependency (btw, active_support 3.0.0
-  requires i18n (ran `gem install i18n) but it's not listed in its
-  dependencies)
+- added missing activesupport dependency (btw, activesupport 3.0.0
+  requires i18n (run 'gem install i18n', for some reason this dependency
+  isn't listed in the gem).
 
 0.0.2
+-----
 
 - nailed the mail gem to explicit version 2.1.3, because the current
   2.2.0 introduced some weird bugs.

data/README.rdoc

@@ -1,41 +1,41 @@
--*- text -*-
 = Name
 
-podgraph -- Create an email from a XHTML and inline images and send it
-to posterous.com.
+podgraph -- Create an email from XHTML + inline images and send it to
+posterous.com.
 
 = Synopsis
 
-podgraph [-Sv] [-m ARG] file.html
+podgraph [-Sv] [-m ARG] [file.html]
 
 = Description
 
-It's a simple program that reads a XHTML file, extracts subject and body
-from the file, constructs an email and delivers it.
+It is a simple program that reads a XHTML file (or stdin), extracts
+subject and body from the file, constructs an email and delivers it to
+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: Podgraph::["related", "mixed"].
+ -m ARG       1 of modes: related, mixed.
 
-The file is supposed to be a XHTML result from python's docutils
+The file is supposed to be a XHTML generated by python's docutils from
 reStructuredText. The idea is:
 
-1. You're writing a post (for example, for posterous.com) in
-   reStructuredText in Emacs.
+1. Write a post (for example, for posterous.com) in reStructuredText in
+   Emacs.
 
-2. You're converting it with help of docutils to the XHTML.
+2. Convert it with help of docutils to the XHTML.
 
-3. Finally, you're creating a proper MIME mail from raw XHTML and
-   sending it to posterous.com.
+3. Finally, create a proper MIME mail from the raw XHTML and send it to
+   posterous.com.
 
-Step 3 is what podgraph does.
+<em>Step 3 is what podgraph does.</em>
 
 == Features
 
-* Creates mails with inline images if it can found links in the XHTML
-  file to local images.
+* Generates mail with inline images if it can found links  to local
+  images in the XHTML file.
 
 * Charset of 'text/html' portion of a mail is always UTF-8.
 
@@ -46,7 +46,7 @@ or >= 1 if en error occurs.
 
 = Examples
 
-Create a config.yaml file in the directory with your writing. For
+Create a config.yaml file in the directory with your writings. For
 example:
 
  % cd ~/lib/writing/posterous
@@ -64,7 +64,7 @@ To give podgraph a chance to find a subject for the mail, write .rest
 file as:
 
  This is a subject
- *****************
+ -----------------
 
  My usual reStructuredText.
 
@@ -86,8 +86,8 @@ Also, you can preview the mail without sending it:
  % podgraph -S 0001.html
 
 If you have links to local images in your .rest file (and
-correspondingly in .html) then podgraph will include images in the mail as
-inline images. But if you don't want this and want images to become a
+correspondingly in .html) then podgraph will include images in the mail
+as inline images. But if you don't want this and want images to become a
 typical gallery on posterous.com, run:
 
  % podgraph -m mixed 0001.html

data/Rakefile

@@ -1,39 +1,42 @@
-# -*- ruby -*-
-
 require 'rake'
 require 'rake/gempackagetask'
 require 'rake/clean'
 require 'rake/rdoctask'
 require 'rake/testtask'
 
+require_relative 'lib/podgraph/meta'
+require_relative 'test/rake_git'
+
 spec = Gem::Specification.new do |s|
-  s.name = "podgraph"
+  s.name = Podgraph::Meta::NAME
+  s.version = Podgraph::Meta::VERSION
   s.summary = 'Creates a MIME mail from a XHTML source and delivers it to Posterous.com.'
-  s.version = '0.0.3'
-  s.author = 'Alexander Gromnitsky'
-  s.email = 'alexander.gromnitsky@gmail.com'
+  s.description = 'Adequately scans XHTML for local inline images and appends them to the mail.'
+  s.author = Podgraph::Meta::AUTHOR
+  s.email = Podgraph::Meta::EMAIL
+  s.homepage = Podgraph::Meta::HOMEPAGE
   s.platform = Gem::Platform::RUBY
-  s.required_ruby_version = '>= 1.9'
-  s.files = FileList['lib/**/*.rb', 'bin/*', '[A-Z]*', 'test/**/*'].to_a
-  s.executables = ['podgraph']
-  s.has_rdoc = true
-  s.test_files = FileList['test/ts_*.rb'].to_a
+  s.required_ruby_version = '>= 1.9.2'
+  s.files = git_ls('.')
+  s.executables = [s.name]
+
+  s.test_files = FileList['test/test_*.rb']
   s.rdoc_options << '-m' << 'Podgraph'
+  
+  s.add_dependency('mail', '~> 2.2.17')
+  s.add_development_dependency('git', '>= 1.2.5')
 end
-spec.add_dependency('mail', '= 2.1.3')
-spec.add_dependency('activesupport', '>= 3.0.0')
 
 Rake::GemPackageTask.new(spec).define
 
-task :default => %(repackage)
+task default: [:repackage]
 
 Rake::RDocTask.new('doc') do |rd|
   rd.main = "Podgraph"
-  rd.rdoc_dir = 'doc'
   rd.rdoc_files.include("lib/**/*.rb")
 end
 
 Rake::TestTask.new do |t|
-  t.test_files = FileList['test/ts_*.rb']
+  t.test_files = FileList['test/test_*.rb']
   t.verbose = true
 end

data/TODO

@@ -1,11 +1,9 @@
--*- text -*-
+-*-org-*-
 
-0.1.2
-
-- read input from stdin
+* 0.1.0
 - CL options for email
 
-0.0.1
+* 0.0.1
 
 + rewrite README.rdoc to make it look more like a manpage
 + add simple tests

data/bin/podgraph

@@ -1,76 +1,57 @@
 #!/usr/bin/env ruby19
 # -*- ruby -*-
 
-# Copyright (c) 2010 Alexander Gromnitsky <mailto:alexander.gromnitsky@gmail.com>.
-#
-# $Id: podgraph 128 2010-04-24 07:16:01Z alex $
-
 require_relative '../lib/podgraph/posterous'
 
-$conf = {
-  prog_ver: '0.0.3',
-  send?: true,
-  config: 'config.yaml',
-  modes: %w(related mixed),
-  mode: 'related',
-  to: nil,
-  from: nil
-}
+$conf = {}
+u = Trestle.new $conf
+
+$conf[:send?] = true
+$conf[:mailconfig] = 'config.yaml'
+$conf[:modes] = %w(related mixed)
+$conf[:mode] = 'related'
+$conf[:to] = nil
+$conf[:from] = nil
+$conf[:banner] = "#{File.basename($0)} [options] [file.html]\nType 'ri #{Podgraph::Meta::NAME.capitalize}' for the help."
+$conf[:input] = nil
 
-def config_load()
+def mailconfig_load()
   begin
-    myconf = YAML.load_file($conf[:config])
+    myconf = YAML.load_file($conf[:mailconfig])
   rescue
-    abort("cannot parse #{$conf[:config]} in the current directory")
+    abort("cannot parse #{$conf[:mailconfig]} in the current directory")
   end
   %w(to from).each { |i|
-    abort("missing #{i} in #{$conf[:config]}") if ! myconf.key?(i.to_sym)
+    Trestle.errx(1, "missing #{i} in #{$conf[:mailconfig]}") if ! myconf.key?(i.to_sym)
   }
   $conf.merge!(myconf)
 end
 
-def cl_parse(myargs)
-  o = OptionParser.new()
-  o.banner = "#{File.basename($PROGRAM_NAME)} #{$conf[:prog_ver]}.
-Create an email from a XHTML and inline images and send it to posterous.com.
-http://podgraph.posterous.com/
 
-Usage: #{File.basename($PROGRAM_NAME)} [options] file.html"
-  o.separator ""
-  o.on('-v', 'Be more verbose.') { |v| Podgraph::cfg[:verbose] += 1 }
-  o.on('-S', "Don't send, just dump the mail to stdout.") { |v| $conf[:send?] = false }
-  o.on('-m ARG', "1 of modes: Podgraph::#{$conf[:modes]}.",
-       $conf[:modes]) { |v| $conf[:mode] = v }
+# ---
 
-  begin
-    o.parse!(myargs)
-  rescue
-    abort("cl parse error: #{$!}")
-  end
-end
-
-# --[ main ]------------------------------------------------------------
-
-config_load()
+u.config_parse(['foobar']) {|src|
+  o = u.cl_parse(src) # create an OptionParser object
+  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 }
+  o.on('-m ARG', "Select mode: #{$conf[:modes].join(', ')}") { |v| $conf[:mode] = v }
+  u.cl_parse(src, o) # run cl parser
+}
 
-cl_parse ARGV
-Podgraph::veputs(1, "CL options: #{ARGV}")
-unless ARGV.size >= 1
-  abort("Usage: #{File.basename($PROGRAM_NAME)} [options] filename.html
-Type \"#{File.basename($PROGRAM_NAME)} -h\" for the help.")
-end
+ARGV.size < 1 ? $conf[:input] = STDIN : $conf[:input] = ARGV[0]
+mailconfig_load
 
-Podgraph::veputs(2, "cfg #{Podgraph::cfg}")
 begin
-  p = Podgraph::Posterous.new(ARGV[0], $conf[:to], $conf[:from], $conf[:mode])
-  Podgraph::veputs(2, "o: #{p.o}".to_s.encode('koi8-u'))
-  mail = p.generate()
+  p = Podgraph::Posterous.new(u, $conf[:input], $conf[:to], $conf[:from], $conf[:mode])
+  u.veputs(2, "o: #{p.o}".to_s.encode('koi8-u'))
+  mail = p.generate
 rescue
-  abort("HTML parsing failed: #{$!}")
+  Trestle.errx(1, "HTML parsing failed: #{$!}")
 end
 
 if ! $conf[:send?]
-  puts mail.to_s()
+  puts mail.to_s
   exit 0
 end
 
@@ -78,5 +59,5 @@ begin
   mail.delivery_method :sendmail
   mail.deliver
 rescue
-  abort("cannot send mail: #{$!}")
+  Trestle.errx(1, "cannot send mail: #{$!}")
 end

data/lib/podgraph/meta.rb

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

data/lib/podgraph/posterous.rb

@@ -1,26 +1,13 @@
-# $Id: posterous.rb 128 2010-04-24 07:16:01Z alex $
-
-gem 'mail', '= 2.1.3'
 require 'mail'
-require 'active_support/core_ext/module/attribute_accessors'
-
 require 'rexml/document'
 require 'yaml'
 require 'optparse'
 
+require_relative 'trestle'
+include Podgraph
+
 # :include: ../../README.rdoc
 module Podgraph
-
-  VERSION = '0.0.3'
-  mattr_accessor :cfg
-  
-  self.cfg = Hash.new()
-  cfg[:verbose] = 0
-
-  def self.veputs(level, s)
-    puts(s) if cfg[:verbose] >= level
-  end
-
   # Reads XHTML file, analyses it, finds images, checks if they can be inlined,
   # generates multipart/relative or multipart/mixed MIME mail.
   class Posterous
@@ -28,12 +15,15 @@ module Podgraph
     # some options for mail generator; change with care
     attr_accessor :o
 
+    # a Trestle object
+    attr_accessor :trestle
+
     # Analyses _filename_. It must be a XHTML file.
     # _to_, _from_ are email.
     # _mode_ is 1 of 'related' or 'mixed' string.
-    def initialize(filename, to, from, mode)
+    def initialize(trestle, filename, to, from, mode)
       @o = Hash.new()
-      @o[:user_agent] = 'podgraph/' + VERSION
+      @o[:user_agent] = Podgraph::Meta::NAME + ?/ + Podgraph::Meta::VERSION
       @o[:subject] = ''
       @o[:body] = []
       @o[:attachment] = []
@@ -42,13 +32,15 @@ module Podgraph
       @o[:to] = to
       @o[:from] = from
 
-      fp = File.new(filename)
+      @trestle = trestle
+
+      fp = (filename == STDIN ? STDIN : File.new(filename))
       begin
         make(fp)
       rescue
         raise $!
       ensure
-        fp.close()
+        fp.close unless fp == STDIN
       end
     end
 
@@ -65,7 +57,7 @@ module Podgraph
         if i.name == 'img'
           if (src = i.attributes['src']) =~ /^\s*$/
             raise '<img> tag with missing or empty src attribute'
-          elsif src =~ /\s*(http|ftp):\/\//
+          elsif src =~ /\s*(https?|s?ftp):\/\//
             # we are ignoring URL's
             return
           else
@@ -77,7 +69,7 @@ module Podgraph
               i.attributes['src'] = random
               @o[:a_marks][src] = random   # save an act of the replacement
               
-              @o.rehash()                  # does is this really necessary?
+              @o.rehash()                  # is this really necessary?
             end
           end
         end
@@ -90,10 +82,10 @@ module Podgraph
           next
         end
 
-        Podgraph::veputs(2, "node: #{i.name}")
+        @trestle.veputs(2, "node: #{i.name}")
         img_collect.call(i, @o[:attachment])
         i.each_recursive { |j|
-          Podgraph::veputs(2, "node recursive: #{j.name}")
+          @trestle.veputs(2, "node recursive: #{j.name}")
           img_collect.call(j, @o[:attachment])
         }
         
@@ -109,11 +101,12 @@ module Podgraph
       m = Mail.new()
       m.from(@o[:from])
       m.to(@o[:to])
-      m.content_transfer_encoding('8bit')
+      m.transport_encoding = Mail::Encodings.get_encoding('8bit')
+#      m.content_transfer_encoding('8bit')
       m.subject(@o[:subject])
       m.headers({'User-Agent' => @o[:user_agent]})
 
-      Podgraph::veputs(2, "Body lines=#{@o[:body].size}, bytes=#{@o[:body].to_s.bytesize}")
+      @trestle.veputs(2, "Body lines=#{@o[:body].size}, bytes=#{@o[:body].to_s.bytesize}")
       if @o[:attachment].size == 0
         m.content_disposition('inline')
         m.content_type('text/html; charset="UTF-8"')
@@ -123,7 +116,6 @@ module Podgraph
           m.content_type('Multipart/Related')
         end
         m.html_part = Mail::Part.new {
-          content_transfer_encoding('8bit')
           content_type('text/html; charset=UTF-8')
         }
         m.html_part.body = @o[:body]
@@ -147,7 +139,7 @@ module Podgraph
 
           @o[:a_marks].each { |k, v|
             if cid.key?(k)
-              Podgraph::veputs(2, "mark #{k} = #{v}; -> to #{cid[k]}")
+              @trestle.veputs(2, "mark #{k} = #{v}; -> to #{cid[k]}")
               # replace marks with corresponding content-id
               m.html_part.body.raw_source.sub!(v, "cid:#{cid[k][1..-1]}")
             else

data/lib/podgraph/trestle.rb

@@ -0,0 +1,216 @@
+# :erb:
+require 'yaml'
+require 'shellwords.rb'
+require 'optparse'
+require 'pp'
+require 'open4'
+
+require_relative 'meta'
+
+# :include: ../../README.rdoc
+module Podgraph
+
+  class Trestle
+
+    # Execute _cmd_ and return a list [exit_status, stderr,
+    # stdout]. Very handy.
+    def self.cmd_run(cmd)
+      so = sr = ''
+      status = Open4::popen4(cmd) { |pid, stdin, stdout, stderr|
+        so = stdout.read
+        sr = stderr.read
+      }
+      [status.exitstatus, sr, so]
+    end
+
+    # Return a directory with program libraries.
+    def self.gem_libdir
+      t = ["#{File.dirname(File.expand_path($0))}/../lib/#{Podgraph::Meta::NAME}",
+           "#{Gem.dir}/gems/#{Podgraph::Meta::NAME}-#{Podgraph::Meta::VERSION}/lib/#{Podgraph::Meta::NAME}",
+           "lib/#{Podgraph::Meta::NAME}"]
+      t.each {|i| return i if File.readable?(i) }
+      fail "all paths are invalid: #{t}"
+    end
+
+    # Analogue to shell command +which+.
+    def self.in_path?(file)
+      return true if file =~ %r%\A/% and File.exist? file
+
+      ENV['PATH'].split(File::PATH_SEPARATOR).any? do |path|
+        File.exist? File.join(path, file)
+      end
+    end
+
+    # Print an error message _t_ and exit if _ec_ > 0.
+    def self.errx(ec, t)
+      STDERR.puts File.basename($0) + ' error: ' + t.to_s
+      exit ec if ec > 0
+    end
+
+    # Print a warning.
+    def self.warnx(t)
+      STDERR.puts File.basename($0) + ' warning: ' + t.to_s
+    end
+
+    # #veputs uses this to decide to put a newline or not to put.
+    NNL_MARK = '__NNL__'
+
+    # Use this in your CL options to check if modifying some variable is
+    # not an idempotent act.
+    attr_reader :cl_opt_protect
+
+    # [conf] Typically must be a reference to some global variable.
+    def initialize(conf)
+      @conf = conf
+      @conf[:verbose] = 0
+      @conf[:banner] = "Usage: #{File.basename($0)} [options]"
+      @conf[:config] =  Meta::NAME + '.yaml'
+      @conf[:config_dirs] =  [ENV['HOME']+'/.'+Meta::NAME,
+                              File.absolute_path("#{File.dirname(File.expand_path($0))}/../etc"),
+                              '/usr/etc', '/usr/local/etc', '/etc',
+                              "#{Gem.dir}/gems/#{Meta::NAME}-#{Meta::VERSION}/etc"
+                             ]
+      @conf[:config_env] = [Meta::NAME.upcase + '_CONF']
+
+      @cl_parsing_times = 0 # not used
+      @cl_opt_protect = false
+    end
+
+    # [level] A verbose level.
+    # [t]     A string to print.
+    #
+    # Don't print _t_ with a newline if it contains NNL_MARK at the end.
+    def veputs(level, t)
+      t = t.dup
+      nnl = nil
+      if t.match(/#{NNL_MARK}$/)
+        t.sub!(/#{$&}/, '')
+        nnl = 1
+      end
+
+      if @conf[:verbose] >= level
+        nnl ? print(t) : puts(t)
+        STDOUT.flush
+      end
+    end
+    
+    # Run all configuration parsing in a batch.
+    #
+    # [rvars] A list of variable names which must be in the
+    #         configuration file.
+    #
+    # If no block is given, only standard CL options will be analysed.
+    def config_parse(rvars, &block)
+      cb = ->(b, src) {
+        if b
+          block.call src
+        else
+          # very basic default options
+          cl_parse(src, nil, true)
+        end
+      }
+      
+      # 1. parse env
+      @conf[:config_env].each {|i|
+#        puts '0 run:'
+        cb.call(block_given?, ENV[i].shellsplit) if ENV.key?(i)
+      }
+
+      # 2. parse CL in case of '--config' option
+#      puts "\n1 run"
+      @cl_opt_protect = true
+      cb.call(block_given?, ARGV.dup)
+      @cl_opt_protect = false
+
+      # 3. load the configuration file & do the final CL parsing
+      begin
+#        puts "\n2 run"
+        r = config_flat_load(rvars)
+      rescue
+        Trestle.errx(1, "cannot load config: #{$!}")
+      end
+      veputs(1, "Loaded config: #{r}")
+      cb.call(block_given?, ARGV)
+    end
+
+    # Load a config file immediately if it contains '/' in its name,
+    # otherwise search through several dirs for it.
+    #
+    # [rvars] a list of requied variables in the config
+    #
+    # Return a loaded filename or nil on error.
+    def config_flat_load(rvars)
+      p = ->(f) {
+        if File.readable?(f)
+          begin
+            myconf = YAML.load_file(f)
+          rescue
+            abort("cannot parse #{f}: #{$!}")
+          end
+          rvars.each { |i|
+            fail "missing or nil '#{i}' in #{f}" if ! myconf.key?(i.to_sym) || ! myconf[i.to_sym]
+          }
+          @conf.merge!(myconf)
+          return @conf[:config]
+        end
+        return nil
+      }
+
+      if @conf[:config].index('/')
+        return p.call(@config[:config])
+      else
+        @conf[:config_dirs].each {|dir|
+          return dir+'/'+@conf[:config] if p.call(dir + '/' + @conf[:config])
+        }
+      end
+
+      return nil
+    end
+
+
+    # Parses CL-like options.
+    #
+    # [src] An array of options (usually +ARGV+).
+    #
+    # If _o_ is non nil function parses _src_ immediately, otherwise it
+    # only creates +OptionParser+ object and return it (if _simple_ is
+    # false).
+    def cl_parse(src, o = nil, simple = false)
+      if ! o then
+#        puts "NEW o (#{cl_opt_protect})" + src.to_s 
+        o = OptionParser.new
+        o.banner = @conf[:banner]
+        o.on('-v', 'Be more verbose.') { |i|
+#          puts "cl_parsing_times "+cl_parsing_times.to_s
+          @conf[:verbose] += 1 unless cl_opt_protect
+        }
+        o.on('-V', 'Show version & exit.') { |i|
+          puts Meta::VERSION
+          exit 0
+        }
+        o.on('--config NAME', "Set a config name (default is #{@conf[:config]})") {|i|
+          @conf[:config] = i
+        }
+        o.on('--config-dirs', 'Show possible config locations') {
+          @conf[:config_dirs].each { |j|
+            f = j + '/' + @conf[:config]
+            puts (File.readable?(f) ? '* ' : '  ') +  f
+          }
+          exit 0
+        }
+
+        return o if ! simple
+      end
+
+      begin
+        o.parse!(src)
+        @cl_parsing_times += 1
+      rescue
+        Trestle.errx(1, $!.to_s)
+      end
+    end
+    
+  end # trestle
+end
+
+# Don't remove this: falsework/0.2.2/naive/2010-12-26T04:50:00+02:00

data/test/helper.rb

@@ -0,0 +1,3 @@
+require_relative 'helper_trestle'
+
+require 'digest/md5'

data/test/helper_trestle.rb

@@ -0,0 +1,37 @@
+# :erb:
+# Various staff for minitest. Include this file into your 'helper.rb'.
+
+require 'fileutils'
+include FileUtils
+
+require_relative '../lib/podgraph/trestle'
+include Podgraph
+
+# don't run tests automatically if they were invoked as 'gem check -t ...'
+if $0 =~ /gem/
+  require 'minitest/unit'
+else
+  require 'minitest/autorun'
+end
+
+# Return the right directory for (probably executable) _c_.
+def cmd(c)
+  case File.basename(Dir.pwd)
+  when Meta::NAME.downcase
+    # test probably is executed from the Rakefile
+    Dir.chdir('test')
+  when 'test'
+    # we are in the test directory, there is nothing special to do
+  else
+    # tests were invoked by 'gem check -t podgraph'
+    begin
+      Dir.chdir(Trestle.gem_libdir + '/../../test')
+    rescue
+      raise "running tests from '#{Dir.pwd}' isn't supported: #{$!}"
+    end
+  end
+
+  '../bin/' + c
+end
+
+# Don't remove this: falsework/0.2.2/naive/2010-12-26T04:50:00+02:00

data/test/rake_git.rb

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+# -*-ruby-*-
+# :erb:
+
+# This is a helper for your Rakefile. Read the comments for each
+# function.
+
+require 'git'
+require 'pp'
+
+# Return a list of files in a git repository _repdir_.
+#
+# Add this to your gem spec:
+#
+# spec = Gem::Specification.new {|i|
+#   i.files = git_ls('.')
+# }
+#
+# What it does is just collecting the list of the files from the git
+# repository. The idea is to use that list for the gem spec. No more
+# missing or redundant files in gems!
+def git_ls(repdir, ignore_some = true)
+  ignore = ['/?\.gitignore$']
+
+  r = []
+  g = Git.open repdir
+  g.ls_files.each {|i, v|
+    next if ignore_some && ignore.index {|ign| i.match(/#{ign}/) }
+    r << i
+  }
+  r
+end
+
+pp git_ls('.') if __FILE__ == $0
+
+# Don't remove this: falsework/0.2.2/naive/2010-12-26T04:50:00+02:00

data/test/simple.html

@@ -2,7 +2,8 @@
 <body>
 <div>
 <h1>Really, dude</h1>
-<p>Here is nothing <i>interesting</i>.</p>
+<p>Here is nothing <i>
+interesting</i>.</p>
 </div>
 </body>
 </html>

data/test/{ts_mime.rb → test_mime.rb}

@@ -1,65 +1,65 @@
-require 'test/unit'
-require 'digest/md5'
-
+require_relative 'helper'
 require_relative '../lib/podgraph/posterous'
 
-class TestMime < Test::Unit::TestCase
+class TestMime < MiniTest::Unit::TestCase
   def setup
     @testdir = File.expand_path(File.dirname(__FILE__))
     @to = 'alex@goliard'
     @from = 'alexander.gromnitsky@gmail.com'
+    @conf = {}
+    @u = Trestle.new @conf
   end
   
   def test_broken_subject
-    e = assert_raise(RuntimeError) {
-      p = Podgraph::Posterous.new(@testdir+'/nosubject.html', @to,
+    e = assert_raises(RuntimeError) {
+      p = Podgraph::Posterous.new(@u, @testdir+'/nosubject.html', @to,
                                   @from, 'related')
     }
     assert_match(/cannot extract the subject/, e.message)
   end
 
   def test_missing_input_file
-    e = assert_raise(Errno::ENOENT) {
-      p = Podgraph::Posterous.new('something_completly_unreliable.html',
+    e = assert_raises(Errno::ENOENT) {
+      p = Podgraph::Posterous.new(@u, 'something_completly_unreliable.html',
                                   @to, @from, 'related')
     }
     assert_match(/no such file or directory/i, e.message)
   end
 
   def test_empty_input_file
-    e = assert_raise(RuntimeError) {
-      p = Podgraph::Posterous.new(@testdir+'/empty.html',
+    e = assert_raises(RuntimeError) {
+      p = Podgraph::Posterous.new(@u, @testdir+'/empty.html',
                                   @to, @from, 'related')
     }
     assert_match(/cannot extract the subject/, e.message)
   end
 
   def test_invalid_input_file_01
-    e = assert_raise(RuntimeError) {
-      p = Podgraph::Posterous.new(@testdir+'/garbage_01.html',
+    e = assert_raises(RuntimeError) {
+      p = Podgraph::Posterous.new(@u, @testdir+'/garbage_01.html',
                                   @to, @from, 'related')
     }
     assert_match(/cannot extract the subject/, e.message)
   end
 
   def test_invalid_input_file_02
-    assert_raise(REXML::ParseException) {
-      p = Podgraph::Posterous.new(@testdir+'/garbage_02.html',
+    assert_raises(REXML::ParseException) {
+      p = Podgraph::Posterous.new(@u, @testdir+'/garbage_02.html',
                                   @to, @from, 'related')
     }
   end
 
   def test_invalid_input_file_03
-    e = assert_raise(RuntimeError) {
-      p = Podgraph::Posterous.new(@testdir+'/garbage_03.html',
+    e = assert_raises(RuntimeError) {
+      p = Podgraph::Posterous.new(@u, @testdir+'/garbage_03.html',
                                   @to, @from, 'related')
     }
     assert_match(/body is empty or filled with nonsence/, e.message)
   end
 
   def test_invalid_input_file_04
-    e = assert_raise(RuntimeError) {
-      p = Podgraph::Posterous.new(@testdir+'/garbage_04.html',
+    e = assert_raises(RuntimeError) {
+      p = Podgraph::Posterous.new(@u, @testdir+'/garbage_04.html',
                                   @to, @from, 'related')
       mail = p.generate()
     }
@@ -69,25 +69,26 @@ class TestMime < Test::Unit::TestCase
   
   # NOTE: run
   #
-  # % ../bin/podgraph -S simple.html | grep -v -e ^Date: -e ^Message-ID: -e '^user-agent:'|md5
+  # ../bin/podgraph -S simple.html | grep -v -e ^To: -e '^Date:' -e ^Message-ID: -e '^user-agent:'|md5
   #
-  # to get a new hash for this test
+  # to get a new hash for this test.
   def test_simple
-    p = Podgraph::Posterous.new(@testdir+'/simple.html', @to, @from, 'related')
-    mail = p.generate().to_s
+    p = Podgraph::Posterous.new(@u, @testdir+'/simple.html', @to, @from, 'related')
+    mail = p.generate.to_s
     mail.sub!(/^Date: .+$\n/, '')
+    mail.sub!(/^To: .+$\n/, '')
     mail.sub!(/^Message-ID: .+$\n/, '')
     mail.sub!(/^user-agent: .+$\n/, '')
 #    p mail
 #    puts mail
-    assert_equal('ffaf6609a4544258e59dfde9f766820f',
-                 Digest::MD5.hexdigest("#{mail}\n") ) # don't forget a newline!
+    assert_equal('c7ac3a5797496efd323c7017c4516cb1',
+                 Digest::MD5.hexdigest(mail + "\n"))
   end
 
   def test_related
     p = mail = nil
     Dir.chdir(@testdir) do
-      p = Podgraph::Posterous.new(@testdir+'/related.html', @to, @from, 'related')
+      p = Podgraph::Posterous.new(@u, @testdir+'/related.html', @to, @from, 'related')
       mail = p.generate()
     end
     assert_equal(mail.multipart?, true)
@@ -98,7 +99,7 @@ class TestMime < Test::Unit::TestCase
 
     # html
     assert_equal(mail.parts[0].content_type, "text/html; charset=UTF-8")
-    assert_not_equal(mail.parts[0].content_disposition, "inline")
+    refute_equal(mail.parts[0].content_disposition, "inline")
     assert_equal(mail.parts[1].content_disposition, "inline")
     assert_equal(mail.parts[2].content_disposition, "inline")
 
@@ -112,7 +113,7 @@ class TestMime < Test::Unit::TestCase
   def test_mixed
     p = mail = nil
     Dir.chdir(@testdir) do
-      p = Podgraph::Posterous.new('related.html', @to, @from, 'mixed')
+      p = Podgraph::Posterous.new(@u, 'related.html', @to, @from, 'mixed')
       mail = p.generate()
     end
     assert_equal(mail.multipart?, true)
@@ -124,8 +125,8 @@ class TestMime < Test::Unit::TestCase
     # html
     assert_equal(mail.parts[0].content_type, "text/html; charset=UTF-8")
     assert_equal(mail.parts[0].content_disposition, "inline")
-    assert_not_equal(mail.parts[1].content_disposition, "inline")
-    assert_not_equal(mail.parts[2].content_disposition, "inline")
+    refute_equal(mail.parts[1].content_disposition, "inline")
+    refute_equal(mail.parts[2].content_disposition, "inline")
   end
   
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: podgraph
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors: 
 - Alexander Gromnitsky
@@ -14,38 +10,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 +03:00
-default_executable: 
+date: 2011-04-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mail
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 3
-        version: 2.1.3
+        version: 2.2.17
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: git
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  type: :runtime
+        version: 1.2.5
+  type: :development
   version_requirements: *id002
-description: 
+description: Adequately scans XHTML for local inline images and appends them to the mail.
 email: alexander.gromnitsky@gmail.com
 executables: 
 - podgraph
@@ -54,33 +43,38 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/podgraph/posterous.rb
-- bin/podgraph
 - LICENSE
-- Rakefile
+- NEWS
 - README.rdoc
+- Rakefile
 - TODO
-- NEWS
+- bin/podgraph
+- lib/podgraph/meta.rb
+- lib/podgraph/posterous.rb
+- lib/podgraph/trestle.rb
+- test/.document
+- test/blue.png
+- test/config.yaml
+- test/empty.html
+- test/garbage_01.html
+- test/garbage_02.html
+- test/garbage_03.html
+- test/garbage_04.html
+- test/helper.rb
+- test/helper_trestle.rb
 - test/mechanical-turk/1.html
 - test/mechanical-turk/2.html
-- test/mechanical-turk/sun.jpg
 - test/mechanical-turk/3.html
-- test/mechanical-turk/config.yaml
 - test/mechanical-turk/Baby-Bunnie.jpg
+- test/mechanical-turk/config.yaml
+- test/mechanical-turk/sun.jpg
 - test/nosubject.html
-- test/ts_mime.rb
-- test/empty.html
+- test/rake_git.rb
 - test/related.html
-- test/config.yaml
-- test/blue.png
-- test/garbage_01.html
-- test/garbage_02.html
 - test/simple.html
-- test/garbage_03.html
-- test/garbage_04.html
+- test/test_mime.rb
 - test/yellow.png
-has_rdoc: true
-homepage: 
+homepage: http://github.com/gromnitsky/podgraph
 licenses: []
 
 post_install_message: 
@@ -90,26 +84,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 9
-      version: "1.9"
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Creates a MIME mail from a XHTML source and delivers it to Posterous.com.
 test_files: 
-- test/ts_mime.rb
+- test/test_mime.rb