termtter 2.2.0 → 2.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5de3d65ab24659675cda8734741447b3cd198a28
+  data.tar.gz: 7128dc6441e6fe09f5b4b53f477ee563476bf94f
+SHA512:
+  metadata.gz: 16bf26f2e015ad2010c109a4438412553b7d9e947e3931f925ee0872442a31588de478cf38fa47ccee559363ff7b5e7a69c0d004153c5793ec0c7bfaeb764ffc
+  data.tar.gz: 996433e58598aae53bb96f8043a5ab1c548336faa9b4e05177c754477a8c182a18e903e7e6d71b106c9fc2f012db4d8934079a9f45e202b5ab9e42fd5cf550a0

data/ChangeLog

@@ -1,3 +1,10 @@
+== 2.2.1 / 2013-05-20
+
+* Fix package problem (termtter requires termtter).
+
+* Suppress the warning on ruby 1.9 with CentOS.
+
+
 == 2.2.0 / 2013-04-20
 
 * Using https to connect to api.twitter.com (important).

data/Gemfile

@@ -6,7 +6,7 @@ gem 'json', '> 1.1.3'
 gem 'highline', '~> 1.5.0'
 gem 'termcolor', '~> 1.0.0'
 gem 'rubytter', '~> 1.5.1'
-gem 'notify', '~> 0.2.1'
+gem 'notify', '~> 0.5.1'
 
 group :test do
   gem 'rake'

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.2.1

data/lib/plugins/{expand-tinyurl.rb → expand_url.rb}

