automatic 13.12.0 → 14.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90595ee77c762cb364af9cfd822d89d1d17d0306
-  data.tar.gz: 48e69a16b6577e239df8e265a09562aa379b383d
+  metadata.gz: b43a1a794a8175f7d650b1b92ca118486fe0d86d
+  data.tar.gz: 47d449093ef8dd0ce5a51638d8fad105333a14de
 SHA512:
-  metadata.gz: df3741889e34f71522aab02de4929a4f04edb922a38ed0abb2027352229b1f2291a15b6dd6d54d64ba57e0c7e142d9cd23207f936ae70f4ce262aa4340b899a7
-  data.tar.gz: 877ddcfa68ca1ceec2b69f40dcc98136ee6979dfe019874ecf4d81f0d21aa1ecdefe1c8269bee9a78647ee7dea49c71d3f3c9a26d48170aa8831945198a3fce1
+  metadata.gz: 5c291f8190dfc97b1995bc306ccce1be8460257481baef90f3132bfd8c8f3fc45afd6bfd02e61df420f3a8a3c9c8e447309c380de1bba3037104aaee1a3b8967
+  data.tar.gz: e19eb66e353be6b34926c6c1e584ed4c28f50e15797cc9cd4819696cf9bf86a88cab59e7a51d31967d6dd7554f4c6857f2e77bb2ebf26c59af7bd48a9e9077d3

data/Gemfile

@@ -1,35 +1,36 @@
-# Version:20131125
+# Version:20140124
 
 source "http://rubygems.org"
 source "http://gems.github.com"
 
-gem 'json'
-gem 'sqlite3'
-gem 'activesupport', '~>4.0.0'
-gem 'activerecord', '~>4.0.0'
-gem 'hashie'
-gem 'gcalapi'
-gem 'xml-simple'
-gem 'feedbag'
-gem 'nokogiri'
-gem 'sanitize'
-gem 'twitter', '~>4.8.1'
-gem 'weather_hacker'
-gem 'pocket-ruby'
-gem 'hipchat'
-gem 'fluent-logger'
-gem 'dalli'
+gem 'json',           '~> 1.8.1'
+gem 'sqlite3',        '~> 1.3.8'
+gem 'activesupport',  '~> 4.0.2'
+gem 'activerecord',   '~> 4.0.2'
+gem 'hashie',         '~> 2.0.5'
+gem 'gcalapi',        '~> 0.1.2'
+gem 'xml-simple',     '~> 1.1.3'
+gem 'feedbag',        '~> 0.9.2'
+gem 'nokogiri',       '~> 1.6.1'
+gem 'sanitize',       '~> 2.1.0'
+gem 'faraday',        '~> 0.8.9'
+gem 'twitter',        '~> 4.8.1'
+gem 'pocket-ruby',    '~> 0.0.4'
+gem 'weather_hacker', '~> 0.1.7'
+gem 'hipchat',        '~> 1.0.1'
+gem 'fluent-logger',  '~> 0.4.7'
+gem 'dalli',          '~> 2.7.0'
 
 group :test do
-  gem 'rspec', '~> 2.14.0'
+  gem 'rspec', '~> 2.14.1'
   gem 'rcov', :platforms => :mri_18
-  gem 'simplecov'
-  gem 'simplecov-rcov'
-  gem 'koseki-mocksmtpd'
+  gem 'simplecov', '~> 0.8.2'
+  gem 'simplecov-rcov', '~> 0.2.3'
+  gem 'koseki-mocksmtpd', '~> 0.0.3'
 end
 
 group :development do
-  gem "cucumber"
+  gem 'cucumber'
   gem 'bundler'
   gem 'builder'
   gem "jeweler"

data/README.md

@@ -75,7 +75,7 @@ For more info, refer to the document (doc/README).
 Environment
 -----------
 
-Ruby 1.9 - 2.0. See Gemfile.
+Ruby 1.9 - 2.1. See Gemfile.
 
 
 Development

data/VERSION

@@ -1 +1 @@
-13.12.0
+14.1.0

