t 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a36794a31632b69bee475211d077c05789f18b46
-  data.tar.gz: 29e6d1355b9beaac16d45070dcbd0f6ad7f59063
+  metadata.gz: 3ea297cdce1433a41e22a761b8733085600eaac1
+  data.tar.gz: 5fe95feae2722d81db4ce981e1165d0cbbdb6a29
 SHA512:
-  metadata.gz: 17032a375d4e948ee86e8dc8edb334e0a1432719a2c578f5f68c743b663c35e5766e6550f68ff04736f708cca0dff0457e634dcd3bfa3784e5f46b9c94cd812c
-  data.tar.gz: 34e246d704562a5f0cbda8eb889fcc0e7e193af0fb2754a619873c90fdb85c7af21c236b270782b0b9f9bb34c38e134e4ef9f81eab67e0bcc8269fe9f6d2152e
+  metadata.gz: 8bf21ca07c797bf8b2e13ca7ffead2ffd4410caf58f294b6d37ba2129cb178e5cdc560fdf29d90cc9096691f077a992af50045ee424e9ac34f54dbefaca945fb
+  data.tar.gz: b20ae5df1eae6d4f006ee0957bfa741ac4f4f5777af17ce0d1589ece0aca45cbb534feb499034c1417adad06a45ce07f885555af18edbf38ed149cf7b0f4b13a

data/Rakefile

@@ -6,7 +6,7 @@ RSpec::Core::RakeTask.new(:spec)
 
 begin
   require 'rubocop/rake_task'
-  Rubocop::RakeTask.new
+  RuboCop::RakeTask.new
 rescue LoadError
   desc 'Run RuboCop'
   task :rubocop do

data/lib/t/cli.rb

@@ -96,7 +96,7 @@ module T
       open_or_print(uri, :dry_run => options['display-uri'])
       pin = ask 'Enter the supplied PIN:'
       access_token = request_token.get_access_token(:oauth_verifier => pin.chomp)
-      oauth_response = access_token.get('/1.1/account/verify_credentials.json?include_entities=false&skip_status=true')
+      oauth_response = access_token.get('/1.1/account/verify_credentials.json?skip_status=true')
       screen_name = oauth_response.body.match(/"screen_name"\s*:\s*"(.*?)"/).captures.first
       @rcfile[screen_name] = {
         key => {
@@ -667,7 +667,7 @@ module T
     map %w[retweetsofme] => :retweets_of_me
 
     desc 'ruler', 'Prints a 140-character ruler'
-    method_option 'indent', :aliases => '-i', :type => :numeric, :default => 0, :desc => 'The number of space to print before the ruler.'
+    method_option 'indent', :aliases => '-i', :type => :numeric, :default => 0, :desc => 'The number of spaces to print before the ruler.'
     def ruler
       markings = '----|'.chars.cycle.take(140).join
       say "#{' ' * options['indent'].to_i}#{markings}"
@@ -683,15 +683,15 @@ module T
       opts[:include_entities] = !!options['decode_uris']
       status = client.status(status_id.to_i, opts)
       location = if status.place?
-        if status.place.name && status.place.attributes && status.place.attributes[:street_address] && status.place.attributes[:locality] && status.place.attributes[:region] && status.place.country
+        if status.place.name? && status.place.attributes? && status.place.attributes[:street_address] && status.place.attributes[:locality] && status.place.attributes[:region] && status.place.country?
           [status.place.name, status.place.attributes[:street_address], status.place.attributes[:locality], status.place.attributes[:region], status.place.country].join(', ')
-        elsif status.place.name && status.place.attributes && status.place.attributes[:locality] && status.place.attributes[:region] && status.place.country
+        elsif status.place.name? && status.place.attributes? && status.place.attributes[:locality] && status.place.attributes[:region] && status.place.country?
           [status.place.name, status.place.attributes[:locality], status.place.attributes[:region], status.place.country].join(', ')
-        elsif status.place.full_name && status.place.attributes && status.place.attributes[:region] && status.place.country
+        elsif status.place.full_name? && status.place.attributes? && status.place.attributes[:region] && status.place.country?
           [status.place.full_name, status.place.attributes[:region], status.place.country].join(', ')
-        elsif status.place.full_name && status.place.country
+        elsif status.place.full_name? && status.place.country?
           [status.place.full_name, status.place.country].join(', ')
-        elsif status.place.full_name
+        elsif status.place.full_name?
           status.place.full_name
         else
           status.place.name
@@ -953,10 +953,9 @@ module T
     end
 
     def add_location!(options, opts)
-      if options['location']
-        lat, lng = options['location'] == 'location' ? [location.lat, location.lng] : options['location'].split(',').collect(&:to_f)
-        opts.merge!(:lat => lat, :long => lng)
-      end
+      return nil unless options['location']
+      lat, lng = options['location'] == 'location' ? [location.lat, location.lng] : options['location'].split(',').collect(&:to_f)
+      opts.merge!(:lat => lat, :long => lng)
     end
 
     def location

data/lib/t/printable.rb

@@ -100,6 +100,7 @@ module T
         require 't/core_ext/kernel'
         array.collect! do |row|
           row.each_with_index.collect do |element, index|
+            next if element.nil?
             Kernel.send(element.class.name.to_sym, format[index] % element)
           end
         end

data/lib/t/version.rb

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

data/spec/cli_spec.rb

@@ -47,7 +47,7 @@ testcli
       @cli.options = @cli.options.merge('profile' => project_path + '/tmp/authorize', 'display-uri' => true)
       stub_post('/oauth/request_token').to_return(:body => fixture('request_token'))
       stub_post('/oauth/access_token').to_return(:body => fixture('access_token'))
-      stub_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       expect(Readline).to receive(:readline).with('Press [Enter] to open the Twitter Developer site. ', true).and_return("\n")
@@ -58,7 +58,7 @@ testcli
       @cli.authorize
       expect(a_post('/oauth/request_token')).to have_been_made
       expect(a_post('/oauth/access_token')).to have_been_made
-      expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+      expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'})).to have_been_made
     end
     it 'does not raise error' do
       expect do
@@ -86,7 +86,7 @@ testcli
         @cli.authorize
         expect(a_post('/oauth/request_token')).to have_been_made
         expect(a_post('/oauth/access_token')).to have_been_made
-        expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+        expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'})).to have_been_made
       end
       it 'does not raise error' do
         expect do
@@ -937,14 +937,14 @@ ID                   Posted at     Screen name       Text
     end
     context 'one user' do
       before do
-        stub_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+        stub_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         stub_post('/1.1/users/lookup.json').with(:body => {:screen_name => 'sferik,pengwynn'}).to_return(:body => fixture('users.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
         stub_post('/1.1/friendships/create.json').with(:body => {:user_id => '14100886'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       end
       it 'requests the correct resource' do
         @cli.follow('sferik', 'pengwynn')
-        expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+        expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'})).to have_been_made
         expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'})).to have_been_made
         expect(a_post('/1.1/users/lookup.json').with(:body => {:screen_name => 'sferik,pengwynn'})).to have_been_made
         expect(a_post('/1.1/friendships/create.json').with(:body => {:user_id => '14100886'})).to have_been_made
@@ -985,13 +985,13 @@ ID                   Posted at     Screen name       Text
 
   describe '#followings' do
     before do
-      stub_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('users.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.followings
-      expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+      expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'})).to have_been_made
       expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'})).to have_been_made
       expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'})).to have_been_made
     end
@@ -1281,13 +1281,13 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 
   describe '#followers' do
     before do
-      stub_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('users.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @cli.followers
-      expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+      expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'})).to have_been_made
       expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'})).to have_been_made
       expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'})).to have_been_made
     end
@@ -2071,9 +2071,9 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.lists
         expect($stdout.string).to eq <<-eos
 ID,Created at,Screen name,Slug,Members,Subscribers,Mode,Description
-1129440,2009-10-30 14:39:25 +0000,pengwynn,rubyists,499,39,public,""
-574,2009-09-23 01:18:01 +0000,twitter,team,1199,78078,other,""
-73546689,2012-07-08 22:19:05 +0000,sferik,test,2,0,private,""
+1129440,2009-10-30 14:39:25 +0000,pengwynn,rubyists,499,39,public,
+574,2009-09-23 01:18:01 +0000,twitter,team,1199,78078,other,
+73546689,2012-07-08 22:19:05 +0000,sferik,test,2,0,private,
         eos
       end
     end
@@ -3201,7 +3201,7 @@ Location     Blowfish Sushi To Die For
     context 'with no place' do
       before do
         stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false', :include_entities => 'false'}).to_return(:body => fixture('status_no_place.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
-        stub_request(:get, 'http://maps.google.com/maps/api/geocode/json').with(:query => {:latlng => '37.75963095,-122.410067', :sensor => 'false'}).to_return(:body => fixture('geo.json'), :headers => {:content_type => 'application/json; charset=UTF-8'})
+        stub_request(:get, 'https://maps.google.com/maps/api/geocode/json').with(:query => {:latlng => '37.75963095,-122.410067', :sensor => 'false'}).to_return(:body => fixture('geo.json'), :headers => {:content_type => 'application/json; charset=UTF-8'})
       end
       it 'has the correct output' do
         @cli.status('55709764298092545')
@@ -3219,7 +3219,7 @@ Location     San Francisco, CA, United States
       context 'with no city' do
         before do
           stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false', :include_entities => 'false'}).to_return(:body => fixture('status_no_place.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
-          stub_request(:get, 'http://maps.google.com/maps/api/geocode/json').with(:query => {:latlng => '37.75963095,-122.410067', :sensor => 'false'}).to_return(:body => fixture('geo_no_city.json'), :headers => {:content_type => 'application/json; charset=UTF-8'})
+          stub_request(:get, 'https://maps.google.com/maps/api/geocode/json').with(:query => {:latlng => '37.75963095,-122.410067', :sensor => 'false'}).to_return(:body => fixture('geo_no_city.json'), :headers => {:content_type => 'application/json; charset=UTF-8'})
         end
         it 'has the correct output' do
           @cli.status('55709764298092545')
@@ -3238,7 +3238,7 @@ Location     CA, United States
       context 'with no state' do
         before do
           stub_get('/1.1/statuses/show/55709764298092545.json').with(:query => {:include_my_retweet => 'false', :include_entities => 'false'}).to_return(:body => fixture('status_no_place.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
-          stub_request(:get, 'http://maps.google.com/maps/api/geocode/json').with(:query => {:latlng => '37.75963095,-122.410067', :sensor => 'false'}).to_return(:body => fixture('geo_no_state.json'), :headers => {:content_type => 'application/json; charset=UTF-8'})
+          stub_request(:get, 'https://maps.google.com/maps/api/geocode/json').with(:query => {:latlng => '37.75963095,-122.410067', :sensor => 'false'}).to_return(:body => fixture('geo_no_state.json'), :headers => {:content_type => 'application/json; charset=UTF-8'})
         end
         it 'has the correct output' do
           @cli.status('55709764298092545')
@@ -3709,7 +3709,7 @@ WOEID,Parent ID,Type,Name,Country
 2487956,23424977,Town,San Francisco,United States
 1587677,23424942,Unknown,Soweto,South Africa
 23424977,1,Country,United States,United States
-1,0,Supername,Worldwide,""
+1,0,Supername,Worldwide,
         eos
       end
     end
@@ -3743,7 +3743,7 @@ WOEID     Parent ID  Type       Name           Country
       end
       it 'sorts by the country name' do
         @cli.trend_locations
-        expect($stdout.string.chomp).to eq 'Worldwide      Soweto         San Francisco  United States'
+        expect($stdout.string.chomp).to eq 'Soweto         San Francisco  United States  Worldwide'
       end
     end
     context '--sort=parent' do

data/spec/delete_spec.rb

@@ -128,14 +128,14 @@ describe T::Delete do
   describe '#list' do
     before do
       @delete.options = @delete.options.merge('profile' => fixture_path + '/.trc')
-      stub_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       stub_get('/1.1/lists/show.json').with(:query => {:owner_id => '7505382', :slug => 'presidents'}).to_return(:body => fixture('list.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       stub_post('/1.1/lists/destroy.json').with(:body => {:owner_id => '7505382', :list_id => '8863586'}).to_return(:body => fixture('list.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       expect(Readline).to receive(:readline).with("Are you sure you want to permanently delete the list \"presidents\"? [y/N] ", false).and_return('yes')
       @delete.list('presidents')
-      expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+      expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'})).to have_been_made
       expect(a_post('/1.1/lists/destroy.json').with(:body => {:owner_id => '7505382', :list_id => '8863586'})).to have_been_made
     end
     context 'yes' do
@@ -158,7 +158,7 @@ describe T::Delete do
       end
       it 'requests the correct resource' do
         @delete.list('presidents')
-        expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+        expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'})).to have_been_made
         expect(a_post('/1.1/lists/destroy.json').with(:body => {:owner_id => '7505382', :list_id => '8863586'})).to have_been_made
       end
       it 'has the correct output' do
@@ -175,7 +175,7 @@ describe T::Delete do
         expect(Readline).to receive(:readline).with("Are you sure you want to permanently delete the list \"presidents\"? [y/N] ", false).and_return('yes')
         @delete.list('8863586')
         expect(a_get('/1.1/lists/show.json').with(:query => {:owner_id => '7505382', :list_id => '8863586'})).to have_been_made
-        expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+        expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'})).to have_been_made
         expect(a_post('/1.1/lists/destroy.json').with(:body => {:owner_id => '7505382', :list_id => '8863586'})).to have_been_made
       end
     end

data/spec/editor_spec.rb

@@ -5,7 +5,7 @@ describe T::Editor do
 
   context 'when editing a file' do
     before do
-      T::Editor.stub(:edit) do |path|
+      allow(T::Editor).to receive(:edit) do |path|
         File.open(path, 'wb') do |f|
           f.write('A tweet!!!!')
         end

data/spec/helper.rb

@@ -10,7 +10,7 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
 
 SimpleCov.start do
   add_filter '/spec/'
-  minimum_coverage(99.26)
+  minimum_coverage(99.27)
 end
 
 require 't'

data/spec/list_spec.rb

@@ -31,12 +31,12 @@ describe T::List do
   describe '#add' do
     before do
       @list.options = @list.options.merge('profile' => fixture_path + '/.trc')
-      stub_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       stub_post('/1.1/lists/members/create_all.json').with(:body => {:screen_name => 'BarackObama', :slug => 'presidents', :owner_id => '7505382'}).to_return(:body => fixture('list.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       @list.add('presidents', 'BarackObama')
-      expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+      expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'})).to have_been_made
       expect(a_post('/1.1/lists/members/create_all.json').with(:body => {:screen_name => 'BarackObama', :slug => 'presidents', :owner_id => '7505382'})).to have_been_made
     end
     it 'has the correct output' do
@@ -50,7 +50,7 @@ describe T::List do
       end
       it 'requests the correct resource' do
         @list.add('presidents', '7505382')
-        expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+        expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'})).to have_been_made
         expect(a_post('/1.1/lists/members/create_all.json').with(:body => {:user_id => '7505382', :slug => 'presidents', :owner_id => '7505382'})).to have_been_made
       end
     end
@@ -290,12 +290,12 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
   describe '#remove' do
     before do
       @list.options = @list.options.merge('profile' => fixture_path + '/.trc')
-      stub_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
+      stub_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'}).to_return(:body => fixture('sferik.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'requests the correct resource' do
       stub_post('/1.1/lists/members/destroy_all.json').with(:body => {:screen_name => 'BarackObama', :slug => 'presidents', :owner_id => '7505382'}).to_return(:body => fixture('list.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
       @list.remove('presidents', 'BarackObama')
-      expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+      expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'})).to have_been_made
       expect(a_post('/1.1/lists/members/destroy_all.json').with(:body => {:screen_name => 'BarackObama', :slug => 'presidents', :owner_id => '7505382'})).to have_been_made
     end
     it 'has the correct output' do
@@ -310,7 +310,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
       end
       it 'requests the correct resource' do
         @list.remove('presidents', '7505382')
-        expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:include_entities => 'false', :skip_status => 'true'})).to have_been_made
+        expect(a_get('/1.1/account/verify_credentials.json').with(:query => {:skip_status => 'true'})).to have_been_made
         expect(a_post('/1.1/lists/members/destroy_all.json').with(:body => {:user_id => '7505382', :slug => 'presidents', :owner_id => '7505382'})).to have_been_made
       end
     end

data/spec/stream_spec.rb

@@ -3,7 +3,7 @@ require 'helper'
 describe T::Stream do
   let(:t_class) do
     klass = Class.new
-    allow(klass).to receive(:options=).and_return
+    allow(klass).to receive(:options=)
     allow(klass).to receive(:options).and_return({})
     klass
   end
@@ -17,7 +17,7 @@ describe T::Stream do
     @streaming_client = double('Twitter::Streaming::Client').as_null_object
     @stream = T::Stream.new
     allow(@stream).to receive(:streaming_client) { @streaming_client }
-    allow(@stream).to receive(:say).and_return
+    allow(@stream).to receive(:say)
     allow(STDOUT).to receive(:tty?).and_return(true)
   end
 
@@ -35,12 +35,12 @@ describe T::Stream do
       end
       it 'outputs headings when the stream initializes' do
         allow(@streaming_client).to receive(:before_request).and_yield
-        allow(@streaming_client).to receive(:sample).and_return
+        allow(@streaming_client).to receive(:sample)
         expect(@stream).to receive(:say).with("ID,Posted at,Screen name,Text\n")
         @stream.all
       end
       it 'outputs in CSV format' do
-        allow(@streaming_client).to receive(:before_request).and_return
+        allow(@streaming_client).to receive(:before_request)
         allow(@streaming_client).to receive(:sample).and_yield(@status)
         expect(@stream).to receive(:print_csv_tweet).with(any_args)
         @stream.all
@@ -52,20 +52,20 @@ describe T::Stream do
       end
       it 'outputs headings when the stream initializes' do
         allow(@streaming_client).to receive(:before_request).and_yield
-        allow(@streaming_client).to receive(:sample).and_return
+        allow(@streaming_client).to receive(:sample)
         expect(@stream).to receive(:print_table).with(any_args)
         @stream.all
       end
       it 'outputs in long text format' do
-        allow(@streaming_client).to receive(:before_request).and_return
+        allow(@streaming_client).to receive(:before_request)
         allow(@streaming_client).to receive(:sample).and_yield(@status)
         expect(@stream).to receive(:print_table).with(any_args)
         @stream.all
       end
     end
     it 'invokes Twitter::Streaming::Client#sample' do
-      allow(@streaming_client).to receive(:before_request).and_return
-      allow(@streaming_client).to receive(:sample).and_return
+      allow(@streaming_client).to receive(:before_request)
+      allow(@streaming_client).to receive(:sample)
       expect(@streaming_client).to receive(:sample)
       @stream.all
     end
@@ -89,7 +89,7 @@ describe T::Stream do
         @stream.options = @stream.options.merge('csv' => true)
       end
       it 'outputs in CSV format' do
-        allow(@streaming_client).to receive(:before_request).and_return
+        allow(@streaming_client).to receive(:before_request)
         allow(@streaming_client).to receive(:filter).and_yield(@status)
         expect(@stream).to receive(:print_csv_tweet).with(any_args)
         @stream.list('presidents')
@@ -104,7 +104,7 @@ describe T::Stream do
         @stream.options = @stream.options.merge('long' => true)
       end
       it 'outputs in long text format' do
-        allow(@streaming_client).to receive(:before_request).and_return
+        allow(@streaming_client).to receive(:before_request)
         allow(@streaming_client).to receive(:filter).and_yield(@status)
         expect(@stream).to receive(:print_table).with(any_args)
         @stream.list('presidents')
@@ -116,13 +116,13 @@ describe T::Stream do
     end
     it 'performs a REST search when the stream initializes' do
       allow(@streaming_client).to receive(:before_request).and_yield
-      allow(@streaming_client).to receive(:filter).and_return
+      allow(@streaming_client).to receive(:filter)
       allow(T::List).to receive(:new).and_return(t_class)
-      expect(t_class).to receive(:timeline).and_return
+      expect(t_class).to receive(:timeline)
       @stream.list('presidents')
     end
     it 'invokes Twitter::Streaming::Client#userstream' do
-      allow(@streaming_client).to receive(:filter).and_return
+      allow(@streaming_client).to receive(:filter)
       expect(@streaming_client).to receive(:filter)
       @stream.list('presidents')
     end
@@ -133,13 +133,13 @@ describe T::Stream do
       stub_get('/1.1/search/tweets.json').with(:query => {:q => 'lang:ja', :count => 100, :include_entities => 'false'}).to_return(:body => fixture('empty_cursor.json'), :headers => {:content_type => 'application/json; charset=utf-8'})
     end
     it 'outputs the tweet status' do
-      allow(@streaming_client).to receive(:before_request).and_return
+      allow(@streaming_client).to receive(:before_request)
       allow(@streaming_client).to receive(:sample).and_yield(@status)
       expect(@stream).to receive(:say).with(any_args)
       @stream.matrix
     end
     it 'invokes Twitter::Streaming::Client#sample' do
-      allow(@streaming_client).to receive(:before_request).and_return
+      allow(@streaming_client).to receive(:before_request)
       allow(@streaming_client).to receive(:sample).and_yield(@status)
       expect(@streaming_client).to receive(:sample)
       @stream.matrix
@@ -164,7 +164,7 @@ describe T::Stream do
         @stream.options = @stream.options.merge('csv' => true)
       end
       it 'outputs in CSV format' do
-        allow(@streaming_client).to receive(:before_request).and_return
+        allow(@streaming_client).to receive(:before_request)
         expect(@stream).to receive(:print_csv_tweet).with(any_args)
         @stream.search(%w[twitter gem])
       end
@@ -174,7 +174,7 @@ describe T::Stream do
         @stream.options = @stream.options.merge('long' => true)
       end
       it 'outputs in long text format' do
-        allow(@streaming_client).to receive(:before_request).and_return
+        allow(@streaming_client).to receive(:before_request)
         allow(@streaming_client).to receive(:filter).with(:track => 'twitter,gem').and_yield(@status)
         expect(@stream).to receive(:print_table).with(any_args)
         @stream.search(%w[twitter gem])
@@ -182,13 +182,13 @@ describe T::Stream do
     end
     it 'performs a REST search when the stream initializes' do
       allow(@streaming_client).to receive(:before_request).and_yield
-      allow(@streaming_client).to receive(:filter).and_return
+      allow(@streaming_client).to receive(:filter)
       allow(T::Search).to receive(:new).and_return(t_class)
-      expect(t_class).to receive(:all).with('t OR gem').and_return
+      expect(t_class).to receive(:all).with('t OR gem')
       @stream.search('t', 'gem')
     end
     it 'invokes Twitter::Streaming::Client#filter' do
-      allow(@streaming_client).to receive(:filter).and_return
+      allow(@streaming_client).to receive(:filter)
       expect(@streaming_client).to receive(:filter).with(:track => 'twitter,gem')
       @stream.search(%w[twitter gem])
     end
@@ -207,7 +207,7 @@ describe T::Stream do
         @stream.options = @stream.options.merge('csv' => true)
       end
       it 'outputs in CSV format' do
-        allow(@streaming_client).to receive(:before_request).and_return
+        allow(@streaming_client).to receive(:before_request)
         expect(@stream).to receive(:print_csv_tweet).with(any_args)
         @stream.timeline
       end
@@ -217,20 +217,20 @@ describe T::Stream do
         @stream.options = @stream.options.merge('long' => true)
       end
       it 'outputs in long text format' do
-        allow(@streaming_client).to receive(:before_request).and_return
+        allow(@streaming_client).to receive(:before_request)
         expect(@stream).to receive(:print_table).with(any_args)
         @stream.timeline
       end
     end
     it 'performs a REST search when the stream initializes' do
       allow(@streaming_client).to receive(:before_request).and_yield
-      allow(@streaming_client).to receive(:user).and_return
+      allow(@streaming_client).to receive(:user)
       allow(T::CLI).to receive(:new).and_return(t_class)
-      expect(t_class).to receive(:timeline).and_return
+      expect(t_class).to receive(:timeline)
       @stream.timeline
     end
     it 'invokes Twitter::Streaming::Client#userstream' do
-      allow(@streaming_client).to receive(:user).and_return
+      allow(@streaming_client).to receive(:user)
       expect(@streaming_client).to receive(:user)
       @stream.timeline
     end
@@ -250,12 +250,12 @@ describe T::Stream do
       end
       it 'outputs headings when the stream initializes' do
         allow(@streaming_client).to receive(:before_request).and_yield
-        allow(@streaming_client).to receive(:filter).and_return
+        allow(@streaming_client).to receive(:filter)
         expect(@stream).to receive(:say).with("ID,Posted at,Screen name,Text\n")
         @stream.users('123')
       end
       it 'outputs in CSV format' do
-        allow(@streaming_client).to receive(:before_request).and_return
+        allow(@streaming_client).to receive(:before_request)
         expect(@stream).to receive(:print_csv_tweet).with(any_args)
         @stream.users('123')
       end
@@ -266,19 +266,19 @@ describe T::Stream do
       end
       it 'outputs headings when the stream initializes' do
         allow(@streaming_client).to receive(:before_request).and_yield
-        allow(@streaming_client).to receive(:filter).and_return
+        allow(@streaming_client).to receive(:filter)
         expect(@stream).to receive(:print_table).with(any_args)
         @stream.users('123')
       end
       it 'outputs in long text format' do
-        allow(@streaming_client).to receive(:before_request).and_return
+        allow(@streaming_client).to receive(:before_request)
         allow(@streaming_client).to receive(:filter).and_yield(@status)
         expect(@stream).to receive(:print_table).with(any_args)
         @stream.users('123')
       end
     end
     it 'invokes Twitter::Streaming::Client#follow' do
-      allow(@streaming_client).to receive(:filter).and_return
+      allow(@streaming_client).to receive(:filter)
       expect(@streaming_client).to receive(:filter).with(:follow => '123,456,789')
       @stream.users('123', '456', '789')
     end

data/t.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'oauth', '~> 0.4.7'
   spec.add_dependency 'retryable', '~> 1.3'
   spec.add_dependency 'thor', ['>= 0.19.1', '< 2']
-  spec.add_dependency 'twitter', '~> 5.9'
+  spec.add_dependency 'twitter', '~> 5.11'
   spec.add_development_dependency 'bundler', '~> 1.0'
   spec.author = 'Erik Michaels-Ober'
   spec.bindir = 'bin'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: t
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Erik Michaels-Ober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-14 00:00:00.000000000 Z
+date: 2014-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -112,14 +112,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -245,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: CLI for Twitter
@@ -312,3 +312,4 @@ test_files:
 - spec/set_spec.rb
 - spec/stream_spec.rb
 - spec/utils_spec.rb
+has_rdoc: