redimap 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cea1f30a4c9e919e8fc0d9d3864f11d6bc9f3b4
-  data.tar.gz: ea39aa22e91e477c542d1caf7ed6c3ea3d22f2be
+  metadata.gz: b6528b99d1b6dcd904c2c60b2e2a292cc6c88210
+  data.tar.gz: 1937d909847c35c540556241434fac179782280d
 SHA512:
-  metadata.gz: 0dd4648e0b0e08b2471dcbaf818262bd659edb03da51da87629c63bfcd463a6cd8db4ba2f5fadda1321cdddcd3693a5491085745fce328dbbad06709ac25e461
-  data.tar.gz: 69b0f8c35ad1d38fd679b031dd8243866c9f7323b0d5c5eafb98960ad8fa9d1e91284510919205d65adba9f6ec8cb2e1b55e80953018d293ec3335746e7597b9
+  metadata.gz: 5138560b0e28a1b78f7cd0abfefd95d19bca1fa73a7ade2ca86cf925f08576daca78e9169e06e024f851c922594bc139275c864dc1b2838c9165a12d66a248b3
+  data.tar.gz: 4279f416c647a13cad78b80e149e4974e1aca47e8ba17fb75413d5ea697f3ce744939b356ff19f110f77df460e69e06a3efd0252a9a05c7e605a36d1107bb1cb

data/.gitignore

@@ -1,17 +1,16 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+/*.gem
+/*.rbc
+/.bundle/
+/.config
+/.yardoc/
+/Gemfile.lock
+/InstalledFiles
+/_yardoc/
+/coverage/
+/doc/
+/lib/bundler/man/
+/pkg/
+/rdoc/
+/spec/reports/
+/test/version_tmp/
+/tmp/

data/README.md

@@ -29,9 +29,9 @@ Check and queue new messages and quit:
 
     $ bundle exec redimap
 
-Check and queue new messages but run for eternity using crude polling:
+Check and queue new messages but run for eternity:
 
-    $ bundle exec redimap 1
+    $ bundle exec redimap --eternal
 
 
 ## Contributions

data/bin/redimap

@@ -1,16 +1,29 @@
 #!/usr/bin/env ruby
 
+require 'optparse'
+
 require File.expand_path(File.dirname(__FILE__) + '/../lib/redimap')
 
 
-running = true
+# = Parse opts
+
+options = {}
 
-while running
-  Redimap.read_mailboxes
+OptionParser.new do |opts|
+  opts.banner = "Usage: redimap [options]"
   
-  if ARGV[0].to_i == 1 # Oh so crude.
-    sleep Redimap.config.polling_interval # Sleep awhile.
-  else
-    running = false
+  opts.on("-e", "--eternal", "Run eternally") do |e|
+    options[:eternal] = true
   end
+end.parse!
+
+
+# = Main loop
+
+loop do
+  Redimap.queue_new_mailboxes_uids
+  
+  break unless options[:eternal]
+  
+  sleep Redimap.config.polling_interval # Sleep awhile.
 end

data/lib/redimap.rb

@@ -1,4 +1,4 @@
 require_relative 'redimap/config'
-require_relative 'redimap/core'
+require_relative 'redimap/base'
 require_relative 'redimap/imap_conn'
 require_relative 'redimap/redis_conn'

data/lib/redimap/{core.rb → base.rb}

@@ -5,10 +5,10 @@ module Redimap
   end
   
   def self.configure
-    yield config if block_given?
+    yield @config
   end
   
-  def self.read_mailboxes
+  def self.queue_new_mailboxes_uids
     Redimap::ImapConn.new do |imap|
       Redimap::RedisConn.new do |redis|
         Redimap.config.imap_mailboxes.each do |mailbox|

data/lib/redimap/config.rb

@@ -4,18 +4,18 @@ require 'json'
 module Redimap
   class Config
     
-    attr_reader :imap_host
-    attr_reader :imap_port
-    attr_reader :imap_username
-    attr_reader :imap_password
+    attr_accessor :imap_host
+    attr_accessor :imap_port
+    attr_accessor :imap_username
+    attr_accessor :imap_password
     
-    attr_reader :imap_mailboxes
+    attr_accessor :imap_mailboxes
     
-    attr_reader :redis_url
-    attr_reader :redis_ns_redimap
-    attr_reader :redis_ns_queue
+    attr_accessor :redis_url
+    attr_accessor :redis_ns_redimap
+    attr_accessor :redis_ns_queue
     
-    attr_reader :polling_interval
+    attr_accessor :polling_interval
     
     def initialize
       @imap_host     = ENV['IMAP_HOST']

data/lib/redimap/imap_conn.rb

@@ -4,8 +4,6 @@ require 'net/imap'
 module Redimap
   class ImapConn
     
-    attr_accessor :imap
-    
     def initialize
       @imap = Net::IMAP.new(Redimap.config.imap_host, {
         :port => Redimap.config.imap_port,

data/lib/redimap/redis_conn.rb

@@ -1,18 +1,23 @@
 require 'redis'
 require 'json'
+require 'securerandom'
 
 
 module Redimap
   class RedisConn
     
-    QUEUE_QUEUE = 'redimap'
-    QUEUE_CLASS = 'RedimapJob'
-    
-    attr_accessor :redis
+    @@RESCUE_QUEUE = 'redimap'
+    @@RESCUE_CLASS = 'RedimapJob'
     
     def initialize
       @redis = Redis.connect(:url => Redimap.config.redis_url)
       
+      @KEYS = {
+        :redimap_mailboxes    => "#{Redimap.config.redis_ns_redimap}:mailboxes",
+        :rescue_queues        => "#{Redimap.config.redis_ns_queue}:queues",
+        :rescue_queue_redimap => "#{Redimap.config.redis_ns_queue}:queue:#{@@RESCUE_QUEUE}",
+      }.freeze
+      
       if block_given?
         yield self
         
@@ -27,35 +32,31 @@ module Redimap
     end
     
     def get_mailbox_uid(mailbox)
-      @redis.hget(
-        "#{Redimap.config.redis_ns_redimap}:mailboxes",
-        mailbox
-      ).to_i # Also handles nil.
+      @redis.hget(@KEYS[:redimap_mailboxes], mailbox).to_i # Also handles nil.
     end
     
     def set_mailbox_uid(mailbox, uid)
-      @redis.hset(
-        "#{Redimap.config.redis_ns_redimap}:mailboxes",
-        mailbox,
-        uid
-      )
+      @redis.hset(@KEYS[:redimap_mailboxes], mailbox, uid)
     end
     
     def queue_mailbox_uid(mailbox, uid)
-      @redis.sadd(
-        "#{Redimap.config.redis_ns_queue}:queues",
-        QUEUE_QUEUE
-      )
+      @redis.sadd(@KEYS[:rescue_queues], @@RESCUE_QUEUE)
       
-      payload = {
-        :class => QUEUE_CLASS,
-        :args  => [mailbox, uid]
+      @redis.rpush(@KEYS[:rescue_queue_redimap], payload(mailbox, uid))
+    end
+    
+    private
+    
+    def payload(mailbox, uid)
+      {
+        # resque
+        :class => @@RESCUE_CLASS,
+        :args  => [mailbox, uid],
+        # sidekiq (extra)
+        :queue => @@RESCUE_QUEUE,
+        :retry => true,
+        :jid   => SecureRandom.hex(12),
       }.to_json
-      
-      @redis.rpush(
-        "#{Redimap.config.redis_ns_queue}:queue:#{QUEUE_QUEUE}",
-        payload
-      )
     end
     
   end

data/lib/redimap/version.rb

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

data/spec/lib/redimap/config_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 
+
 describe Redimap::Config do
   
   context "Defaults" do
@@ -29,7 +30,7 @@ describe Redimap::Config do
       @config.redis_ns_queue.should == "resque"
     end
     
-    it "redis_ns_queue should default to 60 seconds" do
+    it "polling_interval should default to 60 seconds" do
       @config.polling_interval.should == 60
     end
   end

data/spec/lib/redimap/core_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 
+
 describe Redimap do
   
   context "Constants" do

data/spec/lib/redimap/imap_conn_spec.rb

@@ -2,6 +2,7 @@ require 'net/imap'
 
 require 'spec_helper'
 
+
 describe Redimap::ImapConn do
   
   before(:each) do
@@ -14,7 +15,7 @@ describe Redimap::ImapConn do
   
   context "#initialize" do
     it "should set imap as Net::IMAP" do
-      Redimap::ImapConn.new.imap.should == @fake_net_imap
+      Redimap::ImapConn.new.instance_variable_get('@imap').should == @fake_net_imap
     end
     
     it "should #close when block" do
@@ -27,20 +28,22 @@ describe Redimap::ImapConn do
   context "#close" do
     before(:each) do
       @imap = Redimap::ImapConn.new
+      
+      @imap_imap = @imap.instance_variable_get('@imap')
     end
     
     it "should disconnect from IMAP" do
-      @imap.imap.stub(:logout)
+      @imap_imap.stub(:logout)
       
-      @imap.imap.should_receive(:disconnect)
+      @imap_imap.should_receive(:disconnect)
       
       @imap.close
     end
     
     it "should logout from IMAP" do
-      @imap.imap.stub(:disconnect)
+      @imap_imap.stub(:disconnect)
       
-      @imap.imap.should_receive(:logout)
+      @imap_imap.should_receive(:logout)
       
       @imap.close
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redimap
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - tiredpixel
@@ -87,8 +87,8 @@ files:
 - Rakefile
 - bin/redimap
 - lib/redimap.rb
+- lib/redimap/base.rb
 - lib/redimap/config.rb
-- lib/redimap/core.rb
 - lib/redimap/imap_conn.rb
 - lib/redimap/redis_conn.rb
 - lib/redimap/version.rb