t 2.3.0 → 2.4.0

data/README.md

@@ -253,12 +253,12 @@ used by `t`:
 ![List](https://github.com/sferik/t/raw/master/screenshots/list.png)
 
 ## Shell completion
-If you're running Zsh, you can source one of the [bundled completion
+If you're running Zsh or Bash, you can source one of the [bundled completion
 files][completion] to get shell completion for `t` commands, subcommands, and
 flags.
 
-Don't run Zsh? Why not [contribute][] completion support for your favorite
-shell?
+Don't run Zsh or Bash? Why not [contribute][] completion support for your
+favorite shell?
 
 [completion]: https://github.com/sferik/t/tree/master/etc
 [contribute]: https://github.com/sferik/t/blob/master/CONTRIBUTING.md

data/Rakefile

@@ -16,6 +16,6 @@ end
 
 Dir.glob('tasks/*.rake').each { |r| import r }
 
-task :release => 'completion:zsh'
+task :release => ['completion:zsh', 'completion:bash']
 task :test => :spec
 task :default => [:spec, :rubocop]

data/lib/t/cli.rb

@@ -204,18 +204,18 @@ module T
 
     desc 'does_contain [USER/]LIST USER', 'Find out whether a list contains a user.'
     method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify user via ID instead of screen name.'
-    def does_contain(list, user = nil)
-      owner, list = extract_owner(list, options)
+    def does_contain(user_list, user = nil)
+      owner, list_name = extract_owner(user_list, options)
       if user.nil?
         user = @rcfile.active_profile[0]
       else
         require 't/core_ext/string'
         user = options['id'] ? client.user(user.to_i).screen_name : user.strip_ats
       end
-      if client.list_member?(owner, list, user)
-        say "Yes, #{list} contains @#{user}."
+      if client.list_member?(owner, list_name, user)
+        say "Yes, #{list_name} contains @#{user}."
       else
-        abort "No, #{list} does not contain @#{user}."
+        abort "No, #{list_name} does not contain @#{user}."
       end
     end
     map %w[dc doescontain] => :does_contain
@@ -844,7 +844,7 @@ module T
         array << ['Since', "#{ls_formatted_time(user, :created_at, false)} (#{time_ago_in_words(user.created_at)} ago)"]
         array << ['Last update', "#{decode_full_text(user.status, options['decode_uris']).gsub(/\n+/, ' ')} (#{time_ago_in_words(user.status.created_at)} ago)"] unless user.status.nil?
         array << ['Screen name', "@#{user.screen_name}"]
-        array << [user.verified ? 'Name (Verified)' : 'Name', user.name] unless user.name.nil?
+        array << [user.verified ? 'Name (Verified)' : 'Name', user.name] unless user.name.nil? # rubocop:disable BlockNesting
         array << ['Tweets', number_with_delimiter(user.statuses_count)]
         array << ['Favorites', number_with_delimiter(user.favorites_count)]
         array << ['Listed', number_with_delimiter(user.listed_count)]
@@ -858,6 +858,16 @@ module T
     end
     map %w[user] => :whois
 
+    desc 'whoami', 'Retrieves profile information for the authenticated user.'
+    method_option 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :desc => 'Decodes t.co URLs into their original form.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.'
+    method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
+    def whoami
+      user = @rcfile.active_profile[0]
+      whois(user)
+    end
+
     desc 'delete SUBCOMMAND ...ARGS', 'Delete Tweets, Direct Messages, etc.'
     subcommand 'delete', T::Delete
 

data/lib/t/delete.rb

@@ -18,7 +18,7 @@ module T
 
     desc 'block USER [USER...]', 'Unblock users.'
     method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify input as Twitter user IDs instead of screen names.'
-    method_option 'force', :aliases => '-f', :type => :boolean, :default => false
+    method_option 'force', :aliases => '-f', :type => :boolean
     def block(user, *users)
       unblocked_users, number = fetch_users(users.unshift(user), options) do |users_to_unblock|
         client.unblock(users_to_unblock)
@@ -29,7 +29,7 @@ module T
     end
 
     desc 'dm [DIRECT_MESSAGE_ID] [DIRECT_MESSAGE_ID...]', 'Delete the last Direct Message sent.'
-    method_option 'force', :aliases => '-f', :type => :boolean, :default => false
+    method_option 'force', :aliases => '-f', :type => :boolean
     def dm(direct_message_id, *direct_message_ids)
       direct_message_ids.unshift(direct_message_id)
       require 't/core_ext/string'
@@ -51,7 +51,7 @@ module T
     map %w[d m] => :dm
 
     desc 'favorite TWEET_ID [TWEET_ID...]', 'Delete favorites.'
-    method_option 'force', :aliases => '-f', :type => :boolean, :default => false
+    method_option 'force', :aliases => '-f', :type => :boolean
     def favorite(status_id, *status_ids)
       status_ids.unshift(status_id)
       require 't/core_ext/string'
@@ -73,7 +73,7 @@ module T
     map %w[fave favourite] => :favorite
 
     desc 'list LIST', 'Delete a list.'
-    method_option 'force', :aliases => '-f', :type => :boolean, :default => false
+    method_option 'force', :aliases => '-f', :type => :boolean
     method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify list via ID instead of slug.'
     def list(list)
       if options['id']
@@ -89,7 +89,7 @@ module T
     end
 
     desc 'status TWEET_ID [TWEET_ID...]', 'Delete Tweets.'
-    method_option 'force', :aliases => '-f', :type => :boolean, :default => false
+    method_option 'force', :aliases => '-f', :type => :boolean
     def status(status_id, *status_ids)
       status_ids.unshift(status_id)
       require 't/core_ext/string'

data/lib/t/list.rb

@@ -26,34 +26,34 @@ module T
 
     desc 'add LIST USER [USER...]', 'Add members to a list.'
     method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify input as Twitter user IDs instead of screen names.'
-    def add(list, user, *users)
+    def add(list_name, user, *users)
       added_users, number = fetch_users(users.unshift(user), options) do |users_to_add|
-        client.add_list_members(list, users_to_add)
+        client.add_list_members(list_name, users_to_add)
         users_to_add
       end
-      say "@#{@rcfile.active_profile[0]} added #{pluralize(number, 'member')} to the list \"#{list}\"."
+      say "@#{@rcfile.active_profile[0]} added #{pluralize(number, 'member')} to the list \"#{list_name}\"."
       say
       if options['id']
-        say "Run `#{File.basename($PROGRAM_NAME)} list remove --id #{list} #{added_users.join(' ')}` to undo."
+        say "Run `#{File.basename($PROGRAM_NAME)} list remove --id #{list_name} #{added_users.join(' ')}` to undo."
       else
-        say "Run `#{File.basename($PROGRAM_NAME)} list remove #{list} #{added_users.collect { |added_user| "@#{added_user}" }.join(' ')}` to undo."
+        say "Run `#{File.basename($PROGRAM_NAME)} list remove #{list_name} #{added_users.collect { |added_user| "@#{added_user}" }.join(' ')}` to undo."
       end
     end
 
     desc 'create LIST [DESCRIPTION]', 'Create a new list.'
     method_option 'private', :aliases => '-p', :type => :boolean
-    def create(list, description = nil)
+    def create(list_name, description = nil)
       opts = description ? {:description => description} : {}
       opts.merge!(:mode => 'private') if options['private']
-      client.create_list(list, opts)
-      say "@#{@rcfile.active_profile[0]} created the list \"#{list}\"."
+      client.create_list(list_name, opts)
+      say "@#{@rcfile.active_profile[0]} created the list \"#{list_name}\"."
     end
 
     desc 'information [USER/]LIST', 'Retrieves detailed information about a Twitter list.'
     method_option 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
-    def information(list)
-      owner, list = extract_owner(list, options)
-      list = client.list(owner, list)
+    def information(user_list)
+      owner, list_name = extract_owner(user_list, options)
+      list = client.list(owner, list_name)
       if options['csv']
         require 'csv'
         say ['ID', 'Description', 'Slug', 'Screen name', 'Created at', 'Members', 'Subscribers', 'Following', 'Mode', 'URL'].to_csv
@@ -82,25 +82,25 @@ module T
     method_option 'reverse', :aliases => '-r', :type => :boolean, :desc => 'Reverse the order of the sort.'
     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, :desc => 'Output is not sorted.'
-    def members(list)
-      owner, list = extract_owner(list, options)
-      users = client.list_members(owner, list).to_a
+    def members(user_list)
+      owner, list_name = extract_owner(user_list, options)
+      users = client.list_members(owner, list_name).to_a
       print_users(users)
     end
 
     desc 'remove LIST USER [USER...]', 'Remove members from a list.'
     method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify input as Twitter user IDs instead of screen names.'
-    def remove(list, user, *users)
+    def remove(list_name, user, *users)
       removed_users, number = fetch_users(users.unshift(user), options) do |users_to_remove|
-        client.remove_list_members(list, users_to_remove)
+        client.remove_list_members(list_name, users_to_remove)
         users_to_remove
       end
