termtter 1.11.0 → 2.0.0

data/lib/plugins/defaults/expand_tco_url.rb

@@ -13,7 +13,7 @@ module Termtter::Client
   def self.expand_tco_urls!(text, urls)
     urls.each do |u|
       next unless u[:expanded_url]
-      text[/#{Regexp.escape(u[:url])}/] = u[:expanded_url]
+      text.sub!(/#{Regexp.escape(u[:url])}/, u[:expanded_url])
     end
   end
 end

data/lib/plugins/defaults/standard_commands.rb

@@ -61,7 +61,7 @@ module Termtter::Client
 
       result = Termtter::API.twitter.update(arg, params)
 
-      if result.text == arg
+      if ! result[:error]
         puts "updated => #{result.text}"
       else
         puts TermColor.parse("<red>Failed to update :(</red>")

data/lib/termtter/api.rb

@@ -103,9 +103,9 @@ module Termtter
           :app_name => config.app_name.empty? ? Termtter::APP_NAME : config.app_name,
           :host => config.host,
           :header => {
-            'User-Agent' => 'Termtter http://github.com/jugyo/termtter',
+            'User-Agent' => 'Termtter http://github.com/termtter/termtter',
             'X-Twitter-Client' => 'Termtter',
-            'X-Twitter-Client-URL' => 'http://github.com/jugyo/termtter',
+            'X-Twitter-Client-URL' => 'http://github.com/termtter/termtter',
             'X-Twitter-Client-Version' => Termtter::VERSION
           },
           :enable_ssl => config.enable_ssl,

data/lib/termtter/version.rb

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

data/spec/plugins/defaults/expand_tco_url_spec.rb

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+
+require File.expand_path(File.dirname(__FILE__)) + '/../../spec_helper'
+
+describe Termtter::Client, 'plugin expand_tco_url' do
+  before do
+    be_quiet { Termtter::Client.plug 'defaults/expand_tco_url' }
+  end
+
+  it 'should expand urls' do
+    text1 = 'あいうえお http://example.com/xyz'
+    urls1 = [{:url => 'http://example.com/xyz', :expanded_url => 'http://example.net/abc'}]
+    Termtter::Client.expand_tco_urls!(text1, urls1)
+    text1.should == 'あいうえお http://example.net/abc'
+  end
+
+  it 'should not raise exception when url does not matched' do
+    text = 'text without urls'
+    urls = [{:url => 'http://example.com/xyz', :expanded_url => 'http://example.net/abc'}]
+    lambda { Termtter::Client.expand_tco_urls!(text, urls) }.should_not raise_exception
+  end
+end

metadata

@@ -1,115 +1,107 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: termtter
-version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: false
-  segments: 
-  - 1
-  - 11
-  - 0
-  version: 1.11.0
+version: !ruby/object:Gem::Version
+  version: 2.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - jugyo
 - ujihisa
 - koichiroo
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-01 00:00:00 +09:00
-default_executable: termtter
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 1
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  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 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: termcolor
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: termcolor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rubytter
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rubytter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: notify
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: notify
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 description: Termtter is a terminal based Twitter client.
 email: jugyo.org@gmail.com
-executables: 
+executables:
 - termtter
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - ChangeLog
 - README.rdoc
-files: 
+files:
 - .gitignore
 - ChangeLog
 - Gemfile
@@ -344,6 +336,7 @@ files:
 - spec/plugins/cool_spec.rb
 - spec/plugins/curry_spec.rb
 - spec/plugins/db_spec.rb
+- spec/plugins/defaults/expand_tco_url_spec.rb
 - spec/plugins/defaults/hashtag_spec.rb
 - spec/plugins/defaults/list_spec.rb
 - spec/plugins/defaults/plugin_spec.rb
@@ -389,48 +382,40 @@ files:
 - spec/termtter/task_spec.rb
 - spec/termtter_spec.rb
 - termtter.gemspec
-has_rdoc: true
 homepage: http://termtter.github.com/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
 - --exclude
 - spec
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: termtter
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Terminal based Twitter client.
-test_files: 
+test_files:
 - spec/plugins/capital_update_spec.rb
 - spec/plugins/cool_spec.rb
 - spec/plugins/curry_spec.rb
 - spec/plugins/db_spec.rb
+- spec/plugins/defaults/expand_tco_url_spec.rb
 - spec/plugins/defaults/hashtag_spec.rb
 - spec/plugins/defaults/list_spec.rb
 - spec/plugins/defaults/plugin_spec.rb