automatic 14.1.0 → 14.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b43a1a794a8175f7d650b1b92ca118486fe0d86d
-  data.tar.gz: 47d449093ef8dd0ce5a51638d8fad105333a14de
+  metadata.gz: cb8bf871ac773a85f28e4afc565f1acb74937ae2
+  data.tar.gz: d87393ad0ebda325330e66da1c00599bf26917a1
 SHA512:
-  metadata.gz: 5c291f8190dfc97b1995bc306ccce1be8460257481baef90f3132bfd8c8f3fc45afd6bfd02e61df420f3a8a3c9c8e447309c380de1bba3037104aaee1a3b8967
-  data.tar.gz: e19eb66e353be6b34926c6c1e584ed4c28f50e15797cc9cd4819696cf9bf86a88cab59e7a51d31967d6dd7554f4c6857f2e77bb2ebf26c59af7bd48a9e9077d3
+  metadata.gz: e491a29e263b7e3f8dc4fc9e8a6587c1971d14b52e000f62f2ed5fef4fe23cb1230c78f5f1455748685cd991ae60013236b22b309ccdd6cd8d9e966263b398f2
+  data.tar.gz: 0736362169c5ed6b9e3e78dbd967b2b92334279b17cef613f617a2fdb1f6700222d72ca4e24920fb69c50ba4e3fab5099ea67d091e2bbf7bb1c51edb8bc94fe2

data/Gemfile

@@ -1,9 +1,9 @@
-# Version:20140124
+# Version:20140224
 
 source "http://rubygems.org"
 source "http://gems.github.com"
 
-gem 'json',           '~> 1.8.1'
+gem 'json',           '~> 1.7.7'
 gem 'sqlite3',        '~> 1.3.8'
 gem 'activesupport',  '~> 4.0.2'
 gem 'activerecord',   '~> 4.0.2'
@@ -20,6 +20,7 @@ gem 'weather_hacker', '~> 0.1.7'
 gem 'hipchat',        '~> 1.0.1'
 gem 'fluent-logger',  '~> 0.4.7'
 gem 'dalli',          '~> 2.7.0'
+gem 'aws-sdk',        '~> 1.33.0'
 
 group :test do
   gem 'rspec', '~> 2.14.1'

data/README.md

@@ -1,7 +1,7 @@
 Automatic Ruby
 ==============
 
-**Ruby General Automation Framework**
+**Ruby framework for the general-purpose automatic processing**
 
 
 Description
@@ -75,7 +75,7 @@ For more info, refer to the document (doc/README).
 Environment
 -----------
 
-Ruby 1.9 - 2.1. See Gemfile.
+After Ruby 1.9. See Gemfile.
 
 
 Development

data/Rakefile

@@ -32,7 +32,7 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/automaticruby/automaticruby"
   gem.license = "GPL"
   gem.summary = %Q{Automatic Ruby}
-  gem.description = %Q{Ruby General Automation Framework}
+  gem.description = %Q{Ruby framework for the general-purpose automatic processing}
   gem.email = "idnanashi@gmail.com"
   gem.authors = ["id774"]
   # dependencies defined in Gemfile

data/VERSION

@@ -1 +1 @@
-14.1.0
+14.2.0

data/automatic.gemspec

@@ -2,17 +2,17 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: automatic 14.1.0 ruby lib
+# stub: automatic 14.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "automatic"
-  s.version = "14.1.0"
+  s.version = "14.2.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 = "2014-01-24"
-  s.description = "Ruby General Automation Framework"
+  s.date = "2014-02-26"
+  s.description = "Ruby framework for the general-purpose automatic processing"
   s.email = "idnanashi@gmail.com"
   s.executables = ["automatic"]
   s.extra_rdoc_files = [
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
     "doc/README.ja",
     "lib/automatic.rb",
     "lib/automatic/environment.rb",
+    "lib/automatic/feed_maker.rb",
     "lib/automatic/feed_parser.rb",
     "lib/automatic/log.rb",
     "lib/automatic/opml.rb",
@@ -58,6 +59,7 @@ Gem::Specification.new do |s|
     "plugins/filter/tumblr_resize.rb",
     "plugins/notify/ikachan.rb",
     "plugins/provide/fluentd.rb",
+    "plugins/publish/amazon_s3.rb",
     "plugins/publish/console.rb",
     "plugins/publish/console_link.rb",
     "plugins/publish/eject.rb",
@@ -70,9 +72,9 @@ Gem::Specification.new do |s|
     "plugins/publish/pocket.rb",
     "plugins/publish/twitter.rb",
     "plugins/store/database.rb",
+    "plugins/store/file.rb",
     "plugins/store/full_text.rb",
     "plugins/store/permalink.rb",
-    "plugins/store/target_link.rb",
     "plugins/subscription/chan_toru.rb",
     "plugins/subscription/feed.rb",
     "plugins/subscription/g_guide.rb",
@@ -85,6 +87,8 @@ Gem::Specification.new do |s|
     "plugins/subscription/weather.rb",
     "plugins/subscription/xml.rb",
     "script/build",
+    "spec/fixtures/sampleFeeds.tsv",
+    "spec/fixtures/sampleFeeds2.tsv",
     "spec/fixtures/sampleRecipe.yml",
     "spec/lib/automatic/log_spec.rb",
     "spec/lib/automatic/pipeline_spec.rb",
@@ -105,6 +109,7 @@ Gem::Specification.new do |s|
     "spec/plugins/filter/tumblr_resize_spec.rb",
     "spec/plugins/notify/ikachan_spec.rb",
     "spec/plugins/provide/fluentd_spec.rb",
+    "spec/plugins/publish/amazon_s3_spec.rb",
     "spec/plugins/publish/console_spec.rb",
     "spec/plugins/publish/eject_spec.rb",
     "spec/plugins/publish/fluentd_spec.rb",
@@ -115,9 +120,9 @@ Gem::Specification.new do |s|
     "spec/plugins/publish/memcached_spec.rb",
     "spec/plugins/publish/pocket_spec.rb",
     "spec/plugins/publish/twitter_spec.rb",
+    "spec/plugins/store/file_spec.rb",
     "spec/plugins/store/full_text_spec.rb",
     "spec/plugins/store/permalink_spec.rb",
-    "spec/plugins/store/target_link_spec.rb",
     "spec/plugins/subscription/chan_toru_spec.rb",
     "spec/plugins/subscription/feed_spec.rb",
     "spec/plugins/subscription/g_guide_spec.rb",
@@ -167,7 +172,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<json>, ["~> 1.8.1"])
+      s.add_runtime_dependency(%q<json>, ["~> 1.7.7"])
       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"])
