tw 0.0.3 → 0.1.0

data/Gemfile

@@ -1,5 +1,6 @@
 source :rubygems
 
+gem 'backports'
 gem 'hoe'
 gem 'newgem'
 gem 'oauth'

data/Gemfile.lock

@@ -4,6 +4,7 @@ GEM
     RedCloth (4.2.9)
     activesupport (2.3.14)
     args_parser (0.1.0)
+    backports (2.6.4)
     faraday (0.8.4)
       multipart-post (~> 1.1)
     hoe (3.1.0)
@@ -33,6 +34,7 @@ PLATFORMS
 
 DEPENDENCIES
   args_parser
+  backports
   hoe
   newgem
   oauth

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.0.4 2012-10-04
+
+* show direct messages : --dm
+* create direct message : --dm:to=USERNAME
+
 === 0.0.3 2012-10-03
 
 * show home timeline : --timeline

data/Manifest.txt

@@ -7,6 +7,7 @@ Rakefile
 bin/tw
 lib/tw.rb
 lib/tw/app/cmds.rb
+lib/tw/app/helper.rb
 lib/tw/app/main.rb
 lib/tw/app/opt_parser.rb
 lib/tw/app/render.rb

data/README.rdoc

@@ -2,27 +2,37 @@
 
 * http://github.com/shokai/tw
 
+== INSTALL:
+
+* gem install tw
+
 == DESCRIPTION:
 
 * twitter client.
 
-
 == SYNOPSIS:
 
-read timeline
+show help
+
+  % tw --help
+
+read Timeline
 
   % tw @username
   % tw @username @user2 @user3
   % tw @username/listname
+  % tw --timeline
+  % tw --search=ruby
 
-tweet
+Tweet
 
   % tw hello hello
 
+DM
 
-== INSTALL:
+  % tw --dm
+  % tw --dm:to=shokai "hello!"
 
-* gem install tw
 
 == LICENSE:
 

data/Rakefile

@@ -16,6 +16,7 @@ $hoe = Hoe.spec 'tw' do
   self.extra_deps         = [['oauth','>= 0.4.7', '< 1.0.0'],
                              ['twitter', '>= 4.0.0', '< 5.0.0'],
                              ['args_parser', '>= 0.1.0'],
+                             ['backports', '>= 2.6.4'],
                              ['rainbow', '>= 1.1.4', '< 2.0.0']]
 
 end

data/lib/tw.rb

@@ -1,6 +1,7 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+require 'backports'
 require 'oauth'
 require 'twitter'
 require 'yaml'
@@ -13,5 +14,9 @@ require 'tw/client/request'
 require 'tw/client/error'
 
 module Tw
-  VERSION = '0.0.3'
+  VERSION = '0.1.0'
+  class Conf
+    REQUIRE_VERSION = '0.1.0'
+  end
 end
+

data/lib/tw/app/cmds.rb

@@ -44,6 +44,31 @@ module Tw::App
         end
       end
 
+      cmd :dm do |v|
+        auth
+        Render.display client.direct_messages
+        on_exit
+      end
+
+      cmd 'dm:to' do |to|
+        message = @parser.argv.join(' ')
+        len = message.split(//u).size
+        if len > 140
+          STDERR.puts "message too long (#{len} chars)"
+          on_error
+        elsif len < 1
+          STDERR.puts 'e.g.  tw --dm:to=USERNAME  "hello"'
+          on_error
+        else
+          puts "dm \"#{message}\"?  (#{len} chars)"
+          puts '[Y/n]'
+          on_exit if STDIN.gets.strip =~ /^n/i
+          auth
+          client.direct_message_create to, message
+        end
+        on_exit
+      end
+
       cmd :search do |v|
         if v.class == String
           auth

data/lib/tw/app/helper.rb

@@ -0,0 +1,11 @@
+
+class String
+  def colorize(pattern)
+    self.split(/(#{pattern})/).map{|term|
+      if term =~ /#{pattern}/
+        term = term.color(Tw::App::Render.color_code term).bright.underline
+      end
+      term
+    }.join('')
+  end
+end

data/lib/tw/app/main.rb

@@ -2,6 +2,7 @@
 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__)
+require File.expand_path 'helper', File.dirname(__FILE__)
 
 module Tw::App
   
@@ -47,6 +48,8 @@ module Tw::App
         arg 'user:list', 'show user list'
         arg 'user:default', 'set default user'
         arg :timeline, 'show timeline', :alias => :tl
+        arg :dm, 'show direct messages'
+        arg 'dm:to', 'create direct message'
         arg :search, 'search public timeline', :alias => :s
         arg :pipe, 'pipe tweet'
         arg :version, 'show version', :alias => :v
@@ -80,7 +83,7 @@ module Tw::App
       else
         message = @parser.argv.join(' ')
         if (len = message.split(//u).size) > 140
-          puts "tweet too long (#{len} chars)"
+          STDERR.puts "tweet too long (#{len} chars)"
           on_error
         else
           puts "tweet \"#{message}\"?  (#{len} chars)"

data/lib/tw/app/render.rb

@@ -7,17 +7,13 @@ module Tw::App
       return colors[n%colors.size]
     end
     
-    def self.display(hash)
-      hash.flatten.sort{|a,b|
+    def self.display(arr)
+      arr.flatten.sort{|a,b|
         a[:id] <=> b[:id]
       }.uniq.each{|m|
-        line = "#{m[:time].strftime '[%m/%d %a] (%H:%M:%S)'} @#{m[:user]} : #{m[:text]}"
-        puts line.split(/(@[a-zA-Z0-9_]+)/).map{|term|
-          if term =~ /@[a-zA-Z0-9_]+/
-            term = term.color(color_code term).bright.underline
-          end
-          term
-        }.join('')
+        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} : #{m[:text]}"
+        puts line.colorize(/@[a-zA-Z0-9_]+/)
       }
     end
   end

data/lib/tw/client/request.rb

@@ -57,6 +57,27 @@ module Tw
       }
     end
 
+    def direct_messages
+      [Twitter.direct_messages.map{|m|
+         {
+           :id => m.id,
+           :user => m.sender.screen_name,
+           :text => m.text,
+           :time => m.created_at
+         }
+       }, Twitter.direct_messages_sent.map{|m|
+         {
+           :id => m.id,
+           :user => {
+             :from => m.sender.screen_name,
+             :to => m.recipient.screen_name
+           },
+           :text => m.text,
+           :time => m.created_at
+         }
+       }].flatten
+    end
+
     def tweet(message)
       res = Twitter.update message
       puts res.text
@@ -64,5 +85,11 @@ module Tw
       puts res.created_at
     end
 
+    def direct_message_create(to, message)
+      res = Twitter.direct_message_create to, message
+      puts res.text
+      puts res.created_at
+    end
+
   end
 end

data/lib/tw/conf.rb

@@ -29,8 +29,17 @@ module Tw
                   res = default
                   if File.exists? conf_file
                     begin
+                      data = nil
                       open_conf_file do |f|
-                        res = YAML::load f.read
+                        data = YAML::load f.read
+                      end
+                      if data['version'] < REQUIRE_VERSION
+                        puts "This is tw version #{Tw::VERSION}."
+                        puts "Your config file is old ("+data['version']+"). Reset tw settings?"
+                        puts "[Y/n]"
+                        res = data if STDIN.gets =~ /^n/i
+                      else
+                        res = data
                       end
                     rescue => e
                       STDERR.puts e

data/test/test_tw.rb

@@ -7,11 +7,16 @@ class TestTw < Test::Unit::TestCase
     @client.auth
   end
 
+  def user?(str)
+    return false unless str.kind_of? String
+    str =~ /^[a-zA-Z0-9_]+$/
+  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
+                        (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
@@ -37,4 +42,8 @@ class TestTw < Test::Unit::TestCase
   def test_list_timeline
     assert response? @client.list_timeline('shokai', 'arr')
   end
+
+  def test_direct_message
+    assert response? @client.direct_messages
+  end
 end

metadata

@@ -1,168 +1,173 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: tw
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Sho Hashimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-10-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: oauth
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.7
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 4
-        - 7
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    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
+- !ruby/object:Gem::Dependency
+  name: twitter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
-  name: oauth
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 4
-        - 0
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    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
+- !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
-  name: twitter
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 1
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: backports
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.6.4
   type: :runtime
-  name: args_parser
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 1
-        - 4
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.6.4
+- !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: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.4
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    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: *id005
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 1
-        - 5
-        - 3
+  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
         version: 1.5.3
   type: :development
-  name: newgem
-  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.5.3
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    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: *id007
-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
@@ -172,6 +177,7 @@ files:
 - bin/tw
 - lib/tw.rb
 - lib/tw/app/cmds.rb
+- lib/tw/app/helper.rb
 - lib/tw/app/main.rb
 - lib/tw/app/opt_parser.rb
 - lib/tw/app/render.rb
@@ -187,38 +193,33 @@ files:
 - .gemtest
 homepage: http://github.com/shokai/tw
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+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: -3893906850154543404
+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