ryespy 0.7.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9950cd62c7ec9aea8a7b08fb0c1cfbfdcdee22e9
-  data.tar.gz: 4ac0a03ecbff1abf251f528f5c46ca5f9c024534
+  metadata.gz: 860859af5bd69be0921657d6474f6b4a96a94495
+  data.tar.gz: 3e71c677ffc60afd566c7950c10c46213bb7122f
 SHA512:
-  metadata.gz: b3267a88b15e58b90813a5842ed494f7c1aa49b30bbc3da4f6eaa56b9b3cf36281356006fda06531810a47d916bb1efc77d5af86f050039684ad92ffd3cdbace
-  data.tar.gz: 76c90341a60f6c9213e9e5fb8a7c5531434e3e410f93b1e373bcad9cb74e49f443059510ade46d9fa5a28a61a6a4b326fb6646d94b081649c568ba7a05251b84
+  metadata.gz: 156f53787df7235da1fc0ebfaeedddb1bdb717cb8b83e82a28f6d147f3c1eff3fe496db1b7a47c667c63f014703995241c625a38e071168845beaefbb04f13d3
+  data.tar.gz: f0d64d17a01bedc762af9e778c5f3610ba37bbbeda92ba1e0582fc609141fc7c687a5e9287d1dd39427862d0e2ec8889282805e9e33371f4c5d0112611c9d7b2

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p0
+ruby-2.1.0

data/.travis.yml

@@ -1,5 +1,19 @@
 language: ruby
+before_install:
+  - "gem install bundler -v '~> 1.5, != 1.5.0'"
 rvm:
+  - 2.1.0
   - 2.0.0
   - 1.9.3
-  - 1.9.2
+  - jruby-19mode
+  - rbx-2.1.1
+services:
+  - redis-server
+notifications:
+  email:
+    recipients:
+      - tp@tiredpixel.com
+matrix:
+  allow_failures:
+    - rvm: jruby-19mode
+    - rvm: rbx-2.1.1

data/CHANGELOG.md

@@ -0,0 +1,24 @@
+# Ryespy Changelog
+
+This changelog documents the main changes between released versions.
+For a full list of changes, consult the commit history.
+For many of commits by [tiredpixel](http://www.tiredpixel.com), the commit
+message provides information and examples.
+
+
+## 1.0.0
+
+- first major release; Redis key structure frozen
+- Redis key structure backwards-incompatible with 0.x.x (sorry! :( )
+- start of support for Ruby 2.1.0
+- end of support for Ruby 1.9.2
+- new Amazon S3 listener (`--listener amzn-s3`)
+- new Google Cloud Storage listener (`--listener goog-cs`)
+- new Rackspace Cloud Files listener (`--listener rax-cf`)
+- change of `--verbose` mode to `--debug` mode
+- broader error-catching, in case weird things happen when `--eternal`
+- missing FTP listener (`--listener ftp`) `--ftp-port` fix
+- dynamic requiring of listeners (some have their own dependencies)
+- comprehensive `README` with lots of examples
+- major refactoring and improvement of code throughout
+- a plethora of tests; most of the core is now covered

data/README.md

@@ -1,17 +1,27 @@
 # Ryespy
 
-Ryespy provides a simple executable for listening to IMAP mailboxes or FTP
-folders, keeps track of what it's seen using Redis, and notifies Redis in a way
-in which [Resque](https://github.com/resque/resque) and
-[Sidekiq](https://github.com/mperham/sidekiq) can process using workers.
-
-Ryespy was inspired by [Redimap](https://github.com/tiredpixel/redimap). Yes,
-it's sometimes possible to inspire oneself. Ryespy with my little eye.
+[![Gem Version](https://badge.fury.io/rb/ryespy.png)](http://badge.fury.io/rb/ryespy)
+[![Build Status](https://travis-ci.org/tiredpixel/ryespy.png?branch=master,stable)](https://travis-ci.org/tiredpixel/ryespy)
+[![Code Climate](https://codeclimate.com/github/tiredpixel/ryespy.png)](https://codeclimate.com/github/tiredpixel/ryespy)
+
+[Sidekiq](https://github.com/mperham/sidekiq)/[Resque](https://github.com/resque/resque)
+IMAP, FTP, Amazon S3, Google Cloud Storage, Rackspace Cloud Files listener.
+
+Ryespy provides an executable for listening to
+IMAP mailboxes,
+FTP folders,
+Amazon S3 buckets,
+Google Cloud Storage buckets,
+or Rackspace Cloud Files containers,
+keeps track of what it's seen using [Redis](http://redis.io), and writes
+Sidekiq/Resque-compatible payloads.
+
+Ryespy was inspired by [Redimap](https://github.com/tiredpixel/redimap).
+Yes, 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
 
@@ -19,54 +29,165 @@ Install using:
 
     $ gem install ryespy
 
+These externals are required:
+
+- [Redis](http://redis.io)
+
+Listener dependencies are required dynamically. That means that it may be necessary to manually install the indicated gems if you are using that listener. If you are not using that listener, there should be no need to install the dependencies.
+
+- `--listener amzn-s3` :
+  
+        $ gem install fog -v '~> 1.19'
+
+- `--listener goog-cs` :
+  
+        $ gem install fog -v '~> 1.19'
+
+- `--listener rax-cf` :
+  
+        $ gem install fog -v '~> 1.19'
+
 
 ## Usage
 
 View the available options:
 
-    $ bundle exec ryespy --help
+    $ ryespy --help
+
+It is necessary to specify a listener and at least one notifier. Currently, the only notifier is `--notifier-sidekiq` (this must be specified).
+
+The `--help` is most helpful.
+
+Use `--eternal` to run eternally (no need for Cron).
+
+
+### IMAP Listener
+
+Check IMAP, queue new email UIDs, and quit (maybe for Cron):
+
+    $ ryespy --listener imap --imap-host mail.example.com --imap-username a@example.com --imap-password helpimacarrot --notifier-sidekiq
+
+For non-SSL, use `--no-imap-ssl`. For non-INBOX or multiple mailboxes, use `--imap-mailboxes INBOX,Sent`.
+
+### FTP Listener
+
+Check FTP, queue new file paths, and quit (maybe for Cron):
+
+    $ ryespy --listener ftp --ftp-host ftp.example.com --ftp-username b@example.com --ftp-password helpimacucumber --notifier-sidekiq
+
+For PASSIVE mode, use `--ftp-passive`. For non-root or multiple directories, use `--ftp-dirs /DIR1,/DIR2`.
+
+### Amazon S3 Listener
+
+Check Amazon S3, queue new file keys, and quit (maybe for Cron):
 
-It is necessary to choose a listener (IMAP|FTP) and a notifier (Sidekiq).
+    $ ryespy --listener amzn-s3 --amzn-s3-access-key c/example/com --amzn-s3-secret-key helpimabroccoli --amzn-s3-bucket vegetable-box --notifier-sidekiq
 
-Check IMAP and queue new emails and quit:
+For non-* or multiple key prefix filters, use `--amzn-s3-prefixes virtual-dir1/,virtual-dir`.
 
-    $ bundle exec ryespy --listener imap --imap-host mail.example.com --imap-username a@example.com --imap-password helpimacarrot --notifier-sidekiq
+### Google Cloud Storage Listener
 
-Check FTP and queue new files and quit:
+Check Google Cloud Storage, queue new file keys, and quit (maybe for Cron):
 
-    $ bundle exec ryespy --listener ftp --ftp-host ftp.example.com --ftp-username b@example.com --ftp-password helpimacucumber --notifier-sidekiq
+    $ ryespy --listener goog-cs --goog-cs-access-key d/example/com --goog-cs-secret-key helpimanasparagus --goog-cs-bucket vegetable-box --notifier-sidekiq
 
-IMAP SSL and FTP PASSIVE are also supported. It's also possible to watch more
-than one IMAP mailbox or FTP directory. The `--help` is most helpful.
+For non-* or multiple key prefix filters, use `--goog-cs-prefixes virtual-dir1/,virtual-dir`.
 
-Use `--eternal` to run eternally.
+### Rackspace Cloud Files Listener
+
+Check Rackspace Cloud Files, queue new file keys, and quit (maybe for Cron):
+
+    $ ryespy --listener rax-cf --rax-cf-username vegetable --rax-cf-api-key helpimacelery --rax-cf-container vegetable-box --notifier-sidekiq
+
+For non-DFW region, use `--rax-cf-region lon`. For non-US auth endpoint, use `--rax-cf-endpoint uk`. Is your Rackspace account in London? Fret not; combine these and use `--rax-cf-endpoint uk --rax-cf-region lon`. For non-* or multiple key prefix filters, use `--rax-cf-prefixes virtual-dir1/,virtual-dir`.
+
+
+## Advanced Usage
+
+If you want to do something rather more magical, such as checking multiple accounts for a listener or even multiple listeners, then you may wish to use the Ryespy library directly instead of the `ryespy` executable.
+
+Depend upon the `ryespy` gem in a `Gemfile`, remembering to add any manual dependencies for listeners as detailed in [Installation](#installation):
+
+    # Gemfile
+    
+    gem 'ryespy'
+    gem 'fog' # example manual dependency
+
+Configure Ryespy Redis and require Ryespy:
+
+    require 'redis'
+    require 'redis/namespace'
+    
+    Redis.current = Redis::Namespace.new('ryespy',
+      :redis => Redis.connect(:url => nil) # Redis default
+    )
+    
+    require 'ryespy'
+
+Create the notifiers:
+
+    require 'ryespy/notifier/sidekiq'
+    
+    notifiers = []
+    notifiers << Ryespy::Notifier::Sidekiq.new(
+      :url       => nil, # Redis default
+      :namespace => 'resque'
+    )
+
+For each listener, configure like in `ryespy --help` but without the listener prefix and with `-` changed to `_` (e.g. `--amzn-s3-access-key` => `:access_key`). Pass in an array of notifiers. Note that the `check()` argument varies per listener, meaning IMAP mailbox, FTP directory, or storage key prefix.
+
+    require 'ryespy/listener/amzn_s3'
+    
+    Ryespy::Listener::AmznS3.new(
+      :access_key => 'ACCESS_KEY',
+      :secret_key => 'SECRET_KEY',
+      :bucket     => 'BUCKET',
+      :notifiers  => notifiers
+    ) do |listener|
+      listener.check('prefix/')
+    end
+
+That's about the size of it.
+
+
+## Stay Tuned
+
+We have a [Librelist](http://librelist.com) mailing list!
+To subscribe, send an email to <ryespy@librelist.com>.
+To unsubscribe, send an email to <ryespy-unsubscribe@librelist.com>.
+There be [archives](http://librelist.com/browser/ryespy/).
+That was easy.
+
+You can also become a [watcher](https://github.com/tiredpixel/ryespy/watchers)
+on GitHub. And don't forget you can become a [stargazer](https://github.com/tiredpixel/ryespy/stargazers) if you are so minded. :D
 
 
 ## Growing Like Flowers
 
-Coming soon is a grand refactor sprinkled with lots of testing, ensuring that
-present code is stable. Then, something or other else. Like a URL notifier.
-Or maybe more listeners. Stay tuned -- or better still, help with the tuning.
+Dear Me, Here is a vague wishlist:
+
+- Additional notifiers (e.g. URL ?)
+
+Also take a look at the [issue tracker](https://github.com/tiredpixel/ryespy/issues).
 
 
 ## Contributions
 
-Contributions are embraced with much love and affection! Please fork the
-repository and wizard your magic, ensuring that any tests are not broken by the
-changes. Then send a pull request. Simples! If you'd like to discuss what you're
-doing or planning to do, or if you get stuck on something, then just wave. :)
+Contributions are embraced with much love and affection!
+Please fork the repository and wizard your magic, preferably with plenty of
+fairy-dust sprinkled over the tests. ;)
+Then send me a pull request. Simples!
+If you'd like to discuss what you're 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:
+Tests are written using [minitest](https://github.com/seattlerb/minitest),
+which is included by default in Ruby 1.9 onwards. To run all tests:
 
     rake test
 
-Or, if you're of that turn of mind, use [TURN](https://github.com/TwP/turn)
-(`gem install turn`):
-
-    turn test/
+When using the `ryespy` executable in development, you'll probably want to set `--debug` mode so debug-level messages are logged and stack traces raised.
 
 
 ## Blessing
@@ -76,6 +197,6 @@ May you find peace, and help others to do likewise.
 
 ## Licence
 
-© [tiredpixel](http://www.tiredpixel.com) 2013. It is free software, released
-under the MIT License, and may be redistributed under the terms specified in
-`LICENSE`.
+© [tiredpixel](http://www.tiredpixel.com) 2013.
+It is free software, released under the MIT License, and may be redistributed
+under the terms specified in `LICENSE`.

data/bin/ryespy

@@ -4,125 +4,208 @@ $stdout.sync = true
 
 require 'optparse'
 require 'ostruct'
+require 'logger'
 
 require File.expand_path(File.dirname(__FILE__) + '/../lib/ryespy')
 
 
 # = Parse opts
 
-options = OpenStruct.new
-
-options.notifiers = {
-  :sidekiq => [],
-}
+options = OpenStruct.new(
+  :notifiers => {}
+)
 
 OptionParser.new do |opts|
-  opts.banner = "Usage: ryespy [options]"
+  opts.version = "v#{Ryespy::VERSION}"
+  
+  opts.banner = opts.ver
+  
+  opts.separator ""
+  opts.separator "Usage: ryespy [OPTIONS]"
   
   opts.separator ""
   opts.separator "Listener:"
   
-  opts.on("-l", "--listener LISTENER", [:imap, :ftp], "Listener (imap|ftp)") do |o|
-    options[:listener] = o
+  opts.on("-l", "--listener LISTENER", [
+    'imap',
+    'ftp',
+    'amzn-s3',
+    'goog-cs',
+    'rax-cf',
+  ], "Listener (imap|ftp|amzn-s3|goog-cs|rax-cf)") do |o|
+    options[:listener] = o.tr('-', '_').to_sym
   end
   
   opts.separator ""
   opts.separator "Polling:"
   
-  opts.on("-e", "--[no-]eternal", "Run eternally") do |o|
+  opts.on("-e", "--[no-]eternal", "Run eternally (default: no)") do |o|
     options[:eternal] = o
   end
   
-  opts.on("--polling-interval [N]", Integer, "Poll every N seconds when --eternal") do |o|
+  opts.on("--polling-interval [N]", Integer, "Poll every N seconds (default: 60)") do |o|
     options[:polling_interval] = o
   end
   
   opts.separator ""
   opts.separator "Redis:"
   
-  opts.on("--redis-url [URL]", "Connect Redis to URL") do |o|
+  opts.on("--redis-url [URL]", "Ryespy URL (default: Redis default)") do |o|
     options[:redis_url] = o
   end
   
-  opts.on("--redis-ns-ryespy [NS]", "Namespace Redis 'ryespy:' as NS") do |o|
+  opts.on("--redis-ns-ryespy [NS]", "Ryespy namespace (default: ryespy)") do |o|
     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:"
+  opts.separator "--listener imap (IMAP) :"
   
-  opts.on("--imap-host HOST", "Connect IMAP with HOST") do |o|
+  opts.on("--imap-host HOST", "Server HOST") do |o|
     options[:imap_host] = o
   end
   
-  opts.on("--imap-port [PORT]", Integer, "Connect IMAP with PORT") do |o|
+  opts.on("--imap-port [PORT]", Integer, "Server PORT (default: 993)") do |o|
     options[:imap_port] = o
   end
   
-  opts.on("--[no-]imap-ssl", "Connect IMAP using SSL") do |o|
+  opts.on("--[no-]imap-ssl", "Use SSL (default: yes)") do |o|
     options[:imap_ssl] = o
   end
   
-  opts.on("--imap-username USERNAME", "Connect IMAP with USERNAME") do |o|
+  opts.on("--imap-username USERNAME", "Auth USERNAME") do |o|
     options[:imap_username] = o
   end
   
-  opts.on("--imap-password PASSWORD", "Connect IMAP with PASSWORD") do |o|
+  opts.on("--imap-password PASSWORD", "Auth PASSWORD") do |o|
     options[:imap_password] = o
   end
   
-  opts.on("--imap-mailboxes [INBOX,DEV]", Array, "Read IMAP MAILBOXES") do |o|
-    options[:imap_mailboxes] = o
+  opts.on("--imap-mailboxes [INBOX,Mu]", Array, "Mailboxes INBOX,Mu (default: INBOX)") do |o|
+    options[:imap_filters] = o
   end
   
   opts.separator ""
-  opts.separator "Listener ftp:"
+  opts.separator "--listener ftp (FTP) :"
   
-  opts.on("--ftp-host HOST", "Connect FTP with HOST") do |o|
+  opts.on("--ftp-host HOST", "Server HOST") do |o|
     options[:ftp_host] = o
   end
   
-  opts.on("--[no-]ftp-passive", "Connect FTP using PASSIVE mode") do |o|
+  opts.on("--ftp-port [PORT]", Integer, "Server PORT (default: 21)") do |o|
+    options[:ftp_port] = o
+  end
+  
+  opts.on("--[no-]ftp-passive", "Use PASSIVE mode (default: no)") do |o|
     options[:ftp_passive] = o
   end
   
-  opts.on("--ftp-username USERNAME", "Connect FTP with USERNAME") do |o|
+  opts.on("--ftp-username USERNAME", "Auth USERNAME") do |o|
     options[:ftp_username] = o
   end
   
-  opts.on("--ftp-password PASSWORD", "Connect FTP with PASSWORD") do |o|
+  opts.on("--ftp-password PASSWORD", "Auth PASSWORD") do |o|
     options[:ftp_password] = o
   end
   
-  opts.on("--ftp-dirs [dir1,dir2]", Array, "Read FTP DIRS") do |o|
-    options[:ftp_dirs] = o
+  opts.on("--ftp-dirs [/D1,/D2]", Array, "Directories /D1,/D2 (default: /)") do |o|
+    options[:ftp_filters] = o
+  end
+  
+  opts.separator ""
+  opts.separator "--listener amzn-s3 (Amazon S3) :"
+  
+  opts.on("--amzn-s3-access-key ACCESS", "Account ACCESS key") do |o|
+    options[:amzn_s3_access_key] = o
+  end
+  
+  opts.on("--amzn-s3-secret-key SECRET", "Account SECRET key") do |o|
+    options[:amzn_s3_secret_key] = o
+  end
+  
+  opts.on("--amzn-s3-bucket BUCKET", "Storage BUCKET") do |o|
+    options[:amzn_s3_bucket] = o
+  end
+  
+  opts.on("--amzn-s3-prefixes [P1,P2]", Array, "Prefixes P1,P2 (default: *)") do |o|
+    options[:amzn_s3_filters] = o
+  end
+  
+  opts.separator ""
+  opts.separator "--listener goog-cs (Google Cloud Storage) :"
+  
+  opts.on("--goog-cs-access-key ACCESS", "Account ACCESS key") do |o|
+    options[:goog_cs_access_key] = o
+  end
+  
+  opts.on("--goog-cs-secret-key SECRET", "Account SECRET key") do |o|
+    options[:goog_cs_secret_key] = o
+  end
+  
+  opts.on("--goog-cs-bucket BUCKET", "Storage BUCKET") do |o|
+    options[:goog_cs_bucket] = o
+  end
+  
+  opts.on("--goog-cs-prefixes [P1,P2]", Array, "Prefixes P1,P2 (default: *)") do |o|
+    options[:goog_cs_filters] = o
+  end
+  
+  opts.separator ""
+  opts.separator "--listener rax-cf (Rackspace Cloud Files) :"
+  
+  opts.on("--rax-cf-endpoint [ENDPOINT]", "Auth ENDPOINT (default: us)") do |o|
+    options[:rax_cf_endpoint] = o
+  end
+  
+  opts.on("--rax-cf-username USERNAME", "Account USERNAME") do |o|
+    options[:rax_cf_username] = o
+  end
+  
+  opts.on("--rax-cf-api-key API_KEY", "Account API_KEY") do |o|
+    options[:rax_cf_api_key] = o
+  end
+  
+  opts.on("--rax-cf-container CONTAINER", "Storage CONTAINER") do |o|
+    options[:rax_cf_container] = o
+  end
+  
+  opts.on("--rax-cf-region [REGION]", "Storage REGION (default: dfw)") do |o|
+    options[:rax_cf_region] = o
+  end
+  
+  opts.on("--rax-cf-prefixes [P1,P2]", Array, "Prefixes P1,P2 (default: *)") do |o|
+    options[:rax_cf_filters] = o
   end
   
   opts.separator ""
-  opts.separator "Notifier sidekiq:"
+  opts.separator "Notifiers:"
+  
+  opts.on("--redis-ns-notifiers [NS]", "Notifiers namespace (default: resque)") do |o|
+    options[:redis_ns_notifiers] = o
+  end
   
-  opts.on("--notifier-sidekiq [URL]", "Notify Sidekiq/Resque at Redis URL") do |o|
-    options.notifiers[:sidekiq] << o
+  opts.on("--notifier-sidekiq [URL]", "Sidekiq Redis URL (default: Redis default)") do |o|
+    (options.notifiers[:sidekiq] ||= []) << o
   end
   
   opts.separator ""
   opts.separator "Other:"
   
-  opts.on("-v", "--[no-]verbose", "Be somewhat verbose") do |o|
-    options[:verbose] = o
+  opts.on("-d", "--debug", "Set debug mode") do |o|
+    options[:debug] = o
   end
   
-  opts.on_tail("--help", "Show this message") do
+  opts.on_tail("--help",
+    "Output (this) help and exit"
+  ) do
     puts opts
     exit
   end
   
-  opts.on_tail("--version", "Show version") do
-    puts "Ryespy version:#{Ryespy::VERSION}"
+  opts.on_tail("--version",
+    "Output version and exit"
+  ) do
+    puts opts.ver
     exit
   end
 end.parse!
@@ -136,62 +219,85 @@ end.parse!
 end
 
 
+# = Create app
+
+@app = Ryespy::App.new(options[:eternal],
+  :logger => Logger.new($stdout)
+)
+
+
 # = Configure
 
-Ryespy.configure do |c|
-  c.log_level = 'DEBUG' if options[:verbose]
+@app.configure do |c|
+  c.log_level = :DEBUG if options[:debug]
   
   c.listener = options[:listener]
   
-  params = [
+  [
     :polling_interval,
     :redis_url,
     :redis_ns_ryespy,
     :redis_ns_notifiers,
     :notifiers,
-  ]
-  
-  params.concat case c.listener.to_s
-  when 'imap'
-    [
-      :imap_host,
-      :imap_port,
-      :imap_ssl,
-      :imap_username,
-      :imap_password,
-      :imap_mailboxes,
-    ]
-  when 'ftp'
-    [
-      :ftp_host,
-      :ftp_passive,
-      :ftp_username,
-      :ftp_password,
-      :ftp_dirs,
-    ]
-  else
-    []
+  ].each { |k| c[k] = options[k] unless options[k].nil? }
+  
+  {
+    :imap => [
+      :host,
+      :port,
+      :ssl,
+      :username,
+      :password,
+      :filters, # mailboxes
+    ],
+    :ftp => [
+      :host,
+      :port,
+      :passive,
+      :username,
+      :password,
+      :filters, # dirs
+    ],
+    :amzn_s3 => [
+      :access_key,
+      :secret_key,
+      :bucket,
+      :filters, # prefixes
+    ],
+    :goog_cs => [
+      :access_key,
+      :secret_key,
+      :bucket,
+      :filters, # prefixes
+    ],
+    :rax_cf => [
+      :endpoint,
+      :region,
+      :username,
+      :api_key,
+      :container,
+      :filters, # prefixes
+    ],
+  }[c.listener].each do |k|
+    lk = "#{c.listener}_#{k}".to_sym
+    
+    c[c.listener][k] = options[lk] unless options[lk].nil?
   end
-  
-  params.each { |s| c.send("#{s}=", options[s]) unless options[s].nil? }
 end
 
-@logger = Ryespy.logger
 
+# = Run app
 
-# = Main loop
+trap('INT') { @app.stop }
 
-loop do
-  listener = {
-    'imap' => Ryespy::Listener::IMAP,
-    'ftp'  => Ryespy::Listener::FTP,
-  }[Ryespy.config.listener.to_s].new
-  
-  listener.check_all
-  
-  break unless options[:eternal]
+begin
+  @app.start
+rescue => e
+  warn "#{$0}: #{e}"
   
-  @logger.debug { "Snoring for #{Ryespy.config.polling_interval} s" }
-  
-  sleep Ryespy.config.polling_interval # sleep awhile (snore)
+  if options[:debug]
+    raise # reraise for stacktrace
+  else
+    exit 1 # same non-zero status as when --debug
+  end
 end