redimap 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ba76df09385c366a60e9b398d4b4609a26aa651
-  data.tar.gz: 7c513536095b241ea1614e84efb333c26845bc4f
+  metadata.gz: 1ff106fa18b156a8c236ea26e3ba03644d023bf8
+  data.tar.gz: dc152c2d823229d6096defd661002cdb960c32f8
 SHA512:
-  metadata.gz: e9d01fb5a28bba8e1df681f42708550e7af1d76ff1ebafd15a8ee77f4af14220e149e8427f5f0b29f9d183023fa95caf259d9d475fbf0c182817a0c2ee478583
-  data.tar.gz: 0da97e1f2f3328fdbec7d8cb4b678c3ef01a25a5249fc289dc5d5cd0ffc72ecc19d34935f2ff7f76742a15e969412aec33ba1b28c95b8ea323b43b541406f399
+  metadata.gz: b8f18cc18df4e57895a8cec72c54531e6f248603c684f6e914a38eab81bb5b362df3ae4f95014b9a776797444310ff2afa6ac0e41ea451898a87e33d674de8c7
+  data.tar.gz: 83e38fac9519fbfd59a914a332d5ef8ca23fb73a680f8148d78c591747608ef13e6a660a6f8a82eb22b9643503847e7b5e327cc3b1334c188c0dc5a00f393d19

data/README.md

@@ -28,7 +28,27 @@ Check and queue new messages and quit:
 
     $ bundle exec redimap --host mail.example.com --user a@example.com --password helpimacarrot
 
-Use `--eternal` to run eternally.
+It is also possible to set config using environment variables. Command-line
+options override environment variables. Note that environment variables are in
+lowercase, and are named differently to command-line parameters.
+
+    $ imap_host=mail.example.com imap_user=a@example.com imap_password=helpimacarrot bundle exec redimap
+
+The complete list of available environment variables is:
+
+    eternal
+    log_level
+    imap_host
+    imap_port
+    imap_username
+    imap_password
+    imap_mailboxes
+    redis_url
+    redis_ns_redimap
+    redis_ns_queue
+    polling_interval
+
+Use `--eternal` or `eternal=1` to run eternally.
 
 
 ## Contributions

data/bin/redimap

@@ -67,7 +67,7 @@ OptionParser.new do |opts|
   opts.separator "Other:"
   
   opts.on("-v", "--[no-]verbose", "Be somewhat verbose") do |o|
-    options[:verbose] = o
+    options[:log_level] = 'DEBUG'
   end
   
   opts.on_tail("--help", "Show this message") do
@@ -85,20 +85,31 @@ end.parse!
 # = Configure
 
 Redimap.configure do |c|
-  c.log_level = 'DEBUG' if options[:verbose]
-  
-  c.imap_host     = options[:imap_host]     if options[:imap_host]
-  c.imap_port     = options[:imap_port]     if options[:imap_port]
-  c.imap_username = options[:imap_username] if options[:imap_username]
-  c.imap_password = options[:imap_password] if options[:imap_password]
-  
-  c.imap_mailboxes = options[:imap_mailboxes] if options[:imap_mailboxes]
-  
-  c.redis_url        = options[:redis_url]        if options[:redis_url]
-  c.redis_ns_redimap = options[:redis_ns_redimap] if options[:redis_ns_redimap]
-  c.redis_ns_queue   = options[:redis_ns_queue]   if options[:redis_ns_queue]
-  
-  c.polling_interval = options[:polling_interval] if options[:polling_interval]
+  %w[
+    log_level
+    imap_host
+    imap_port
+    imap_username
+    imap_password
+    imap_mailboxes
+    redis_url
+    redis_ns_redimap
+    redis_ns_queue
+    polling_interval
+  ].each do |e_k|
+    e_v = case e_k
+    when 'imap_port'
+      ENV[e_k].to_i
+    when 'imap_mailboxes'
+      ENV[e_k].split(',')
+    else
+      ENV[e_k]
+    end if ENV[e_k] # Read env var if set, parsing as for params.
+    
+    e_v = options[e_k.to_sym] if options[e_k.to_sym] # Override from params.
+    
+    c.instance_variable_set("@#{e_k}", e_v) if e_v # Only set extant settings.
+  end
 end
 
 @logger = Redimap.logger
@@ -109,7 +120,7 @@ end
 loop do
   Redimap.queue_new_mailboxes_uids
   
-  break unless options[:eternal]
+  break unless (options[:eternal] || ENV['eternal'].to_i == 1)
   
   @logger.debug { "Snoring for #{Redimap.config.polling_interval} s" }
   

data/lib/redimap/version.rb

@@ -1,5 +1,5 @@
 module Redimap
   
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redimap
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - tiredpixel