termtter 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47109373f39797dc79ef16623fae5412b2edf692
-  data.tar.gz: 208d6c0924fed76cad20f68174cca37ff4612aea
+  metadata.gz: 0031c3535e7a12c56800bb53f611a46944a35ca5
+  data.tar.gz: aa46725689221ca1ef7a5455180fabdefa5ff9e1
 SHA512:
-  metadata.gz: dd84b33c702b44a1192c5d7045cb5d8b45ab93dd5c03155590fd6bafeceaaf09295c683be90e8f10c81d90bfc72fd7bf2092190df61427907539d8ac8635553c
-  data.tar.gz: a59bf708e6403d198d8fadd463dc5bab21feef91d666382b6390d80e30d295b49a3721620939873ef76f5c41715f4e761551ba5f3ef2788433e4d12484528eb1
+  metadata.gz: d116bec2f0f654b603ab3789e46722b6e33eda15ebcf9f8b39d06c5fcd3da87fe8977d4595fbe6ca00dd9881c967ba03c5ca8683856e6d6ce4ee0bb93dd65603
+  data.tar.gz: 71408044ab7f87107e15201c26943cff7636d2c4c9f0b6929c5a427ac7e4bdf02e734ef318638b973dd07d90d5aaf139b5c23440d57d5848c98616f466f3926f

data/Gemfile

@@ -2,14 +2,14 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'json', '>= 1.1.3'
-gem 'highline', '>= 1.5.0'
-gem 'termcolor', '~> 1.0.0'
+gem 'json', '~> 1.8.0'
+gem 'highline', '~> 1.6.0'
+gem 'termcolor', '~> 1.0'
 gem 'rubytter', '~> 1.5.1'
-gem 'notify', '>= 0.5.1'
-gem 'activerecord', '~> 4.0.0'
-gem 'builder', '>= 3.0.4'
-gem 'fluent-logger', '>= 0.4.6'
+gem 'notify', '~> 0.5.1'
+gem 'activerecord', '~> 4.1.0'
+gem 'builder', '~> 3.1.4'
+gem 'fluent-logger', '~> 0.4.6'
 
 group :test do
   gem 'rake'
@@ -23,7 +23,7 @@ group :test do
 end
 
 group :development do
-  gem "cucumber"
-  gem "bundler"
-  gem "jeweler"
+  gem 'cucumber', '~> 1.3.18'
+  gem 'bundler', '~> 1.3.6'
+  gem 'jeweler', '~> 2.0.1'
 end

data/VERSION

@@ -1 +1 @@
-2.2.2
+2.2.3

data/lib/plugins/expand_url.rb

@@ -2,7 +2,6 @@
 
 URL_SHORTTERS = [
   {:host => "tinyurl.com", :pattern => %r'(http://tinyurl\.com(/[\w/]+))'},
-  {:host => "is.gd", :pattern => %r'(http://is\.gd(/[\w/]+))'},
   {:host => "bit.ly", :pattern => %r'(http://bit\.ly(/[\w/]+))'},
   {:host => "ff.im", :pattern => %r'(http://ff\.im(/[-\w/]+))'},
   {:host => "j.mp", :pattern => %r'(http://j\.mp(/[\w/]+))'},

data/lib/termtter/version.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
 module Termtter
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
 end

data/spec/plugins/expand_url_spec.rb

@@ -20,29 +20,29 @@ describe Termtter::Client, 'when the plugin expand_url is loaded' do
       :in_reply_to_user_id, :created_at)
     statuses << status_struct.new(1, '無変換 http://id774.net zzz', 'termtter', user_1, 100, nil, Time.now.to_s)
     statuses << status_struct.new(2, 'あああ http://goo.gl/U7dM4Z aaa', 'termtter', user_1, 100, nil, Time.now.to_s)
