ryespy 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81189d612d2169d1f39164bac11198586502d33a
-  data.tar.gz: b256a8dd802f5e3502e72562a003319ea07693f9
+  metadata.gz: 9950cd62c7ec9aea8a7b08fb0c1cfbfdcdee22e9
+  data.tar.gz: 4ac0a03ecbff1abf251f528f5c46ca5f9c024534
 SHA512:
-  metadata.gz: 3ae2702a04cc80734d1bc5fc2d8eed1b48ecff1f1c7fc32e0bd20b6755acb9a77541e748d5c39c728e017e1ae3f1b92292cc83c6a93a2574a6b65a8ddafec8a9
-  data.tar.gz: 7ba4e48afe98b6a815621ed7266b2fa2494cef1ebf6b67b937aeac25cd6d18953f5485357096d8c693f828b84929d5832b73a96a34655f0a15ee39192a190ac0
+  metadata.gz: b3267a88b15e58b90813a5842ed494f7c1aa49b30bbc3da4f6eaa56b9b3cf36281356006fda06531810a47d916bb1efc77d5af86f050039684ad92ffd3cdbace
+  data.tar.gz: 76c90341a60f6c9213e9e5fb8a7c5531434e3e410f93b1e373bcad9cb74e49f443059510ade46d9fa5a28a61a6a4b326fb6646d94b081649c568ba7a05251b84

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - 1.9.2

data/README.md

@@ -10,6 +10,8 @@ it's sometimes possible to inspire oneself. Ryespy with my little eye.
 
 More sleep lost by [tiredpixel](http://www.tiredpixel.com).
 
+[![Build Status](https://travis-ci.org/tiredpixel/ryespy.png?branch=master,develop)](https://travis-ci.org/tiredpixel/ryespy)
+
 
 ## Installation
 
@@ -57,14 +59,14 @@ doing or planning to do, or if you get stuck on something, then just wave. :)
 Do whatever makes you happy. We'll probably still like you. :)
 
 Tests are written using [minitest](https://github.com/seattlerb/minitest), which
-is included by default in Ruby 1.9 onwards. To run all tests in a pretty way:
+is included by default in Ruby 1.9 onwards. To run all tests:
 
-    ruby -rminitest/pride test/ryespy.rb
+    rake test
 
 Or, if you're of that turn of mind, use [TURN](https://github.com/TwP/turn)
 (`gem install turn`):
 
-    turn test/ryespy.rb
+    turn test/
 
 
 ## Blessing

data/Rakefile

@@ -1 +1,11 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+
+Rake::TestTask.new do |t|
+  t.libs.push 'lib'
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
+end
+
+task :default => 'test'

data/bin/ryespy

@@ -48,6 +48,10 @@ OptionParser.new do |opts|
     options[:redis_ns_ryespy] = o
   end
   
+  opts.on("--redis-ns-notifiers [NS]", "Namespace notifiers Redis 'resque:' as NS") do |o|
+    options[:redis_ns_notifiers] = o
+  end
+  
   opts.separator ""
   opts.separator "Listener imap:"
   
@@ -143,11 +147,12 @@ Ryespy.configure do |c|
     :polling_interval,
     :redis_url,
     :redis_ns_ryespy,
+    :redis_ns_notifiers,
     :notifiers,
   ]
   
-  params.concat case c.listener
-  when :imap
+  params.concat case c.listener.to_s
+  when 'imap'
     [
       :imap_host,
       :imap_port,
@@ -156,7 +161,7 @@ Ryespy.configure do |c|
       :imap_password,
       :imap_mailboxes,
     ]
-  when :ftp
+  when 'ftp'
     [
       :ftp_host,
       :ftp_passive,
@@ -177,7 +182,12 @@ end
 # = Main loop
 
 loop do
-  Ryespy.check_listener
+  listener = {
+    'imap' => Ryespy::Listener::IMAP,
+    'ftp'  => Ryespy::Listener::FTP,
+  }[Ryespy.config.listener.to_s].new
+  
+  listener.check_all
   
   break unless options[:eternal]
   

data/lib/ryespy.rb

@@ -34,80 +34,20 @@ module Ryespy
     @logger
   end
   
-  def check_listener
-    redis_prefix = "#{Ryespy.config.redis_ns_ryespy}#{Ryespy.config.listener}:"
-    
-    notifiers = []
-    
-    begin
-      Ryespy.config.notifiers[:sidekiq].each do |notifier_instance|
-        notifiers << Ryespy::Notifier::Sidekiq.new(notifier_instance)
-      end
-      
-      Ryespy::RedisConn.new(Ryespy.config.redis_url) do |redis|
-        Ryespy.send("check_#{Ryespy.config.listener}", redis, redis_prefix, notifiers)
-      end
-    ensure
-      notifiers.each { |n| n.close }
-    end
+  def redis
+    @redis ||= Ryespy::RedisConn.new(Ryespy.config.redis_url).redis
   end
   
-  def check_imap(redis, redis_prefix, notifiers)
-    redis_prefix += "#{Ryespy.config.imap_host},#{Ryespy.config.imap_port}:#{Ryespy.config.imap_username}:"
-    
-    Ryespy::Listener::IMAP.new do |listener|
-      Ryespy.config.imap_mailboxes.each do |mailbox|
-        Ryespy.logger.debug { "mailbox:#{mailbox}" }
-        
-        redis_key = redis_prefix + "#{mailbox}"
-        
-        Ryespy.logger.debug { "redis_key:#{redis_key}" }
-        
-        new_items = listener.check({
-          :mailbox       => mailbox,
-          :last_seen_uid => redis.get(redis_key).to_i,
-        })
-        
-        Ryespy.logger.debug { "new_items:#{new_items}" }
-        
-        new_items.each do |uid|
-          redis.set(redis_key, uid)
-          
-          notifiers.each { |n| n.notify('RyespyIMAPJob', [mailbox, uid]) }
-        end
-        
-        Ryespy.logger.info { "#{mailbox} has #{new_items.count} new emails" }
+  def notifiers
+    unless @notifiers
+      @notifiers = []
+      
+      Ryespy.config.notifiers[:sidekiq].each do |notifier_instance|
+        @notifiers << Ryespy::Notifier::Sidekiq.new(notifier_instance)
       end
     end
-  end
-  
-  def check_ftp(redis, redis_prefix, notifiers)
-    redis_prefix += "#{Ryespy.config.ftp_host}:#{Ryespy.config.ftp_username}:"
     
-    Ryespy::Listener::FTP.new do |listener|
-      Ryespy.config.ftp_dirs.each do |dir|
-        Ryespy.logger.debug { "dir:#{dir}" }
-        
-        redis_key = redis_prefix + "#{dir}"
-        
-        Ryespy.logger.debug { "redis_key:#{redis_key}" }
-        
-        new_items = listener.check({
-          :dir        => dir,
-          :seen_files => redis.hgetall(redis_key),
-        })
-        
-        Ryespy.logger.debug { "new_items:#{new_items}" }
-        
-        new_items.each do |filename, checksum|
-          redis.hset(redis_key, filename, checksum)
-          
-          notifiers.each { |n| n.notify('RyespyFTPJob', [dir, filename]) }
-        end
-        
-        Ryespy.logger.info { "#{dir} has #{new_items.count} new files" }
-      end
-    end
+    @notifiers
   end
   
 end

data/lib/ryespy/config.rb

@@ -6,6 +6,7 @@ module Ryespy
     attr_accessor :polling_interval
     attr_accessor :redis_url
     attr_accessor :redis_ns_ryespy
+    attr_accessor :redis_ns_notifiers
     attr_accessor :notifiers
     
     attr_accessor :imap_host
@@ -22,10 +23,11 @@ module Ryespy
     attr_accessor :ftp_dirs
     
     def initialize
-      @log_level        = 'INFO'
-      @polling_interval = 60
-      @redis_ns_ryespy  = 'ryespy:'
-      @notifiers        = {
+      @log_level          = 'INFO'
+      @polling_interval   = 60
+      @redis_ns_ryespy    = 'ryespy:'
+      @redis_ns_notifiers = 'resque:'
+      @notifiers          = {
         :sidekiq => [],
       }
       
@@ -44,11 +46,12 @@ module Ryespy
         :polling_interval,
         :redis_url,
         :redis_ns_ryespy,
+        :redis_ns_notifiers,
         :notifiers,
       ]
       
-      params.concat case @listener
-      when :imap
+      params.concat case @listener.to_s
+      when 'imap'
         [
           :imap_host,
           :imap_port,
@@ -56,7 +59,7 @@ module Ryespy
           :imap_username,
           :imap_password,
         ]
-      when :ftp
+      when 'ftp'
         [
           :ftp_host,
           :ftp_passive,
@@ -72,5 +75,9 @@ module Ryespy
       Hash[params].to_s
     end
     
+    def redis_prefix_ryespy
+      "#{Ryespy.config.redis_ns_ryespy}#{Ryespy.config.listener}:"
+    end
+    
   end
 end

data/lib/ryespy/listeners/ftp.rb

@@ -56,6 +56,31 @@ module Ryespy
         end
       end
       
+      def check_all
+        Ryespy.config.ftp_dirs.each do |dir|
+          Ryespy.logger.debug { "dir:#{dir}" }
+          
+          redis_key = "#{Ryespy.config.redis_prefix_ryespy}#{Ryespy.config.ftp_host}:#{Ryespy.config.ftp_username}:#{dir}"
+          
+          Ryespy.logger.debug { "redis_key:#{redis_key}" }
+          
+          new_items = check({
+            :dir        => dir,
+            :seen_files => Ryespy.redis.hgetall(redis_key),
+          })
+          
+          Ryespy.logger.debug { "new_items:#{new_items}" }
+          
+          new_items.each do |filename, checksum|
+            Ryespy.redis.hset(redis_key, filename, checksum)
+            
+            Ryespy.notifiers.each { |n| n.notify('RyespyFTPJob', [dir, filename]) }
+          end
+          
+          Ryespy.logger.info { "#{dir} has #{new_items.count} new files" }
+        end
+      end
+      
     end
   end
 end

data/lib/ryespy/listeners/imap.rb

@@ -27,8 +27,6 @@ module Ryespy
       end
       
       def close
-        @imap.logout
-        
         @imap.disconnect
       end
       
@@ -46,6 +44,31 @@ module Ryespy
         end
       end
       
+      def check_all
+        Ryespy.config.imap_mailboxes.each do |mailbox|
+          Ryespy.logger.debug { "mailbox:#{mailbox}" }
+          
+          redis_key = "#{Ryespy.config.redis_prefix_ryespy}#{Ryespy.config.imap_host},#{Ryespy.config.imap_port}:#{Ryespy.config.imap_username}:#{mailbox}"
+          
+          Ryespy.logger.debug { "redis_key:#{redis_key}" }
+          
+          new_items = check({
+            :mailbox       => mailbox,
+            :last_seen_uid => Ryespy.redis.get(redis_key).to_i,
+          })
+          
+          Ryespy.logger.debug { "new_items:#{new_items}" }
+          
+          new_items.each do |uid|
+            Ryespy.redis.set(redis_key, uid)
+            
+            Ryespy.notifiers.each { |n| n.notify('RyespyIMAPJob', [mailbox, uid]) }
+          end
+          
+          Ryespy.logger.info { "#{mailbox} has #{new_items.count} new emails" }
+        end
+      end
+      
     end
   end
 end

data/lib/ryespy/notifiers/sidekiq.rb

@@ -8,8 +8,7 @@ module Ryespy
   module Notifier
     class Sidekiq
       
-      REDIS_NS_RESQUE = 'resque'
-      RESQUE_QUEUE    = 'ryespy'
+      RESQUE_QUEUE = 'ryespy'
       
       def initialize(url = nil)
         begin
@@ -32,9 +31,9 @@ module Ryespy
       end
       
       def notify(job_class, args)
-        @redis_conn.redis.sadd("#{REDIS_NS_RESQUE}:queues", RESQUE_QUEUE)
+        @redis_conn.redis.sadd("#{Ryespy.config.redis_ns_notifiers}queues", RESQUE_QUEUE)
         
-        @redis_conn.redis.rpush("#{REDIS_NS_RESQUE}:queue:#{RESQUE_QUEUE}", {
+        @redis_conn.redis.rpush("#{Ryespy.config.redis_ns_notifiers}queue:#{RESQUE_QUEUE}", {
           # resque
           :class => job_class,
           :args  => args,

data/lib/ryespy/version.rb

@@ -1,5 +1,5 @@
 module Ryespy
   
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
   
 end

data/test/ryespy/config_test.rb

@@ -0,0 +1,223 @@
+require 'minitest/autorun'
+
+require_relative '../../lib/ryespy'
+require_relative '../../lib/ryespy/config'
+
+
+describe Ryespy::Config do
+  
+  describe "default" do
+    before do
+      @config = Ryespy::Config.new
+    end
+    
+    it "sets log_level to INFO" do
+      @config.log_level.must_equal 'INFO'
+    end
+    
+    it "sets polling_interval to 60" do
+      @config.polling_interval.must_equal 60
+    end
+    
+    it "sets redis_ns_ryespy to ryespy:" do
+      @config.redis_ns_ryespy.must_equal 'ryespy:'
+    end
+    
+    it "sets redis_ns_notifiers to resque:" do
+      @config.redis_ns_notifiers.must_equal 'resque:'
+    end
+    
+    it "sets notifiers hash structure" do
+      @config.notifiers.must_equal({ :sidekiq => [] })
+    end
+    
+    it "sets imap_port to 993" do
+      @config.imap_port.must_equal 993
+    end
+    
+    it "sets imap_ssl to true" do
+      @config.imap_ssl.must_equal true
+    end
+    
+    it "sets imap_mailboxes to INBOX" do
+      @config.imap_mailboxes.must_equal ['INBOX']
+    end
+    
+    it "sets ftp_passive to false" do
+      @config.ftp_passive.must_equal false
+    end
+    
+    it "sets ftp_dirs to /" do
+      @config.ftp_dirs.must_equal ['/']
+    end
+  end
+  
+  describe "configure block main" do
+    before do
+      Ryespy.configure do |c|
+        c.log_level           = 'ERROR'
+        c.listener            = 'imap'
+        c.polling_interval    = 13
+        c.redis_url           = 'redis://127.0.0.1:6379/1'
+        c.redis_ns_ryespy     = 'WithMyLittleEye!'
+        c.redis_ns_notifiers  = 'LaLaLiLi-'
+        c.notifiers           = [{ :sidekiq => 'redis://127.0.0.1:6379/2' }]
+      end
+      
+      @config = Ryespy.config
+    end
+    
+    it "configures log_level" do
+      @config.log_level.must_equal 'ERROR'
+    end
+    
+    it "configures listener" do
+      @config.listener.must_equal 'imap'
+    end
+    
+    it "configures polling_interval" do
+      @config.polling_interval.must_equal 13
+    end
+    
+    it "configures redis_url" do
+      @config.redis_url.must_equal 'redis://127.0.0.1:6379/1'
+    end
+    
+    it "configures redis_ns_ryespy" do
+      @config.redis_ns_ryespy.must_equal 'WithMyLittleEye!'
+    end
+    
+    it "configures redis_ns_notifiers" do
+      @config.redis_ns_notifiers.must_equal 'LaLaLiLi-'
+    end
+    
+    it "configures notifiers" do
+      @config.notifiers.must_equal [{ :sidekiq => 'redis://127.0.0.1:6379/2' }]
+    end
+  end
+  
+  describe "configure block listener IMAP" do
+    before do
+      Ryespy.configure do |c|
+        c.imap_host      = 'imap.example.com'
+        c.imap_port      = 143
+        c.imap_ssl       = false
+        c.imap_username  = 'lucy.westenra@example.com'
+        c.imap_password  = 'white'
+        c.imap_mailboxes = 'BoxA,Sent Messages'
+        
+        @config = Ryespy.config
+      end
+    end
+    
+    it "configures imap_host" do
+      @config.imap_host.must_equal 'imap.example.com'
+    end
+    
+    it "configures imap_port" do
+      @config.imap_port.must_equal 143
+    end
+    
+    it "configures imap_ssl" do
+      @config.imap_ssl.must_equal false
+    end
+    
+    it "configures imap_username" do
+      @config.imap_username.must_equal 'lucy.westenra@example.com'
+    end
+    
+    it "configures imap_password" do
+      @config.imap_password.must_equal 'white'
+    end
+    
+    it "configures imap_mailboxes" do
+      @config.imap_mailboxes.must_equal 'BoxA,Sent Messages'
+    end
+  end
+  
+  describe "configure block listener FTP" do
+    before do
+      Ryespy.configure do |c|
+        c.ftp_host     = 'ftp.example.org'
+        c.ftp_passive  = true
+        c.ftp_username = 'madam.mina@example.com'
+        c.ftp_password = 'black'
+        c.ftp_dirs     = ['BoxA', 'Sent Messages']
+        
+        @config = Ryespy.config
+      end
+    end
+    
+    it "configures ftp_host" do
+      @config.ftp_host.must_equal 'ftp.example.org'
+    end
+    
+    it "configures ftp_passive" do
+      @config.ftp_passive.must_equal true
+    end
+    
+    it "configures ftp_username" do
+      @config.ftp_username.must_equal 'madam.mina@example.com'
+    end
+    
+    it "configures ftp_password" do
+      @config.ftp_password.must_equal 'black'
+    end
+    
+    it "configures ftp_dirs" do
+      @config.ftp_dirs.must_equal ['BoxA', 'Sent Messages']
+    end
+  end
+  
+  describe "#to_s" do
+    before do
+      @config = Ryespy::Config.new
+    end
+    
+    describe "when listener NULL" do
+      before do
+        @config.listener = nil
+      end
+      
+      it "stringifies hash of config" do
+        @config.to_s.must_equal '{:log_level=>"INFO", :listener=>nil, :polling_interval=>60, :redis_url=>nil, :redis_ns_ryespy=>"ryespy:", :redis_ns_notifiers=>"resque:", :notifiers=>{:sidekiq=>[]}}'
+      end
+    end
+    
+    describe "when listener IMAP" do
+      before do
+        @config.listener = 'imap'
+      end
+      
+      it "stringifies hash of config" do
+        @config.to_s.must_equal '{:log_level=>"INFO", :listener=>"imap", :polling_interval=>60, :redis_url=>nil, :redis_ns_ryespy=>"ryespy:", :redis_ns_notifiers=>"resque:", :notifiers=>{:sidekiq=>[]}, :imap_host=>nil, :imap_port=>993, :imap_ssl=>true, :imap_username=>nil, :imap_password=>nil}'
+      end
+    end
+    
+    describe "when listener FTP" do
+      before do
+        @config.listener = 'ftp'
+      end
+      
+      it "stringifies hash of config" do
+        @config.to_s.must_equal '{:log_level=>"INFO", :listener=>"ftp", :polling_interval=>60, :redis_url=>nil, :redis_ns_ryespy=>"ryespy:", :redis_ns_notifiers=>"resque:", :notifiers=>{:sidekiq=>[]}, :ftp_host=>nil, :ftp_passive=>false, :ftp_username=>nil, :ftp_dirs=>["/"]}'
+      end
+    end
+  end
+  
+  describe "#redis_prefix_ryespy" do
+    before do
+      Ryespy.configure do |c|
+        c.listener         = 'earear'
+        c.redis_ns_ryespy  = 'LittleEye:'
+      end
+      
+      @config = Ryespy.config
+    end
+    
+    it "returns key prefix" do
+      @config.redis_prefix_ryespy.must_equal "LittleEye:earear:"
+    end
+  end
+  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ryespy
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - tiredpixel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -67,6 +67,7 @@ files:
 - .gitignore
 - .ruby-gemset
 - .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -80,9 +81,9 @@ files:
 - lib/ryespy/redis_conn.rb
 - lib/ryespy/version.rb
 - ryespy.gemspec
-- test/ryespy.rb
-- test/ryespy/config.rb
-- test/ryespy/version.rb
+- test/ryespy/config_test.rb
+- test/ryespy/version_test.rb
+- test/ryespy_test.rb
 homepage: https://github.com/tiredpixel/ryespy
 licenses:
 - MIT
@@ -108,6 +109,6 @@ signing_key:
 specification_version: 4
 summary: Ryespy listens to IMAP and FTP and queues in Redis (Sidekiq/Resque).
 test_files:
-- test/ryespy.rb
-- test/ryespy/config.rb
-- test/ryespy/version.rb
+- test/ryespy/config_test.rb
+- test/ryespy/version_test.rb
+- test/ryespy_test.rb

data/test/ryespy.rb

@@ -1,2 +0,0 @@
-require_relative 'ryespy/version'
-require_relative 'ryespy/config'

data/test/ryespy/config.rb

@@ -1,71 +0,0 @@
-require 'minitest/autorun'
-
-require_relative '../../lib/ryespy'
-require_relative '../../lib/ryespy/config'
-
-
-describe Ryespy::Config do
-  
-  describe "default" do
-    before do
-      @config = Ryespy::Config.new
-    end
-    
-    it "sets log_level to INFO" do
-      @config.log_level.must_equal 'INFO'
-    end
-    
-    it "sets polling_interval to 60" do
-      @config.polling_interval.must_equal 60
-    end
-    
-    it "sets redis_ns_ryespy to ryespy:" do
-      @config.redis_ns_ryespy.must_equal 'ryespy:'
-    end
-  end
-  
-  describe "configure block" do
-    before do
-      Ryespy.configure do |c|
-        c.log_level        = 'ERROR'
-        c.listener         = 'imap'
-        c.polling_interval = 13
-        c.redis_url        = 'redis://127.0.0.1:6379/1'
-        c.redis_ns_ryespy  = 'WithMyLittleEye!'
-      end
-      
-      @config = Ryespy.config
-    end
-    
-    it "configures log_level" do
-      @config.log_level.must_equal 'ERROR'
-    end
-    
-    it "configures listener" do
-      @config.listener.must_equal 'imap'
-    end
-    
-    it "configures polling_interval" do
-      @config.polling_interval.must_equal 13
-    end
-    
-    it "configures redis_url" do
-      @config.redis_url.must_equal 'redis://127.0.0.1:6379/1'
-    end
-    
-    it "configures redis_ns_ryespy" do
-      @config.redis_ns_ryespy.must_equal 'WithMyLittleEye!'
-    end
-  end
-  
-  describe "#to_s" do
-    before do
-      @config = Ryespy::Config.new
-    end
-    
-    it "stringifies hash of config" do
-      @config.to_s.must_equal '{:log_level=>"INFO", :listener=>nil, :polling_interval=>60, :redis_url=>nil, :redis_ns_ryespy=>"ryespy:", :notifiers=>{:sidekiq=>[]}}'
-    end
-  end
-  
-end