twtr 0.1.0 → 0.1.1

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.1 2008-06-13
+* Added friends method.
+* Added update_location method.
+* Added highline dependancy in gem.
+
 == 0.1.0 2008-05-22
-* 1 major enhancement:
-  * Initial release
+* Initial release

data/config/hoe.rb

@@ -58,7 +58,7 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p|
   
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = []     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
+  p.extra_deps = [['highline', '>= 1.4.0']]
   
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
   

data/lib/twtr/client.rb

@@ -45,6 +45,12 @@ module Twtr
       id = options.delete(:id) || @account_user
       get_status("/statuses/user_timeline/#{id}", options)
     end
+
+    def friends(options={})
+      options[:method] = :get
+      id = options.delete(:id) || @account_user
+      request_status("/statuses/friends/#{id}", options)
+    end
     
     def replies(options={})
       get_status("/statuses/replies", options)
@@ -55,9 +61,14 @@ module Twtr
       friends_timeline()
     end
     
+    def update_location(options = {})
+      options[:method] = :post
+      request_status("/account/update_location", options)
+    end
+
     def test(options={})
       request_status("/help/test", options)
-    end
+    end    
     
     def post_status(path,options = {})
       options[:method] = :post

data/lib/twtr/console.rb

@@ -20,6 +20,9 @@ SYNOPSIS
       $ twtr ut -i bob            # => Show someone's timeline.
       $ twtr rp                   # => Show replies.
       $ twtr up -m "hello world"  # => Update message.
+      $ twtr friends              # => Show friends.
+      $ twtr friedns -i bob       # => Show bob's friends.
+      $ twtr ul -l "Tokyo, Japan" # => Update location.
 
 SUBCMMAND
     setting (reset)         # (Re)Set twtr configuration info.
@@ -28,9 +31,14 @@ SUBCMMAND
     user_timeline (ut)      # Show user timeline. -i, --id  option required.
     replies (rp)            # Show replies.
     update (up)             # Updates your status. -m, --message option required.
+    friedns (fds)           # Show friends. available -i, --id  option.
+    update_location (ul)    # Update location. -l, --location option required.
+    
 _TEXT_
 
   class Console
+    include Screen
+
     CONFIG_FILE = Twtr.is_win? ? File.expand_path("#{ENV['HOMEPATH']}/twtr/twtr.yml") \
                                : File.expand_path("~/.twtr/twtr.yml")
     DEFAULT_DISPLAY_COUNT = 20
@@ -50,6 +58,10 @@ _TEXT_
       :up => :update,
       :setting => :setting,
       :reset => :setting,
+      :friends => :friends,
+      :fds => :friends,
+      :update_location => :update_location,
+      :ul => :update_location,
     }
     
     def run(args)
@@ -61,11 +73,13 @@ _TEXT_
 
       if @subcommand
         @configfile ||= CONFIG_FILE
-          (edit_config(); return) if @subcommand == :setting
+        (edit_config(); return) if @subcommand == :setting
         
         begin
           client = Twtr::Client.new(Twtr::Config.load(@configfile))
-          show_status( client.send(@subcommand, @params) )
+          @display_count ||= DEFAULT_DISPLAY_COUNT
+          @source = client.send(@subcommand, @params)
+          self.send("show_#{@subcommand}")
         rescue Twtr::ConfigFileNotFoundException => e
           puts e.message
           edit_config() 
@@ -83,9 +97,9 @@ _TEXT_
       config = {}
 
       account = {}
-      print "Twitter username: "; user = gets
-      print "Twitter password: "; password = gets     
-      account["user"] = user.to_s.chomp
+      user = HighLine.new.ask("Twitter username: ")
+      password = HighLine.new.ask("Twitter password: ") {|q| q.echo = '*' }
+      account["user"] = user.to_s.chomp      
       account["password"] = password.to_s.chomp
       config["account"] = account      
 
@@ -126,6 +140,10 @@ _TEXT_
           @params.merge!({:source => "twtr", :status => val.toutf8})
         end
 
+        opt.on('-l','--location=location','Post location.') do |val|
+          @params.merge!({:source => "twtr", :location => val.toutf8})
+        end
+
         opt.on('-p', '--page=number',"Gets the 20 next statuses.") do |val|
           @params.merge!({:page => val.to_i})
         end