-      say "@#{@rcfile.active_profile[0]} removed #{pluralize(number, 'member')} from the list \"#{list}\"."
+      say "@#{@rcfile.active_profile[0]} removed #{pluralize(number, 'member')} from the list \"#{list_name}\"."
       say
       if options['id']
-        say "Run `#{File.basename($PROGRAM_NAME)} list add --id #{list} #{removed_users.join(' ')}` to undo."
+        say "Run `#{File.basename($PROGRAM_NAME)} list add --id #{list_name} #{removed_users.join(' ')}` to undo."
       else
-        say "Run `#{File.basename($PROGRAM_NAME)} list add #{list} #{removed_users.collect { |removed_user| "@#{removed_user}" }.join(' ')}` to undo."
+        say "Run `#{File.basename($PROGRAM_NAME)} list add #{list_name} #{removed_users.collect { |removed_user| "@#{removed_user}" }.join(' ')}` to undo."
       end
     end
 
@@ -112,13 +112,13 @@ module T
     method_option 'number', :aliases => '-n', :type => :numeric, :default => DEFAULT_NUM_RESULTS, :desc => 'Limit the number of results.'
     method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
     method_option 'reverse', :aliases => '-r', :type => :boolean, :desc => 'Reverse the order of the sort.'
-    def timeline(list)
-      owner, list = extract_owner(list, options)
+    def timeline(user_list)
+      owner, list_name = extract_owner(user_list, options)
       count = options['number'] || DEFAULT_NUM_RESULTS
       opts = {}
       opts[:include_entities] = !!options['decode_uris']
       tweets = collect_with_count(count) do |count_opts|
-        client.list_timeline(owner, list, count_opts.merge(opts))
+        client.list_timeline(owner, list_name, count_opts.merge(opts))
       end
       print_tweets(tweets)
     end

data/lib/t/printable.rb

@@ -157,7 +157,7 @@ module T
       when 'tweets'
         users.sort_by { |user| user.statuses_count.to_i }
       when 'tweeted'
-        users.sort_by { |user| user.status? ? user.status.created_at : Time.at(0) }
+        users.sort_by { |user| user.status? ? user.status.created_at : Time.at(0) } # rubocop:disable BlockNesting
       else
         users.sort_by { |user| user.screen_name.downcase }
       end unless options['unsorted']

data/lib/t/search.rb

@@ -93,13 +93,13 @@ module T
     method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify user via ID instead of screen name.'
     method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.'
     method_option 'relative_dates', :aliases => '-a', :type => :boolean, :desc => 'Show relative dates.'
-    def list(list, query)
-      owner, list = extract_owner(list, options)
+    def list(user_list, query)
+      owner, list_name = extract_owner(user_list, options)
       opts = {:count => MAX_NUM_RESULTS}
       opts[:include_entities] = !!options['decode_uris']
       tweets = collect_with_max_id do |max_id|
         opts[:max_id] = max_id unless max_id.nil?
-        client.list_timeline(owner, list, opts)
+        client.list_timeline(owner, list_name, opts)
       end
       tweets = tweets.select do |tweet|
         /#{query}/i.match(tweet.full_text)

data/lib/t/stream.rb

@@ -1,10 +1,13 @@
 require 'thor'
 require 't/printable'
 require 't/rcfile'
+require 't/requestable'
+require 't/utils'
 
 module T
   class Stream < Thor
     include T::Printable
+    include T::Requestable
     include T::Utils
 
     TWEET_HEADINGS_FORMATTING = [
@@ -23,9 +26,10 @@ module T
 
     desc 'all', 'Stream a random sample of all Tweets (Control-C to stop)'
     method_option 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :desc => 'Decodes t.co URLs into their original form.'
     method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.'
     def all
-      client.before_request do
+      streaming_client.before_request do
         if options['csv']
           require 'csv'
           say TWEET_HEADINGS.to_csv
@@ -36,7 +40,7 @@ module T
           print_table([headings])
         end
       end
-      client.sample do |tweet|
+      streaming_client.sample do |tweet|
         next unless tweet.is_a?(Twitter::Tweet)
         if options['csv']
           print_csv_tweet(tweet)
@@ -51,9 +55,42 @@ module T
       end
     end
 
+    desc 'list [USER/]LIST', 'Stream a timeline for members of the specified list (Control-C to stop)'
+    method_option 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :desc => 'Decodes t.co URLs into their original form.'
+    method_option 'id', :aliases => '-i', :type => :boolean, :desc => 'Specify user via ID instead of screen name.'
+    method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.'
+    method_option 'reverse', :aliases => '-r', :type => :boolean, :desc => 'Reverse the order of the sort.'
+    def list(user_list)
+      owner, list_name = extract_owner(user_list, options)
+      require 't/list'
+      streaming_client.before_request do
+        list = T::List.new
+        list.options = list.options.merge(options)
+        list.options = list.options.merge(:reverse => true)
+        list.options = list.options.merge(:format => TWEET_HEADINGS_FORMATTING)
+        list.timeline(user_list)
+      end
+      user_ids = client.list_members(owner, list_name).collect(&:id)
+      streaming_client.filter(:follow => user_ids.join(',')) do |tweet|
+        next unless tweet.is_a?(Twitter::Tweet)
+        if options['csv']
+          print_csv_tweet(tweet)
+        elsif options['long']
+          array = build_long_tweet(tweet).each_with_index.collect do |element, index|
+            TWEET_HEADINGS_FORMATTING[index] % element
+          end
+          print_table([array], :truncate => STDOUT.tty?)
+        else
+          print_message(tweet.user.screen_name, tweet.text)
+        end
+      end
+    end
+    map %w[tl] => :timeline
+
     desc 'matrix', 'Unfortunately, no one can be told what the Matrix is. You have to see it for yourself.'
     def matrix
-      client.sample(:language => 'ja') do |tweet|
+      streaming_client.sample(:language => 'ja') do |tweet|
         next unless tweet.is_a?(Twitter::Tweet)
         say(tweet.full_text.gsub("\n", '').reverse, [:bold, :green, :on_black])
       end
@@ -61,18 +98,19 @@ module T
 
     desc 'search KEYWORD [KEYWORD...]', 'Stream Tweets that contain specified keywords, joined with logical ORs (Control-C to stop)'
     method_option 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :desc => 'Decodes t.co URLs into their original form.'
     method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.'
     def search(keyword, *keywords)
       keywords.unshift(keyword)
       require 't/search'
-      client.before_request do
+      streaming_client.before_request do
         search = T::Search.new
         search.options = search.options.merge(options)
         search.options = search.options.merge(:reverse => true)
         search.options = search.options.merge(:format => TWEET_HEADINGS_FORMATTING)
         search.all(keywords.join(' OR '))
       end
-      client.filter(:track => keywords.join(',')) do |tweet|
+      streaming_client.filter(:track => keywords.join(',')) do |tweet|
         next unless tweet.is_a?(Twitter::Tweet)
         if options['csv']
           print_csv_tweet(tweet)
@@ -89,17 +127,18 @@ module T
 
     desc 'timeline', 'Stream your timeline (Control-C to stop)'
     method_option 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :desc => 'Decodes t.co URLs into their original form.'
     method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.'
     def timeline
       require 't/cli'
-      client.before_request do
+      streaming_client.before_request do
         cli = T::CLI.new
         cli.options = cli.options.merge(options)
         cli.options = cli.options.merge(:reverse => true)
         cli.options = cli.options.merge(:format => TWEET_HEADINGS_FORMATTING)
         cli.timeline
       end
-      client.user do |tweet|
+      streaming_client.user do |tweet|
         next unless tweet.is_a?(Twitter::Tweet)
         if options['csv']
           print_csv_tweet(tweet)
@@ -116,11 +155,12 @@ module T
 
     desc 'users USER_ID [USER_ID...]', 'Stream Tweets either from or in reply to specified users (Control-C to stop)'
     method_option 'csv', :aliases => '-c', :type => :boolean, :desc => 'Output in CSV format.'
+    method_option 'decode_uris', :aliases => '-d', :type => :boolean, :desc => 'Decodes t.co URLs into their original form.'
     method_option 'long', :aliases => '-l', :type => :boolean, :desc => 'Output in long format.'
     def users(user_id, *user_ids)
       user_ids.unshift(user_id)
       user_ids.collect!(&:to_i)
-      client.before_request do
+      streaming_client.before_request do
         if options['csv']
           require 'csv'
           say TWEET_HEADINGS.to_csv
@@ -131,7 +171,7 @@ module T
           print_table([headings])
         end
       end
-      client.filter(:follow => user_ids.join(',')) do |tweet|
+      streaming_client.filter(:follow => user_ids.join(',')) do |tweet|
         next unless tweet.is_a?(Twitter::Tweet)
         if options['csv']
           print_csv_tweet(tweet)
@@ -148,10 +188,10 @@ module T
 
   private
 
-    def client
-      return @client if @client
+    def streaming_client
+      return @streaming_client if @streaming_client
       @rcfile.path = options['profile'] if options['profile']
-      @client = Twitter::Streaming::Client.new do |config|
+      @streaming_client = Twitter::Streaming::Client.new do |config|
         config.consumer_key        = @rcfile.active_consumer_key
         config.consumer_secret     = @rcfile.active_consumer_secret
         config.access_token        = @rcfile.active_token

data/lib/t/utils.rb

@@ -61,16 +61,16 @@ module T
       options['id'] ? users.collect!(&:to_i) : users.collect!(&:strip_ats)
     end
 
-    def extract_owner(list, options)
-      owner, list = list.split('/')
-      if list.nil?
-        list = owner
+    def extract_owner(user_list, options)
+      owner, list_name = user_list.split('/')
+      if list_name.nil?
+        list_name = owner
         owner = @rcfile.active_profile[0]
       else
         require 't/core_ext/string'
         owner = options['id'] ? owner.to_i : owner.strip_ats
       end
-      [owner, list]
+      [owner, list_name]
     end
 
     def strip_tags(html)

data/lib/t/version.rb

@@ -1,7 +1,7 @@
 module T
   class Version
     MAJOR = 2
-    MINOR = 3
+    MINOR = 4
     PATCH = 0
     PRE = nil
 

data/spec/cli_spec.rb

@@ -8,12 +8,7 @@ describe T::CLI do
     T.utc_offset = 'PST'
   end
 
-  after :all do
-    T.utc_offset = nil
-    Timecop.return
-  end
-
-  before :each do
+  before do
     T::RCFile.instance.path = fixture_path + '/.trc'
     @cli = T::CLI.new
     @cli.options = @cli.options.merge('color' => 'always')
@@ -23,12 +18,17 @@ describe T::CLI do
     $stdout = StringIO.new
   end
 
-  after :each do
+  after do
     T::RCFile.instance.reset
     $stderr = @old_stderr
     $stdout = @old_stdout
   end
 
+  after :all do
+    T.utc_offset = nil
+    Timecop.return
+  end
+
   describe '#account' do
     before do
       @cli.options = @cli.options.merge('profile' => fixture_path + '/.trc')
@@ -4035,6 +4035,58 @@ ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name
         @cli.whois('sferik')
         expect($stdout.string).to eq <<-eos
 ID       Since         Last tweeted at  Tweets  Favorites  Listed  Following ...
+7505382  Jul 16  2007  Jul  8 10:29       7890       3755     118        212 ...
+        eos
+      end
+    end
+  end
+
+  describe '#whoami' do
+    before do
+      stub_get('/1.1/users/show.json').with(:query => {:screen_name => 'testcli', :include_entities => 'false'}).to_return(:body => fixture('sferik.json'))
+    end
+    it 'requests the correct resource' do
+      @cli.whoami
+      expect(a_get('/1.1/users/show.json').with(:query => {:screen_name => 'testcli', :include_entities => 'false'})).to have_been_made
+    end
+    it 'has the correct output' do
+      @cli.whoami
+      expect($stdout.string).to eq <<-eos
+ID           7505382
+Since        Jul 16  2007 (4 years ago)
+Last update  @goldman You're near my home town! Say hi to Woodstock for me. (7 months ago)
+Screen name  @sferik
+Name         Erik Michaels-Ober
+Tweets       7,890
+Favorites    3,755
+Listed       118
+Following    212
+Followers    2,262
+Bio          Vagabond.
+Location     San Francisco
+URL          https://github.com/sferik
+      eos
+    end
+    context '--csv' do
+      before do
+        @cli.options = @cli.options.merge('csv' => true)
+      end
+      it 'has the correct output' do
+        @cli.whoami
+        expect($stdout.string).to eq <<-eos
+ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name,Name,Verified,Protected,Bio,Status,Location,URL
+7505382,2007-07-16 12:59:01 +0000,2012-07-08 18:29:20 +0000,7890,3755,118,212,2262,sferik,Erik Michaels-Ober,false,false,Vagabond.,@goldman You're near my home town! Say hi to Woodstock for me.,San Francisco,https://github.com/sferik
+        eos
+      end
+    end
+    context '--long' do
+      before do
+        @cli.options = @cli.options.merge('long' => true)
+      end
+      it 'outputs in long format' do
+        @cli.whoami
+        expect($stdout.string).to eq <<-eos
+ID       Since         Last tweeted at  Tweets  Favorites  Listed  Following ...
 7505382  Jul 16  2007  Jul  8 10:29       7890       3755     118        212 ...
         eos
       end