vmail 2.5.8 → 2.5.9

data/README.markdown

@@ -43,7 +43,10 @@ problem, and mention what system you're using. You might want to try
 
     sudo gem install vmail
 
-to see if that puts `vmail` on your PATH.
+to see if that puts `vmail` on your PATH. (If you're using [rbenv], running
+`rbenv rehash` should do the trick.)
+
+[rbenv]: https://github.com/sstephenson/rbenv
 
 Vmail is evolving rapidly. To update to the latest version, simply run the
 installation command again.
@@ -59,9 +62,9 @@ during execution (see below).
 
 ## Configuration file
 
-To run Vmail, create a yaml file called `.vmailrc` and save it either in the
-current directory (the directory from which you launch Vmail) or in your home
-directory.
+To run Vmail, create a yaml file called `.vmailrc` and save it either in
+~/.vmail/defaults/ or in your home directory. If you do the latter,
+Vmail will move the file to ~/.vmail/defaults/ when it starts up.
 
 The `.vmailrc` file should look something like this. Substitute your own values.
 
@@ -110,11 +113,11 @@ configuration options][firewall] that you can use.
 ## Contacts autocompletion
 
 Vmail uses Vim autocompletion to help you auto-complete email addresses.
-To use this feature, generate a `vmail-contacts.txt` file in the current or
-home directory. This is a simple list of your email contacts.
-Invoking Vmail with the `-g` option generates this file for you by
-collecting all the recipients and cc's from your last 500 sent
-emails. You can adjust this number by using `-g` with a number argument. 
+To use this feature, generate a `vmail-contacts.txt` file.  This is a
+simple list of your email contacts.  Invoking Vmail with the `-g` option
+generates this file for you by collecting all the recipients and cc's
+from your last 500 sent emails. You can adjust this number by using `-g`
+with a number argument. 
 
 After Vmail generates this file for you, you can edit it however and whenever
 you want, as long as there is one address per line.
@@ -463,9 +466,10 @@ invoke Vmail will show Vmail's logging output while MacVim is running. To quit
 Vmail, first quit the MacVim window running Vmail, and then press CTRL-c in the
 original terminal window to stop the Vmail process.
 
-## Vmail file byproducts
+## Alternate VMAIL_HOME working directories
 
-Vmail generates a few files in the current directory when it is running: 
+Vmail generates a directory called ~/.vmail/defaults and uses this as
+the default `VMAIL_HOME`. Vmail places these files in it:
 
 * `vmail.db` is a sqlite3 database. Vmail uses this to cache messages it has seen..
 
@@ -479,6 +483,10 @@ Finally, Vmail logs output to a `vmail.log` file which it creates in the
 current directory. You can tail this file in a separate terminal window to see
 what's going on behind the scenes as you use Vmail.
 
+You can use up other working directories by setting the `VMAIL_HOME`
+environment variable before or when you launch Vmail.  Make sure you
+place a `.vmailrc` configuration in that directory.
+
 ## Is my Gmail password secure?
 
 In short, yes. Vmail uses TLS ([Transport Layer Security][tls]) to perform IMAP

data/lib/vmail.rb

@@ -1,6 +1,5 @@
 require 'vmail/version'
 require 'vmail/options'
-require 'vmail/imap_client'
 require 'vmail/query'
 require 'vmail/message_formatter'
 
@@ -16,17 +15,6 @@ module Vmail
       exit
     end
 
-    # check database version
-    print "Checking vmail.db version... "
-    db = Sequel.connect 'sqlite://vmail.db'
-    if (r = db[:version].first) && r[:vmail_version] != Vmail::VERSION
-      print "Vmail database version is outdated. Recreating.\n"
-      `rm vmail.db`
-      `sqlite3 vmail.db < #{CREATE_TABLE_SCRIPT}`
-    else
-      print "OK\n"
-    end
-
     vim = ENV['VMAIL_VIM'] || 'vim'
     ENV['VMAIL_BROWSER'] ||= if RUBY_PLATFORM.downcase.include?('linux') 
                                tools = ['gnome-open', 'kfmclient-exec', 'xdg-open', 'konqueror']
@@ -45,6 +33,18 @@ module Vmail
     puts "Setting VMAIL_BROWSER to '#{ENV['VMAIL_BROWSER']}'"
     check_lynx
 
+    working_dir = ENV['VMAIL_HOME'] || "#{ENV['HOME']}/.vmail/default"
+    `mkdir -p #{working_dir}`
+    # legacy migration: move files into VMAIL_HOME
+    ['.vmailrc', 'vmail.log', 'vmail.db', 'vmail-contacts.txt', 'compose_message.txt', 'attachments'].each do |x|
+      if File.size?(x)
+        c = "mv #{x} #{working_dir}"
+        puts c
+        %x{#{c}}
+      end
+    end
+    puts "Changing working directory to #{working_dir}"
+    Dir.chdir(working_dir)
     opts = Vmail::Options.new(ARGV)
     opts.config
     config = opts.config
@@ -67,6 +67,11 @@ module Vmail
       end
     end
 
+    puts "WORKING DIR: #{Dir.pwd}"
+
+    # require after the working dir is set
+    require 'vmail/imap_client'
+
     drb_uri = begin 
                 Vmail::ImapClient.daemon config
               rescue 

data/lib/vmail/database.rb

@@ -1,12 +1,28 @@
 require 'sequel'
 
+# check database version
+
 CREATE_TABLE_SCRIPT = File.expand_path("../../../db/create.sql", __FILE__)
+print "Checking vmail.db version... "
+db = Sequel.connect 'sqlite://vmail.db'
+if db.tables.include?(:version) && 
+    (r = db[:version].first) && 
+    r[:vmail_version] != Vmail::VERSION
+
+  print "Vmail database version is outdated. Recreating.\n"
+  `rm vmail.db`
+  `sqlite3 vmail.db < #{CREATE_TABLE_SCRIPT}`
+else
+  print "OK\n"
+end
+db.disconnect
 
 if !File.size?('vmail.db')
   puts `sqlite3 vmail.db < #{CREATE_TABLE_SCRIPT}`
 end
 
 DB = Sequel.connect 'sqlite://vmail.db'
+puts "Connecting to database"
 
 if DB[:version].count == 0
   DB[:version].insert(:vmail_version => Vmail::VERSION)

data/lib/vmail/imap_client.rb

@@ -505,6 +505,7 @@ EOF
     end
 
     def self.daemon(config)
+      puts "STARTING Vmail::ImapClient in dir #{Dir.pwd}"
       $gmail = self.start(config)
       use_uri = config['drb_uri'] || nil # redundant but explicit
       DRb.start_service(use_uri, $gmail)

data/lib/vmail/showing_message.rb

@@ -61,8 +61,9 @@ module Vmail
       headers = format_headers headers_hash
       # replace the date value with the one derived from the envelope
       body = formatter.plaintext_part
-      body.force_encoding("UTF-8")
-      body = Iconv.conv('UTF-8//IGNORE', 'UTF-8', body)
+      conv_from = /charset=(.*)\s/.match(parts_list)[1].strip
+      body.force_encoding conv_from
+      body = body.encode!('utf-8', undef: :replace, invalid: :replace)
       message_text = <<-EOF
 #{message_id} #{number_to_human_size message.size} #{message.flags} #{parts_list}
 #{divider '-'}

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = '2.5.8'
+  VERSION = '2.5.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmail
 version: !ruby/object:Gem::Version
-  version: 2.5.8
+  version: 2.5.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-20 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail