redimap 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6528b99d1b6dcd904c2c60b2e2a292cc6c88210
-  data.tar.gz: 1937d909847c35c540556241434fac179782280d
+  metadata.gz: 7aae1058590d80f17e8db74f6958c9f6f4298e2f
+  data.tar.gz: 7210171c97d686c2621c0c80c8d95e3e4bb9e7c7
 SHA512:
-  metadata.gz: 5138560b0e28a1b78f7cd0abfefd95d19bca1fa73a7ade2ca86cf925f08576daca78e9169e06e024f851c922594bc139275c864dc1b2838c9165a12d66a248b3
-  data.tar.gz: 4279f416c647a13cad78b80e149e4974e1aca47e8ba17fb75413d5ea697f3ce744939b356ff19f110f77df460e69e06a3efd0252a9a05c7e605a36d1107bb1cb
+  metadata.gz: d577b5997aaab61c5d2671b500c1f7a537e4b3cd747e659979c369eaf3a69f8504527f69f53ed918ba1c481ddab124b7936cef620cdcc8e24c0882bff4545e33
+  data.tar.gz: 90a755ebb2374c138f8008de02053e5a0a8649b37a0481fbac9559ccaf4146b668e483e99d0e54dcf229621d284d5def22171d7fe4f091f763c076b1a2ab2964

data/README.md

@@ -2,8 +2,9 @@
 
 Redimap provides a simple executable for polling mailboxes
 within an IMAP account. It keeps track of what it's seen using Redis. For new
-messages, the mailbox and uid are queued in Redis. The format used should be
-compatible with Resque.
+messages, the mailbox and uid are queued in Redis. The queue format should be
+compatible with [Resque](https://github.com/resque/resque) and
+[Sidekiq](https://github.com/mperham/sidekiq).
 
 More sleep lost by [tiredpixel](http://www.tiredpixel.com).
 

data/bin/redimap

@@ -4,6 +4,8 @@ require 'optparse'
 
 require File.expand_path(File.dirname(__FILE__) + '/../lib/redimap')
 
+@logger = Redimap.logger
+
 
 # = Parse opts
 
@@ -25,5 +27,7 @@ loop do
   
   break unless options[:eternal]
   
+  @logger.debug { "Snoring for #{Redimap.config.polling_interval} s" }
+  
   sleep Redimap.config.polling_interval # Sleep awhile.
 end

data/lib/redimap/base.rb

@@ -1,3 +1,6 @@
+require 'logger'
+
+
 module Redimap
   
   def self.config
@@ -5,22 +8,47 @@ module Redimap
   end
   
   def self.configure
-    yield @config
+    yield self.config
+  end
+  
+  def self.logger
+    unless @logger
+      @logger = Logger.new($stdout)
+      
+      @logger.level    = Logger.const_get(ENV['LOG_LEVEL'] || 'INFO')
+      @logger.progname = :Redimap
+    end
+    
+    @logger
   end
   
   def self.queue_new_mailboxes_uids
+    @logger = Redimap.logger
+    
+    @logger.info { "Queueing new mailboxes UIDs" }
+    
     Redimap::ImapConn.new do |imap|
       Redimap::RedisConn.new do |redis|
-        Redimap.config.imap_mailboxes.each do |mailbox|
-          last_seen_uid = redis.get_mailbox_uid(mailbox)
-          
-          unseen_uids = imap.read_mailbox(mailbox, last_seen_uid)
-          
-          unseen_uids.each do |uid|
-            redis.queue_mailbox_uid(mailbox, uid)
+        begin
+          Redimap.config.imap_mailboxes.each do |mailbox|
+            last_seen_uid = redis.get_mailbox_uid(mailbox)
             
-            redis.set_mailbox_uid(mailbox, uid)
+            @logger.debug { "Last saw #{mailbox}##{last_seen_uid}" }
+            
+            unseen_uids = imap.read_mailbox(mailbox, last_seen_uid)
+            
+            unseen_uids.each do |uid|
+              redis.queue_mailbox_uid(mailbox, uid)
+              
+              redis.set_mailbox_uid(mailbox, uid)
+            end
+            
+            @logger.info { "Queued #{unseen_uids.count} UIDs from #{mailbox}" }
           end
+        rescue Net::IMAP::Error, Redis::BaseError => e
+          @logger.error { e.to_s }
+          
+          return
         end
       end
     end

data/lib/redimap/config.rb

@@ -18,6 +18,8 @@ module Redimap
     attr_accessor :polling_interval
     
     def initialize
+      @logger = Redimap.logger
+      
       @imap_host     = ENV['IMAP_HOST']
       @imap_port     = ENV['IMAP_PORT']     || 993
       @imap_username = ENV['IMAP_USERNAME']
@@ -30,6 +32,24 @@ module Redimap
       @redis_ns_queue   = ENV['REDIS_NS_QUEUE']   || "resque"
       
       @polling_interval = (ENV['POLLING_INTERVAL'] || 60).to_i
+      
+      @logger.debug { "Initialized #{to_s}" }
+    end
+    
+    def to_s
+      {
+        :imap_host     => @imap_host,
+        :imap_port     => @imap_port,
+        :imap_username => @imap_username,
+        
+        :imap_mailboxes => @imap_mailboxes,
+        
+        :redis_url        => @redis_url,
+        :redis_ns_redimap => @redis_ns_redimap,
+        :redis_ns_queue   => @redis_ns_queue,
+        
+        :polling_interval => @polling_interval,
+      }
     end
     
   end

data/lib/redimap/imap_conn.rb

@@ -5,13 +5,19 @@ module Redimap
   class ImapConn
     
     def initialize
-      @imap = Net::IMAP.new(Redimap.config.imap_host, {
-        :port => Redimap.config.imap_port,
-        :ssl  => true
-      })
+      @logger = Redimap.logger
       
-      if @imap
+      begin
+        @imap = Net::IMAP.new(Redimap.config.imap_host, {
+          :port => Redimap.config.imap_port,
+          :ssl  => true
+        })
+        
         @imap.login(Redimap.config.imap_username, Redimap.config.imap_password)
+      rescue Net::IMAP::NoResponseError => e
+        @logger.error { e.to_s }
+        
+        return
       end
       
       if block_given?
@@ -22,11 +28,9 @@ module Redimap
     end
     
     def close
-      if @imap
-        @imap.logout
-        
-        @imap.disconnect
-      end
+      @imap.logout
+      
+      @imap.disconnect
     end
     
     def read_mailbox(mailbox = "INBOX", last_seen_uid = 0)

data/lib/redimap/redis_conn.rb

@@ -10,7 +10,17 @@ module Redimap
     @@RESCUE_CLASS = 'RedimapJob'
     
     def initialize
-      @redis = Redis.connect(:url => Redimap.config.redis_url)
+      @logger = Redimap.logger
+      
+      begin
+        @redis = Redis.connect(:url => Redimap.config.redis_url)
+        
+        @redis.ping
+      rescue Redis::CannotConnectError => e
+        @logger.error { e.to_s }
+        
+        return
+      end
       
       @KEYS = {
         :redimap_mailboxes    => "#{Redimap.config.redis_ns_redimap}:mailboxes",
@@ -26,9 +36,7 @@ module Redimap
     end
     
     def close
-      if @redis
-        @redis.quit
-      end
+      @redis.quit
     end
     
     def get_mailbox_uid(mailbox)

data/lib/redimap/version.rb

@@ -1,5 +1,5 @@
 module Redimap
   
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
   
 end

data/redimap.gemspec

@@ -10,10 +10,10 @@ Gem::Specification.new do |spec|
   spec.email         = ["tp@tiredpixel.com"]
   spec.description   = %q{Redimap provides a simple executable for polling mailboxes
     within an IMAP account. It keeps track of what it's seen using Redis. For new
-    messages, the mailbox and uid are queued in Redis. The format used should be
-    compatible with Resque.}
+    messages, the mailbox and uid are queued in Redis. The queue format should be
+    compatible with Resque and Sidekiq.}
   spec.summary       = %q{Redimap polls IMAP account mailboxes and queues in Redis.}
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/tiredpixel/redimap"
   spec.license       = "MIT"
   
   spec.files         = `git ls-files`.split($/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redimap
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - tiredpixel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -69,8 +69,8 @@ dependencies:
 description: |-
   Redimap provides a simple executable for polling mailboxes
       within an IMAP account. It keeps track of what it's seen using Redis. For new
-      messages, the mailbox and uid are queued in Redis. The format used should be
-      compatible with Resque.
+      messages, the mailbox and uid are queued in Redis. The queue format should be
+      compatible with Resque and Sidekiq.
 email:
 - tp@tiredpixel.com
 executables:
@@ -97,7 +97,7 @@ files:
 - spec/lib/redimap/core_spec.rb
 - spec/lib/redimap/imap_conn_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/tiredpixel/redimap
 licenses:
 - MIT
 metadata: {}