@@ -25,7 +25,7 @@ config.plugins.expand_tinyurl.set_default(:shortters, [])
 config.plugins.expand_tinyurl.set_default(:skip_users, [])
 
 Termtter::Client::register_hook(
-  :name => :expand_tinyurl,
+  :name => :expand_url,
   :point => :filter_for_output,
   :exec_proc => lambda do |statuses, event|
     shortters = URL_SHORTTERS + config.plugins.expand_tinyurl.shortters

data/lib/plugins/quicklook.rb

@@ -36,6 +36,6 @@ end
 
 # quicklook.rb
 # REQUIREMENTS:
-#   t.plug 'expand-tinyurl'
+#   t.plug 'expand_url'
 # TODO:
 #   Close quicklook window automatically.

data/lib/plugins/{tinyurl.rb → url_shortener.rb}

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 
-config.plugins.tinyurl.set_default(:shorturl_makers, [
+config.plugins.url_shortener.set_default(:shorturl_makers, [
     { :host => "api.bit.ly",
       :format => '/v3/shorten?login=termtter&apiKey=R_e7f22d523a803dbff7f67de18c109856&longUrl=%s&format=txt' },
     { :host => "is.gd", :format => '/api.php?longurl=%s' },
     { :host => "tinyurl.com", :format => '/api-create.php?url=%s' },
   ])
-config.plugins.tinyurl.set_default(:ignore_regexp, %r{
+config.plugins.url_shortener.set_default(:ignore_regexp, %r{
     \Ahttp://bit\.ly/ | \Ahttp://tinyurl\.com/ | \Ahttp://is\.gd/
   | \Ahttp://ff\.im/ | \Ahttp://j\.mp/ | \Ahttp://goo\.gl/
   | \Ahttp://tr\.im/ | \Ahttp://short\.to/ | \Ahttp://ow\.ly/
@@ -14,27 +14,27 @@ config.plugins.tinyurl.set_default(:ignore_regexp, %r{
   | \Ahttp://htn\.to/ | \Ahttp://cot\.ag/ | \Ahttp://ht\.ly/ | \Ahttp://p\.tl/
   | \Ahttp://url4\.eu/ | \Ahttp://t\.co/
 }x )
-config.plugins.tinyurl.set_default(:tinyurl_hook_commands, [:update, :reply, :retweet])
-config.plugins.tinyurl.set_default(
+config.plugins.url_shortener.set_default(:url_shortener_hook_commands, [:update, :reply, :retweet])
+config.plugins.url_shortener.set_default(
   :uri_regexp,
   /#{URI.regexp(%w(http https ftp))}\S*/ )
 
 # Shorten URLs in tweets which size is longer than this value.
 # If you want to shorten only when over termtter's limit, set `140'
-config.plugins.tinyurl.set_default(:when_over, 0)
+config.plugins.url_shortener.set_default(:when_over, 0)
 
 module Termtter::Client
   register_hook(
-    :name => :tinyurl,
-    :points => config.plugins.tinyurl.tinyurl_hook_commands.map {|cmd|
+    :name => :url_shortener,
+    :points => config.plugins.url_shortener.url_shortener_hook_commands.map {|cmd|
       "modify_arg_for_#{cmd.to_s}".to_sym
     },
     :exec_proc => lambda {|cmd, arg|
-      if config.plugins.tinyurl.when_over == 0 || # skip character count
-          arg.charsize > config.plugins.tinyurl.when_over
-        arg.gsub(config.plugins.tinyurl.uri_regexp) do |url|
+      if config.plugins.url_shortener.when_over == 0 || # skip character count
+          arg.charsize > config.plugins.url_shortener.when_over
+        arg.gsub(config.plugins.url_shortener.uri_regexp) do |url|
           result = nil
-          config.plugins.tinyurl.shorturl_makers.each do |site|
+          config.plugins.url_shortener.shorturl_makers.each do |site|
             result = shorten_url(url, site[:host], site[:format])
             break if result
           end
@@ -48,7 +48,7 @@ module Termtter::Client
 
   # returns nil if not shorten
   def self.shorten_url(url, host, format)
-    return url if config.plugins.tinyurl.ignore_regexp =~ url # already shorten
+    return url if config.plugins.url_shortener.ignore_regexp =~ url # already shorten
     url_enc = URI.escape(url, /[^a-zA-Z0-9.:]/)
     res = Termtter::HTTPpool.start(host) do |h|
       h.get(format % url_enc)
@@ -67,5 +67,5 @@ module Termtter::Client
   end
 end
 
-# tinyuri.rb
+# url_shortener.rb
 # make URLs in your update to convert tinyurl.com/XXXXXXX.

data/lib/termtter/version.rb

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

data/spec/plugins/expand_url_spec.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+
+require File.expand_path(File.dirname(__FILE__)) + '/../spec_helper'
+
+describe Termtter::Client, 'when the plugin expand_url is loaded' do
+  it 'should expand url in status' do
+    f = nil
+    Termtter::Client.should_receive(:register_hook).once do |params|
+      f = params[:exec_proc]
+    end
+    config.plugins.expand_tinyurl.set_default('tinyurl.com', nil)
+    Termtter::Client.plug 'expand_url'
+    f.should_not be_nil
+    status_struct = Struct.new(:text)
+    statuses = []
+    user_struct = Struct.new(:id, :screen_name, :protected)
+    user_1 = user_struct.new(1, 'jugyo')
+    user_2 = user_struct.new(2, 'oyguj')
+    status_struct = Struct.new(:id, :text, :source, :user, :in_reply_to_status_id,
+      :in_reply_to_user_id, :created_at)
+    statuses << status_struct.new(1, 'あああ http://tinyurl.com/de5my6 aaa', '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://example.com/テスト aaa'
+  end
+
+  it 'should define expand_url method' do
+    expand_url('is.gd', '/5oDxw').should == 'http://example.com/'
+    expand_url('goo.gl', '/e').should == 'http://www.google.com/'
+  end
+end

data/spec/plugins/{tinyurl_spec.rb → url_shortener_spec.rb}

@@ -5,16 +5,16 @@ require 'open-uri'
 require 'uri'
 require 'net/http'
 
-describe 'plugin tinyurl' do
+describe 'plugin url_shortener' do
   before do
     Termtter::Client.setup_task_manager
   end
 
-  it 'adds hook :tinyurl' do
+  it 'adds hook :url_shortener' do
     Termtter::Client.should_receive(:register_hook).once
-    Termtter::Client.plug 'tinyurl'
-    #Termtter::Client.get_hook(:tinyurl).should be_a_kind_of(Hook)
-    #Termtter::Client.get_hook(:tinyurl).name.should == :tinyurl
+    Termtter::Client.plug 'url_shortener'
+    #Termtter::Client.get_hook(:url_shortener).should be_a_kind_of(Hook)
+    #Termtter::Client.get_hook(:url_shortener).name.should == :url_shortener
   end
 
   it 'truncates url' do
@@ -27,7 +27,7 @@ describe 'plugin tinyurl' do
         end
       end
     )
-    Termtter::Client.plug 'tinyurl'
+    Termtter::Client.plug 'url_shortener'
     Termtter::Client.execute('update http://www.google.com/')
   end
 
@@ -43,7 +43,7 @@ describe 'plugin tinyurl' do
         end
       end
     )
-    Termtter::Client.plug 'tinyurl'
+    Termtter::Client.plug 'url_shortener'
     Termtter::Client.execute('update http://ja.wikipedia.org/wiki/深田恭子')
   end
 
@@ -57,7 +57,7 @@ describe 'plugin tinyurl' do
         end
       end
     )
-    Termtter::Client.plug 'tinyurl'
+    Termtter::Client.plug 'url_shortener'
     Termtter::Client.execute('update http://ja.wikipedia.org/wiki/%E3%82%B9%E3%83%88%E3%83%AA%E3%83%BC%E3%83%88%E3%82%B3%E3%83%B3%E3%83%94%E3%83%A5%E3%83%BC%E3%83%86%E3%82%A3%E3%83%B3%E3%82%B0')
   end
 
@@ -71,7 +71,7 @@ describe 'plugin tinyurl' do
         end
       end
     )
-    Termtter::Client.plug 'tinyurl'
+    Termtter::Client.plug 'url_shortener'
     Termtter::Client.execute('update http://www.google.co.jp/search?hl=ja&source=hp&q=ujihisa&lr=&aq=f&aqi=g4g-r6&aql=&oq=&gs_rfai=')
 
   end

data/termtter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "termtter"
-  s.version = "2.2.0"
+  s.version = "2.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["jugyo", "ujihisa", "koichiroo", "id774"]
-  s.date = "2013-04-20"
+  s.date = "2013-05-20"
   s.description = "Termtter is a terminal based Twitter client."
   s.email = "jugyo.org@gmail.com"
   s.executables = ["termtter", "termtter_frame"]
@@ -83,7 +83,7 @@ Gem::Specification.new do |s|
     "lib/plugins/error_log.rb",
     "lib/plugins/event_invoked_at.rb",
     "lib/plugins/exec_and_update.rb",
-    "lib/plugins/expand-tinyurl.rb",
+    "lib/plugins/expand_url.rb",
     "lib/plugins/favotter.rb",
     "lib/plugins/fib_filter.rb",
     "lib/plugins/fibyou.rb",
@@ -202,7 +202,6 @@ Gem::Specification.new do |s|
     "lib/plugins/system_status.rb",
     "lib/plugins/time_signal.rb",
     "lib/plugins/timer.rb",
-    "lib/plugins/tinyurl.rb",
     "lib/plugins/toppo.rb",
     "lib/plugins/train.rb",
     "lib/plugins/translate_tweet.rb",
@@ -214,6 +213,7 @@ Gem::Specification.new do |s|
     "lib/plugins/update_editor.rb",
     "lib/plugins/uri-open.rb",
     "lib/plugins/url.rb",
+    "lib/plugins/url_shortener.rb",
     "lib/plugins/user_stream.rb",
     "lib/plugins/w3mimg.rb",
     "lib/plugins/wassr.rb",
@@ -259,7 +259,7 @@ Gem::Specification.new do |s|
     "spec/plugins/defaults/retweet_spec.rb",
     "spec/plugins/draft_spec.rb",
     "spec/plugins/english_spec_.rb",
-    "spec/plugins/expand-tinyurl_spec.rb",
+    "spec/plugins/expand_url_spec.rb",
     "spec/plugins/fib_spec.rb",
     "spec/plugins/filter_spec_.rb",
     "spec/plugins/footer_spec.rb",
@@ -274,8 +274,8 @@ Gem::Specification.new do |s|
     "spec/plugins/standard_commands_spec.rb",
     "spec/plugins/storage/sqlite3_spec.rb",
     "spec/plugins/storage/status_spec_.rb",
-    "spec/plugins/tinyurl_spec.rb",
     "spec/plugins/truncate_spec.rb",
+    "spec/plugins/url_shortener_spec.rb",
     "spec/plugins/whois_spec_.rb",
     "spec/spec_helper.rb",
     "spec/termtter/active_rubytter_spec.rb",
@@ -302,67 +302,46 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "termtter"
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.0.3"
   s.summary = "Terminal based Twitter client."
 
   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<termtter>, [">= 0"])
       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<rubytter>, ["~> 1.5.1"])
-      s.add_runtime_dependency(%q<notify>, ["~> 0.2.1"])
+      s.add_runtime_dependency(%q<notify>, ["~> 0.5.1"])
       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>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<termtter>, [">= 0"])
       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<rubytter>, ["~> 1.5.1"])
-      s.add_dependency(%q<notify>, ["~> 0.2.1"])
+      s.add_dependency(%q<notify>, ["~> 0.5.1"])
       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>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<termtter>, [">= 0"])
     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<rubytter>, ["~> 1.5.1"])
-    s.add_dependency(%q<notify>, ["~> 0.2.1"])
+    s.add_dependency(%q<notify>, ["~> 0.5.1"])
     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>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: termtter
 version: !ruby/object:Gem::Version
-  version: 2.2.0
-  prerelease: 
+  version: 2.2.1
 platform: ruby
 authors:
 - jugyo
@@ -12,44 +11,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-20 00:00:00.000000000 Z
+date: 2013-05-20 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: termtter
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>'
+    - - '>'
       - !ruby/object:Gem::Version
         version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -57,7 +37,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -65,7 +44,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: termcolor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -73,7 +51,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -81,7 +58,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubytter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -89,7 +65,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,241 +72,85 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: notify
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Termtter is a terminal based Twitter client.
@@ -409,7 +228,7 @@ files:
 - lib/plugins/error_log.rb
 - lib/plugins/event_invoked_at.rb
 - lib/plugins/exec_and_update.rb
-- lib/plugins/expand-tinyurl.rb
+- lib/plugins/expand_url.rb
 - lib/plugins/favotter.rb
 - lib/plugins/fib_filter.rb
 - lib/plugins/fibyou.rb
@@ -528,7 +347,6 @@ files:
 - lib/plugins/system_status.rb
 - lib/plugins/time_signal.rb
 - lib/plugins/timer.rb
-- lib/plugins/tinyurl.rb
 - lib/plugins/toppo.rb
 - lib/plugins/train.rb
 - lib/plugins/translate_tweet.rb
@@ -540,6 +358,7 @@ files:
 - lib/plugins/update_editor.rb
 - lib/plugins/uri-open.rb
 - lib/plugins/url.rb
+- lib/plugins/url_shortener.rb
 - lib/plugins/user_stream.rb
 - lib/plugins/w3mimg.rb
 - lib/plugins/wassr.rb
@@ -585,7 +404,7 @@ files:
 - spec/plugins/defaults/retweet_spec.rb
 - spec/plugins/draft_spec.rb
 - spec/plugins/english_spec_.rb
-- spec/plugins/expand-tinyurl_spec.rb
+- spec/plugins/expand_url_spec.rb
 - spec/plugins/fib_spec.rb
 - spec/plugins/filter_spec_.rb
 - spec/plugins/footer_spec.rb
@@ -600,8 +419,8 @@ files:
 - spec/plugins/standard_commands_spec.rb
 - spec/plugins/storage/sqlite3_spec.rb
 - spec/plugins/storage/status_spec_.rb
-- spec/plugins/tinyurl_spec.rb
 - spec/plugins/truncate_spec.rb
+- spec/plugins/url_shortener_spec.rb
 - spec/plugins/whois_spec_.rb
 - spec/spec_helper.rb
 - spec/termtter/active_rubytter_spec.rb
@@ -626,26 +445,25 @@ files:
 homepage: http://termtter.github.com/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: termtter
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Terminal based Twitter client.
 test_files: []

data/spec/plugins/expand-tinyurl_spec.rb

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-
-require File.expand_path(File.dirname(__FILE__)) + '/../spec_helper'
-
-describe Termtter::Client, 'when the plugin expand-tinyurl is loaded' do
-  before do
-    be_quiet { Termtter::Client.plug 'expand-tinyurl' }
-  end
-
-  it 'should define expand_url method' do
-    # TODO: 直接ネットにアクセスしに行かないようにしたい。 fakeweb?
-
-    expand_url('tinyurl.com', '/kotu').should == 'http://example.com/'
-
-    expand_url('tinyurl.com', '/de5my6').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