vmail 2.6.6 → 2.6.7

data/lib/vmail.rb

@@ -4,13 +4,16 @@ require 'vmail/query'
 require 'vmail/message_formatter'
 
 require 'iconv'
+require 'versionomy'
 
 module Vmail
   extend self
 
   def start
     puts "Starting vmail #{Vmail::VERSION}"
-    if  "1.9.0" > RUBY_VERSION
+    required_version = Versionomy::create(:major => 1, :minor => 9, :tiny => 0)
+    ruby_version = Versionomy::parse(RUBY_VERSION)
+    if required_version > ruby_version
       puts "This version of vmail requires Ruby version 1.9.0 or higher (1.9.2 is recommended)"
       exit
     end
@@ -36,11 +39,13 @@ module Vmail
     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}}
+    if Dir.pwd != working_dir
+      ['.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
     end
     puts "Changing working directory to #{working_dir}"

data/lib/vmail/imap_client.rb

@@ -498,7 +498,7 @@ EOF
       Timeout::timeout(timeout) do
         block.call
       end
-    rescue IOError, Errno::EADDRNOTAVAIL, Errno::ECONNRESET, Timeout::Error
+    rescue IOError, Errno::EADDRNOTAVAIL, Errno::ECONNRESET, Timeout::Error, Errno::ETIMEDOUT
       log "Error: #{$!}"
       log "Attempting to reconnect"
       close

data/lib/vmail/version.rb

@@ -1,3 +1,3 @@
 module Vmail
-  VERSION = '2.6.6'
+  VERSION = '2.6.7'
 end

data/vmail.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'highline', '>= 1.6.1'
   s.add_dependency 'sequel', '>= 3.24.1'
   s.add_dependency 'sqlite3', '>= 1.3.3'
+  s.add_dependency 'versionomy', '>= 0.4.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmail
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-16 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -75,6 +75,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.3
+- !ruby/object:Gem::Dependency
+  name: versionomy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.4
 description: Manage your email with Vim
 email:
 - dhchoi@gmail.com