@@ -184,12 +189,13 @@ Gem::Specification.new do |s|
       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_runtime_dependency(%q<aws-sdk>, ["~> 1.33.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>, ["~> 1.8.1"])
+      s.add_dependency(%q<json>, ["~> 1.7.7"])
       s.add_dependency(%q<sqlite3>, ["~> 1.3.8"])
       s.add_dependency(%q<activesupport>, ["~> 4.0.2"])
       s.add_dependency(%q<activerecord>, ["~> 4.0.2"])
@@ -206,13 +212,14 @@ Gem::Specification.new do |s|
       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<aws-sdk>, ["~> 1.33.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>, ["~> 1.8.1"])
+    s.add_dependency(%q<json>, ["~> 1.7.7"])
     s.add_dependency(%q<sqlite3>, ["~> 1.3.8"])
     s.add_dependency(%q<activesupport>, ["~> 4.0.2"])
     s.add_dependency(%q<activerecord>, ["~> 4.0.2"])
@@ -229,6 +236,7 @@ Gem::Specification.new do |s|
     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<aws-sdk>, ["~> 1.33.0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<builder>, [">= 0"])

data/bin/automatic

@@ -3,8 +3,8 @@
 # Name::      Automatic::Ruby
 # Author::    774 <http://id774.net>
 # Created::   Feb 18, 2012
-# Updated::   Jul 19, 2013
-# Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
+# Updated::   Feb 21, 2014
+# Copyright:: Copyright (c) 2012-2014 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 root_dir = File.expand_path("..", File.dirname(__FILE__))
@@ -66,7 +66,7 @@ subparsers = {
   'feedparser' => lambda {|argv|
     require 'automatic/feed_parser'
     url = argv.shift || abort_with_usage("feedparser", "<url>")
-    rss_results = Automatic::FeedParser.get(url)
+    rss_results = Automatic::FeedParser.get_url(url)
     pp rss_results
   },
   'inspect' => lambda {|argv|
@@ -74,7 +74,7 @@ subparsers = {
     url = argv.shift || abort_with_usage("inspect", "<url>")
     feeds = Feedbag.find(url)
     pp feeds
-    rss_results = Automatic::FeedParser.get(feeds.pop)
+    rss_results = Automatic::FeedParser.get_url(feeds.pop)
     pp rss_results
   },
   'opmlparser' => lambda {|argv|

data/doc/ChangeLog

@@ -1,3 +1,30 @@
+=== 14.2.0 / 2014-02-26
+
+* Added new plugins.
+
+  * Publish::AmazonS3
+
+* Improvement File Saving Plugin
+
+  * Store::TargetLink rename to Store::File.
+  * Store::File rewrite link to file URI scheme.
+  * Enable file URI scheme in RSS 2.0 Feed.
+  * Store::File enable get file from Amazon S3.
+
+* Improvement Subscription::Text
+
+  * Read text from TSV formatted files.
+  * Add fields description, author, comments to RSS 2.0 Feed.
+
+* Into details Log messages.
+
+* Use 'double' instead of 'mock', 'stub' for rspec-mocks.
+
+* Improvement CI with network connection.
+
+* Refactoring to divide Feed::Parser to Feed::Maker.
+
+
 === 14.1.0 / 2014-01-24
 
 * Fix dependency conflict.

data/doc/PLUGINS

@@ -140,6 +140,7 @@ SubscriptionText
 
 [Abstract]
  Create new feeds from urls, titles, feeds on text.
+ Reading data from TSV (sep = '\t') formatted files.
 
 [Syntax]
   - module: SubscriptionText
@@ -155,6 +156,9 @@ SubscriptionText
         -
           title: 'title'
           url:   'url'
+      files:
+        - 'somefile1.tsv'
+        - 'somefile2.tsv'
 
 
 SubscriptionPocket
@@ -409,21 +413,26 @@ StoreFullText
       db: DB_NAME
 
 
-StoreTargetLink
----------------
+StoreFile
+---------
 [Path]
- /plugins/store/target_link.rb
+ /plugins/store/file.rb
 
 [Abstract]
- Store target locally.
- This emulate "Right click to save".
+ Store target to local file system.
+ This emulate "Right click to save"
+ If scheme begin with "s3n://", get file from Amazon S3.
+ Re-write URI scheme to file URI scheme and return feeds.
 
 [Syntax]
-  - Module: StoreTargetLink
+  - Module: StoreFile
     config:
       path: SAVE_TO_PATH
       retry: RETRY_COUNT
       interval: INTERVAL_FOR_DOWNLOAD (in seconds.)
+      access_key: ACCESS_KEY_ID (Only using S3)
+      secret_key: SECRET_ACCESS_KEY (Only using S3)
+      bucket_name: AMAZONS3_BUCKET_NAME (Only using S3)
 
 
 PublishConsole
@@ -438,6 +447,27 @@ PublishConsole
   - module: PublishConsole
 
 
+PublishAmazonS3
+---------------
+[Path]
+ /plugins/publish/amazon_s3.rb
+
+[Abstract]
+ Upload file to Amazon S3.
+
+[Description]
+ Read file URI scheme and upload it to aws.
+ Postulate feed link must be file URI scheme.
+
+[Syntax]
+  - module: PublishAmazonS3
+    config:
+      access_key: ACCESS_KEY_ID
+      secret_key: SECRET_ACCESS_KEY
+      bucket_name: AMAZONS3_BUCKET_NAME
+      target_path: PATH_ON_BUCKET
+
+
 PublishFluentd
 --------------
 [Path]

data/doc/PLUGINS.ja

@@ -141,6 +141,7 @@ SubscriptionText
 
 [概要]
  テキストベースの urls, titles, feeds から新規のフィードを作成する
+ タブ区切りの TSV 形式のファイルからフィードの情報を読み込む
 
 [レシピ記法]
   - module: SubscriptionText
@@ -154,8 +155,9 @@ SubscriptionText
         -
           title: TITLE
           url:   URL ...
-      interval: スクレイピングの間隔 (秒数, 省略可)
-      retry: エラー時のリトライ回数 (回数, 省略時 0)
+      files:
+        - 'somefile1.tsv'
+        - 'somefile2.tsv' ...
 
 
 SubscriptionPocket
@@ -412,20 +414,25 @@ StoreFullText
       db: SQLite3 DB 名
 
 
-StoreTargetLink
----------------
+StoreFile
+---------
 [パス]
- /plugins/store/target_link.rb
+ /plugins/store/file.rb
 
 [概要]
- リンク先のコンテンツをローカルに保存する
+ リンク先のコンテンツをローカルファイルシステムに保存する
+ s3n:// で始まる場合は Amazon S3 からファイルを取得する
+ リンクを保存したファイルのパス (file スキーム) に書き換えてフィードを返す
 
 [レシピ記法]
-  - module: StoreTargetLink
+  - module: StoreFile
     config:
       path: 保存先のフォルダ
       retry: エラー時のリトライ回数 (回数, 省略時 0)
       interval: 保存する間隔 (秒)
+      access_key: アクセスキー (S3 使用時のみ)
+      secret_key: シークレットアクセスキー (S3 使用時のみ)
+      bucket_name: S3 のバケット名 (S3 使用時のみ)
 
 
 PublishConsole
@@ -440,6 +447,27 @@ PublishConsole
   - module: PublishConsole
 
 
+PublishAmazonS3
+---------------
+[パス]
+ /plugins/publish/amazon_s3.rb
+
+[概要]
+ Amazon S3 にファイルをアップロードする
+
+[説明]
+ フィードのリンクにあるファイルを Amazon S3 にアップする
+ リンクが file URI スキームであることが前提である
+
+[レシピ記法]
+  - module: PublishAmazonS3
+    config:
+      access_key: アクセスキー
+      secret_key: シークレットアクセスキー
+      bucket_name: S3 のバケット名
+      target_path: バケット上でのファイルのパス
+
+
 PublishFluentd
 --------------
 [パス]

data/doc/README

@@ -1,7 +1,7 @@
 automaticruby
 
 Name
- Automatic Ruby - Ruby General Automation Framework
+ Automatic Ruby - Ruby framework for the general-purpose automatic processing
 
 Syntax
 $ automatic
@@ -112,7 +112,7 @@ plugins:
 
   - module: FilterTumblrResize
 
-  - module: StoreTargetLink
+  - module: StoreFile
     config:
       path: /Users/yourname/Desktop/
       interval: 1
@@ -121,7 +121,7 @@ In the case of sample this recipe.
 1. Subscribe to RSS feeds of Tumblr by SubScriptionFeed.
 2. Save permalink to database by StorePermalink.
 3. Specify the URL of the image by FilterImage and FilterTumblrResize.
-4. Downloading image file of Tumblr by StoreTargetLink.
+4. Downloading image file of Tumblr by StoreFile.
 
 
 Showing another example as follows.
@@ -496,7 +496,7 @@ TODO
 Environment
 ===========
 
- Ruby 1.9 - 2.0.
+ After Ruby 1.9.
 
  Depend on the packages that described in Gemfile.
 

data/doc/README.ja

@@ -117,7 +117,7 @@ plugins:
 
   - module: FilterTumblrResize
 
-  - module: StoreTargetLink
+  - module: StoreFile
     config:
       path: /Users/yourname/Desktop/
       interval: 1
@@ -126,7 +126,7 @@ plugins:
 1. Subscription Feed で Tumblr のフィードを購読し
 2. StorePermalink でパーマリンクをデータベースに保存し
 3  FilterImage と FilterTumblrResize で画像の URL を指定して
-4. StoreTargetLink で Tumblr の画像をダウンロードする
+4. StoreFile で Tumblr の画像をダウンロードする
 という一連の処理をプラグインの組み合わせで実現している。
 
 
@@ -504,7 +504,7 @@ TODO
 動作環境
 ========
 
-Ruby 1.9 - 2.0
+Ruby 1.9 以降
 
 Gemfile に記述された gem パッケージに依存