automatic 13.6.0 → 13.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 099ebe9f608899e3318f8293889007967d9c4d72
+  data.tar.gz: 88c76fd97d4d934d0dfab965a0cda255b841d5eb
+SHA512:
+  metadata.gz: 58984aa3a163a1fecd59d800bc3cd7602b9fc0c24cdc80a2a247ff1738bc1f3ba369fa2aeda337ce2abbbba0e0ebdd2c8dd85b62819acfafea463ba8e0d84014
+  data.tar.gz: 0f87f0567276ccc1fbe5faf712be010ce826d87a3bd266d7e0327fc9c64f968fa32fd7b350a48c22fafd2b0433705c2b4bb499c510f82becd24dd7ecdb29ebf1

data/Gemfile

@@ -7,7 +7,6 @@ gem 'json', '~> 1.7.7'
 gem 'sqlite3'
 gem 'activesupport', '~>4.0.0'
 gem 'activerecord', '~>4.0.0'
-gem 'actionmailer', '~>4.0.0'
 gem 'hashie'
 gem 'gcalapi'
 gem 'xml-simple'

data/VERSION

@@ -1 +1 @@
-13.6.0
+13.7.0

data/automatic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "automatic"
-  s.version = "13.6.0"
+  s.version = "13.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["id774"]
-  s.date = "2013-06-28"
+  s.date = "2013-07-27"
   s.description = "Ruby General Automation Framework"
   s.email = "idnanashi@gmail.com"
   s.executables = ["automatic"]
@@ -54,6 +54,7 @@ Gem::Specification.new do |s|
     "plugins/filter/sort.rb",
     "plugins/filter/tumblr_resize.rb",
     "plugins/notify/ikachan.rb",
+    "plugins/provide/fluentd.rb",
     "plugins/publish/console.rb",
     "plugins/publish/console_link.rb",
     "plugins/publish/eject.rb",
@@ -72,7 +73,6 @@ Gem::Specification.new do |s|
     "plugins/subscription/chan_toru.rb",
     "plugins/subscription/feed.rb",
     "plugins/subscription/g_guide.rb",
-    "plugins/subscription/google_reader_star.rb",
     "plugins/subscription/link.rb",
     "plugins/subscription/pocket.rb",
     "plugins/subscription/text.rb",
@@ -80,6 +80,7 @@ Gem::Specification.new do |s|
     "plugins/subscription/twitter.rb",
     "plugins/subscription/twitter_search.rb",
     "plugins/subscription/weather.rb",
+    "plugins/subscription/xml.rb",
     "script/build",
     "spec/fixtures/sampleRecipe.yml",
     "spec/lib/automatic/log_spec.rb",
@@ -100,6 +101,7 @@ Gem::Specification.new do |s|
     "spec/plugins/filter/sort_spec.rb",
     "spec/plugins/filter/tumblr_resize_spec.rb",
     "spec/plugins/notify/ikachan_spec.rb",
+    "spec/plugins/provide/fluentd_spec.rb",
     "spec/plugins/publish/console_spec.rb",
     "spec/plugins/publish/eject_spec.rb",
     "spec/plugins/publish/fluentd_spec.rb",
@@ -116,7 +118,6 @@ Gem::Specification.new do |s|
     "spec/plugins/subscription/chan_toru_spec.rb",
     "spec/plugins/subscription/feed_spec.rb",
     "spec/plugins/subscription/g_guide_spec.rb",
-    "spec/plugins/subscription/google_reader_star_spec.rb",
     "spec/plugins/subscription/link_spec.rb",
     "spec/plugins/subscription/pocket_spec.rb",
     "spec/plugins/subscription/text_spec.rb",
@@ -124,6 +125,7 @@ Gem::Specification.new do |s|
     "spec/plugins/subscription/twitter_search_spec.rb",
     "spec/plugins/subscription/twitter_spec.rb",
     "spec/plugins/subscription/weather_spec.rb",
+    "spec/plugins/subscription/xml_spec.rb",
     "spec/spec_helper.rb",
     "spec/user_dir/plugins/store/mock.rb",
     "test/fixtures/sampleOPML.xml",
@@ -134,7 +136,6 @@ Gem::Specification.new do |s|
     "test/integration/test_fluentd.yml",
     "test/integration/test_fulltext.yml",
     "test/integration/test_googlealert.yml",
-    "test/integration/test_googlestar.yml",
     "test/integration/test_hatenabookmark.yml",
     "test/integration/test_ignore.yml",
     "test/integration/test_ignore2.yml",
@@ -151,23 +152,23 @@ Gem::Specification.new do |s|
     "test/integration/test_tumblr2local.yml",
     "test/integration/test_twitter_search.yml",
     "test/integration/test_weather.yml",
+    "test/integration/test_xml2fluentd.yml",
     "vendor/.gitkeep"
   ]
   s.homepage = "http://github.com/automaticruby/automaticruby"
   s.licenses = ["GPL"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.0.5"
   s.summary = "Automatic Ruby"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, ["~> 1.7.7"])
       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<actionmailer>, ["~> 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"])
@@ -189,7 +190,6 @@ Gem::Specification.new do |s|
       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<actionmailer>, ["~> 4.0.0"])
       s.add_dependency(%q<hashie>, [">= 0"])
       s.add_dependency(%q<gcalapi>, [">= 0"])
       s.add_dependency(%q<xml-simple>, [">= 0"])
@@ -212,7 +212,6 @@ Gem::Specification.new do |s|
     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<actionmailer>, ["~> 4.0.0"])
     s.add_dependency(%q<hashie>, [">= 0"])
     s.add_dependency(%q<gcalapi>, [">= 0"])
     s.add_dependency(%q<xml-simple>, [">= 0"])

data/bin/automatic

@@ -3,8 +3,8 @@
 # Name::      Automatic::Ruby
 # Author::    774 <http://id774.net>
 # Created::   Feb 18, 2012
-# Updated::   Apr 10, 2013
-# Copyright:: 774 Copyright (c) 2012-2013
+# Updated::   Jul 19, 2013
+# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 root_dir = File.expand_path("..", File.dirname(__FILE__))

data/doc/ChangeLog

@@ -1,3 +1,13 @@
+=== 13.7.0 / 2013-07-28
+
+* Added new plugins.
+
+  * Subscription::Xml
+  * Provide::Fluentd
+
+* Fix some problems.
+
+
 === 13.6.0 / 2013-06-28
 
 * Added new plugins.

data/doc/PLUGINS

@@ -38,42 +38,43 @@ SubscriptionLink
       retry: RETRY_COUNT
 
 
-SubscriptionTumblr
-------------------
+SubscriptionXml
+---------------
 [Path]
- /plugins/subscription/tumblr.rb
+ /plugins/subscription/xml.rb
 
 [Abstract]
- Subscribe tumblr and extract the links.
- If pages specified, including past pages.
+ Subscribe XML API with GET method.
+ This plug-in store encoded XML in content_encoded of RSS feed.
 
 [Syntax]
-  - module: SubscriptionTumblr
+  - module: SubscriptionXml
     config:
       urls:
         - URL
-        - URL ...
-      pages: PAGES
+        - URL ... (XML base API)
       interval: INTERVAL_FOR_SCRAPING (in seconds.)
       retry: RETRY_COUNT
 
 
-SubscriptionGoogleReaderStar
-----------------------------
+SubscriptionTumblr
+------------------
 [Path]
- /plugins/subscription/google_reader_star.rb
+ /plugins/subscription/tumblr.rb
 
 [Abstract]
- Subscribe to Google reader star feed.
+ Subscribe tumblr and extract the links.
+ If pages specified, including past pages.
 
 [Syntax]
-  - module: SubscriptionGoogleReaderStar
+  - module: SubscriptionTumblr
     config:
-      feeds:
-        - FEED
-        - FEED ...
+      urls:
+        - URL
+        - URL ...
+      pages: PAGES
+      interval: INTERVAL_FOR_SCRAPING (in seconds.)
       retry: RETRY_COUNT
-      interval: INTERVAL_FOR_RETRY (in seconds.)
 
 
 SubscriptionTwitter
@@ -187,7 +188,7 @@ SubscriptionGGuide
 [Syntax]
   - module: SubscriptionGGuide
     config:
