vmail 2.6.7 → 2.6.9

data/README.markdown

@@ -71,21 +71,10 @@ The `.vmailrc` file should look something like this. Substitute your own values.
     username: dhchoi@gmail.com
     password: password
     name: Daniel Choi
-    date_format: wordy
     signature: |
       -- 
       Sent from Vmail. http://danielchoi.com/software/vmail.html
 
-
-### Configuration file - optional parameters
-`date_format: wordy | numerical`
-
-`wordy`: The email arrival date is shown as for example 'Dec 15 11:59pm' or 'Dec 15 2008'.
-This is the default value of the date_format parameter.
-
-`numerical`: The email arrival date is shown as for example '15.12 23:59' or '15.12 2008'.
-It saves two characters - useful on devices with really small displays.
-
 This file should be formatted in [YAML syntax][1].
 
 [1]:http://www.yaml.org/spec/1.2/spec.html
@@ -104,7 +93,6 @@ If you want to use a shell script to print the signature, use the
     username: dhchoi@gmail.com
     password: password
     name: Daniel Choi
-    date_format: wordy
     signature_script: /home/choi/bin/vmail_signature.sh
 
 You can add a `vim_opts:` key-value pair to run arbitrary Vim commands when Vmail starts up.
@@ -121,6 +109,12 @@ configuration options][firewall] that you can use.
 
 [firewall]:https://github.com/danchoi/vmail/wiki/How-to-use-vmail-behind-a-firewall-that-blocks-IMAP
 
+Another optional parameter is `date_format`, which controls the appearance of
+the dates in the message list. Here you can use a strptime-compatible date
+format string. Make sure you enclose these in quotes:
+
+    date_format_: '%b %d %I:%M%P'
+    date_format_previous_years: '%b %d %Y'
 
 ## Contacts autocompletion
 

data/lib/vmail/imap_client.rb

@@ -46,20 +46,17 @@ module Vmail
       @smtp_domain = config['smtp_domain'] || 'gmail.com'
       @authentication = config['authentication'] || 'plain'
       @width = 100
-      @date_format = config['date_format'] || 'wordy'
-      if @date_format == 'numerical'
-         @date_formatter_this_year = '%d.%m %H:%M'
-         @date_formatter_prev_years = '%d.%m %Y'
-         @formatted_date_with = 11
-      else
-         if @date_format != 'wordy'
-            @logger.warn "Unknown date_format: #{@date_format}; Using default value: wordy"
-            @date_format = 'wordy'
-         end
-         @date_formatter_this_year = '%b %d %I:%M%P'
-         @date_formatter_prev_years = '%b %d %Y'
-         @formatted_date_with = 14
+
+      if config['date_format'] =~ /numerical/
+        config['date_format'] = '%d.%m %H:%M'
+        config['date_format_prev_years'] = '%d.%m %Y'
+      elsif config['date_format'] =~ /wordy/
+        config['date_format'] = '%b %d %I:%M%P' 
+        config['date_format_prev_years'] = '%b %d %Y'
       end
+      @date_formatter_this_year = config['date_format'] || '%b %d %I:%M%P' 
+      @date_formatter_prev_years = config['date_format_previous_years'] || '%b %d %Y'
+      @date_width = DateTime.parse("12/12/2012 12:12:12").strftime(@date_formatter_this_year).length
       current_message = nil
     end
 

data/lib/vmail/showing_headers.rb

@@ -92,7 +92,7 @@ module Vmail
       address_col_width = (mid_width * 0.3).ceil
       subject_col_width = (mid_width * 0.7).floor
       row_text = [ format_flags(message.flags).col(2),
-                   (formatted_date || '').col(@formatted_date_with),
+                   (formatted_date || '').col(@date_width),
                    address.col(address_col_width),
                    message.subject.col(subject_col_width), 
                    number_to_human_size(message.size).rcol(7), 

data/lib/vmail/version.rb

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

metadata

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