tw 0.0.1 → 0.0.2

data/Gemfile

@@ -0,0 +1,8 @@
+source :rubygems
+
+gem 'hoe'
+gem 'newgem'
+gem 'oauth'
+gem 'twitter'
+gem 'rainbow'
+gem 'args_parser'

data/Gemfile.lock

@@ -0,0 +1,40 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    RedCloth (4.2.9)
+    activesupport (2.3.14)
+    args_parser (0.1.0)
+    faraday (0.8.4)
+      multipart-post (~> 1.1)
+    hoe (3.1.0)
+      rake (~> 0.8)
+    multi_json (1.3.6)
+    multipart-post (1.1.5)
+    newgem (1.5.3)
+      RedCloth (>= 4.1.1)
+      activesupport (~> 2.3.4)
+      hoe (>= 2.4.0)
+      rubigen (>= 1.5.3)
+      syntax (>= 1.0.0)
+    oauth (0.4.7)
+    rainbow (1.1.4)
+    rake (0.9.2.2)
+    rubigen (1.5.8)
+      activesupport (>= 2.3.5, < 3.2.0)
+    simple_oauth (0.1.9)
+    syntax (1.0.0)
+    twitter (4.0.0)
+      faraday (~> 0.8)
+      multi_json (~> 1.3)
+      simple_oauth (~> 0.1.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  args_parser
+  hoe
+  newgem
+  oauth
+  rainbow
+  twitter

data/History.txt

@@ -1,3 +1,10 @@
-=== 0.0.1 2011-04-22
+=== 0.0.2 2012-10-03
 
-* project start
+* support multi user accounts : --user=NAME
+* tweet from pipe : --pipe
+* option : --search=WORD
+* show version : --version
+
+=== 0.0.1 2012-09-15
+
+* first release

data/Manifest.txt

@@ -1,14 +1,19 @@
+Gemfile
+Gemfile.lock
 History.txt
 Manifest.txt
 README.rdoc
 Rakefile
+bin/tw
 lib/tw.rb
-lib/tw/auth.rb
-lib/tw/client.rb
+lib/tw/app/cmds.rb
+lib/tw/app/main.rb
+lib/tw/app/opt_parser.rb
+lib/tw/app/render.rb
+lib/tw/client/auth.rb
+lib/tw/client/error.rb
+lib/tw/client/request.rb
 lib/tw/conf.rb
-lib/tw/opts.rb
-lib/tw/render.rb
-bin/tw
 script/console
 script/destroy
 script/generate

data/Rakefile

@@ -1,5 +1,5 @@
 require 'rubygems'
-gem 'hoe', '>= 2.1.0'
+require 'bundler/setup'
 require 'hoe'
 require 'fileutils'
 require './lib/tw'
@@ -14,8 +14,9 @@ $hoe = Hoe.spec 'tw' do
   self.developer 'Sho Hashimoto', 'hashimoto@shokai.org'
   self.rubyforge_name       = self.name # TODO this is default value
   self.extra_deps         = [['oauth','>= 0.4.7', '< 1.0.0'],
-                            ['twitter', '>= 3.7.0', '< 4.0.0'],
-                            ['rainbow', '>= 1.1.4', '< 2.0.0']]
+                             ['twitter', '>= 4.0.0', '< 5.0.0'],
+                             ['args_parser', '>= 0.1.0'],
+                             ['rainbow', '>= 1.1.4', '< 2.0.0']]
 
 end
 

data/bin/tw

@@ -1,39 +1,8 @@
 #!/usr/bin/env ruby
-require File.expand_path '../lib/tw', File.dirname(__FILE__)
+$:.unshift File.expand_path '../lib', File.dirname(__FILE__)
+require 'rubygems'
+require 'tw'
+require 'tw/app/main'
 
