feed2email 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.2.1
+
+* Add config option to delay mail sending
+
 ### 0.2.0
 
 * Add support for sending mail via SMTP

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    feed2email (0.2.0)
+    feed2email (0.2.1)
       feedzirra
       mail
 

data/README.md

@@ -23,31 +23,23 @@ $ gem install feed2email
 
 ## Configuration
 
-Since version 0.2.0, feed2email no longer supports command-line arguments and is configured through a [YAML][] configuration file located under `~/.feed2email/config.yml`.
+Through a [YAML][] file at `~/.feed2email/config.yml`.
 
 There are two ways to send mail: SMTP and Sendmail. If `config.yml` contains options for both, feed2email will use SMTP.
 
 [YAML]: http://en.wikipedia.org/wiki/YAML
 
-### SMTP
+### Format
 
-Since version 0.2.0, it is possible to send mail via SMTP.
+Each line in the configuration file contains a key-value pair. Each key-value pair is separated with a colon: `foo: bar`
 
-Here's a sample `config.yml` file:
+### Generic options
 
-~~~ yaml
-recipient: johndoe@example.org
-smtp_host: mail.example.org
-smtp_port: 587
-smtp_user: johndoe
-smtp_pass: 12345
-smtp_tls: true
-smtp_auth: login
-~~~
+* `recipient` (required) is the email address to send email to
+* `send_delay` (optional) is the number of seconds to wait between each email to avoid SMTP server throttling errors (default is `10`; use `0` to turn off)
 
-A short explanation of the available options:
+### SMTP
 
-* `recipient` is the email address to send updates to
 * `smtp_host` is the SMTP service hostname to connect to
 * `smtp_port` is the SMTP service port to connect to
 * `smtp_user` is the username of your mail account
@@ -61,16 +53,6 @@ A short explanation of the available options:
 
 For this method you need to have [Sendmail][] setup and working in your system. It is also possible to use [a program with a Sendmail-compatible interface][msmtp].
 
-Assuming you have everything setup and working, here's a sample `config.yml` file:
-
-~~~ yaml
-recipient: johndoe@example.org
-sendmail_path: /usr/sbin/sendmail
-~~~
-
-A short explanation of the available options:
-
-* `recipient` is the email address to send updates to
 * `sendmail_path` (optional) is the path to the Sendmail binary (default is `/usr/sbin/sendmail`)
 
 [Sendmail]: http://en.wikipedia.org/wiki/Sendmail

data/lib/feed2email/mail.rb

@@ -5,10 +5,9 @@ module Feed2Email
     end
 
     def send
-      if $config['smtp_host'] &&
-          $config['smtp_port'] &&
-          $config['smtp_user'] &&
-          $config['smtp_pass']
+      sleep $config['send_delay'] || 10 # avoid Net::SMTPServerBusy errors
+
+      if smtp_config_present?
         send_with_smtp
       else
         send_with_sendmail
@@ -94,6 +93,13 @@ module Feed2Email
       $config['sendmail_path'] || '/usr/sbin/sendmail'
     end
 
+    def smtp_config_present?
+      $config['smtp_host'] &&
+        $config['smtp_port'] &&
+        $config['smtp_user'] &&
+        $config['smtp_pass']
+    end
+
     def subject
       @entry.title
     end

data/lib/feed2email/version.rb

@@ -1,3 +1,3 @@
 module Feed2Email
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feed2email
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-27 00:00:00.000000000 Z
+date: 2013-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: feedzirra
@@ -81,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2515505025282581014
+      hash: 1285304786354070987
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2515505025282581014
+      hash: 1285304786354070987
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23