t 0.9.9 → 1.0.0

data/lib/t/rcfile.rb

@@ -1,95 +1,101 @@
 require 'singleton'
 
-class RCFile
-  FILE_NAME = '.trc'
-  attr_reader :path
+module T
+  class RCFile
+    FILE_NAME = '.trc'
+    attr_reader :path
 
-  include Singleton
+    include Singleton
 
-  def initialize
-    @path = File.join(File.expand_path("~"), FILE_NAME)
-    @data = load
-  end
+    def initialize
+      @path = File.join(File.expand_path("~"), FILE_NAME)
+      @data = load
+    end
 
-  def [](username)
-    profiles[username]
-  end
+    def [](username)
+      profiles[username]
+    end
 
-  def []=(username, profile)
-    profiles[username] ||= {}
-    profiles[username].merge!(profile)
-    write
-  end
+    def []=(username, profile)
+      profiles[username] ||= {}
+      profiles[username].merge!(profile)
+      write
+    end
 
-  def configuration
-    @data['configuration']
-  end
+    def configuration
+      @data['configuration']
+    end
 
-  def active_consumer_key
-    profiles[active_profile[0]][active_profile[1]]['consumer_key'] if active_profile && profiles[active_profile[0]] && profiles[active_profile[0]][active_profile[1]]
-  end
+    def active_consumer_key
+      profiles[active_profile[0]][active_profile[1]]['consumer_key'] if active_profile?
+    end
 
-  def active_consumer_secret
-    profiles[active_profile[0]][active_profile[1]]['consumer_secret'] if active_profile && profiles[active_profile[0]] && profiles[active_profile[0]][active_profile[1]]
-  end
+    def active_consumer_secret
+      profiles[active_profile[0]][active_profile[1]]['consumer_secret'] if active_profile?
+    end
 
-  def active_profile
-    configuration['default_profile']
-  end
+    def active_profile
+      configuration['default_profile']
+    end
 
-  def active_profile=(profile)
-    configuration['default_profile'] = [profile['username'], profile['consumer_key']]
-    write
-  end
+    def active_profile=(profile)
+      configuration['default_profile'] = [profile['username'], profile['consumer_key']]
+      write
+    end
 
-  def active_secret
-    profiles[active_profile[0]][active_profile[1]]['secret'] if active_profile && profiles[active_profile[0]] && profiles[active_profile[0]][active_profile[1]]
-  end
+    def active_secret
+      profiles[active_profile[0]][active_profile[1]]['secret'] if active_profile?
+    end
 
-  def active_token
-    profiles[active_profile[0]][active_profile[1]]['token'] if active_profile && profiles[active_profile[0]] && profiles[active_profile[0]][active_profile[1]]
-  end
+    def active_token
+      profiles[active_profile[0]][active_profile[1]]['token'] if active_profile?
+    end
 
-  def delete
-    File.delete(@path) if File.exist?(@path)
-  end
+    def delete
+      File.delete(@path) if File.exist?(@path)
+    end
 
-  def empty?
-    @data == default_structure
-  end
+    def empty?
+      @data == default_structure
+    end
 
-  def load
-    require 'yaml'
-    YAML.load_file(@path)
-  rescue Errno::ENOENT
-    default_structure
-  end
+    def load
+      require 'yaml'
+      YAML.load_file(@path)
+    rescue Errno::ENOENT
+      default_structure
+    end
 
-  def path=(path)
-    @path = path
-    @data = load
-    @path
-  end
+    def path=(path)
+      @path = path
+      @data = load
+      @path
+    end
 
-  def profiles
-    @data['profiles']
-  end
+    def profiles
+      @data['profiles']
+    end
 
-  def reset
-    self.send(:initialize)
-  end
+    def reset
+      self.send(:initialize)
+    end
 
-private
+  private
 
-  def default_structure
-    {'configuration' => {}, 'profiles' => {}}
-  end
+    def active_profile?
+      active_profile && profiles[active_profile[0]] && profiles[active_profile[0]][active_profile[1]]
+    end
 
-  def write
-    require 'yaml'
-    File.open(@path, File::RDWR|File::TRUNC|File::CREAT, 0600) do |rcfile|
-      rcfile.write @data.to_yaml
+    def default_structure
+      {'configuration' => {}, 'profiles' => {}}
+    end
+
+    def write
+      require 'yaml'
+      File.open(@path, File::RDWR|File::TRUNC|File::CREAT, 0600) do |rcfile|
+        rcfile.write @data.to_yaml
+      end
     end
-  end
 
+  end
 end

data/lib/t/search.rb

@@ -1,26 +1,26 @@
 require 'thor'
 require 'twitter'
+require 't/collectable'
+require 't/printable'
+require 't/rcfile'
+require 't/requestable'
+require 't/utils'
 
 module T
-  autoload :Collectable, 't/collectable'
-  autoload :Printable, 't/printable'
-  autoload :RCFile, 't/rcfile'
-  autoload :Requestable, 't/requestable'
   class Search < Thor
     include T::Collectable
     include T::Printable
     include T::Requestable
+    include T::Utils
 
     DEFAULT_NUM_RESULTS = 20
     MAX_NUM_RESULTS = 200
-    MAX_SCREEN_NAME_SIZE = 20
-    MAX_USERS_PER_REQUEST = 20
 
     check_unknown_options!
 
     def initialize(*)
+      @rcfile = T::RCFile.instance
       super
-      @rcfile = RCFile.instance
     end
 
     desc "all QUERY", "Returns the #{DEFAULT_NUM_RESULTS} most recent Tweets that match the specified query."
@@ -30,8 +30,9 @@ module T
     def all(query)
       rpp = options['number'] || DEFAULT_NUM_RESULTS
       statuses = collect_with_rpp(rpp) do |opts|
-        client.search(query, opts)
+        client.search(query, opts).results
       end
+      statuses.reverse! if options['reverse']
       require 'htmlentities'
       if options['csv']
         require 'csv'
@@ -49,19 +50,35 @@ module T
       else
         say unless statuses.empty?
         statuses.each do |status|
-          print_status(status)
+          print_message(status.from_user, status.full_text)
         end
       end
     end
 
-    desc "favorites QUERY", "Returns Tweets you've favorited that match the specified query."
+    desc "favorites [USER] QUERY", "Returns Tweets you've favorited that match the specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
+    method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
-    def favorites(query)
+    def favorites(*args)
       opts = {:count => MAX_NUM_RESULTS}
-      statuses = collect_with_max_id do |max_id|
-        opts[:max_id] = max_id unless max_id.nil?
-        client.favorites(opts)
+      query = args.pop
+      user = args.pop
+      if user
+        require 't/core_ext/string'
+        user = if options['id']
+          user.to_i
+        else
+          user.strip_ats
+        end
+        statuses = collect_with_max_id do |max_id|
+          opts[:max_id] = max_id unless max_id.nil?
+          client.favorites(user, opts)
+        end
+      else
+        statuses = collect_with_max_id do |max_id|
+          opts[:max_id] = max_id unless max_id.nil?
+          client.favorites(opts)
+        end
       end
       statuses = statuses.select do |status|
         /#{query}/i.match(status.full_text)
@@ -75,18 +92,7 @@ module T
     method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     def list(list, query)
-      owner, list = list.split('/')
-      if list.nil?
-        list = owner
-        owner = @rcfile.active_profile[0]
-      else
-        require 't/core_ext/string'
-        owner = if options['id']
-          owner.to_i
-        else
-          owner.strip_ats
-        end
-      end
+      owner, list = extract_owner(list, options)
       opts = {:count => MAX_NUM_RESULTS}
       statuses = collect_with_max_id do |max_id|
         opts[:max_id] = max_id unless max_id.nil?
@@ -114,14 +120,30 @@ module T
     end
     map %w(replies) => :mentions
 
-    desc "retweets QUERY", "Returns Tweets you've retweeted that match the specified query."
+    desc "retweets [USER] QUERY", "Returns Tweets you've retweeted that match the specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
+    method_option "id", :aliases => "-i", :type => "boolean", :default => false, :desc => "Specify user via ID instead of screen name."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
-    def retweets(query)
+    def retweets(*args)
       opts = {:count => MAX_NUM_RESULTS}
-      statuses = collect_with_max_id do |max_id|
-        opts[:max_id] = max_id unless max_id.nil?
-        client.retweeted_by(opts)
+      query = args.pop
+      user = args.pop
+      if user
+        require 't/core_ext/string'
+        user = if options['id']
+          user.to_i
+        else
+          user.strip_ats
+        end
+        statuses = collect_with_max_id do |max_id|
+          opts[:max_id] = max_id unless max_id.nil?
+          client.retweeted_by_user(user, opts)
+        end
+      else
+        statuses = collect_with_max_id do |max_id|
+          opts[:max_id] = max_id unless max_id.nil?
+          client.retweeted_by_me(opts)
+        end
       end
       statuses = statuses.select do |status|
         /#{query}/i.match(status.full_text)
@@ -164,23 +186,14 @@ module T
 
     desc "users QUERY", "Returns users that match the specified query."
     method_option "csv", :aliases => "-c", :type => :boolean, :default => false, :desc => "Output in CSV format."
-    method_option "favorites", :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by number of favorites."
-    method_option "followers", :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by number of followers."
-    method_option "friends", :aliases => "-e", :type => :boolean, :default => false, :desc => "Sort by number of friends."
-    method_option "listed", :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
-    method_option "posted", :aliases => "-p", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter account was posted."
     method_option "reverse", :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
-    method_option "tweets", :aliases => "-t", :type => :boolean, :default => false, :desc => "Sort by number of Tweets."
+    method_option "sort", :aliases => "-s", :type => :string, :enum => %w(favorites followers friends listed screen_name since tweets tweeted), :default => "screen_name", :desc => "Specify the order of the results.", :banner => "ORDER"
     method_option "unsorted", :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
     def users(query)
-      require 't/core_ext/enumerable'
-      require 'retryable'
-      users = 1.upto(50).threaded_map do |page|
-        retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
-          client.user_search(query, :page => page, :per_page => MAX_USERS_PER_REQUEST)
-        end
-      end.flatten
+      users = collect_with_page do |page|
+        client.user_search(query, :page => page)
+      end
       print_users(users)
     end
 

data/lib/t/set.rb

@@ -1,16 +1,16 @@
 require 'thor'
+require 't/rcfile'
+require 't/requestable'
 
 module T
-  autoload :RCFile, 't/rcfile'
-  autoload :Requestable, 't/requestable'
   class Set < Thor
     include T::Requestable
 
     check_unknown_options!
 
     def initialize(*)
+      @rcfile = T::RCFile.instance
       super
-      @rcfile = RCFile.instance
     end
 
     desc "active SCREEN_NAME [CONSUMER_KEY]", "Set your active account."

data/lib/t/stream.rb

@@ -1,10 +1,8 @@
 require 'thor'
+require 't/printable'
+require 't/rcfile'
 
 module T
-  autoload :CLI, 't/cli'
-  autoload :Printable, 't/printable'
-  autoload :RCFile, 't/rcfile'
-  autoload :Search, 't/search'
   class Stream < Thor
     include T::Printable
 
@@ -16,8 +14,8 @@ module T
     ]
 
     def initialize(*)
+      @rcfile = T::RCFile.instance
       super
-      @rcfile = RCFile.instance
     end
 
     desc "all", "Stream a random sample of all Tweets (Control-C to stop)"
@@ -46,7 +44,7 @@ module T
           end
           print_table([array], :truncate => STDOUT.tty?)
         else
-          print_status(status)
+          print_message(status.user.screen_name, status.text)
         end
       end
       client.sample
@@ -67,6 +65,7 @@ module T
     def search(keyword, *keywords)
       keywords.unshift(keyword)
       require 'tweetstream'
+      require 't/search'
       client.on_inited do
         search = T::Search.new
         search.options = search.options.merge(options)
@@ -83,7 +82,7 @@ module T
           end
           print_table([array], :truncate => STDOUT.tty?)
         else
-          print_status(status)
+          print_message(status.user.screen_name, status.text)
         end
       end
       client.track(keywords)
@@ -94,6 +93,7 @@ module T
     method_option "long", :aliases => "-l", :type => :boolean, :default => false, :desc => "Output in long format."
     def timeline
       require 'tweetstream'
+      require 't/cli'
       client.on_inited do
         cli = T::CLI.new
         cli.options = cli.options.merge(options)
@@ -110,7 +110,7 @@ module T
           end
           print_table([array], :truncate => STDOUT.tty?)
         else
-          print_status(status)
+          print_message(status.user.screen_name, status.text)
         end
       end
       client.userstream
@@ -144,7 +144,7 @@ module T
           end
           print_table([array], :truncate => STDOUT.tty?)
         else
-          print_status(status)
+          print_message(status.user.screen_name, status.text)
         end
       end
       client.follow(user_ids)

data/lib/t/{format_helpers.rb → utils.rb}

@@ -1,5 +1,5 @@
 module T
-  module FormatHelpers
+  module Utils
   private
 
     # https://github.com/rails/rails/blob/bd8a970/actionpack/lib/action_view/helpers/date_helper.rb
@@ -47,16 +47,53 @@ module T
     alias :time_ago_in_words :distance_of_time_in_words
     alias :time_from_now_in_words :distance_of_time_in_words
 
+    def fetch_users(users, options, &block)
+      format_users!(users, options)
+      require 'retryable'
+      users = retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
+        yield users
+      end
+      [users, users.length]
+    end
+
+    def format_users!(users, options)
+      require 't/core_ext/string'
+      if options['id']
+        users.map!(&:to_i)
+      else
+        users.map!(&:strip_ats)
+      end
+    end
+
+    def extract_owner(list, options)
+      owner, list = list.split('/')
+      if list.nil?
+        list = owner
+        owner = @rcfile.active_profile[0]
+      else
+        require 't/core_ext/string'
+        owner = if options['id']
+          owner.to_i
+        else
+          owner.strip_ats
+        end
+      end
+      [owner, list]
+    end
+
     def strip_tags(html)
       html.gsub(/<.+?>/, '')
     end
 
     def number_with_delimiter(number, delimiter=",")
       digits = number.to_s.split(//)
-      require 'active_support/core_ext/array/grouping'
-      groups = digits.reverse.in_groups_of(3).map{|g| g.join('')}
+      groups = digits.reverse.each_slice(3).map{|g| g.join('')}
       groups.join(delimiter).reverse
     end
 
+    def pluralize(count, singular, plural=nil)
+      "#{count || 0} " + ((count == 1 || count =~ /^1(\.0+)?$/) ? singular : (plural || "#{singular}s"))
+    end
+
   end
 end