-c = Tw::Client.new
-
-if ARGV.size < 1
-  Tw::Render.display c.mentions
-elsif Tw::Opts.all_cmds? ARGV
-  Tw::Render.display ARGV.map{|arg|
-    if word = Tw::Opts.search_word?(arg)
-      res = c.search word
-    elsif user = Tw::Opts.username?(arg)
-      res = c.user_timeline user
-    elsif (user, list = Tw::Opts.listname?(arg)) != false
-      res = c.list_timeline(user, list)
-    end
-    res
-  }
-else
-  if ARGV.size == 1 and ARGV.first =~ /^-+$/
-    ARGF.each do |line|
-      line.split(/(.{140})/u).select{|m|m.size>0}.each do |message|
-        c.tweet message
-      end
-      sleep 1
-    end
-  else
-    message = ARGV.join(' ')
-    if (len = message.split(//u).size) > 140
-      puts "tweet too long (#{len} chars)"
-      exit 1
-    else
-      puts "tweet \"#{message}\"?  (#{len} chars)"
-      puts '[Y/n]'
-      exit if STDIN.gets.strip =~ /^n/i
-    end
-    c.tweet message
-  end
-end
+app = Tw::App.new
+app.run ARGV

data/lib/tw/app/cmds.rb

@@ -0,0 +1,80 @@
+
+module Tw::App
+  class Main
+
+    private
+    def regist_cmds
+      cmd :user do |v|
+        if v == true
+          STDERR.puts 'e.g.  tw "hello" --user=USERNAME'
+          on_error
+        end
+      end
+
+      cmd 'user:add' do |v|
+        client.add_user
+        on_exit
+      end
+
+      cmd 'user:list' do |v|
+        Tw::Conf['users'].keys.each do |name|
+          puts name == Tw::Conf['default_user'] ? "* #{name}" : "  #{name}"
+        end
+        puts "(#{Tw::Conf['users'].size} users)"
+        on_exit
+      end
+
+      cmd 'user:default' do |v|
+        if v.class == String
+          Tw::Conf['default_user'] = v
+          Tw::Conf.save
+          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"
+        end
+        on_exit
+      end
+
+      cmd :search do |v|
+        if v.class == String
+          auth
+          Render.display client.search v
+          on_exit
+        else
+          STDERR.puts "e.g.  tw --search=ruby"
+          on_error
+        end
+      end
+
+      cmd :pipe do |v|
+        auth
+        STDIN.read.split(/[\r\n]+/).each do |line|
+          line.split(/(.{140})/u).select{|m|m.size>0}.each do |message|
+            client.tweet message
+          end
+          sleep 1
+        end
+        on_exit
+      end
+
+      cmd :version do |v|
+        puts "tw version #{Tw::VERSION}"
+        on_exit
+      end
+    end
+
+    def cmd(name, &block)
+      if block_given?
+        cmds[name.to_sym] = block
+      else
+        return cmds[name.to_sym]
+      end
+    end
+
+    def cmds
+      @cmds ||= Hash.new
+    end
+
+  end
+end

data/lib/tw/app/main.rb

@@ -0,0 +1,101 @@
+
+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__)
+
+module Tw::App
+  
+  def self.new
+    Main.new
+  end
+
+  class Main
+    def initialize
+      on_exit do
+        exit 0
+      end
+
+      on_error do
+        exit 1
+      end
+    end
+
+    def client
+      @client ||= Tw::Client.new
+    end
+
+    def on_exit(&block)
+      if block_given?
+        @on_exit = block
+      else
+        @on_exit.call if @on_exit
+      end
+    end
+
+    def on_error(&block)
+      if block_given?
+        @on_error = block
+      else
+        @on_error.call if @on_error
+      end
+    end
+
+    def run(argv)
+      @parser = ArgsParser.parse argv, :style => :equal do
+        arg :user, 'user account'
+        arg 'user:add', 'add user'
+        arg 'user:list', 'show user list'
+        arg 'user:default', 'set default user'
+        arg :timeline, 'show timeline'
+        arg :search, 'search public timeline'
+        arg :pipe, 'pipe tweet'
+        arg :version, 'show version', :alias => :v
+        arg :help, 'show help', :alias => :h
+      end
+
+      if @parser.has_option? :help
+        STDERR.puts @parser.help
+        on_exit
+      end
+
+      regist_cmds
+
+      cmds.each do |name, cmd|
+        next unless @parser[name]
+        cmd.call @parser[name]
+      end
+
+      auth
+      if @parser.argv.size < 1
+        Render.display client.mentions
+      elsif all_requests?(@parser.argv)
+        Render.display @parser.argv.map{|arg|
+          if user = username?(arg)
+            res = client.user_timeline user
+          elsif (user, list =listname?(arg)) != false
+            res = client.list_timeline(user, list)
+          end
+          res
+        }
+      else
+        message = @parser.argv.join(' ')
+        if (len = message.split(//u).size) > 140
+          puts "tweet too long (#{len} chars)"
+          on_error
+        else
+          puts "tweet \"#{message}\"?  (#{len} chars)"
+          puts '[Y/n]'
+          on_exit if STDIN.gets.strip =~ /^n/i
+        end
+        client.tweet message
+      end
+    end
+
+    private
+    def auth
+      return unless @parser
+      client.auth @parser.has_param?(:user) ? @parser[:user] : nil
+    end
+
+  end
+end

data/lib/tw/app/opt_parser.rb

@@ -0,0 +1,20 @@
+
+module Tw::App
+  class Main
+    def username?(arg)
+      arg =~ /^@[a-zA-Z0-9_]+$/ ? arg.scan(/^@([a-zA-Z0-9_]+)$/)[0][0] : false
+    end
+    
+    def listname?(arg)
+      arg =~ /^@[a-zA-Z0-9_]+\/[a-zA-Z0-9_]+$/ ? arg.scan(/^@([a-zA-Z0-9_]+)\/([a-zA-Z0-9_]+)$/)[0] : false
+    end
+
+    def request?(arg)
+      username?(arg) or listname?(arg)
+    end
+    
+    def all_requests?(args)
+      !args.map{|arg| request? arg}.include?(false)
+    end
+  end  
+end

data/lib/tw/{render.rb → app/render.rb}

@@ -1,5 +1,5 @@
 
-module Tw
+module Tw::App
   class Render
     def self.color_code(str)
       colors = Sickill::Rainbow::TERM_COLORS.keys - [:default, :black, :white]

data/lib/tw/client/auth.rb

@@ -0,0 +1,50 @@
+
+module Tw
+  class Client
+
+    def initialize
+    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
+      Twitter.configure do |c|
+        c.consumer_key = Conf['consumer_key']
+        c.consumer_secret = Conf['consumer_secret']
+        c.oauth_token = user['access_token']
+        c.oauth_token_secret = user['access_secret']
+      end
+    end
+
+    def add_user
+      consumer = OAuth::Consumer.new(Conf['consumer_key'], Conf['consumer_secret'],
+                                     :site => 'http://twitter.com')
+      request_token = consumer.get_request_token
+      puts cmd = "open #{request_token.authorize_url}"
+      system cmd
+      print 'input PIN Number: '
+      verifier = STDIN.gets.strip
+      access_token = request_token.get_access_token(:oauth_verifier => verifier)
+      self.auth('access_token' => access_token.token,
+                'access_secret' => access_token.secret)
+      u = Twitter.user
+      Conf['users'][u.screen_name] = {
+        'access_token' => access_token.token,
+        'access_secret' => access_token.secret,
+        'id' => u.id
+      }
+      Conf['default_user'] = u.screen_name unless Conf['default_user']
+      Conf.save
+      puts "add \"@#{u.screen_name}\""
+    end
+
+  end
+end

data/lib/tw/client/error.rb

@@ -0,0 +1,4 @@
+module Tw
+  class Error < StandardError
+  end
+end

data/lib/tw/conf.rb

@@ -4,8 +4,11 @@ module Tw
 
     def self.default
       {
+        'version' => Tw::VERSION,
         'consumer_key' => 'AYhhkOC8H2yTZyelz3uw',
-        'consumer_secret' => '28Ba8YyFDSPgoCYAmH5ANqOmT6qVS8gIhKnUiDbIpU'
+        'consumer_secret' => '28Ba8YyFDSPgoCYAmH5ANqOmT6qVS8gIhKnUiDbIpU',
+        'default_user' => nil,
+        'users' => {}
       }
     end
 
@@ -18,7 +21,7 @@ module Tw
     end
 
     def self.conf_file
-      "#{ENV['HOME']}/.tw.conf"
+      "#{ENV['HOME']}/.tw.yml"
     end
 
     def self.conf
@@ -38,6 +41,17 @@ module Tw
                   )
     end
 
+    def self.to_yaml
+      self.conf.to_yaml
+    end
+
+    def self.save
+      open_conf_file('w+') do |f|
+        f.write conf.to_yaml
+      end
+    end
+
+    private
     def self.open_conf_file(opt=nil, &block)
       if block_given?
         yield open(self.conf_file, opt)
@@ -45,10 +59,5 @@ module Tw
         return open(self.conf_file, opt)
       end
     end
-
-    def self.to_yaml
-      self.conf.to_yaml
-    end
-
   end
 end

data/lib/tw.rb

@@ -1,21 +1,17 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-require 'rubygems'
 require 'oauth'
 require 'twitter'
 require 'yaml'
 require 'time'
+require 'args_parser'
 require 'rainbow'
-require 'tw/auth'
-require 'tw/client'
 require 'tw/conf'
-require 'tw/opts'
-require 'tw/render'
+require 'tw/client/auth'
+require 'tw/client/request'
+require 'tw/client/error'
 
 module Tw
-  VERSION = '0.0.1'
-
-  class Error < StandardError
-  end
+  VERSION = '0.0.2'
 end

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+require 'bundler'
 require 'stringio'
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/tw'

data/test/test_tw.rb

@@ -3,9 +3,34 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 class TestTw < Test::Unit::TestCase
 
   def setup
+    @client = Tw::Client.new
+    @client.auth
+  end
+
+  def response?(arr)
+    return false unless arr.kind_of? Array
+    arr.each do |i|
+      return false if !(i[:id].class == Fixnum and
+                        i[:user] =~ /^[a-zA-Z0-9_]+$/ and
+                        i[:text].kind_of? String and
+                        i[:time].kind_of? Time)
+    end
+    return true
   end
   
-  def test_truth
-    assert true
+  def test_mentions
+    assert response? @client.mentions
+  end
+
+  def test_search
+    assert response? @client.search('ruby')
+  end
+
+  def test_user_timeline
+    assert response? @client.user_timeline 'shokai'
+  end
+
+  def test_list_timeline
+    assert response? @client.list_timeline('shokai', 'arr')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tw
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-15 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
@@ -40,10 +40,10 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 4.0.0
     - - <
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,10 +51,26 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 4.0.0
     - - <
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: args_parser
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +132,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -124,7 +140,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 description: ! '* twitter client.'
 email:
 - hashimoto@shokai.org
@@ -136,17 +152,22 @@ extra_rdoc_files:
 - Manifest.txt
 - README.rdoc
 files:
+- Gemfile
+- Gemfile.lock
 - History.txt
 - Manifest.txt
 - README.rdoc
 - Rakefile
+- bin/tw
 - lib/tw.rb
-- lib/tw/auth.rb
-- lib/tw/client.rb
+- lib/tw/app/cmds.rb
+- lib/tw/app/main.rb
+- lib/tw/app/opt_parser.rb
+- lib/tw/app/render.rb
+- lib/tw/client/auth.rb
+- lib/tw/client/error.rb
+- lib/tw/client/request.rb
 - lib/tw/conf.rb
-- lib/tw/opts.rb
-- lib/tw/render.rb
-- bin/tw
 - script/console
 - script/destroy
 - script/generate
@@ -167,6 +188,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4067215787574588106
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/tw/auth.rb

@@ -1,35 +0,0 @@
-
-module Tw
-  class Client
-
-    def initialize
-      if !Conf['access_token'] or !Conf['access_secret']
-        consumer = OAuth::Consumer.new(Conf['consumer_key'], Conf['consumer_secret'],
-                                       :site => 'http://twitter.com')
-        begin
-          request_token = consumer.get_request_token
-          puts "open #{request_token.authorize_url}"
-          system "open #{request_token.authorize_url}"
-          print 'input PIN Number: '
-          oauth_verifier = gets.strip
-          access_token = request_token.get_access_token(:oauth_verifier => oauth_verifier)
-          Conf['access_token'] = access_token.token
-          Conf['access_secret'] = access_token.secret
-        rescue => e
-          raise Error.new "#{e.to_s}\ncheck config file(#{Conf.conf_file}) and twitter.com status."
-        end
-        Conf.open_conf_file('w+'){|f|
-          f.puts Conf.to_yaml
-        }
-      end
-
-      Twitter.configure do |c|
-        c.consumer_key = Conf['consumer_key']
-        c.consumer_secret = Conf['consumer_secret']
-        c.oauth_token = Conf['access_token']
-        c.oauth_token_secret = Conf['access_secret']
-      end
-    end
-
-  end
-end

data/lib/tw/opts.rb

@@ -1,27 +0,0 @@
-
-module Tw
-  class Opts
-    def self.search_word?(str)
-      str =~ /^\?.+$/ ? str.scan(/^\?(.+)$/)[0][0] : false
-    end
-    
-    def self.username?(str)
-      str =~ /^@[a-zA-Z0-9_]+$/ ? str.scan(/^@([a-zA-Z0-9_]+)$/)[0][0] : false
-    end
-    
-    def self.listname?(str)
-      if str =~ /^@[a-zA-Z0-9_]+\/[a-zA-Z0-9_]+$/
-        return str.scan(/^@([a-zA-Z0-9_]+)\/([a-zA-Z0-9_]+)$/).first
-      end
-      false
-    end
-    
-    def self.cmd?(str)
-      search_word?(str) || username?(str) || listname?(str)
-    end
-    
-    def self.all_cmds?(argv)
-      argv.map{|arg| cmd? arg}.count(false) < 1
-    end
-  end
-end