tw 0.1.1 → 0.2.0

data/Gemfile

@@ -1,9 +1,10 @@
 source :rubygems
 
-gem 'backports'
 gem 'hoe'
 gem 'newgem'
 gem 'oauth'
 gem 'twitter'
+gem 'userstream'
+gem 'json'
 gem 'rainbow'
 gem 'args_parser'

data/Gemfile.lock

@@ -2,13 +2,15 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.9)
+    RedCloth (4.2.9-java)
     activesupport (2.3.14)
     args_parser (0.1.0)
-    backports (2.6.4)
     faraday (0.8.4)
       multipart-post (~> 1.1)
+    hashie (1.2.0)
     hoe (3.1.0)
       rake (~> 0.8)
+    json (1.7.4)
     multi_json (1.3.6)
     multipart-post (1.1.5)
     newgem (1.5.3)
@@ -28,15 +30,20 @@ GEM
       faraday (~> 0.8)
       multi_json (~> 1.3)
       simple_oauth (~> 0.1.6)
+    userstream (1.2.2)
+      hashie (~> 1.2.0)
+      oauth (~> 0.4.6)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   args_parser
-  backports
   hoe
+  json
   newgem
   oauth
   rainbow
   twitter
+  userstream

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.2.0 2012-10-04
+
+* user stream :  --stream
+* filter stream :  --stream:filter=WORD1,WORD2
+
 === 0.1.1 2012-10-04
 
 * command option detail on help

data/Manifest.txt

@@ -14,6 +14,7 @@ lib/tw/app/render.rb
 lib/tw/client/auth.rb
 lib/tw/client/error.rb
 lib/tw/client/request.rb
+lib/tw/client/stream.rb
 lib/tw/conf.rb
 script/console
 script/destroy

data/README.rdoc

@@ -1,6 +1,7 @@
 = tw
 
-* http://github.com/shokai/tw
+* http://shokai.github.com/tw
+* https://rubygems.org/gems/tw
 
 == INSTALL:
 
@@ -16,6 +17,11 @@ show help
 
   % tw --help
 
+Tweet
+
+  % tw hello hello
+  % echo "hello" | tw --pipe
+
 read Timeline
 
   % tw @username
@@ -23,16 +29,29 @@ read Timeline
   % tw @username/listname
   % tw --timeline
   % tw --search=ruby
-
-Tweet
-
-  % tw hello hello
+  % tw --stream
+  % tw --stream:filter=ruby,java
 
 DM
 
   % tw --dm
   % tw --dm:to=shokai "hello!"
 
+Switch Accounts
+
+  % tw --user:add
+  open http://twitter.com/oauth/authorize?oauth_token=a1b2cDEF3456gh78
+  input PIN Number: 19283746
+  add "@user2"
+  % tw --user:list
+  * shokai
+    user2
+    user3
+  (3 users)
+  % tw hello --user=user2
+  % tw --user:default=user2
+  set default user "@user2"
+
 
 == LICENSE:
 

data/Rakefile

@@ -15,8 +15,8 @@ $hoe = Hoe.spec 'tw' do
   self.rubyforge_name       = self.name # TODO this is default value
   self.extra_deps         = [['oauth','>= 0.4.7', '< 1.0.0'],
                              ['twitter', '>= 4.0.0', '< 5.0.0'],
+                             ['userstream', '>= 1.2.0', '< 1.3.0'],
                              ['args_parser', '>= 0.1.0'],
-                             ['backports', '>= 2.6.4'],
                              ['rainbow', '>= 1.1.4', '< 2.0.0']]
 
 end

data/lib/tw.rb

@@ -1,9 +1,10 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-require 'backports'
 require 'oauth'
 require 'twitter'
+require 'time'
+require 'user_stream'
 require 'yaml'
 require 'time'
 require 'args_parser'
@@ -11,10 +12,11 @@ require 'rainbow'
 require 'tw/conf'
 require 'tw/client/auth'
 require 'tw/client/request'
+require 'tw/client/stream'
 require 'tw/client/error'
 
 module Tw
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
   class Conf
     REQUIRE_VERSION = '0.1.0'
   end

data/lib/tw/app/cmds.rb

@@ -12,7 +12,7 @@ module Tw::App
       end
 
       cmd 'user:add' do |v|
-        client.add_user
+        Tw::Auth.regist_user
         on_exit
       end
 
@@ -80,6 +80,27 @@ module Tw::App
         end
       end
 
+      cmd :stream do |v|
+        stream = Tw::Client::Stream.new @parser.has_param?(:user) ? @parser[:user] : nil
+        stream.user_stream do |s|
+          Render.display s
+        end
+        on_exit
+      end
+
+      cmd 'stream:filter' do |v|
+        unless v.class == String
+          STDERR.puts "e.g.  tw --stream:filter=ruby,java"
+          on_error
+        else
+          stream = Tw::Client::Stream.new @parser.has_param?(:user) ? @parser[:user] : nil
+          stream.filter v do |s|
+            Render.display s
+          end
+          on_exit
+        end
+      end
+
       cmd :pipe do |v|
         auth
         STDIN.read.split(/[\r\n]+/).each do |line|

data/lib/tw/app/main.rb

@@ -1,4 +1,3 @@
-
 require File.expand_path 'opt_parser', File.dirname(__FILE__)
 require File.expand_path 'cmds', File.dirname(__FILE__)
 require File.expand_path 'render', File.dirname(__FILE__)
@@ -51,9 +50,22 @@ module Tw::App
         arg :dm, 'show direct messages'
         arg 'dm:to', 'create direct message'
         arg :search, 'search public timeline', :alias => :s
+        arg :stream, 'show user stream', :alias => :st
         arg :pipe, 'pipe tweet'
         arg :version, 'show version', :alias => :v
         arg :help, 'show help', :alias => :h
+
+        validate :user, 'invalid user name' do |v|
+          v =~ /^[a-zA-Z0-9_]+$/
+        end
+
+        validate 'user:default', 'invalid user name' do |v|
+          v =~ /^[a-zA-Z0-9_]+$/
+        end
+
+        validate 'dm:to', 'invalid user name' do |v|
+          v =~ /^[a-zA-Z0-9_]+$/
+        end
       end
 
       if @parser.has_option? :help
@@ -61,11 +73,13 @@ module Tw::App
         STDERR.puts
         STDERR.puts "e.g."
         STDERR.puts "tweet  tw hello world"
+        STDERR.puts "       echo 'hello' | tw --pipe"
         STDERR.puts "read   tw @username"
         STDERR.puts "       tw @username @user2 @user2/listname"
         STDERR.puts "       tw --search=ruby"
+        STDERR.puts "       tw --stream"
+        STDERR.puts "       tw --stream:filter=ruby,java"
         STDERR.puts "       tw --dm:to=username \"hello!\""
-        STDERR.puts "       echo 'hello' | tw --pipe"
         on_exit
       end
 

data/lib/tw/app/render.rb

@@ -8,6 +8,7 @@ module Tw::App
     end
     
     def self.display(arr)
+      arr = [arr] unless arr.kind_of? Array
       arr.flatten.sort{|a,b|
         a[:id] <=> b[:id]
       }.uniq.each{|m|

data/lib/tw/client/auth.rb

@@ -1,21 +1,15 @@
 
 module Tw
   class Client
-
-    def initialize
+    def auth(user=nil)
+      Auth.auth user
     end
+  end
 
-    def auth(user=nil)
-      user = Conf['default_user'] unless user
-      if user == nil and Conf['users'].empty?
-        add_user
-        return
-      end
-      raise ArgumentError, "Argument must be instance of String or Hash." unless [Hash, String].include? user.class
-      if user.class == String
-        raise ArgumentError, "user \"#{user}\" not exists." unless Conf['users'].include? user
-        user = Conf['users'][user]
-      end
+  class Auth
+
+    def self.auth(user=nil)
+      user = get_or_regist_user user
       Twitter.configure do |c|
         c.consumer_key = Conf['consumer_key']
         c.consumer_secret = Conf['consumer_secret']
@@ -24,7 +18,19 @@ module Tw
       end
     end
 
-    def add_user
+    def self.get_or_regist_user(user)
+      return user if user.kind_of? Hash
+      if user.kind_of? String
+        raise ArgumentError, "user \"#{user}\" not exists." unless Conf['users'].include? user
+        return Conf['users'][user]
+      end
+      unless user
+        return Conf['users'][ Conf['default_user'] ] if Conf['default_user']
+        return regist_user
+      end
+    end
+
+    def self.regist_user
       consumer = OAuth::Consumer.new(Conf['consumer_key'], Conf['consumer_secret'],
                                      :site => 'http://twitter.com')
       request_token = consumer.get_request_token
@@ -44,6 +50,7 @@ module Tw
       Conf['default_user'] = u.screen_name unless Conf['default_user']
       Conf.save
       puts "add \"@#{u.screen_name}\""
+      return Conf['users'][u.screen_name]
     end
 
   end

data/lib/tw/client/stream.rb

@@ -0,0 +1,49 @@
+
+module Tw
+  class Client::Stream
+    def initialize(user=nil)
+      user = Tw::Auth.get_or_regist_user user
+      UserStream.configure do |config|
+        config.consumer_key = Conf['consumer_key']
+        config.consumer_secret = Conf['consumer_secret']
+        config.oauth_token = user['access_token']
+        config.oauth_token_secret = user['access_secret']
+      end
+
+      puts '-- waiting stream..'
+      @client = UserStream::Client.new
+    end
+
+    def user_stream(&block)
+      raise ArgumentError, 'block not given' unless block_given?
+      @client.user do |m|
+        if data = tweet?(m)
+          yield data
+        end
+      end
+    end
+
+    def filter(*track_words, &block)
+      raise ArgumentError, 'block not given' unless block_given?
+      track_words = track_words.join(',')
+      puts "track #{track_words}"
+      @client.filter :track => track_words do |m|
+        if data = tweet?(m)
+          yield data
+        end
+      end
+    end
+
+    private
+    def tweet?(chunk)
+      return false unless chunk.user and chunk.user.screen_name and chunk.text and chunk.created_at and chunk.id
+      {
+        :id => chunk.id,
+        :user => chunk.user.screen_name,
+        :text => chunk.text,
+        :time => (Time.parse chunk.created_at)
+      }
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tw
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -56,13 +56,16 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: args_parser
+  name: userstream
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -70,15 +73,18 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: backports
+  name: args_parser
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.4
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -86,7 +92,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.4
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +190,7 @@ files:
 - lib/tw/client/auth.rb
 - lib/tw/client/error.rb
 - lib/tw/client/request.rb
+- lib/tw/client/stream.rb
 - lib/tw/conf.rb
 - script/console
 - script/destroy
@@ -191,7 +198,7 @@ files:
 - test/test_helper.rb
 - test/test_tw.rb
 - .gemtest
-homepage: http://github.com/shokai/tw
+homepage: http://shokai.github.com/tw
 licenses: []
 post_install_message: 
 rdoc_options:
@@ -207,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 945180289423209762
+      hash: 2435437866156816289
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: