automatic 13.7.0 → 13.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 099ebe9f608899e3318f8293889007967d9c4d72
-  data.tar.gz: 88c76fd97d4d934d0dfab965a0cda255b841d5eb
+  metadata.gz: 90595ee77c762cb364af9cfd822d89d1d17d0306
+  data.tar.gz: 48e69a16b6577e239df8e265a09562aa379b383d
 SHA512:
-  metadata.gz: 58984aa3a163a1fecd59d800bc3cd7602b9fc0c24cdc80a2a247ff1738bc1f3ba369fa2aeda337ce2abbbba0e0ebdd2c8dd85b62819acfafea463ba8e0d84014
-  data.tar.gz: 0f87f0567276ccc1fbe5faf712be010ce826d87a3bd266d7e0327fc9c64f968fa32fd7b350a48c22fafd2b0433705c2b4bb499c510f82becd24dd7ecdb29ebf1
+  metadata.gz: df3741889e34f71522aab02de4929a4f04edb922a38ed0abb2027352229b1f2291a15b6dd6d54d64ba57e0c7e142d9cd23207f936ae70f4ce262aa4340b899a7
+  data.tar.gz: 877ddcfa68ca1ceec2b69f40dcc98136ee6979dfe019874ecf4d81f0d21aa1ecdefe1c8269bee9a78647ee7dea49c71d3f3c9a26d48170aa8831945198a3fce1

data/Gemfile

@@ -1,9 +1,9 @@
-# Version:20130628
+# Version:20131125
 
 source "http://rubygems.org"
 source "http://gems.github.com"
 
-gem 'json', '~> 1.7.7'
+gem 'json'
 gem 'sqlite3'
 gem 'activesupport', '~>4.0.0'
 gem 'activerecord', '~>4.0.0'
@@ -13,7 +13,7 @@ gem 'xml-simple'
 gem 'feedbag'
 gem 'nokogiri'
 gem 'sanitize'
-gem 'twitter'
+gem 'twitter', '~>4.8.1'
 gem 'weather_hacker'
 gem 'pocket-ruby'
 gem 'hipchat'
@@ -21,7 +21,7 @@ gem 'fluent-logger'
 gem 'dalli'
 
 group :test do
-  gem 'rspec'
+  gem 'rspec', '~> 2.14.0'
   gem 'rcov', :platforms => :mri_18
   gem 'simplecov'
   gem 'simplecov-rcov'
@@ -30,7 +30,7 @@ end
 
 group :development do
   gem "cucumber"
-  gem 'bundler', '~>1.3.5'
-  gem 'builder', '~>3.1.0'
+  gem 'bundler'
+  gem 'builder'
   gem "jeweler"
 end

data/VERSION

@@ -1 +1 @@
-13.7.0
+13.12.0

data/automatic.gemspec

@@ -2,14 +2,15 @@
 # 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
 
 Gem::Specification.new do |s|
   s.name = "automatic"
-  s.version = "13.7.0"
+  s.version = "13.12.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["id774"]
-  s.date = "2013-07-27"
+  s.date = "2013-12-17"
   s.description = "Ruby General Automation Framework"
   s.email = "idnanashi@gmail.com"
   s.executables = ["automatic"]
@@ -158,14 +159,14 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/automaticruby/automaticruby"
   s.licenses = ["GPL"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.5"
+  s.rubygems_version = "2.1.11"
   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>, ["~> 1.7.7"])
+      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"])
@@ -175,18 +176,18 @@ Gem::Specification.new do |s|
       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<twitter>, [">= 0"])
+      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_development_dependency(%q<cucumber>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.3.5"])
-      s.add_development_dependency(%q<builder>, ["~> 3.1.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.7.7"])
+      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"])
@@ -196,19 +197,19 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<feedbag>, [">= 0"])
       s.add_dependency(%q<nokogiri>, [">= 0"])
       s.add_dependency(%q<sanitize>, [">= 0"])
-      s.add_dependency(%q<twitter>, [">= 0"])
+      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<cucumber>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.3.5"])
-      s.add_dependency(%q<builder>, ["~> 3.1.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.7.7"])
+    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"])
@@ -218,15 +219,15 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<feedbag>, [">= 0"])
     s.add_dependency(%q<nokogiri>, [">= 0"])
     s.add_dependency(%q<sanitize>, [">= 0"])
