tw 0.2.6 → 0.3.0

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.3.0 2012-10-10
+
+* silent mode option : --silent
+* pipe tweet each line from STDIN
+* add Tw API sample
+* update README
+
 === 0.2.6 2012-10-10
 
 * bugfix merging users and lists

data/Manifest.txt

@@ -18,6 +18,7 @@ lib/tw/client/stream.rb
 lib/tw/client/tweet.rb
 lib/tw/conf.rb
 samples/README.md
+samples/sample.rb
 samples/update_profile_image.rb
 script/console
 script/destroy

data/README.rdoc

@@ -30,7 +30,7 @@ read Timeline
   % tw --timeline
   % tw --search=ruby
   % tw --stream
-  % tw --stream:filter=ruby,java
+  % tw --stream:filter=ruby,java --silent
 
 DM
 
@@ -58,6 +58,13 @@ Format
   % tw --stream --format="@#{user} #{text} - http://twitter.com/#{user}/#{id}"
 
 
+== Make Twitter Bot
+
+stream reply bot
+
+  % tw --silent --stream:filter=BOT_NAME --user=BOT_NAME --format="@#{user} OK" | tw --pipe --user=BOT_NAME
+
+
 == LICENSE:
 
 (The MIT License)

data/bin/tw

@@ -3,6 +3,7 @@ $:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'rubygems'
 require 'tw'
 require 'tw/app/main'
+$stdout.sync = true
 
 app = Tw::App.new
 app.run ARGV

data/lib/tw.rb

@@ -20,7 +20,7 @@ require 'tw/client/stream'
 require 'tw/client/error'
 
 module Tw
-  VERSION = '0.2.6'
+  VERSION = '0.3.0'
   class Conf
     REQUIRE_VERSION = '0.1.0'
   end

data/lib/tw/app/cmds.rb

@@ -31,7 +31,7 @@ module Tw::App
           puts "set default user \"@#{Tw::Conf['default_user']}\""
         else
           puts "@"+Tw::Conf['default_user'] if Tw::Conf['default_user']
-          puts "e.g.  tw --user:default=USERNAME"
+          STDERR.puts "e.g.  tw --user:default=USERNAME"
         end
         on_exit
       end
@@ -82,7 +82,7 @@ module Tw::App
 
       cmd :stream do |v, opts|
         stream = Tw::Client::Stream.new @parser.has_param?(:user) ? @parser[:user] : nil
-        puts "-- waiting stream.."
+        Render.puts "-- waiting stream.."
         loop do
           begin
             stream.user_stream do |s|
@@ -106,7 +106,7 @@ module Tw::App
         else
           track_words = v.split(/\s*,\s*/)
           stream = Tw::Client::Stream.new @parser.has_param?(:user) ? @parser[:user] : nil
-          puts "-- waiting stream..  track \"#{track_words.join(',')}\""
+          Render.puts "-- waiting stream..  track \"#{track_words.join(',')}\""
           loop do
             begin
               stream.filter track_words do |s|
@@ -126,9 +126,13 @@ module Tw::App
 
       cmd :pipe do |v, opts|
         auth
-        STDIN.read.split(/[\r\n]+/).each do |line|
+        while line = STDIN.gets do
           line.split(/(.{140})/u).select{|m|m.size>0}.each do |message|
-            client.tweet message
+            begin
+              client.tweet message
+            rescue => e
+              STDERR.puts e.message
+            end
           end
           sleep 1
         end

data/lib/tw/app/main.rb

@@ -53,6 +53,7 @@ module Tw::App
         arg :stream, 'show user stream', :alias => :st
         arg :pipe, 'pipe tweet'
         arg :format, 'output format', :default => 'text'
+        arg :silent, 'silent mode'
         arg :version, 'show version', :alias => :v
         arg :help, 'show help', :alias => :h
 
@@ -89,6 +90,8 @@ module Tw::App
         on_exit
       end
 
+      Render.silent = @parser[:silent]
+
       regist_cmds
 
       cmds.each do |name, cmd|
@@ -118,7 +121,11 @@ module Tw::App
           puts '[Y/n]'
           on_exit if STDIN.gets.strip =~ /^n/i
         end
-        client.tweet message
+        begin
+          client.tweet message
+        rescue => e
+          STDERR.puts e.message
+        end
       end
     end
 

data/lib/tw/app/render.rb

@@ -1,6 +1,18 @@
-
 module Tw::App
   class Render
+
+    def self.silent=(bool)
+      @@silent = bool ? true : false
+    end
+
+    def self.silent
+      @@silent ||= false
+    end
+
+    def self.puts(s)
+      STDOUT.puts s unless silent
+    end
+
     def self.color_code(str)
       colors = Sickill::Rainbow::TERM_COLORS.keys - [:default, :black, :white]
       n = str.each_byte.map{|c| c.to_i}.inject{|a,b|a+b}
@@ -14,7 +26,7 @@ module Tw::App
       }.values.sort{|a,b|
         a.id <=> b.id
       }.each{|m|
-        puts case format
+        STDOUT.puts case format
              when 'text'
                user = m.user.kind_of?(Hash) ? "@#{m.user[:from]} > @#{m.user[:to]}" : "@#{m.user}"
                line = "#{m.time.strftime '[%m/%d %a] (%H:%M:%S)'} #{user} : #{CGI.unescapeHTML m.text}"
@@ -22,7 +34,7 @@ module Tw::App
              when 'json'
                m.to_json
              else
-               m.to_s format
+               m.format format
              end
       }
     end

data/lib/tw/client/tweet.rb

@@ -18,8 +18,16 @@ module Tw
       }.to_json(*a)
     end
 
-    def to_s(format)
-      self.instance_eval "\"#{format}\""
+    def url
+      "http://twitter.com/#{user}/status/#{id}"
+    end
+
+    def to_s
+      "@#{user} #{text} - #{time} #{url}"
+    end
+
+    def format(fmt)
+      self.instance_eval "\"#{fmt}\""
     end
   end
 end

data/samples/README.md

@@ -1,7 +1,12 @@
 # tw samples
 
+## Tw API
+
+    % tw sample.rb hello woooorld
+
 ## Use Tw as front-end of twitter auth
 
     % tw --user:add
     % ruby upload_profile_image.rb image.jpg
     % ruby upload_profile_image.rb image.jpg shokai
+

data/samples/sample.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
+require 'rubygems'
+require 'tw'
+
+if ARGV.empty?
+  STDERR.puts "ruby #{$0} hello world"
+  exit 1
+end
+
+msg = ARGV.join(' ')
+
+client = Tw::Client.new
+client.auth
+client.mentions.each do |m|
+  puts m
+end
+
+begin
+  p client.tweet msg
+rescue => e
+  STDERR.puts e
+  exit 1
+end

data/samples/update_profile_image.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
 require 'rubygems'
 require 'tw'
 

data/test/test_tw.rb

@@ -15,10 +15,10 @@ class TestTw < Test::Unit::TestCase
   def response?(arr)
     return false unless arr.kind_of? Array
     arr.each do |i|
-      return false if !(i[:id].class == Fixnum and
-                        (user? i[:user] or (user? i[:user][:to] and user? i[:user][:from])) and
-                        i[:text].kind_of? String and
-                        i[:time].kind_of? Time)
+      return false if !(i.id.class == Fixnum and
+                        (user? i.user or (user? i.user[:to] and user? i.user[:from])) and
+                        i.text.kind_of? String and
+                        i.time.kind_of? Time)
     end
     return true
   end

metadata

@@ -1,240 +1,223 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tw
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 6
-  version: 0.2.6
 platform: ruby
-authors: 
+authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-10-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: oauth
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 4
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.7
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  name: oauth
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.7
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: twitter
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 4
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 4.0.0
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 5
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 5.0.0
   type: :runtime
-  name: twitter
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: userstream
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.0
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
-  name: userstream
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 7
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.7.5
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 1
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.8.0
   type: :runtime
-  name: json
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.7.5
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+- !ruby/object:Gem::Dependency
+  name: args_parser
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.1
   type: :runtime
-  name: args_parser
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 1
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.4
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  name: rainbow
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 0
-        - 5
-        - 18
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.18
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  name: parallel
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.18
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  name: rdoc
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: newgem
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.3
   type: :development
-  name: newgem
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :development
-  name: hoe
-  version_requirements: *id010
-description: "* twitter client."
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+description: ! '* twitter client.'
+email:
 - hashimoto@shokai.org
-executables: 
+executables:
 - tw
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.rdoc
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - History.txt
@@ -255,6 +238,7 @@ files:
 - lib/tw/client/tweet.rb
 - lib/tw/conf.rb
 - samples/README.md
+- samples/sample.rb
 - samples/update_profile_image.rb
 - script/console
 - script/destroy
@@ -264,38 +248,33 @@ files:
 - .gemtest
 homepage: http://shokai.github.com/tw
 licenses: []
-
-post_install_message: "!! Installed \"tw\" command. => http://shokai.github.com/tw"
-rdoc_options: 
+post_install_message: ! '!! Installed "tw" command. => http://shokai.github.com/tw'
+rdoc_options:
 - --main
 - README.rdoc
-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: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3459005174118460767
+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: tw
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: "* twitter client."
-test_files: 
+summary: ! '* twitter client.'
+test_files:
 - test/test_helper.rb
 - test/test_tw.rb