-      keyword: 'anime' # search word
+      keyword: 'anime,shogi' # search word (',' dividing and coming out two or more search)
       station: '地上波' # (It means terrestrial broadcasting in Japanese.)
       interval: INTERVAL_FOR_SCRAPING (in seconds.)
       retry:    RETRY_COUNT
@@ -462,6 +463,28 @@ PublishFluentd
       tag:  TAGS (example: automatic.feed)
 
 
+ProvideFluentd
+--------------
+[Path]
+ /plugins/provide/fluentd.rb
+
+[Abstract]
+ This plugin output content_encoded to fluentd.
+
+[Description]
+ Provide::Fluentd is different from Publish::Fluentd.
+
+ Publish::Fluentd -> Output feed to flulentd.
+ Provide::Fluentd -> Output content_encoded to fluentd.
+
+[Syntax]
+  - module: ProvideFluentd
+    config:
+      host: HOSTNAME
+      port: PORT_NUMBER
+      tag:  TAGS (example: automatic.feed)
+
+
 PublishMemcached
 ----------------
 [Path]

data/doc/PLUGINS.ja

@@ -38,42 +38,44 @@ SubscriptionLink
       retry: エラー時のリトライ回数 (回数, 省略時 0)
 
 
-SubscriptionTumblr
-------------------
+SubscriptionXml
+---------------
 [パス]
- /plugins/subscription/tumblr.rb
+ /plugins/subscription/xml.rb
 
 [概要]
- Tumblr を購読し、リンクを抽出する
- pages が指定された場合、過去のページも遡って購読する
+ XML で提供された API を GET メソッドで購読する
+ このプラグインはエンコードされた XML を RSS フィードの
+ content_encoded に保存する
 
 [レシピ記法]
-  - module: SubscriptionTumblr
+  - module: SubscriptionXml
     config:
       urls:
         - URL
-        - URL ...
-      pages: PAGES
+        - URL ... (XML ベース API)
       interval: スクレイピングの間隔 (秒数, 省略可)
       retry: エラー時のリトライ回数 (回数, 省略時 0)
 
 
-SubscriptionGoogleReaderStar
-----------------------------
+SubscriptionTumblr
+------------------
 [パス]
- /plugins/subscription/google_reader_star.rb
+ /plugins/subscription/tumblr.rb
 
 [概要]
- Google リーダーのスターフィードを購読する
+ Tumblr を購読し、リンクを抽出する
+ pages が指定された場合、過去のページも遡って購読する
 
 [レシピ記法]
-  - module: SubscriptionGoogleReaderStar
+  - module: SubscriptionTumblr
     config:
-      feeds:
-        - フィード名
-        - フィード名 ...
+      urls:
+        - URL
+        - URL ...
+      pages: PAGES
+      interval: スクレイピングの間隔 (秒数, 省略可)
       retry: エラー時のリトライ回数 (回数, 省略時 0)
-      interval: エラー時のリトライ間隔 (秒数, 省略可)
 
 
 SubscriptionTwitter
@@ -188,7 +190,7 @@ SubscriptionGGuide
 [レシピ記法]
   - module: SubscriptionGGuide
     config:
-      keyword: 'アニメ' # 検索ワード
+      keyword: 'アニメ,将棋' # 検索ワード(','区切りで複数検索)
       station: '地上波' # 衛星放送の区域(現在は地上波のみ対応)
       interval: スクレイピングの間隔 (秒数, 省略可)
       retry: エラー時のリトライ回数 (回数, 省略時 0)
@@ -206,7 +208,7 @@ SubscriptionChanToru
 [レシピ記法]
   - module: SubscriptionChanToru
     config:
-      keyword: 'アニメ' # 検索ワード
+      keyword: 'アニメ,将棋' # 検索ワード(','区切りで複数検索)
       station: '地上波' # 衛星放送の区域(現在は地上波のみ対応)
       interval: スクレイピングの間隔 (秒数, 省略可)
       retry: エラー時のリトライ回数 (回数, 省略時 0)
@@ -463,6 +465,28 @@ PublishFluentd
       tag:  タグ (例 automatic.feed)
 
 