-    s.add_dependency(%q<twitter>, [">= 0"])
+    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<cucumber>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.3.5"])
-    s.add_dependency(%q<builder>, ["~> 3.1.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<builder>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end

data/doc/ChangeLog

@@ -1,3 +1,8 @@
+=== 13.12.0 / 2013-12-17
+
+* Fix twitter gem version.
+
+
 === 13.7.0 / 2013-07-28
 
 * Added new plugins.

data/lib/automatic.rb

@@ -2,7 +2,7 @@
 # Name::      Automatic::Ruby
 # Author::    774 <http://id774.net>
 # Created::   Feb 18, 2012
-# Updated::   Jul 28, 2013
+# Updated::   Dec 17, 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.7.0"
+  VERSION = "13.12.0"
   USER_DIR = "/.automatic"
 
   class << self

data/plugins/filter/ignore.rb

@@ -2,7 +2,7 @@
 # Name::      Automatic::Plugin::Filter::Ignore
 # Author::    774 <http://id774.net>
 # Created::   Feb 22, 2012
-# Updated::   Apr  5, 2013
+# Updated::   Oct 15, 2013
 # Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
@@ -28,31 +28,33 @@ module Automatic::Plugin
     end
 
     private
+    def detect_exclude(item, evaluation, reason)
+      begin
+        if item.include?(evaluation)
+          Automatic::Log.puts("info", "Excluded by #{reason}: #{item}")
+          return true
+        end
+      rescue NoMethodError
+        Automatic::Log.puts("warn", "Invalid feed detected in ignore process with #{item}")
+        return false
+      end
+    end
 
     def exclude(items)
       detection = false
       unless @config['title'].nil?
         @config['title'].each {|e|
-          if items.title.include?(e.chomp)
-            detection = true
-            Automatic::Log.puts("info", "Excluded by title: #{items.link}")
-          end
+          detection = true if detect_exclude(items.title, e.chomp, 'title')
         }
       end
       unless @config['link'].nil?
         @config['link'].each {|e|
-          if items.link.include?(e.chomp)
-            detection = true
-            Automatic::Log.puts("info", "Excluded by link: #{items.link}")
-          end
+          detection = true if detect_exclude(items.link, e.chomp, 'link')
         }
       end
       unless @config['description'].nil?
         @config['description'].each {|e|
-          if items.description.include?(e.chomp)
-            detection = true
-            Automatic::Log.puts("info", "Excluded by description: #{items.link}")
-          end
+          detection = true if detect_exclude(items.description, e.chomp, 'description')
         }
       end
       detection

data/spec/lib/automatic_spec.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-# Name::      Automatic
+# Name::      Automatic::Ruby
 # Author::    kzgs
 #             774 <http://id774.net>
 # Created::   Mar  9, 2012
-# Updated::   Jul 28, 2013
+# Updated::   Dec 17, 2013
 # Copyright:: Copyright (c) 2012-2013 Automatic Ruby Developers.
 # License::   Licensed under the GNU GENERAL PUBLIC LICENSE, Version 3.0.
 
@@ -14,27 +14,33 @@ require 'automatic'
 describe Automatic do
   describe "#run" do
     describe "with a root dir which has default recipe" do
-      specify {
-        lambda{
+      subject {
           Automatic.run(:recipe   => "",
                         :root_dir => APP_ROOT,
                         :user_dir => APP_ROOT + "/spec/user_dir")
-        }.should_not raise_exception(Errno::ENOENT)
       }
+
+      it { expect { subject }.to raise_error }
     end
   end
 
   describe "#version" do
-    specify {
-      Automatic.const_get(:VERSION).should == "13.7.0"
-    }
+    subject { Automatic.const_get(:VERSION) }
+
+    it { expect(subject).to eq "13.12.0" }
   end
 
-  describe "#(root|config)_dir" do
-    specify {
-      Automatic.root_dir.should == APP_ROOT
-      Automatic.config_dir.should == APP_ROOT+"/config"
-    }
+  describe "#(root)_dir" do
+    subject { Automatic.root_dir }
+
+    it { expect(subject).to eq APP_ROOT }
+
+  end
+
+  describe "#(config)_dir" do
+    subject { Automatic.config_dir }
+
+    it { expect(subject).to eq APP_ROOT+"/config" }
   end
 
   describe "#user_dir= in test env" do
@@ -43,14 +49,18 @@ describe Automatic do
     end
 
     describe "#user_dir" do
+      subject { Automatic.user_dir }
+
       it "return valid value" do
-        Automatic.user_dir.should == File.join(APP_ROOT, "spec/user_dir")
+        expect(subject).to eq File.join(APP_ROOT, "spec/user_dir")
       end
     end
 
     describe "#user_plugins_dir" do
+      subject { Automatic.user_plugins_dir }
+
       it "return valid value" do
-        Automatic.user_plugins_dir.should == File.join(APP_ROOT, "spec/user_dir/plugins")
+        expect(subject).to eq File.join(APP_ROOT, "spec/user_dir/plugins")
       end
     end
 
@@ -66,14 +76,18 @@ describe Automatic do
     end
 
     describe "#user_dir" do
+      subject { Automatic.user_dir }
+
       it "return valid value" do
-        Automatic.user_dir.should == File.expand_path("~/") + "/.automatic"
+        expect(subject).to eq File.expand_path("~/") + "/.automatic"
       end
     end
 
     describe "#user_plugins_dir" do
+      subject { Automatic.user_plugins_dir }
+
       it "return valid value" do
-        Automatic.user_plugins_dir.should == File.expand_path("~/") + "/.automatic/plugins"
+        expect(subject).to eq File.expand_path("~/") + "/.automatic/plugins"
       end
     end
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: automatic
 version: !ruby/object:Gem::Version
-  version: 13.7.0
+  version: 13.12.0
 platform: ruby
 authors:
 - id774
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.7.7
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -154,16 +154,16 @@ dependencies:
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.8.1
 - !ruby/object:Gem::Dependency
   name: weather_hacker
   requirement: !ruby/object:Gem::Requirement
@@ -252,30 +252,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -455,7 +455,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Automatic Ruby