data/automatic.gemspec

@@ -2,15 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: automatic 13.12.0 ruby lib
+# stub: automatic 14.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "automatic"
-  s.version = "13.12.0"
+  s.version = "14.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["id774"]
-  s.date = "2013-12-17"
+  s.date = "2014-01-24"
   s.description = "Ruby General Automation Framework"
   s.email = "idnanashi@gmail.com"
   s.executables = ["automatic"]
@@ -41,6 +42,7 @@ Gem::Specification.new do |s|
     "lib/automatic/opml.rb",
     "lib/automatic/pipeline.rb",
     "lib/automatic/recipe.rb",
+    "lib/automatic/version.rb",
     "plugins/custom_feed/svn_log.rb",
     "plugins/filter/absolute_uri.rb",
     "plugins/filter/accept.rb",
@@ -158,73 +160,75 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/automaticruby/automaticruby"
   s.licenses = ["GPL"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.11"
+  s.rubygems_version = "2.2.0"
   s.summary = "Automatic Ruby"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 4.0.0"])
-      s.add_runtime_dependency(%q<activerecord>, ["~> 4.0.0"])
-      s.add_runtime_dependency(%q<hashie>, [">= 0"])
-      s.add_runtime_dependency(%q<gcalapi>, [">= 0"])
-      s.add_runtime_dependency(%q<xml-simple>, [">= 0"])
-      s.add_runtime_dependency(%q<feedbag>, [">= 0"])
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
-      s.add_runtime_dependency(%q<sanitize>, [">= 0"])
+      s.add_runtime_dependency(%q<json>, ["~> 1.8.1"])
+      s.add_runtime_dependency(%q<sqlite3>, ["~> 1.3.8"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 4.0.2"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 4.0.2"])
+      s.add_runtime_dependency(%q<hashie>, ["~> 2.0.5"])
+      s.add_runtime_dependency(%q<gcalapi>, ["~> 0.1.2"])
+      s.add_runtime_dependency(%q<xml-simple>, ["~> 1.1.3"])
+      s.add_runtime_dependency(%q<feedbag>, ["~> 0.9.2"])
+      s.add_runtime_dependency(%q<nokogiri>, ["~> 1.6.1"])
+      s.add_runtime_dependency(%q<sanitize>, ["~> 2.1.0"])
+      s.add_runtime_dependency(%q<faraday>, ["~> 0.8.9"])
       s.add_runtime_dependency(%q<twitter>, ["~> 4.8.1"])
-      s.add_runtime_dependency(%q<weather_hacker>, [">= 0"])
-      s.add_runtime_dependency(%q<pocket-ruby>, [">= 0"])
-      s.add_runtime_dependency(%q<hipchat>, [">= 0"])
-      s.add_runtime_dependency(%q<fluent-logger>, [">= 0"])
-      s.add_runtime_dependency(%q<dalli>, [">= 0"])
+      s.add_runtime_dependency(%q<pocket-ruby>, ["~> 0.0.4"])
+      s.add_runtime_dependency(%q<weather_hacker>, ["~> 0.1.7"])
+      s.add_runtime_dependency(%q<hipchat>, ["~> 1.0.1"])
+      s.add_runtime_dependency(%q<fluent-logger>, ["~> 0.4.7"])
+      s.add_runtime_dependency(%q<dalli>, ["~> 2.7.0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<builder>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<activesupport>, ["~> 4.0.0"])
-      s.add_dependency(%q<activerecord>, ["~> 4.0.0"])
-      s.add_dependency(%q<hashie>, [">= 0"])
-      s.add_dependency(%q<gcalapi>, [">= 0"])
-      s.add_dependency(%q<xml-simple>, [">= 0"])
-      s.add_dependency(%q<feedbag>, [">= 0"])
-      s.add_dependency(%q<nokogiri>, [">= 0"])
-      s.add_dependency(%q<sanitize>, [">= 0"])
+      s.add_dependency(%q<json>, ["~> 1.8.1"])
+      s.add_dependency(%q<sqlite3>, ["~> 1.3.8"])
+      s.add_dependency(%q<activesupport>, ["~> 4.0.2"])
+      s.add_dependency(%q<activerecord>, ["~> 4.0.2"])
+      s.add_dependency(%q<hashie>, ["~> 2.0.5"])
+      s.add_dependency(%q<gcalapi>, ["~> 0.1.2"])
+      s.add_dependency(%q<xml-simple>, ["~> 1.1.3"])
+      s.add_dependency(%q<feedbag>, ["~> 0.9.2"])
+      s.add_dependency(%q<nokogiri>, ["~> 1.6.1"])
+      s.add_dependency(%q<sanitize>, ["~> 2.1.0"])
+      s.add_dependency(%q<faraday>, ["~> 0.8.9"])
       s.add_dependency(%q<twitter>, ["~> 4.8.1"])
-      s.add_dependency(%q<weather_hacker>, [">= 0"])
-      s.add_dependency(%q<pocket-ruby>, [">= 0"])
-      s.add_dependency(%q<hipchat>, [">= 0"])
-      s.add_dependency(%q<fluent-logger>, [">= 0"])
-      s.add_dependency(%q<dalli>, [">= 0"])
+      s.add_dependency(%q<pocket-ruby>, ["~> 0.0.4"])
+      s.add_dependency(%q<weather_hacker>, ["~> 0.1.7"])
+      s.add_dependency(%q<hipchat>, ["~> 1.0.1"])
+      s.add_dependency(%q<fluent-logger>, ["~> 0.4.7"])
+      s.add_dependency(%q<dalli>, ["~> 2.7.0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<builder>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<activesupport>, ["~> 4.0.0"])
-    s.add_dependency(%q<activerecord>, ["~> 4.0.0"])
-    s.add_dependency(%q<hashie>, [">= 0"])
-    s.add_dependency(%q<gcalapi>, [">= 0"])
-    s.add_dependency(%q<xml-simple>, [">= 0"])
-    s.add_dependency(%q<feedbag>, [">= 0"])
-    s.add_dependency(%q<nokogiri>, [">= 0"])
-    s.add_dependency(%q<sanitize>, [">= 0"])
+    s.add_dependency(%q<json>, ["~> 1.8.1"])
+    s.add_dependency(%q<sqlite3>, ["~> 1.3.8"])
+    s.add_dependency(%q<activesupport>, ["~> 4.0.2"])
+    s.add_dependency(%q<activerecord>, ["~> 4.0.2"])
+    s.add_dependency(%q<hashie>, ["~> 2.0.5"])
+    s.add_dependency(%q<gcalapi>, ["~> 0.1.2"])
+    s.add_dependency(%q<xml-simple>, ["~> 1.1.3"])
+    s.add_dependency(%q<feedbag>, ["~> 0.9.2"])
+    s.add_dependency(%q<nokogiri>, ["~> 1.6.1"])
+    s.add_dependency(%q<sanitize>, ["~> 2.1.0"])
+    s.add_dependency(%q<faraday>, ["~> 0.8.9"])
     s.add_dependency(%q<twitter>, ["~> 4.8.1"])
-    s.add_dependency(%q<weather_hacker>, [">= 0"])
-    s.add_dependency(%q<pocket-ruby>, [">= 0"])
-    s.add_dependency(%q<hipchat>, [">= 0"])
-    s.add_dependency(%q<fluent-logger>, [">= 0"])
-    s.add_dependency(%q<dalli>, [">= 0"])
+    s.add_dependency(%q<pocket-ruby>, ["~> 0.0.4"])
+    s.add_dependency(%q<weather_hacker>, ["~> 0.1.7"])
+    s.add_dependency(%q<hipchat>, ["~> 1.0.1"])
+    s.add_dependency(%q<fluent-logger>, ["~> 0.4.7"])
+    s.add_dependency(%q<dalli>, ["~> 2.7.0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<builder>, [">= 0"])

data/doc/ChangeLog

@@ -1,3 +1,10 @@
+=== 14.1.0 / 2014-01-24
+
+* Fix dependency conflict.
+
+* Refactoring error retry handling.
+
+
 === 13.12.0 / 2013-12-17
 
 * Fix twitter gem version.

data/lib/automatic/version.rb

@@ -0,0 +1,3 @@
+module Automatic
+  VERSION = "14.1.0"
+end

data/lib/automatic.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Ruby
 # Author::    774 <http://id774.net>
 # Created::   Feb 18, 2012
-# Updated::   Dec 17, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Updated::   Jan 24, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic
@@ -12,8 +12,8 @@ module Automatic
   require 'automatic/pipeline'
   require 'automatic/log'
   require 'automatic/feed_parser'
+  require 'automatic/version'
 
-  VERSION = "13.12.0"
   USER_DIR = "/.automatic"
 
   class << self

data/plugins/notify/ikachan.rb

@@ -75,7 +75,7 @@ module Automatic::Plugin
           feeds.items.each {|feed|
             Automatic::Log.puts("info", %Q(Ikachan: [#{feed.link}] sending with params #{ikachan.params.to_s}...))
             ikachan.post(feed.link, feed.title)
-            sleep @config['interval'].to_i unless @config['interval'].nil?
+            sleep ||= @config['interval'].to_i
           }
         end
       }

data/plugins/publish/eject.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 # Name::      Automatic::Plugin::Publish::Eject
 # Author::    soramugi <http://soramugi.net>
-# Created::   Jun 9, 2013
-# Updated::   Jun 9, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Created::   Jun  9, 2013
+# Updated::   Jan 15, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -23,7 +23,7 @@ module Automatic::Plugin
               Automatic::Log.puts('info', "Eject: #{feed.link}")
 
               interval = @config['interval'].to_i unless @config['interval'].nil? unless @config.nil?
-              sleep 3 if interval.nil?
+              sleep ||= @config['interval'].to_i
             end
           }
         end

data/plugins/publish/google_calendar.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Publish::Googlecalendar
 # Author::    774 <http://id774.net>
 # Created::   Feb 24, 2012
-# Updated::   Jan  8, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Updated::   Jan 15, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -74,7 +74,7 @@ module Automatic::Plugin
         unless feeds.nil?
           feeds.items.each {|feed|
             @gc.add('今日 ' + feed.title)
-            sleep @config['interval'].to_i unless @config['interval'].nil?
+            sleep ||= @config['interval'].to_i
           }
         end
       }

data/plugins/publish/hatena_bookmark.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Publish::HatenaBookmark
 # Author::    774 <http://id774.net>
 # Created::   Feb 22, 2012
-# Updated::   Mar  7, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Updated::   Jan 15, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -89,7 +89,7 @@ module Automatic::Plugin
         unless feeds.nil?
           feeds.items.each {|feed|
             hb.post(rewrite(feed.link), nil)
-            sleep @config['interval'].to_i unless @config['interval'].nil?
+            sleep ||= @config['interval'].to_i
           }
         end
       }

data/plugins/publish/hipchat.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 # Name::      Automatic::Plugin::Publish::Hipchat
 # Author::    Kohei Hasegawa <http://github.com/banyan>
-# Created::   Jun 6, 2013
-# Updated::   Jun 6, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Created::   Jun  6, 2013
+# Updated::   Jan 15, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -26,16 +26,17 @@ module Automatic::Plugin
         unless feeds.nil?
           feeds.items.each {|feed|
             retries = 0
+            retry_max = @config['retry'].to_i || 0
             begin
               @client.send(@config['username'], feed.description, @options)
               Automatic::Log.puts("info", "post: #{feed.description.gsub(/[\r\n]/,'')[0..50]}...") rescue nil
             rescue => e
               retries += 1
               Automatic::Log.puts("error", "ErrorCount: #{retries}, #{e.message}")
-              sleep @config['interval'].to_i unless @config['interval'].nil?
-              retry if retries <= @config['retry'].to_i unless @config['retry'].nil?
+              sleep ||= @config['interval'].to_i
+              retry if retries <= retry_max
             end
-            sleep @config['interval'].to_i unless @config['interval'].nil?
+            sleep ||= @config['interval'].to_i
           }
         end
       }

data/plugins/publish/instapaper.rb

@@ -3,8 +3,8 @@
 # Author::    soramugi <http://soramugi.net>
 #             774 <http://id774.net>
 # Created::   Feb  9, 2013
-# Updated::   Mar 23, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Updated::   Jan 15, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -69,15 +69,16 @@ module Automatic::Plugin
           feeds.items.each {|feed|
             Automatic::Log.puts("info", "add: #{feed.link}")
             retries = 0
+            retry_max = @config['retry'].to_i || 0
             begin
               instapaper.add(feed.link, feed.title, feed.description)
             rescue
               retries += 1
               Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault in publish to instapaper.")
-              sleep @config['interval'].to_i unless @config['interval'].nil?
-              retry if retries <= @config['retry'].to_i unless @config['retry'].nil?
+              sleep ||= @config['interval'].to_i
+              retry if retries <= retry_max
             end
-            sleep @config['interval'].to_i unless @config['interval'].nil?
+            sleep ||= @config['interval'].to_i
           }
         end
       }

data/plugins/publish/pocket.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Publish::Pocket
 # Author::    soramugi <http://soramugi.net>
 # Created::   May 15, 2013
-# Updated::   May 15, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Updated::   Jan 15, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -25,16 +25,17 @@ module Automatic::Plugin
         unless feeds.nil?
           feeds.items.each {|feed|
             retries = 0
+            retry_max = @config['retry'].to_i || 0
             begin
               @client.add(:url => feed.link)
               Automatic::Log.puts("info", "add: #{feed.link}")
             rescue
               retries += 1
               Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault in publish to pocket.")
-              sleep @config['interval'].to_i unless @config['interval'].nil?
-              retry if retries <= @config['retry'].to_i unless @config['retry'].nil?
+              sleep ||= @config['interval'].to_i
+              retry if retries <= retry_max
             end
-            sleep @config['interval'].to_i unless @config['interval'].nil?
+            sleep ||= @config['interval'].to_i
           }
         end
       }

data/plugins/publish/twitter.rb

@@ -36,6 +36,7 @@ module Automatic::Plugin
           feeds.items.each {|feed|
             Automatic::Log.puts("info", "tweet: #{feed.link}")
             retries = 0
+            retry_max = @config['retry'].to_i || 0
             begin
               tweet = @tweet_tmp.gsub(/\{(.+?)\}/) do |text|
                 feed.__send__($1)
@@ -44,10 +45,10 @@ module Automatic::Plugin
             rescue
               retries += 1
               Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault in publish to twitter.")
-              sleep @config['interval'].to_i unless @config['interval'].nil?
-              retry if retries <= @config['retry'].to_i unless @config['retry'].nil?
+              sleep ||= @config['interval'].to_i
+              retry if retries <= retry_max
             end
-            sleep @config['interval'].to_i unless @config['interval'].nil?
+            sleep ||= @config['interval'].to_i
           }
         end
       }

data/plugins/store/target_link.rb

@@ -3,8 +3,8 @@
 # Name::      Automatic::Plugin::Store::TargetLink
 # Author::    774 <http://id774.net>
 # Created::   Feb 28, 2012
-# Updated::   Feb  9, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Updated::   Jan 15, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 require 'open-uri'
@@ -25,14 +25,15 @@ module Automatic::Plugin
               Automatic::Log.puts("info", "Downloading: #{feed.link}")
               FileUtils.mkdir_p(@config['path']) unless FileTest.exist?(@config['path'])
               retries = 0
+              retry_max = @config['retry'].to_i || 0
               begin
                 retries += 1
                 wget(feed.link)
-                sleep @config['interval'].to_i unless @config['interval'].nil?
+                sleep ||= @config['interval'].to_i
               rescue
                 Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault during file download.")
-                sleep @config['interval'].to_i unless @config['interval'].nil?
-                retry if retries <= @config['retry'].to_i unless @config['retry'].nil?
+                sleep ||= @config['interval'].to_i
+                retry if retries <= retry_max
               end
             end
           }

data/plugins/subscription/chan_toru.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Subscription::ChanToru
 # Author::    soramugi <http://soramugi.net>
 # Created::   Jun 28, 2013
-# Updated::   Jun 28, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Updated::   Jan 15, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 require File.expand_path(File.dirname(__FILE__) + '/g_guide')
@@ -22,6 +22,7 @@ module Automatic::Plugin
 
     def run
       retries = 0
+      retry_max = @config['retry'].to_i || 0
       begin
         pipeline = g_guide_pipeline
         pipeline.each {|feeds|
@@ -33,8 +34,8 @@ module Automatic::Plugin
       rescue
         retries += 1
         Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault in parsing: #{retries}")
-        sleep @config['interval'].to_i unless @config['interval'].nil?
-        retry if retries <= @config['retry'].to_i unless @config['retry'].nil?
+        sleep ||= @config['interval'].to_i
+        retry if retries <= retry_max
       end
 
       @pipeline

data/plugins/subscription/feed.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::SubscriptionFeed
 # Author::    774 <http://id774.net>
 # Created::   Feb 22, 2012
-# Updated::   Feb  8, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Updated::   Jan 15, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -16,14 +16,15 @@ module Automatic::Plugin
     def run
       @config['feeds'].each {|feed|
         retries = 0
+        retry_max = @config['retry'].to_i || 0
         begin
           rss = Automatic::FeedParser.get(feed)
           @pipeline << rss
         rescue
           retries += 1
           Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault in parsing: #{feed}")
-          sleep @config['interval'].to_i unless @config['interval'].nil?
-          retry if retries <= @config['retry'].to_i unless @config['retry'].nil?
+          sleep ||= @config['interval'].to_i
+          retry if retries <= retry_max
         end
       }
       @pipeline

data/plugins/subscription/g_guide.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Subscription::GGuide
 # Author::    soramugi <http://soramugi.net>
 # Created::   Jun 28, 2013
-# Updated::   Jun 28, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Updated::   Jan 15, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -22,6 +22,7 @@ module Automatic::Plugin
 
     def run
       retries = 0
+      retry_max = @config['retry'].to_i || 0
       begin
         @keywords.each {|keyword|
           @pipeline << Automatic::FeedParser.get(feed_url keyword)
@@ -29,8 +30,8 @@ module Automatic::Plugin
       rescue
         retries += 1
         Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault in parsing: #{retries}")
-        sleep @config['interval'].to_i unless @config['interval'].nil?
-        retry if retries <= @config['retry'].to_i unless @config['retry'].nil?
+        sleep ||= @config['interval'].to_i
+        retry if retries <= retry_max
       end
       @pipeline
     end

data/plugins/subscription/link.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Subscription::Link
 # Author::    774 <http://id774.net>
 # Created::   Sep 18, 2012
-# Updated::   Apr  5, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Updated::   Jan 15, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -20,13 +20,14 @@ module Automatic::Plugin
       @return_feeds = []
       @config['urls'].each {|url|
         retries = 0
+        retry_max = @config['retry'].to_i || 0
         begin
           create_rss(URI.encode(url))
         rescue
           retries += 1
           Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault in parsing: #{url}")
-          sleep @config['interval'].to_i unless @config['interval'].nil?
-          retry if retries <= @config['retry'].to_i unless @config['retry'].nil?
+          sleep ||= @config['interval'].to_i
+          retry if retries <= retry_max
         end
       }
       @return_feeds
@@ -38,7 +39,7 @@ module Automatic::Plugin
       html = open(url).read
       unless html.nil?
         rss = Automatic::FeedParser.parse(html)
-        sleep @config['interval'].to_i unless @config['interval'].nil?
+        sleep ||= @config['interval'].to_i
         @return_feeds << rss
       end
     end