t 2.2.1 → 2.3.0

data/lib/t/utils.rb

@@ -1,6 +1,6 @@
 module T
   module Utils
-    private
+  private
 
     # https://github.com/rails/rails/blob/bd8a970/actionpack/lib/action_view/helpers/date_helper.rb
     def distance_of_time_in_words(from_time, to_time = Time.now) # rubocop:disable CyclomaticComplexity
@@ -58,7 +58,7 @@ module T
 
     def format_users!(users, options)
       require 't/core_ext/string'
-      options['id'] ? users.map!(&:to_i) : users.map!(&:strip_ats)
+      options['id'] ? users.collect!(&:to_i) : users.collect!(&:strip_ats)
     end
 
     def extract_owner(list, options)
@@ -79,7 +79,7 @@ module T
 
     def number_with_delimiter(number, delimiter = ',')
       digits = number.to_s.split(//)
-      groups = digits.reverse.each_slice(3).map { |g| g.join('') }
+      groups = digits.reverse.each_slice(3).collect { |g| g.join('') }
       groups.join(delimiter).reverse
     end
 
@@ -109,5 +109,9 @@ module T
         say "Open: #{uri}"
       end
     end
+
+    def parallel_map(enumerable)
+      enumerable.collect { |object| Thread.new { yield object } }.collect(&:value)
+    end
   end
 end

data/lib/t/version.rb

@@ -1,8 +1,8 @@
 module T
   class Version
     MAJOR = 2
-    MINOR = 2
-    PATCH = 1
+    MINOR = 3
+    PATCH = 0
     PRE = nil
 
     class << self

data/spec/cli_spec.rb

@@ -132,7 +132,7 @@ testcli
     end
     it 'has the correct output' do
       @cli.block('sferik')
-      expect($stdout.string).to match /^@testcli blocked 1 user/
+      expect($stdout.string).to match(/^@testcli blocked 1 user/)
     end
     context '--id' do
       before do
@@ -484,158 +484,6 @@ ID          Posted at     Screen name  Text
     end
   end
 
-  describe '#groupies' do
-    before do
-      stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'))
-      stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('followers_ids.json'))
-      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-      stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '213747670,428004849'}).to_return(:body => fixture('users.json'))
-    end
-    it 'requests the correct resource' do
-      @cli.groupies
-      expect(a_get('/1.1/account/verify_credentials.json')).to have_been_made
-      expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
-      expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
-      expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '213747670,428004849'})).to have_been_made
-    end
-    it 'has the correct output' do
-      @cli.groupies
-      expect($stdout.string.chomp).to eq 'pengwynn  sferik'
-    end
-    context '--csv' do
-      before do
-        @cli.options = @cli.options.merge('csv' => true)
-      end
-      it 'outputs in CSV format' do
-        @cli.groupies
-        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
-14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland,false,false,"Christian, husband, father, GitHubber, Co-host of @thechangelog, Co-author of Sass, Compass, #CSS book  http://wynn.fm/sass-meap",@akosmasoftware Sass book! @hcatlin @nex3 are the brains behind Sass. :-),"Denton, TX",http://wynnnetherland.com
-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.groupies
-        expect($stdout.string).to eq <<-eos
-ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
-14100886  Mar  8  2008  Jul  7 12:33       6940        192     358       3427...
- 7505382  Jul 16  2007  Jul  8 10:29       7890       3755     118        212...
-        eos
-      end
-    end
-    context '--reverse' do
-      before do
-        @cli.options = @cli.options.merge('reverse' => true)
-      end
-      it 'reverses the order of the sort' do
-        @cli.groupies
-        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
-      end
-    end
-    context '--sort=favorites' do
-      before do
-        @cli.options = @cli.options.merge('sort' => 'favorites')
-      end
-      it 'sorts by the number of favorites' do
-        @cli.groupies
-        expect($stdout.string.chomp).to eq 'pengwynn  sferik'
-      end
-    end
-    context '--sort=followers' do
-      before do
-        @cli.options = @cli.options.merge('sort' => 'followers')
-      end
-      it 'sorts by the number of followers' do
-        @cli.groupies
-        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
-      end
-    end
-    context '--sort=friends' do
-      before do
-        @cli.options = @cli.options.merge('sort' => 'friends')
-      end
-      it 'sorts by the number of friends' do
-        @cli.groupies
-        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
-      end
-    end
-    context '--sort=listed' do
-      before do
-        @cli.options = @cli.options.merge('sort' => 'listed')
-      end
-      it 'sorts by the number of list memberships' do
-        @cli.groupies
-        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
-      end
-    end
-    context '--sort=since' do
-      before do
-        @cli.options = @cli.options.merge('sort' => 'since')
-      end
-      it 'sorts by the time when Twitter acount was created' do
-        @cli.groupies
-        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
-      end
-    end
-    context '--sort=tweets' do
-      before do
-        @cli.options = @cli.options.merge('sort' => 'tweets')
-      end
-      it 'sorts by the number of Tweets' do
-        @cli.groupies
-        expect($stdout.string.chomp).to eq 'pengwynn  sferik'
-      end
-    end
-    context '--sort=tweeted' do
-      before do
-        @cli.options = @cli.options.merge('sort' => 'tweeted')
-      end
-      it 'sorts by the time of the last Tweet' do
-        @cli.groupies
-        expect($stdout.string.chomp).to eq 'pengwynn  sferik'
-      end
-    end
-    context '--unsorted' do
-      before do
-        @cli.options = @cli.options.merge('unsorted' => true)
-      end
-      it 'is not sorted' do
-        @cli.groupies
-        expect($stdout.string.chomp).to eq 'pengwynn  sferik'
-      end
-    end
-    context 'with a user passed' do
-      before do
-        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('followers_ids.json'))
-        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-      end
-      it 'requests the correct resource' do
-        @cli.groupies('sferik')
-        expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
-        expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
-        expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '213747670,428004849'})).to have_been_made
-      end
-      context '--id' do
-        before do
-          @cli.options = @cli.options.merge('id' => true)
-          stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('followers_ids.json'))
-          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'))
-        end
-        it 'requests the correct resource' do
-          @cli.groupies('7505382')
-          expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'})).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 => '213747670,428004849'})).to have_been_made
-        end
-      end
-    end
-  end
-
   describe '#dm' do
     before do
       @cli.options = @cli.options.merge('profile' => fixture_path + '/.trc')
@@ -807,7 +655,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     end
     it 'has the correct output' do
       @cli.favorite('26755176471724032')
-      expect($stdout.string).to match /^@testcli favorited 1 tweet.$/
+      expect($stdout.string).to match(/^@testcli favorited 1 tweet.$/)
     end
   end
 
@@ -1123,7 +971,7 @@ ID                   Posted at     Screen name       Text
       end
       it 'has the correct output' do
         @cli.follow('sferik', 'pengwynn')
-        expect($stdout.string).to match /^@testcli is now following 1 more user\.$/
+        expect($stdout.string).to match(/^@testcli is now following 1 more user\.$/)
       end
       context '--id' do
         before do
@@ -1301,20 +1149,20 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
     end
   end
 
-  describe '#followers' do
+  describe '#followings_following' do
     before do
-      stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'))
+      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'testcli'}).to_return(:body => fixture('friends_ids.json'))
       stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
       stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('users.json'))
     end
     it 'requests the correct resource' do
-      @cli.followers
-      expect(a_get('/1.1/account/verify_credentials.json')).to have_been_made
+      @cli.followings_following('sferik')
+      expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'testcli'})).to have_been_made
       expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
       expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'})).to have_been_made
     end
     it 'has the correct output' do
-      @cli.followers
+      @cli.followings_following('sferik')
       expect($stdout.string.chomp).to eq 'pengwynn  sferik'
     end
     context '--csv' do
@@ -1322,7 +1170,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('csv' => true)
       end
       it 'outputs in CSV format' do
-        @cli.followers
+        @cli.followings_following('sferik')
         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
 14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland,false,false,"Christian, husband, father, GitHubber, Co-host of @thechangelog, Co-author of Sass, Compass, #CSS book  http://wynn.fm/sass-meap",@akosmasoftware Sass book! @hcatlin @nex3 are the brains behind Sass. :-),"Denton, TX",http://wynnnetherland.com
@@ -1335,7 +1183,7 @@ ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name
         @cli.options = @cli.options.merge('long' => true)
       end
       it 'outputs in long format' do
-        @cli.followers
+        @cli.followings_following('sferik')
         expect($stdout.string).to eq <<-eos
 ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 14100886  Mar  8  2008  Jul  7 12:33       6940        192     358       3427...
@@ -1348,7 +1196,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('reverse' => true)
       end
       it 'reverses the order of the sort' do
-        @cli.followers
+        @cli.followings_following('sferik')
         expect($stdout.string.chomp).to eq 'sferik    pengwynn'
       end
     end
@@ -1357,7 +1205,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('sort' => 'favorites')
       end
       it 'sorts by the number of favorites' do
-        @cli.followers
+        @cli.followings_following('sferik')
         expect($stdout.string.chomp).to eq 'pengwynn  sferik'
       end
     end
@@ -1366,7 +1214,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('sort' => 'followers')
       end
       it 'sorts by the number of followers' do
-        @cli.followers
+        @cli.followings_following('sferik')
         expect($stdout.string.chomp).to eq 'sferik    pengwynn'
       end
     end
@@ -1375,7 +1223,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('sort' => 'friends')
       end
       it 'sorts by the number of friends' do
-        @cli.followers
+        @cli.followings_following('sferik')
         expect($stdout.string.chomp).to eq 'sferik    pengwynn'
       end
     end
@@ -1384,7 +1232,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('sort' => 'listed')
       end
       it 'sorts by the number of list memberships' do
-        @cli.followers
+        @cli.followings_following('sferik')
         expect($stdout.string.chomp).to eq 'sferik    pengwynn'
       end
     end
@@ -1393,7 +1241,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('sort' => 'since')
       end
       it 'sorts by the time when Twitter acount was created' do
-        @cli.followers
+        @cli.followings_following('sferik')
         expect($stdout.string.chomp).to eq 'sferik    pengwynn'
       end
     end
@@ -1402,7 +1250,458 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('sort' => 'tweets')
       end
       it 'sorts by the number of Tweets' do
+        @cli.followings_following('sferik')
+        expect($stdout.string.chomp).to eq 'pengwynn  sferik'
+      end
+    end
+    context '--sort=tweeted' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'tweeted')
+      end
+      it 'sorts by the time of the last Tweet' do
+        @cli.followings_following('sferik')
+        expect($stdout.string.chomp).to eq 'pengwynn  sferik'
+      end
+    end
+    context '--unsorted' do
+      before do
+        @cli.options = @cli.options.merge('unsorted' => true)
+      end
+      it 'is not sorted' do
+        @cli.followings_following('sferik')
+        expect($stdout.string.chomp).to eq 'pengwynn  sferik'
+      end
+    end
+    context 'with two users passed' do
+      before do
+        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'pengwynn'}).to_return(:body => fixture('friends_ids.json'))
+        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
+      end
+      it 'requests the correct resource' do
+        @cli.followings_following('sferik', 'pengwynn')
+        expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'pengwynn'})).to have_been_made
+        expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
+        expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'})).to have_been_made
+      end
+      context '--id' do
+        before do
+          @cli.options = @cli.options.merge('id' => true)
+          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '14100886'}).to_return(:body => fixture('friends_ids.json'))
+          stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'))
+        end
+        it 'requests the correct resource' do
+          @cli.followings_following('7505382', '14100886')
+          expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '14100886'})).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
+      end
+    end
+  end
+
+  describe '#followers' do
+    before do
+      stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'))
+      stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
+      stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('users.json'))
+    end
+    it 'requests the correct resource' do
+      @cli.followers
+      expect(a_get('/1.1/account/verify_credentials.json')).to have_been_made
+      expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
+      expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'})).to have_been_made
+    end
+    it 'has the correct output' do
+      @cli.followers
+      expect($stdout.string.chomp).to eq 'pengwynn  sferik'
+    end
+    context '--csv' do
+      before do
+        @cli.options = @cli.options.merge('csv' => true)
+      end
+      it 'outputs in CSV format' do
+        @cli.followers
+        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
+14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland,false,false,"Christian, husband, father, GitHubber, Co-host of @thechangelog, Co-author of Sass, Compass, #CSS book  http://wynn.fm/sass-meap",@akosmasoftware Sass book! @hcatlin @nex3 are the brains behind Sass. :-),"Denton, TX",http://wynnnetherland.com
+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.followers
+        expect($stdout.string).to eq <<-eos
+ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
+14100886  Mar  8  2008  Jul  7 12:33       6940        192     358       3427...
+ 7505382  Jul 16  2007  Jul  8 10:29       7890       3755     118        212...
+        eos
+      end
+    end
+    context '--reverse' do
+      before do
+        @cli.options = @cli.options.merge('reverse' => true)
+      end
+      it 'reverses the order of the sort' do
         @cli.followers
+        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
+      end
+    end
+    context '--sort=favorites' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'favorites')
+      end
+      it 'sorts by the number of favorites' do
+        @cli.followers
+        expect($stdout.string.chomp).to eq 'pengwynn  sferik'
+      end
+    end
+    context '--sort=followers' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'followers')
+      end
+      it 'sorts by the number of followers' do
+        @cli.followers
+        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
+      end
+    end
+    context '--sort=friends' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'friends')
+      end
+      it 'sorts by the number of friends' do
+        @cli.followers
+        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
+      end
+    end
+    context '--sort=listed' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'listed')
+      end
+      it 'sorts by the number of list memberships' do
+        @cli.followers
+        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
+      end
+    end
+    context '--sort=since' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'since')
+      end
+      it 'sorts by the time when Twitter acount was created' do
+        @cli.followers
+        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
+      end
+    end
+    context '--sort=tweets' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'tweets')
+      end
+      it 'sorts by the number of Tweets' do
+        @cli.followers
+        expect($stdout.string.chomp).to eq 'pengwynn  sferik'
+      end
+    end
+    context '--sort=tweeted' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'tweeted')
+      end
+      it 'sorts by the time of the last Tweet' do
+        @cli.followers
+        expect($stdout.string.chomp).to eq 'pengwynn  sferik'
+      end
+    end
+    context '--unsorted' do
+      before do
+        @cli.options = @cli.options.merge('unsorted' => true)
+      end
+      it 'is not sorted' do
+        @cli.followers
+        expect($stdout.string.chomp).to eq 'pengwynn  sferik'
+      end
+    end
+    context 'with a user passed' do
+      before do
+        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
+        stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '213747670,428004849'}).to_return(:body => fixture('users.json'))
+      end
+      it 'requests the correct resource' do
+        @cli.followers('sferik')
+        expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
+        expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'})).to have_been_made
+      end
+      context '--id' do
+        before do
+          @cli.options = @cli.options.merge('id' => true)
+          stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'))
+        end
+        it 'requests the correct resource' do
+          @cli.followers('7505382')
+          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
+      end
+    end
+  end
+
+  describe '#friends' do
+    before do
+      stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'))
+      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
+      stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
+      stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('users.json'))
+    end
+    it 'requests the correct resource' do
+      @cli.friends
+      expect(a_get('/1.1/account/verify_credentials.json')).to have_been_made
+      expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
+      expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
+      expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'})).to have_been_made
+    end
+    it 'has the correct output' do
+      @cli.friends
+      expect($stdout.string.chomp).to eq 'pengwynn  sferik'
+    end
+    context '--csv' do
+      before do
+        @cli.options = @cli.options.merge('csv' => true)
+      end
+      it 'outputs in CSV format' do
+        @cli.friends
+        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
+14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland,false,false,"Christian, husband, father, GitHubber, Co-host of @thechangelog, Co-author of Sass, Compass, #CSS book  http://wynn.fm/sass-meap",@akosmasoftware Sass book! @hcatlin @nex3 are the brains behind Sass. :-),"Denton, TX",http://wynnnetherland.com
+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.friends
+        expect($stdout.string).to eq <<-eos
+ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
+14100886  Mar  8  2008  Jul  7 12:33       6940        192     358       3427...
+ 7505382  Jul 16  2007  Jul  8 10:29       7890       3755     118        212...
+        eos
+      end
+    end
+    context '--reverse' do
+      before do
+        @cli.options = @cli.options.merge('reverse' => true)
+      end
+      it 'reverses the order of the sort' do
+        @cli.friends
+        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
+      end
+    end
+    context '--sort=favorites' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'favorites')
+      end
+      it 'sorts by the number of favorites' do
+        @cli.friends
+        expect($stdout.string.chomp).to eq 'pengwynn  sferik'
+      end
+    end
+    context '--sort=followers' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'followers')
+      end
+      it 'sorts by the number of followers' do
+        @cli.friends
+        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
+      end
+    end
+    context '--sort=friends' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'friends')
+      end
+      it 'sorts by the number of friends' do
+        @cli.friends
+        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
+      end
+    end
+    context '--sort=listed' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'listed')
+      end
+      it 'sorts by the number of list memberships' do
+        @cli.friends
+        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
+      end
+    end
+    context '--sort=since' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'since')
+      end
+      it 'sorts by the time when Twitter acount was created' do
+        @cli.friends
+        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
+      end
+    end
+    context '--sort=tweets' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'tweets')
+      end
+      it 'sorts by the number of Tweets' do
+        @cli.friends
+        expect($stdout.string.chomp).to eq 'pengwynn  sferik'
+      end
+    end
+    context '--sort=tweeted' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'tweeted')
+      end
+      it 'sorts by the time of the last Tweet' do
+        @cli.friends
+        expect($stdout.string.chomp).to eq 'pengwynn  sferik'
+      end
+    end
+    context '--unsorted' do
+      before do
+        @cli.options = @cli.options.merge('unsorted' => true)
+      end
+      it 'is not sorted' do
+        @cli.friends
+        expect($stdout.string.chomp).to eq 'pengwynn  sferik'
+      end
+    end
+    context 'with a user passed' do
+      before do
+        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
+        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
+      end
+      it 'requests the correct resource' do
+        @cli.friends('sferik')
+        expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
+        expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
+        expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'})).to have_been_made
+      end
+      context '--id' do
+        before do
+          @cli.options = @cli.options.merge('id' => true)
+          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'))
+          stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'))
+        end
+        it 'requests the correct resource' do
+          @cli.friends('7505382')
+          expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'})).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
+      end
+    end
+  end
+
+  describe '#groupies' do
+    before do
+      stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'))
+      stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('followers_ids.json'))
+      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
+      stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '213747670,428004849'}).to_return(:body => fixture('users.json'))
+    end
+    it 'requests the correct resource' do
+      @cli.groupies
+      expect(a_get('/1.1/account/verify_credentials.json')).to have_been_made
+      expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
+      expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
+      expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '213747670,428004849'})).to have_been_made
+    end
+    it 'has the correct output' do
+      @cli.groupies
+      expect($stdout.string.chomp).to eq 'pengwynn  sferik'
+    end
+    context '--csv' do
+      before do
+        @cli.options = @cli.options.merge('csv' => true)
+      end
+      it 'outputs in CSV format' do
+        @cli.groupies
+        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
+14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland,false,false,"Christian, husband, father, GitHubber, Co-host of @thechangelog, Co-author of Sass, Compass, #CSS book  http://wynn.fm/sass-meap",@akosmasoftware Sass book! @hcatlin @nex3 are the brains behind Sass. :-),"Denton, TX",http://wynnnetherland.com
+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.groupies
+        expect($stdout.string).to eq <<-eos
+ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
+14100886  Mar  8  2008  Jul  7 12:33       6940        192     358       3427...
+ 7505382  Jul 16  2007  Jul  8 10:29       7890       3755     118        212...
+        eos
+      end
+    end
+    context '--reverse' do
+      before do
+        @cli.options = @cli.options.merge('reverse' => true)
+      end
+      it 'reverses the order of the sort' do
+        @cli.groupies
+        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
+      end
+    end
+    context '--sort=favorites' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'favorites')
+      end
+      it 'sorts by the number of favorites' do
+        @cli.groupies
+        expect($stdout.string.chomp).to eq 'pengwynn  sferik'
+      end
+    end
+    context '--sort=followers' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'followers')
+      end
+      it 'sorts by the number of followers' do
+        @cli.groupies
+        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
+      end
+    end
+    context '--sort=friends' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'friends')
+      end
+      it 'sorts by the number of friends' do
+        @cli.groupies
+        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
+      end
+    end
+    context '--sort=listed' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'listed')
+      end
+      it 'sorts by the number of list memberships' do
+        @cli.groupies
+        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
+      end
+    end
+    context '--sort=since' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'since')
+      end
+      it 'sorts by the time when Twitter acount was created' do
+        @cli.groupies
+        expect($stdout.string.chomp).to eq 'sferik    pengwynn'
+      end
+    end
+    context '--sort=tweets' do
+      before do
+        @cli.options = @cli.options.merge('sort' => 'tweets')
+      end
+      it 'sorts by the number of Tweets' do
+        @cli.groupies
         expect($stdout.string.chomp).to eq 'pengwynn  sferik'
       end
     end
@@ -1411,7 +1710,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('sort' => 'tweeted')
       end
       it 'sorts by the time of the last Tweet' do
-        @cli.followers
+        @cli.groupies
         expect($stdout.string.chomp).to eq 'pengwynn  sferik'
       end
     end
@@ -1420,50 +1719,52 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('unsorted' => true)
       end
       it 'is not sorted' do
-        @cli.followers
+        @cli.groupies
         expect($stdout.string.chomp).to eq 'pengwynn  sferik'
       end
     end
     context 'with a user passed' do
       before do
-        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-        stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '213747670,428004849'}).to_return(:body => fixture('users.json'))
+        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('followers_ids.json'))
+        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
       end
       it 'requests the correct resource' do
-        @cli.followers('sferik')
+        @cli.groupies('sferik')
         expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
-        expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'})).to have_been_made
+        expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
+        expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '213747670,428004849'})).to have_been_made
       end
       context '--id' do
         before do
           @cli.options = @cli.options.merge('id' => true)
-          stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'))
+          stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('followers_ids.json'))
+          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'))
         end
         it 'requests the correct resource' do
-          @cli.followers('7505382')
+          @cli.groupies('7505382')
           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
+          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 => '213747670,428004849'})).to have_been_made
         end
       end
     end
   end
 
-  describe '#friends' do
+  describe '#intersection' do
     before do
-      stub_get('/1.1/account/verify_credentials.json').to_return(:body => fixture('sferik.json'))
+      @cli.options = @cli.options.merge('type' => 'followings')
+      stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'testcli'}).to_return(:body => fixture('friends_ids.json'))
       stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-      stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
       stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'}).to_return(:body => fixture('users.json'))
     end
     it 'requests the correct resource' do
-      @cli.friends
-      expect(a_get('/1.1/account/verify_credentials.json')).to have_been_made
+      @cli.intersection('sferik')
+      expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'testcli'})).to have_been_made
       expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
-      expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
       expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'})).to have_been_made
     end
     it 'has the correct output' do
-      @cli.friends
+      @cli.intersection('sferik')
       expect($stdout.string.chomp).to eq 'pengwynn  sferik'
     end
     context '--csv' do
@@ -1471,7 +1772,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('csv' => true)
       end
       it 'outputs in CSV format' do
-        @cli.friends
+        @cli.intersection('sferik')
         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
 14100886,2008-03-08 16:34:22 +0000,2012-07-07 20:33:19 +0000,6940,192,358,3427,5457,pengwynn,Wynn Netherland,false,false,"Christian, husband, father, GitHubber, Co-host of @thechangelog, Co-author of Sass, Compass, #CSS book  http://wynn.fm/sass-meap",@akosmasoftware Sass book! @hcatlin @nex3 are the brains behind Sass. :-),"Denton, TX",http://wynnnetherland.com
@@ -1484,7 +1785,7 @@ ID,Since,Last tweeted at,Tweets,Favorites,Listed,Following,Followers,Screen name
         @cli.options = @cli.options.merge('long' => true)
       end
       it 'outputs in long format' do
-        @cli.friends
+        @cli.intersection('sferik')
         expect($stdout.string).to eq <<-eos
 ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
 14100886  Mar  8  2008  Jul  7 12:33       6940        192     358       3427...
@@ -1497,7 +1798,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('reverse' => true)
       end
       it 'reverses the order of the sort' do
-        @cli.friends
+        @cli.intersection('sferik')
         expect($stdout.string.chomp).to eq 'sferik    pengwynn'
       end
     end
@@ -1506,7 +1807,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('sort' => 'favorites')
       end
       it 'sorts by the number of favorites' do
-        @cli.friends
+        @cli.intersection('sferik')
         expect($stdout.string.chomp).to eq 'pengwynn  sferik'
       end
     end
@@ -1515,7 +1816,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('sort' => 'followers')
       end
       it 'sorts by the number of followers' do
-        @cli.friends
+        @cli.intersection('sferik')
         expect($stdout.string.chomp).to eq 'sferik    pengwynn'
       end
     end
@@ -1524,7 +1825,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('sort' => 'friends')
       end
       it 'sorts by the number of friends' do
-        @cli.friends
+        @cli.intersection('sferik')
         expect($stdout.string.chomp).to eq 'sferik    pengwynn'
       end
     end
@@ -1533,7 +1834,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('sort' => 'listed')
       end
       it 'sorts by the number of list memberships' do
-        @cli.friends
+        @cli.intersection('sferik')
         expect($stdout.string.chomp).to eq 'sferik    pengwynn'
       end
     end
@@ -1542,7 +1843,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('sort' => 'since')
       end
       it 'sorts by the time when Twitter acount was created' do
-        @cli.friends
+        @cli.intersection('sferik')
         expect($stdout.string.chomp).to eq 'sferik    pengwynn'
       end
     end
@@ -1551,7 +1852,7 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('sort' => 'tweets')
       end
       it 'sorts by the number of Tweets' do
-        @cli.friends
+        @cli.intersection('sferik')
         expect($stdout.string.chomp).to eq 'pengwynn  sferik'
       end
     end
@@ -1560,7 +1861,25 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('sort' => 'tweeted')
       end
       it 'sorts by the time of the last Tweet' do
-        @cli.friends
+        @cli.intersection('sferik')
+        expect($stdout.string.chomp).to eq 'pengwynn  sferik'
+      end
+    end
+    context '--type=followers' do
+      before do
+        @cli.options = @cli.options.merge('type' => 'followers')
+        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'testcli'}).to_return(:body => fixture('followers_ids.json'))
+        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('followers_ids.json'))
+        stub_post('/1.1/users/lookup.json').with(:body => {:user_id => '213747670,428004849'}).to_return(:body => fixture('users.json'))
+      end
+      it 'requests the correct resource' do
+        @cli.intersection('sferik')
+        expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'testcli'})).to have_been_made
+        expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
+        expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '213747670,428004849'})).to have_been_made
+      end
+      it 'has the correct output' do
+        @cli.intersection('sferik')
         expect($stdout.string.chomp).to eq 'pengwynn  sferik'
       end
     end
@@ -1569,31 +1888,31 @@ ID        Since         Last tweeted at  Tweets  Favorites  Listed  Following...
         @cli.options = @cli.options.merge('unsorted' => true)
       end
       it 'is not sorted' do
-        @cli.friends
+        @cli.intersection('sferik')
         expect($stdout.string.chomp).to eq 'pengwynn  sferik'
       end
     end
-    context 'with a user passed' do
+    context 'with two users passed' do
       before do
+        stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'pengwynn'}).to_return(:body => fixture('friends_ids.json'))
         stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
-        stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'}).to_return(:body => fixture('friends_ids.json'))
       end
       it 'requests the correct resource' do
-        @cli.friends('sferik')
+        @cli.intersection('sferik', 'pengwynn')
+        expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'pengwynn'})).to have_been_made
         expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
-        expect(a_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :screen_name => 'sferik'})).to have_been_made
         expect(a_post('/1.1/users/lookup.json').with(:body => {:user_id => '7505382'})).to have_been_made
       end
       context '--id' do
         before do
           @cli.options = @cli.options.merge('id' => true)
+          stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '14100886'}).to_return(:body => fixture('friends_ids.json'))
           stub_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'))
-          stub_get('/1.1/followers/ids.json').with(:query => {:cursor => '-1', :user_id => '7505382'}).to_return(:body => fixture('friends_ids.json'))
         end
         it 'requests the correct resource' do
-          @cli.friends('7505382')
+          @cli.intersection('7505382', '14100886')
+          expect(a_get('/1.1/friends/ids.json').with(:query => {:cursor => '-1', :user_id => '14100886'})).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_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
       end
@@ -2203,7 +2522,7 @@ ID                   Posted at     Screen name       Text
     end
     it 'has the correct output' do
       @cli.report_spam('sferik')
-      expect($stdout.string).to match /^@testcli reported 1 user/
+      expect($stdout.string).to match(/^@testcli reported 1 user/)
     end
     context '--id' do
       before do
@@ -2228,7 +2547,7 @@ ID                   Posted at     Screen name       Text
     end
     it 'has the correct output' do
       @cli.retweet('26755176471724032')
-      expect($stdout.string).to match /^@testcli retweeted 1 tweet.$/
+      expect($stdout.string).to match(/^@testcli retweeted 1 tweet.$/)
     end
   end
 
@@ -2476,6 +2795,223 @@ ID                  Posted at     Screen name      Text
     end
   end
 