-    statuses << status_struct.new(3, 'いいい http://is.gd/ZIqgo7 bbb', 'termtter', user_1, 100, nil, Time.now.to_s)
-    statuses << status_struct.new(4, 'ううう http://bit.ly/1RvMdT ccc', 'termtter', user_1, 100, nil, Time.now.to_s)
-    statuses << status_struct.new(5, 'えええ http://j.mp/1RvMdT ddd', 'termtter', user_1, 100, nil, Time.now.to_s)
-    statuses << status_struct.new(6, 'おおお http://ow.ly/nwfAS eee', 'termtter', user_1, 100, nil, Time.now.to_s)
-    statuses << status_struct.new(7, 'ききき http://ow.ly/nwg5a ggg', 'termtter', user_1, 100, nil, Time.now.to_s)
-    statuses << status_struct.new(8, 'くくく http://p.tl/mwda hhh', 'termtter', user_1, 100, nil, Time.now.to_s)
+    #statuses << status_struct.new(3, 'いいい http://is.gd/ZIqgo7 bbb', 'termtter', user_1, 100, nil, Time.now.to_s)
+    statuses << status_struct.new(3, 'ううう http://bit.ly/1RvMdT ccc', 'termtter', user_1, 100, nil, Time.now.to_s)
+    statuses << status_struct.new(4, 'えええ http://j.mp/1RvMdT ddd', 'termtter', user_1, 100, nil, Time.now.to_s)
+    statuses << status_struct.new(5, 'おおお http://ow.ly/nwfAS eee', 'termtter', user_1, 100, nil, Time.now.to_s)
+    statuses << status_struct.new(6, 'ききき http://ow.ly/nwg5a ggg', 'termtter', user_1, 100, nil, Time.now.to_s)
+    statuses << status_struct.new(7, 'くくく http://p.tl/mwda hhh', 'termtter', user_1, 100, nil, Time.now.to_s)
 
     # statuses << status_struct.new(2, 'bar', 'termtter', user_1, nil, nil, Time.now.to_s)
     # statuses << status_struct.new(3, 'xxx', 'web', user_2, nil, nil, Time.now.to_s)
     f.call(statuses, nil)
     statuses[0].text.should == '無変換 http://id774.net zzz'
     statuses[1].text.should == 'あああ http://id774.net/ aaa'
-    statuses[2].text.should == 'いいい http://id774.net bbb'
-    statuses[3].text.should == 'ううう http://id774.net/ ccc'
-    statuses[4].text.should == 'えええ http://id774.net/ ddd'
-    statuses[5].text.should == 'おおお http://id774.net eee'
-    statuses[6].text.should == 'ききき http://id774.net ggg'
-    statuses[7].text.should == 'くくく http://id774.net hhh'
+    #statuses[2].text.should == 'いいい http://id774.net bbb'
+    statuses[2].text.should == 'ううう http://id774.net/ ccc'
+    statuses[3].text.should == 'えええ http://id774.net/ ddd'
+    statuses[4].text.should == 'おおお http://id774.net eee'
+    statuses[5].text.should == 'ききき http://id774.net ggg'
+    statuses[6].text.should == 'くくく http://id774.net hhh'
 
   end
 
   it 'should define expand_url method' do
-    expand_url('is.gd', '/5oDxw').should == 'http://example.com/'
+    #expand_url('is.gd', '/5oDxw').should == 'http://example.com/'
     expand_url('goo.gl', '/e').should == 'http://www.google.com/'
   end
 end

data/spec/plugins/fluentd_spec.rb

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+require File.expand_path(File.dirname(__FILE__)) + '/../spec_helper'
+
+module Termtter
+  describe Client, 'when the plugin is loaded' do
+
+    it 'should add commands' do
+      config.plugins.fluentd.port = 49999
+      config.plugins.fluentd.tag = "twitter.statuses"
+      Termtter::Client.should_receive(:register_command).exactly(0)
+      Termtter::Client.plug 'fluentd'
+    end
+
+  end
+end

data/termtter.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: termtter 2.2.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "termtter"
-  s.version = "2.2.2"
+  s.version = "2.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["jugyo", "ujihisa", "koichiroo", "id774"]
-  s.date = "2013-09-04"
+  s.date = "2015-01-06"
   s.description = "Termtter is a terminal based Twitter client."
   s.email = "jugyo.org@gmail.com"
   s.executables = ["termtter", "termtter_frame"]
@@ -265,6 +267,7 @@ Gem::Specification.new do |s|
     "spec/plugins/expand_url_spec.rb",
     "spec/plugins/fib_spec.rb",
     "spec/plugins/filter_spec_.rb",
+    "spec/plugins/fluentd_spec.rb",
     "spec/plugins/footer_spec.rb",
     "spec/plugins/gsub_spec.rb",
     "spec/plugins/haml_spec.rb",
@@ -303,57 +306,56 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://termtter.github.com/"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
   s.rubyforge_project = "termtter"
-  s.rubygems_version = "2.0.6"
+  s.rubygems_version = "2.4.5"
   s.summary = "Terminal based Twitter client."
 
   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.1.3"])
