automatic 13.2.0 → 13.4.1

data/Gemfile

@@ -1,6 +1,6 @@
-# Version:20120317
+# Version:20130322
 
-source :rubygems
+source "http://rubygems.org"
 source "http://gems.github.com"
 
 gem 'sqlite3'

data/README.md

@@ -17,11 +17,23 @@ See doc/README file.
 Get Started
 -----------
 
-Installation.
+``` html
+[Stable]
+$ gem install automatic
+$ automatic scaffold
+(Make ~/.automatic on your home directory.)
+$ automatic -c ~/.automatic/config/example/feed2console.yml
+(This process will be output my blog feed to your terminal.)
+```
 
 ``` html
-gem install automatic
-automatic-config scaffold
+[Development]
+$ git clone git://github.com/id774/automaticruby.git
+$ cd automaticruby
+$ bundle install --path vendor/gems
+$ bin/automatic scaffold
+$ bin/automatic -c ~/.automatic/config/example/feed2console.yml
+(The same as above.)
 ```
 
 Specify any recipe with -c option.

data/Rakefile

@@ -37,7 +37,7 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-if /^1\.9\./ =~ RUBY_VERSION
+unless /^1\.8\./ =~ RUBY_VERSION
   desc "Run RSpec code examples with simplecov"
   task :simplecov do
     ENV['COVERAGE'] = "on"

data/VERSION

@@ -1 +1 @@
-13.2.0
+13.4.1

data/automatic.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = "automatic"
-  s.version = "13.2.0"
+  s.version = "13.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["id774"]
-  s.date = "2013-02-13"
+  s.date = "2013-04-10"
   s.description = "Ruby General Automation Framework"
   s.email = "idnanashi@gmail.com"
-  s.executables = ["automatic", "automatic-config"]
+  s.executables = ["automatic"]
   s.extra_rdoc_files = [
     "README.md"
   ]
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
     "assets/siteinfo/items_all.json",
     "automatic.gemspec",
     "bin/automatic",
-    "bin/automatic-config",
     "config/feed2console.yml",
     "db/.gitkeep",
     "doc/AUTHORS",
@@ -65,7 +64,6 @@ Gem::Specification.new do |s|
     "plugins/subscription/link.rb",
     "plugins/subscription/tumblr.rb",
     "plugins/subscription/twitter.rb",
-    "script/bootstrap",
     "script/build",
     "spec/fixtures/sampleRecipe.yml",
     "spec/lib/automatic/pipeline_spec.rb",

data/bin/automatic

@@ -3,26 +3,111 @@
 # Name::      Automatic::Ruby
 # Author::    774 <http://id774.net>
 # Created::   Feb 18, 2012
-# Updated::   Jan 22, 2013
-# Copyright:: 774 Copyright (c) 2012
+# Updated::   Apr 10, 2013
+# Copyright:: 774 Copyright (c) 2012-2013
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 root_dir = File.expand_path("..", File.dirname(__FILE__))
 $:.unshift root_dir
 $:.unshift root_dir + '/lib'
+
 require 'automatic'
+require 'rubygems'
 require 'optparse'
+require 'fileutils'
+require 'feedbag'
+require 'pp'
 
 recipe_path = ""
-parser = OptionParser.new { |parser|
-  parser.banner = "Usage: automatic [options] arg"
+
+def abort_with_usage(subcommand, message)
+  top_filename = File.basename($0)
+  abort("Usage: #{top_filename} #{subcommand} #{message}")
+end
+
+subparsers = {
+  'scaffold' => lambda {|argv|
+    Dir::entries(root_dir + '/plugins').sort.each {|path|
+      dir = (File.expand_path('~/.automatic/plugins/' + path))
+      unless File.exist?(dir)
+        FileUtils.mkdir_p(dir)
+        puts "Creating #{dir}"
+      end
+    }
+    dir = (File.expand_path('~/.automatic/assets'))
+    unless File.exist?(dir)
+      FileUtils.mkdir_p(dir)
+      FileUtils.cp_r(root_dir + '/assets/siteinfo', dir + '/siteinfo')
+      puts "Creating #{dir}"
+    end
+    dir = (File.expand_path('~/.automatic/config'))
+    unless File.exist?(dir)
+      FileUtils.mkdir_p(dir)
+      FileUtils.cp_r(root_dir + '/config', dir + '/example')
+      puts "Creating #{dir}"
+    end
+    dir = (File.expand_path('~/.automatic/db'))
+    unless File.exist?(dir)
+      FileUtils.mkdir_p(dir)
+      puts "Creating #{dir}"
+    end
+  },
+  'unscaffold' => lambda {|argv|
+    dir = (File.expand_path('~/.automatic'))
+    if File.directory?(dir)
+      puts "Removing #{dir}"
+      FileUtils.rm_r(dir)
+    end
+  },
+  'autodiscovery' => lambda {|argv|
+    url = argv.shift || abort_with_usage("autodiscovery", "<url>")
+    pp Feedbag.find(url)
+  },
+  'feedparser' => lambda {|argv|
+    require 'automatic/feed_parser'
+    url = argv.shift || abort_with_usage("feedparser", "<url>")
+    rss_results = Automatic::FeedParser.get(url)
+    pp rss_results
+  },
+  'inspect' => lambda {|argv|
+    require 'automatic/feed_parser'
+    url = argv.shift || abort_with_usage("inspect", "<url>")
+    feeds = Feedbag.find(url)
+    pp feeds
+    rss_results = Automatic::FeedParser.get(feeds.pop)
+    pp rss_results
+  },
+  'opmlparser' => lambda {|argv|
+    require 'automatic/opml'
+    path = argv.shift
+    if path.nil?
+      abort_with_usage("opmlparser", "<opml path>")
+    end
+    parser = Automatic::OPML::Parser.new(File.read(path))
+    parser.each_outline {|opml, o|
+      puts "#{o.xmlUrl}"
+    }
+  },
+  'log' => lambda {|argv|
+    require 'automatic/log'
+    level = argv.shift || abort_with_usage("log", "<level> <message>")
+    message = ARGV.shift
+    Automatic::Log.puts(level, message)
+  }
+}
+
+parser = OptionParser.new {|parser|
   parser.version = Automatic.const_get(:VERSION)
-  parser.separator "options:"
+  parser.banner = "Automatic #{parser.version}
+    Usage: automatic [options] [subcommand]"
+  parser.separator "SubCommands:
+    #{subparsers.keys.join(", ")}"
+  parser.separator "Options:"
   parser.on('-c', '--config FILE', String,
             "recipe YAML file"){|c| recipe_path = c}
   parser.on('-h', '--help', "show this message") {
     puts parser
-    exit
+    exit 1
   }
 }
 
@@ -32,18 +117,22 @@ begin
 rescue OptionParser::ParseError => err
   $stderr.puts err.message
   $stderr.puts parser.help
-  exit 1
+  exit 2
 end
 
-if recipe_path.to_s.empty?
-  if ENV["AUTOMATIC_RUBY_ENV"] == "test"
-    recpie_path = File.join(root_dir, 'config/default.yml')
+unless recipe_path.to_s.empty?
+  recipe = Automatic::Recipe.new(recipe_path)
+  Automatic.run(:recipe   => recipe,
+                :root_dir => root_dir)
+else
+  parser.order!(ARGV)
+  unless ARGV.empty?
+    Hash.new {|h, k|
+      puts "No such subcommand: #{k}"
+      exit 1
+    }.update(subparsers)[ARGV.shift].call(ARGV)
   else
     puts parser
-    exit 0
+    exit 1
   end
 end
-
-recipe = Automatic::Recipe.new(recipe_path)
-Automatic.run(:recipe   => recipe,
-              :root_dir => root_dir)

data/doc/ChangeLog

@@ -1,3 +1,12 @@
+=== 13.4.1 / 2013-04-10
+
+* Command automatic-config merged into automatic.
+
+* Improvement retry functions.
+
+* Running tests on Ruby 2.0.
+
+
 === 13.2.0 / 2013-02-13
 
 * All subscription and download plugins implemented retry function.

data/doc/PLUGINS

@@ -72,6 +72,8 @@ SubscriptionGoogleReaderStar
       feeds:
         - FEED
         - FEED ...
+      retry: RETRY_COUNT
+      interval: INTERVAL_FOR_RETRY (in seconds.)
 
 
 SubscriptionTwitter
@@ -293,7 +295,8 @@ PublishInstapaper
     config:
       email: INSTAPAPER_ACCOUNT
       password: PASSWORD
-      interval: INTERVAL
+      interval: INTERVAL_FOR_RETRY (in seconds.)
+      retry: RETRY_COUNT
 
 
 PublishGoogleCalendar

data/doc/PLUGINS.ja

@@ -72,6 +72,8 @@ SubscriptionGoogleReaderStar
       feeds:
         - フィード名
         - フィード名 ...
+      retry: エラー時のリトライ回数 (回数, 省略時 0)
+      interval: エラー時のリトライ間隔 (秒数, 省略可)
 
 
 SubscriptionTwitter
@@ -293,7 +295,8 @@ PublishInstapaper
     config:
       email: Instapaper メールアドレス
       password: パスワード
-      interval: 複数の予定の投稿間隔 (秒)
+      interval: 複数の予定の投稿間隔, エラー時のリトライ間隔 (秒)
+      retry: エラー時のリトライ回数 (回数, 省略時 0)
 
 
 PublishGoogleCalendar

data/doc/README

@@ -24,16 +24,19 @@ Installation
 
 [Stable]
 $ gem install automatic
-
-$ automatic-config scaffold
+$ automatic scaffold
 (Make ~/.automatic on your home directory.)
+$ automatic -c ~/.automatic/config/example/feed2console.yml
+(This process will be output my blog feed to your terminal.)
 
 
 [Development]
 $ git clone git://github.com/id774/automaticruby.git
-
 $ cd automaticruby
-$ script/bootstrap
+$ bundle install --path vendor/gems
+$ bin/automatic scaffold
+$ bin/automatic -c ~/.automatic/config/example/feed2console.yml
+(The same as above.)
 
 
 ===========
@@ -60,7 +63,7 @@ directory.
  This is the easy recipe to simply output blog's feed to
 only console. It can be used to check the operation of
 this software.
-$ automatic -c ~/automatic/config/example/feed2console.yml
+$ automatic -c ~/.automatic/config/example/feed2console.yml
 
 
 =======
@@ -183,8 +186,8 @@ Put your own plug-ins in your home directory.
 You can automatically generate a sub-directory for your own plug-ins
 with the following command.
 
-$ automatic-config scaffold
-(For a description of automatic-config will be described later.)
+$ automatic scaffold
+(For a description of automatic subcommands will be described later.)
 
 
 ============================
@@ -195,10 +198,7 @@ Directory and file structure
 +-+ bin
 | |
 | +-- automatic
-| | The main file for run.
-| |
-| +-- automatic-config
-|   The tool for the auxiliary.
+|   The main file for run.
 |
 +-- config
 |
@@ -265,11 +265,7 @@ Directory and file structure
 +-+ script
 | |
 | +-- build
-| | Run Integration Test that carried out on CI.
-| |
-| +-- bootstrap
-|   To set the environment, such as bundle install.
-|   (Only more than ruby 1.9)
+|   Run Integration Test that carried out on CI.
 |
 +-- spec
 |   Directory for unit tests (Use RSpec).
@@ -439,44 +435,44 @@ See doc/PLUGINS.
 
 
 
-================
-automatic-config
-================
+===========
+SubCommands
+===========
 
-automatic-config is the auxiliary tool.
+automatic has the auxiliary tool in subcommands.
 
 [Syntax]
-$ automatic-config
- Show list of sub-command.
+$ automatic
+ Show help and list of sub-command.
 
-$ automatic-config scaffold
+$ automatic scaffold
  Make ~/.automatic directory in your home directory.
  This operation makes 'plugins', 'db', 'config', 'assets' directories.
  These takes precedence the origin directory.
 
-$ automatic-config unscaffold
+$ automatic unscaffold
  Delete ~/.automatic directory.
 
-$ automatic-config autodiscovery <url>
+$ automatic autodiscovery <url>
  Return the URL of the feed of target detected by auto discovery.
 (ex.)
-$ automatic-config autodiscovery http://blog.id774.net/post
+$ automatic autodiscovery http://blog.id774.net/post
 ["http://blog.id774.net/post/feed/", "http://blog.id774.net/post/comments/feed/"]
 
-$ automatic-config opmlparser <opml path>
+$ automatic opmlparser <opml path>
  Output the URLs to parse the OPML file.
 (ex.)
-$ automatic-config opmlparser opml.xml > feeds.txt
+$ automatic opmlparser opml.xml > feeds.txt
 
-$ automatic-config feedparser <url>
+$ automatic feedparser <url>
  Return the contents to parse the feed.
 
-$ automatic-config inspect <url>
+$ automatic inspect <url>
  Return the URL of the feed of target detected by auto discovery.
  Return the contents to parse the first feed further.
  This inspects verify the target subscriptionable.
 
-$ automatic-config log <level> <message>
+$ automatic log <level> <message>
  Output log messages in the form of Automatic Ruby.
 
 

data/doc/README.ja

@@ -25,16 +25,19 @@ $ automatic -v
 
 [安定版]
 $ gem install automatic
-
-$ automatic-config scaffold
+$ automatic scaffold
 (ホームディレクトリに ~/.automatic を生成する)
+$ automatic -c ~/.automatic/config/example/feed2console.yml
+(ブログのフィードを入力しターミナルに出力する)
 
 
 [開発版]
 $ git clone git://github.com/id774/automaticruby.git
-
 $ cd automaticruby
-$ script/bootstrap
+$ bundle install --path vendor/gems
+$ bin/automatic scaffold
+$ bin/automatic -c ~/.automatic/config/example/feed2console.yml
+(上記に同じ)
 
 
 ============
@@ -174,10 +177,7 @@ plugins:
 +- bin
 |   |
 |   +- automatic
-|   |    実行ファイル本体
-|   |
-|   +- automatic-config
-|        利用を補助するためのツール
+|        実行ファイル本体
 |
 +- config
 |   YAML 形式でプラグインの情報を記述する
@@ -245,11 +245,7 @@ plugins:
 +- script
 |   |
 |   +- build
-|   |    CI で実施する結合試験をおこなう
-|   |
-|   +- bootstrap
-|        bundle install 等の環境設定をおこなう
-|        (ruby 1.9 以上のみ)
+|        CI で実施する結合試験をおこなう
 |
 +- spec
 |    ユニットテスト用ディレクトリ
@@ -446,45 +442,45 @@ doc/PLUGINS.ja を参照
 
 
 
-================
-automatic-config
-================
+============
+サブコマンド
+============
 
-automatic-config は補助的なツールである。
+automatic コマンドから補助的なツールをサブコマンド経由で実行できる。
 
 [書式]
-$ automatic-config
- サブコマンドの一覧を表示する
+$ automatic
+ ヘルプ及びサブコマンドの一覧を表示する
 
-$ automatic-config scaffold
+$ automatic scaffold
  ホームディレクトリに ~/.automatic ディレクトリを生成する。
  この操作により ~/.automatic の下に plugins, db, config, assets
 ディレクトリが生成される。
  これらは本体のそれぞれのディレクトリよりも優先される。
 
-$ automatic-config unscaffold
+$ automatic unscaffold
  ホームディレクトリの ~/.automatic ディレクトリを削除する。
 
-$ automatic-config autodiscovery <url>
+$ automatic autodiscovery <url>
  対象の URL をオートディスカバリで探知しフィードの URL を返す。
 (例)
-$ automatic-config autodiscovery http://blog.id774.net/post
+$ automatic autodiscovery http://blog.id774.net/post
 ["http://blog.id774.net/post/feed/", "http://blog.id774.net/post/comments/feed/"]
 
-$ automatic-config opmlparser <opml path>
+$ automatic opmlparser <opml path>
  OPML ファイルを解析し URL を出力する。
 (例)
-$ automatic-config opmlparser opml.xml > feeds.txt
+$ automatic opmlparser opml.xml > feeds.txt
 
-$ automatic-config feedparser <url>
+$ automatic feedparser <url>
  フィードを解析して内容を返す。
 
-$ automatic-config inspect <url>
+$ automatic inspect <url>
  対象の URL をオートディスカバリで探知する。
  さらに最初のフィードの URL を解析して内容を返す。
  目的のサイトのフィードを購読可能かどうか検証するのに使う。
 
-$ automatic-config log <level> <message>
+$ automatic log <level> <message>
  Automatic Ruby のログ形式でメッセージを出力する。
 
 

data/lib/automatic/feed_parser.rb

@@ -3,7 +3,7 @@
 # Author::    774 <http://id774.net>
 # Created::   Feb 19, 2012
 # Updated::   Jan  8, 2013
-# Copyright:: 774 Copyright (c) 2012
+# Copyright:: 774 Copyright (c) 2012-2013
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic

data/lib/automatic.rb

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

data/plugins/filter/absolute_uri.rb

@@ -2,8 +2,8 @@
 # Name::      Automatic::Plugin::Filter::AbsoluteURI
 # Author::    774 <http://id774.net>
 # Created::   Jun 20, 2012
-# Updated::   Sep 18, 2012
-# Copyright:: 774 Copyright (c) 2012
+# Updated::   Apr  5, 2013
+# Copyright:: 774 Copyright (c) 2012-2013
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
 module Automatic::Plugin
@@ -14,14 +14,6 @@ module Automatic::Plugin
       @pipeline = pipeline
     end
 
-    def rewrite(string)
-      if /^http:\/\/.*$/ =~ string
-        return string
-      else
-        return @config['url'] + string
-      end
-    end
-
     def run
       @return_feeds = []
       @pipeline.each {|feeds|
@@ -35,5 +27,14 @@ module Automatic::Plugin
       }
       @return_feeds
     end
+
+    private
+    def rewrite(string)
+      if /^http:\/\/.*$/ =~ string
+        return string
+      else
+        return @config['url'] + string
+      end
+    end
   end
 end

data/plugins/filter/full_feed.rb

@@ -3,7 +3,7 @@
 # Author::    progd <http://d.hatena.ne.jp/progd/20120429/automatic_ruby_filter_full_feed>
 #             774 <http://id774.net>
 # Created::   Apr 29, 2012
-# Updated::   Jan 24, 2013
+# Updated::   Apr  5, 2013
 # Copyright:: progd
 #             774 Copyright (c) 2012-2013
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
@@ -21,6 +21,21 @@ module Automatic::Plugin
       @siteinfo = get_siteinfo
     end
 
+    def run
+      @return_feeds = []
+      @pipeline.each {|feeds|
+        unless feeds.nil?
+          feeds.items.each {|feed|
+            feed = fulltext(feed)
+          }
+        end
+        @return_feeds << feeds
+      }
+      @return_feeds
+    end
+
+    private
+
     def get_siteinfo
       Automatic::Log.puts(:info, "Loading siteinfo from #{@config['siteinfo']}")
       siteinfo = JSON.load(open(File.join(assets_dir, @config['siteinfo'])).read)
@@ -59,18 +74,5 @@ module Automatic::Plugin
       Automatic::Log.puts(:info, "Fulltext SITEINFO not found: #{feed.link}")
       return feed
     end
-
-    def run
-      @return_feeds = []
-      @pipeline.each {|feeds|
-        unless feeds.nil?
-          feeds.items.each {|feed|
-            feed = fulltext(feed)
-          }
-        end
-        @return_feeds << feeds
-      }
-      @return_feeds
-    end
   end
 end