+  describe '#retweets_of_me' do
+    before do
+      stub_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => '20', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+    end
+    context 'without arguments' do
+      it 'requests the correct resource' do
+        @cli.retweets_of_me
+        expect(a_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => '20', :include_entities => 'false'})).to have_been_made
+      end
+      it 'has the correct output' do
+        @cli.retweets_of_me
+        expect($stdout.string).to eq <<-eos
+   @mutgoff
+   Happy Birthday @imdane. Watch out for those @rally pranksters!
+
+   @ironicsans
+   If you like good real-life stories, check out @NarrativelyNY's just-launched 
+   site http://t.co/wiUL07jE (and also visit http://t.co/ZoyQxqWA)
+
+   @pat_shaughnessy
+   Something else to vote for: "New Rails workshops to bring more women into the 
+   Boston software scene" http://t.co/eNBuckHc /cc @bostonrb
+
+   @calebelston
+   Pushing the button to launch the site. http://t.co/qLoEn5jG
+
+   @calebelston
+   RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
+
+   @fivethirtyeight
+   The Weatherman is Not a Moron: http://t.co/ZwL5Gnq5. An excerpt from my book, 
+   THE SIGNAL AND THE NOISE (http://t.co/fNXj8vCE)
+
+   @codeforamerica
+   RT @randomhacks: Going to Code Across Austin II: Y'all Come Hack Now, Sat, 
+   Sep 8 http://t.co/Sk5BM7U3 We'll see y'all there! #rhok @codeforamerica 
+   @TheaClay
+
+   @fbjork
+   RT @jondot: Just published: "Pragmatic Concurrency With #Ruby" 
+   http://t.co/kGEykswZ /cc @JRuby @headius
+
+   @mbostock
+   If you are wondering how we computed the split bubbles: http://t.co/BcaqSs5u
+
+   @FakeDorsey
+   "Write drunk. Edit sober."—Ernest Hemingway
+
+   @al3x
+   RT @wcmaier: Better banking through better ops: build something new with us 
+   @Simplify (remote, PDX) http://t.co/8WgzKZH3
+
+   @calebelston
+   We just announced Mosaic, what we've been working on since the Yobongo 
+   acquisition. My personal post, http://t.co/ELOyIRZU @heymosaic
+
+   @BarackObama
+   Donate $10 or more --> get your favorite car magnet: http://t.co/NfRhl2s2 
+   #Obama2012
+
+   @JEG2
+   RT @tenderlove: If corporations are people, can we use them to drive in the 
+   carpool lane?
+
+   @eveningedition
+   LDN—Obama's nomination; Putin woos APEC; Bombs hit Damascus; Quakes shake 
+   China; Canada cuts Iran ties; weekend read: http://t.co/OFs6dVW4
+
+   @dhh
+   RT @ggreenwald: Democrats parade Osama bin Laden's corpse as their proudest 
+   achievement: why this goulish jingoism is so warped http://t.co/kood278s
+
+   @jasonfried
+   The story of Mars Curiosity's gears, made by a factory in Rockford, IL: 
+   http://t.co/MwCRsHQg
+
+   @sferik
+   @episod @twitterapi now https://t.co/I17jUTu2 and https://t.co/deDu4Hgw seem 
+   to be missing "1.1" from the URL.
+
+   @sferik
+   @episod @twitterapi Did you catch https://t.co/VHsQvZT0 as well?
+
+   @dwiskus
+   Gentlemen, you can't fight in here! This is the war room! 
+   http://t.co/kMxMYyqF
+
+        eos
+      end
+    end
+    context '--csv' do
+      before do
+        @cli.options = @cli.options.merge('csv' => true)
+      end
+      it 'outputs in CSV format' do
+        @cli.retweets_of_me
+        expect($stdout.string).to eq <<-eos
+ID,Posted at,Screen name,Text
+4611686018427387904,2012-09-07 16:35:24 +0000,mutgoff,Happy Birthday @imdane. Watch out for those @rally pranksters!
+244111183165157376,2012-09-07 16:33:36 +0000,ironicsans,"If you like good real-life stories, check out @NarrativelyNY's just-launched site http://t.co/wiUL07jE (and also visit http://t.co/ZoyQxqWA)"
+244110336414859264,2012-09-07 16:30:14 +0000,pat_shaughnessy,"Something else to vote for: ""New Rails workshops to bring more women into the Boston software scene"" http://t.co/eNBuckHc /cc @bostonrb"
+244109797308379136,2012-09-07 16:28:05 +0000,calebelston,Pushing the button to launch the site. http://t.co/qLoEn5jG
+244108728834592770,2012-09-07 16:23:50 +0000,calebelston,RT @olivercameron: Mosaic looks cool: http://t.co/A8013C9k
+244107890632294400,2012-09-07 16:20:31 +0000,fivethirtyeight,"The Weatherman is Not a Moron: http://t.co/ZwL5Gnq5. An excerpt from my book, THE SIGNAL AND THE NOISE (http://t.co/fNXj8vCE)"
+244107823733174272,2012-09-07 16:20:15 +0000,codeforamerica,"RT @randomhacks: Going to Code Across Austin II: Y'all Come Hack Now, Sat, Sep 8 http://t.co/Sk5BM7U3  We'll see y'all there! #rhok @codeforamerica @TheaClay"
+244107236262170624,2012-09-07 16:17:55 +0000,fbjork,"RT @jondot: Just published: ""Pragmatic Concurrency With #Ruby"" http://t.co/kGEykswZ   /cc @JRuby @headius"
+244106476048764928,2012-09-07 16:14:53 +0000,mbostock,If you are wondering how we computed the split bubbles: http://t.co/BcaqSs5u
+244105599351148544,2012-09-07 16:11:24 +0000,FakeDorsey,"""Write drunk. Edit sober.""—Ernest Hemingway"
+244104558433951744,2012-09-07 16:07:16 +0000,al3x,"RT @wcmaier: Better banking through better ops: build something new with us @Simplify (remote, PDX) http://t.co/8WgzKZH3"
+244104146997870594,2012-09-07 16:05:38 +0000,calebelston,"We just announced Mosaic, what we've been working on since the Yobongo acquisition. My personal post, http://t.co/ELOyIRZU @heymosaic"
+244103057175113729,2012-09-07 16:01:18 +0000,BarackObama,Donate $10 or more --> get your favorite car magnet: http://t.co/NfRhl2s2 #Obama2012
+244102834398851073,2012-09-07 16:00:25 +0000,JEG2,"RT @tenderlove: If corporations are people, can we use them to drive in the carpool lane?"
+244102741125890048,2012-09-07 16:00:03 +0000,eveningedition,LDN—Obama's nomination; Putin woos APEC; Bombs hit Damascus; Quakes shake China; Canada cuts Iran ties; weekend read: http://t.co/OFs6dVW4
+244102729860009984,2012-09-07 16:00:00 +0000,dhh,RT @ggreenwald: Democrats parade Osama bin Laden's corpse as their proudest achievement: why this goulish jingoism is so warped http://t.co/kood278s
+244102490646278146,2012-09-07 15:59:03 +0000,jasonfried,"The story of Mars Curiosity's gears, made by a factory in Rockford, IL: http://t.co/MwCRsHQg"
+244102209942458368,2012-09-07 15:57:56 +0000,sferik,"@episod @twitterapi now https://t.co/I17jUTu2 and https://t.co/deDu4Hgw seem to be missing ""1.1"" from the URL."
+244100411563339777,2012-09-07 15:50:47 +0000,sferik,@episod @twitterapi Did you catch https://t.co/VHsQvZT0 as well?
+244099460672679938,2012-09-07 15:47:01 +0000,dwiskus,"Gentlemen, you can't fight in here! This is the war room! http://t.co/kMxMYyqF"
+       eos
+      end
+    end
+    context '--decode-uris' do
+      before do
+        @cli.options = @cli.options.merge('decode_uris' => true)
+        stub_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => '20', :include_entities => 'true'}).to_return(:body => fixture('statuses.json'))
+      end
+      it 'requests the correct resource' do
+        @cli.retweets_of_me
+        expect(a_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => '20', :include_entities => 'true'})).to have_been_made
+      end
+    end
+    context '--long' do
+      before do
+        @cli.options = @cli.options.merge('long' => true)
+      end
+      it 'outputs in long format' do
+        @cli.retweets_of_me
+        expect($stdout.string).to eq <<-eos
+ID                   Posted at     Screen name       Text
+4611686018427387904  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. ...
+ 244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-li...
+ 244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote f...
+ 244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to la...
+ 244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosai...
+ 244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a ...
+ 244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going t...
+ 244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publish...
+ 244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how...
+ 244105599351148544  Sep  7 08:11  @FakeDorsey       "Write drunk. Edit sober...
+ 244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better bank...
+ 244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic...
+ 244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> g...
+ 244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpo...
+ 244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; ...
+ 244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrat...
+ 244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curios...
+ 244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now ...
+ 244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did ...
+ 244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't fig...
+        eos
+      end
+      context '--reverse' do
+        before do
+          @cli.options = @cli.options.merge('reverse' => true)
+        end
+        it 'reverses the order of the sort' do
+          @cli.retweets_of_me
+          expect($stdout.string).to eq <<-eos
+ID                   Posted at     Screen name       Text
+ 244099460672679938  Sep  7 07:47  @dwiskus          Gentlemen, you can't fig...
+ 244100411563339777  Sep  7 07:50  @sferik           @episod @twitterapi Did ...
+ 244102209942458368  Sep  7 07:57  @sferik           @episod @twitterapi now ...
+ 244102490646278146  Sep  7 07:59  @jasonfried       The story of Mars Curios...
+ 244102729860009984  Sep  7 08:00  @dhh              RT @ggreenwald: Democrat...
+ 244102741125890048  Sep  7 08:00  @eveningedition   LDN—Obama's nomination; ...
+ 244102834398851073  Sep  7 08:00  @JEG2             RT @tenderlove: If corpo...
+ 244103057175113729  Sep  7 08:01  @BarackObama      Donate $10 or more --> g...
+ 244104146997870594  Sep  7 08:05  @calebelston      We just announced Mosaic...
+ 244104558433951744  Sep  7 08:07  @al3x             RT @wcmaier: Better bank...
+ 244105599351148544  Sep  7 08:11  @FakeDorsey       "Write drunk. Edit sober...
+ 244106476048764928  Sep  7 08:14  @mbostock         If you are wondering how...
+ 244107236262170624  Sep  7 08:17  @fbjork           RT @jondot: Just publish...
+ 244107823733174272  Sep  7 08:20  @codeforamerica   RT @randomhacks: Going t...
+ 244107890632294400  Sep  7 08:20  @fivethirtyeight  The Weatherman is Not a ...
+ 244108728834592770  Sep  7 08:23  @calebelston      RT @olivercameron: Mosai...
+ 244109797308379136  Sep  7 08:28  @calebelston      Pushing the button to la...
+ 244110336414859264  Sep  7 08:30  @pat_shaughnessy  Something else to vote f...
+ 244111183165157376  Sep  7 08:33  @ironicsans       If you like good real-li...
+4611686018427387904  Sep  7 08:35  @mutgoff          Happy Birthday @imdane. ...
+          eos
+        end
+      end
+    end
+    context '--number' do
+      before do
+        stub_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => '1', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+        stub_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => '200', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+        (1..181).step(20) do |count|
+          stub_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => count, :max_id => '244099460672679937', :include_entities => 'false'}).to_return(:body => fixture('statuses.json'))
+        end
+      end
+      it 'limits the number of results to 1' do
+        @cli.options = @cli.options.merge('number' => 1)
+        @cli.retweets_of_me
+        expect(a_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => '1', :include_entities => 'false'})).to have_been_made
+      end
+      it 'limits the number of results to 201' do
+        @cli.options = @cli.options.merge('number' => 201)
+        @cli.retweets_of_me
+        expect(a_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => '200', :include_entities => 'false'})).to have_been_made
+        (1..181).step(20) do |count|
+          expect(a_get('/1.1/statuses/retweets_of_me.json').with(:query => {:count => count, :max_id => '244099460672679937', :include_entities => 'false'})).to have_been_made
+        end
+      end
+    end
+  end
+
   describe '#ruler' do
     it 'has the correct output' do
       @cli.ruler
@@ -3162,7 +3698,7 @@ WOEID     Parent ID  Type       Name           Country
       end
       it 'sorts by the country name' do
         @cli.trend_locations
-        expect($stdout.string.chomp).to match 'Worldwide      Soweto         San Francisco  United States'
+        expect($stdout.string.chomp).to eq 'Worldwide      Soweto         San Francisco  United States'
       end
     end
     context '--sort=parent' do
@@ -3216,7 +3752,7 @@ WOEID     Parent ID  Type       Name           Country
       it 'has the correct output' do
         stub_post('/1.1/friendships/destroy.json').with(:body => {:screen_name => 'sferik'}).to_return(:body => fixture('sferik.json'))
         @cli.unfollow('sferik')
-        expect($stdout.string).to match /^@testcli is no longer following 1 user\.$/
+        expect($stdout.string).to match(/^@testcli is no longer following 1 user\.$/)
       end
       context '--id' do
         before do