+ProvideFluentd
+--------------
+[パス]
+ /plugins/provide/fluentd.rb
+
+[概要]
+ fluentd に content_encoded の内容を出力する
+
+[説明]
+ このプラグインは Publish::Fluentd とは異なる
+
+ Publish::Fluentd -> フィード全体を fluentd に出力
+ Provide::Fluentd -> content_encoded の内容を fluentd に出力
+
+[レシピ記法]
+  - module: ProvideFluentd
+    config:
+      host: ホスト名
+      port: ポート番号
+      tag:  タグ (例 automatic.feed)
+
+
 PublishMemcached
 ----------------
 [パス]

data/lib/automatic.rb

@@ -2,7 +2,7 @@
 # Name::      Automatic::Ruby
 # Author::    774 <http://id774.net>
 # Created::   Feb 18, 2012
-# Updated::   Jun 27, 2013
+# Updated::   Jul 28, 2013
 # Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
@@ -13,7 +13,7 @@ module Automatic
   require 'automatic/log'
   require 'automatic/feed_parser'
 
-  VERSION = "13.6.0"
+  VERSION = "13.7.0"
   USER_DIR = "/.automatic"
 
   class << self

data/lib/automatic/feed_parser.rb

@@ -2,7 +2,7 @@
 # Name::      Automatic::FeedParser
 # Author::    774 <http://id774.net>
 # Created::   Feb 19, 2012
-# Updated::   Jan  8, 2013
+# Updated::   Jul 12, 2013
 # Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
@@ -77,5 +77,19 @@ module Automatic
       }
     end
 
+    def self.content_provide(url, data)
+      RSS::Maker.make("2.0") {|maker|
+        xss = maker.xml_stylesheets.new_xml_stylesheet
+        maker.channel.title = "Automatic Ruby"
+        maker.channel.description = "Automatic Ruby"
+        maker.channel.link = "https://github.com/automaticruby/automaticruby"
+        maker.items.do_sort = true
+        item = maker.items.new_item
+        item.title = "Automatic Ruby"
+        item.link = url
+        item.content_encoded = data
+        item.date = Time.now
+      }
+    end
   end
 end

data/plugins/provide/fluentd.rb

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Name::      Automatic::Plugin::Provide::Fluentd
+# Author::    774 <http://id774.net>
+# Created::   Jul 12, 2013
+# Updated::   Jul 12, 2013
+# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
+
+module Automatic::Plugin
+  class ProvideFluentd
+    require 'fluent-logger'
+    require 'active_support'
+
+    def initialize(config, pipeline=[])
+      @config = config
+      @pipeline = pipeline
+      @fluentd = Fluent::Logger::FluentLogger.open(nil,
+        host = @config['host'],
+        port = @config['port'])
+    end
+
+    def run
+      @pipeline.each {|feeds|
+        unless feeds.nil?
+          feeds.items.each {|feed|
+            begin
+              @fluentd.post(@config['tag'], feed.content_encoded)
+            rescue
+              Automatic::Log.puts("error", "Fluent::Logger.post failed, the content_encoded of item may be not kind of Hash.")
+            end
+          }
+        end
+      }
+      @pipeline
+    end
+  end
+end

data/plugins/subscription/g_guide.rb

@@ -13,12 +13,19 @@ module Automatic::Plugin
     def initialize(config, pipeline=[])
       @config   = config
       @pipeline = pipeline
+      unless @config['keyword'].nil? || @config['keyword'].index(',').nil?
+        @keywords = @config['keyword'].split(',')
+      else
+        @keywords = [@config['keyword']]
+      end
     end
 
     def run
       retries = 0
       begin
-        @pipeline << Automatic::FeedParser.get(feed_url)
+        @keywords.each {|keyword|
+          @pipeline << Automatic::FeedParser.get(feed_url keyword)
+        }
       rescue
         retries += 1
         Automatic::Log.puts("error", "ErrorCount: #{retries}, Fault in parsing: #{retries}")
@@ -28,10 +35,10 @@ module Automatic::Plugin
       @pipeline
     end
 
-    def feed_url
+    def feed_url keyword = nil
       feed = G_GUIDE_RSS
-      unless @config['keyword'].nil?
-        feed += "condition.keyword=#{@config['keyword']}&"
+      unless keyword.nil?
+        feed += "condition.keyword=#{keyword}&"
       end
       feed += station_param
       URI.encode(feed)