@@ -150,23 +168,5 @@ _TEXT_
       end
     end
     
-    def show_help(opt)
-      puts "\n#{Twtr::DESCRIPTION}\n#{opt}"
-    end
-    
-    def show_status(source)
-      @display_count ||= DEFAULT_DISPLAY_COUNT
-      doc = REXML::Document.new(source)
-      return if(!doc || !doc.elements['statuses'])
-      count = 0
-      doc.elements['statuses'].each_element do |e|
-        msg = e.elements['user/screen_name'].text + ': ' + e.elements['text'].text
-        msg = msg.tosjis if Twtr.is_win?
-        print "#{msg}\n"
-        break if((count+=1) >= @display_count)
-      end
-      puts ""
-    end
-    
   end
 end

data/lib/twtr/screen.rb

@@ -0,0 +1,66 @@
+module Twtr
+  module Screen
+    
+    module InstanceMethods
+
+      def show_public_timeline() show_status(); end
+      def show_friends_timeline() show_status(); end
+      def show_user_timeline() show_status(); end
+      def show_replies() show_status(); end
+      def show_update() show_status(); end
+
+      def show_status()
+        doc = REXML::Document.new(@source)
+        return if(!doc || !doc.elements['statuses'])
+        count = 0
+        doc.elements['statuses'].each_element do |e|
+          text = e.elements['user/screen_name'].text + ': ' + e.elements['text'].text
+          puts_with_enc text
+          break if((count+=1) >= @display_count)
+        end
+        puts ""
+      end
+
+      def show_friends()
+        doc = REXML::Document.new(@source)
+        return if(!doc || !doc.elements['users'])
+        count = 0
+        doc.elements['users'].each_element do |e|
+          puts_user_and_location(e)
+          break if((count+=1) >= @display_count)
+        end
+        puts ""
+      end
+
+      def show_update_location()
+        doc = REXML::Document.new(@source)
+        return if(!doc || !doc.elements['user'])
+        count = 0
+        e = doc.elements['user']
+        puts_user_and_location(e)
+        puts ""
+      end
+      
+      def puts_user_and_location(e)
+        text = "#{e.elements['screen_name'].text}"
+        location = "#{e.elements['location'].text}"
+        text += " (#{location})" unless location.empty?
+        puts_with_enc text
+      end
+
+      def show_help(opt)
+        puts "\n#{Twtr::DESCRIPTION}\n#{opt}"
+      end
+      
+    end
+
+    def puts_with_enc(text)
+      text = text.tosjis if Twtr.is_win?
+      print "#{text}\n"  
+    end
+    
+    def self.included(receiver)
+      receiver.send :include, InstanceMethods
+    end
+  end
+end

data/lib/twtr/version.rb

@@ -2,7 +2,7 @@ module Twtr #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/twtr.rb

@@ -9,8 +9,11 @@ module Twtr
   require "kconv"
   require "cgi"
   require "rexml/document"
+  require "rubygems"
+  require "highline"
   require "twtr/version"
   require "twtr/config"
+  require "twtr/screen"
   require "twtr/console"
   require "twtr/client"
   require "twtr/errors"

data/test/test_twtr_console.rb

@@ -56,7 +56,7 @@ class TestTwtrConsole < Test::Unit::TestCase
 
   def test_version()
     ret = `#{TWTR_PATH} -v`
-    assert_equal("twtr 0.1.0\n", ret)
+    assert_equal("twtr 0.1.1\n", ret)
   end
   
   def test_unkown_subcommand

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twtr
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ryota Maruko
@@ -9,10 +9,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-10 00:00:00 +09:00
+date: 2008-06-13 00:00:00 +09:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: highline
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.4.0
+    version: 
 description: twtr is a twitter client for Linux, OSX and Windows Console.
 email: 
 - ""
@@ -36,6 +44,7 @@ files:
 - lib/twtr/config.rb
 - lib/twtr/console.rb
 - lib/twtr/errors.rb
+- lib/twtr/screen.rb
 - lib/twtr/version.rb
 - setup.rb
 - test/test_helper.rb