bin/redimap in redimap-0.5.0 vs bin/redimap in redimap-0.6.0

@@ -65,11 +65,11 @@
   
   opts.separator ""
   opts.separator "Other:"
   
   opts.on("-v", "--[no-]verbose", "Be somewhat verbose") do |o|
-    options[:log_level] = 'DEBUG'
+    options[:verbose] = o
   end
   
   opts.on_tail("--help", "Show this message") do
     puts opts
     exit
@@ -83,45 +83,34 @@
 
 
 # = Configure
 
 Redimap.configure do |c|
-  %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
+  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]
 end
 
 @logger = Redimap.logger
 
 
 # = Main loop
 
 loop do
   Redimap.queue_new_mailboxes_uids
   
-  break unless (options[:eternal] || ENV['eternal'].to_i == 1)
+  break unless options[:eternal]
   
   @logger.debug { "Snoring for #{Redimap.config.polling_interval} s" }
   
   sleep Redimap.config.polling_interval # Sleep awhile.
 end