-      s.add_runtime_dependency(%q<highline>, [">= 1.5.0"])
-      s.add_runtime_dependency(%q<termcolor>, ["~> 1.0.0"])
+      s.add_runtime_dependency(%q<json>, ["~> 1.8.0"])
+      s.add_runtime_dependency(%q<highline>, ["~> 1.6.0"])
+      s.add_runtime_dependency(%q<termcolor>, ["~> 1.0"])
       s.add_runtime_dependency(%q<rubytter>, ["~> 1.5.1"])
-      s.add_runtime_dependency(%q<notify>, [">= 0.5.1"])
-      s.add_runtime_dependency(%q<activerecord>, ["~> 4.0.0"])
-      s.add_runtime_dependency(%q<builder>, [">= 3.0.4"])
-      s.add_runtime_dependency(%q<fluent-logger>, [">= 0.4.6"])
+      s.add_runtime_dependency(%q<notify>, ["~> 0.5.1"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 4.1.0"])
+      s.add_runtime_dependency(%q<builder>, ["~> 3.1.4"])
+      s.add_runtime_dependency(%q<fluent-logger>, ["~> 0.4.6"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<cucumber>, ["~> 1.3.18"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.3.6"])
+      s.add_development_dependency(%q<jeweler>, ["~> 2.0.1"])
     else
-      s.add_dependency(%q<json>, [">= 1.1.3"])
-      s.add_dependency(%q<highline>, [">= 1.5.0"])
-      s.add_dependency(%q<termcolor>, ["~> 1.0.0"])
+      s.add_dependency(%q<json>, ["~> 1.8.0"])
+      s.add_dependency(%q<highline>, ["~> 1.6.0"])
+      s.add_dependency(%q<termcolor>, ["~> 1.0"])
       s.add_dependency(%q<rubytter>, ["~> 1.5.1"])
-      s.add_dependency(%q<notify>, [">= 0.5.1"])
-      s.add_dependency(%q<activerecord>, ["~> 4.0.0"])
-      s.add_dependency(%q<builder>, [">= 3.0.4"])
-      s.add_dependency(%q<fluent-logger>, [">= 0.4.6"])
+      s.add_dependency(%q<notify>, ["~> 0.5.1"])
+      s.add_dependency(%q<activerecord>, ["~> 4.1.0"])
+      s.add_dependency(%q<builder>, ["~> 3.1.4"])
+      s.add_dependency(%q<fluent-logger>, ["~> 0.4.6"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<cucumber>, ["~> 1.3.18"])
+      s.add_dependency(%q<bundler>, ["~> 1.3.6"])
+      s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
     end
   else
-    s.add_dependency(%q<json>, [">= 1.1.3"])
-    s.add_dependency(%q<highline>, [">= 1.5.0"])
-    s.add_dependency(%q<termcolor>, ["~> 1.0.0"])
+    s.add_dependency(%q<json>, ["~> 1.8.0"])
+    s.add_dependency(%q<highline>, ["~> 1.6.0"])
+    s.add_dependency(%q<termcolor>, ["~> 1.0"])
     s.add_dependency(%q<rubytter>, ["~> 1.5.1"])
-    s.add_dependency(%q<notify>, [">= 0.5.1"])
-    s.add_dependency(%q<activerecord>, ["~> 4.0.0"])
-    s.add_dependency(%q<builder>, [">= 3.0.4"])
-    s.add_dependency(%q<fluent-logger>, [">= 0.4.6"])
+    s.add_dependency(%q<notify>, ["~> 0.5.1"])
+    s.add_dependency(%q<activerecord>, ["~> 4.1.0"])
+    s.add_dependency(%q<builder>, ["~> 3.1.4"])
+    s.add_dependency(%q<fluent-logger>, ["~> 0.4.6"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<cucumber>, ["~> 1.3.18"])
+    s.add_dependency(%q<bundler>, ["~> 1.3.6"])
+    s.add_dependency(%q<jeweler>, ["~> 2.0.1"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: termtter
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - jugyo
@@ -11,190 +11,190 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: termcolor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rubytter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: notify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.1.4
 - !ruby/object:Gem::Dependency
   name: fluent-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.18
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
 description: Termtter is a terminal based Twitter client.
 email: jugyo.org@gmail.com
 executables:
@@ -452,6 +452,7 @@ files:
 - spec/plugins/expand_url_spec.rb
 - spec/plugins/fib_spec.rb
 - spec/plugins/filter_spec_.rb
+- spec/plugins/fluentd_spec.rb
 - spec/plugins/footer_spec.rb
 - spec/plugins/gsub_spec.rb
 - spec/plugins/haml_spec.rb
@@ -497,18 +498,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: termtter
-rubygems_version: 2.0.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Terminal based Twitter client.
 test_files: []
+has_rdoc: