t 0.6.2 → 0.6.3

data/README.md

@@ -23,7 +23,7 @@ or send direct messages via the CLI.
 Once you have registered your application, you'll be given a consumer key and
 secret, which you can use to authorize your Twitter account.
 
-    t authorize --consumer-key YOUR_CONSUMER_KEY --consumer-secret YOUR_CONSUMER_SECRET
+    t authorize -c YOUR_CONSUMER_KEY -s YOUR_CONSUMER_SECRET
 
 This will open a new browser window where you can authenticate to Twitter and
 then enter the returned PIN back into the terminal.  Assuming that works,
@@ -43,7 +43,7 @@ Notice that one account is marked as the default. To change the default use the
 `set` subcommand, passing either just the username, if it's unambiguous, or the
 username and consumer key pair, like so:
 
-    t set default sferik thG9EfWoADtIr6NjbL9ON
+    t set default sferik UDfNTpOz5ZDG4a6w7dIWj
 
 Account information is stored in the YAML-formatted file `~/.trc`.
 
@@ -56,11 +56,15 @@ type `t help TASK` to get help for a specific command.
 ### <a name="update"></a>Update your status
     t update "I'm tweeting from the command line. Isn't that special?"
 
+Note: If your tweet includes characters such as `@` or `!`, make sure to wrap
+it in single quotes instead of double quotes, so those characters are not
+interpreted by your shell.
+
 ### <a name="stats"></a>Retrieve stats about users
-    t users -l sferik gem
+    t users -l @sferik @gem
 
 ### <a name="follow"></a>Follow users
-    t follow sferik gem
+    t follow @sferik @gem
 
 ### <a name="friends"></a>List your friends (ordered by number of followers)
     t friends -lf
@@ -78,19 +82,19 @@ type `t help TASK` to get help for a specific command.
     t list create presidents
 
 ### <a name="list-add"></a>Add users to a list
-    t list add presidents BarackObama Jasonfinn
+    t list add presidents @BarackObama @Jasonfinn
 
 ### <a name="following"></a>Create a list that contains today's date in the name
-    date "+following-%Y-%m-%d" | xargs t list create
+    t list create following-`date "+%Y-%m-%d"`
 
 ### Add everyone you're following to a list
     t followings | xargs t list add following-`date "+%Y-%m-%d"`
 
-### <a name="members"></a>Display members of a list
-    t members following-`date "+%Y-%m-%d"`
+### <a name="list-members"></a>Display members of a list
+    t list members following-`date "+%Y-%m-%d"`
 
 ### Count the number of Twitter employees
-    t members twitter team | wc -l
+    t list members twitter team | wc -l
 
 ### <a name="search-all"></a>Search Twitter for the 20 most recent Tweets that match a specified query
     t search all "query"
@@ -108,7 +112,29 @@ type `t help TASK` to get help for a specific command.
     t search timeline "query"
 
 ### <a name="search-user"></a>Search Tweets in a user's timeline that match a specified query
-    t search user sferik "query"
+    t search user @sferik "query"
+
+## <a name="terminology"></a>Relationship Terminology
+
+There is some ambiguity in the terminology used to describe relationships on
+Twitter. For example, some people use the term "friends" to mean the set of
+everyone you follow, while we use it to mean just the subset of people who
+follow you back (i.e., friendship is bidirectional). Here is the full table of
+terminology used throughout `t`:
+
+                               ___________________________________________________
+                              |                         |                         |
+                              |     YOU FOLLOW THEM     |  YOU DON'T FOLLOW THEM  |
+     _________________________|_________________________|_________________________|_________________________
+    |                         |                         |                         |                         |
+    |     THEY FOLLOW YOU     |         friends         |        disciples        |        followers        |
+    |_________________________|_________________________|_________________________|_________________________|
+    |                         |                         |
+    |  THEY DON'T FOLLOW YOU  |         leaders         |
+    |_________________________|_________________________|
+                              |                         |
+                              |       followings        |
+                              |_________________________|
 
 ## <a name="history"></a>History
 ![History](http://twitter.rubyforge.org/images/terminal_output.png "History")

data/lib/t/cli.rb

@@ -98,6 +98,7 @@ module T
     desc "block SCREEN_NAME [SCREEN_NAME...]", "Block users."
     def block(screen_name, *screen_names)
       screen_names.unshift(screen_name)
+      screen_names.map!(&:strip_ats)
       screen_names.threaded_each do |screen_name|
         screen_name.strip_ats
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
@@ -161,6 +162,32 @@ module T
     end
     map %w(sent_messages sms) => :direct_messages_sent
 
+    desc "disciples", "Returns the list of people who follow you but you don't follow back."
+    method_option :created, :aliases => "-c", :type => :boolean, :default => false, :desc => "Sort by the time when Twitter acount was created."
+    method_option :favorites, :aliases => "-v", :type => :boolean, :default => false, :desc => "Sort by number of favorites."
+    method_option :followers, :aliases => "-f", :type => :boolean, :default => false, :desc => "Sort by number of followers."
+    method_option :friends, :aliases => "-d", :type => :boolean, :default => false, :desc => "Sort by number of friends."
+    method_option :listed, :aliases => "-i", :type => :boolean, :default => false, :desc => "Sort by number of list memberships."
+    method_option :long, :aliases => "-l", :type => :boolean, :default => false, :desc => "List in long format."
+    method_option :reverse, :aliases => "-r", :type => :boolean, :default => false, :desc => "Reverse the order of the sort."
+    method_option :tweets, :aliases => "-t", :type => :boolean, :default => false, :desc => "Sort by number of Tweets."
+    method_option :unsorted, :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
+    def disciples
+      follower_ids = collect_with_cursor do |cursor|
+        client.follower_ids(:cursor => cursor)
+      end
+      following_ids = collect_with_cursor do |cursor|
+        client.friend_ids(:cursor => cursor)
+      end
+      disciple_ids = (follower_ids - following_ids)
+      users = disciple_ids.in_groups_of(MAX_USERS_PER_REQUEST, false).threaded_map do |disciple_id_group|
+        retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
+          client.users(disciple_id_group, :include_entities => false)
+        end
+      end.flatten
+      print_user_list(users)
+    end
+
     desc "dm SCREEN_NAME MESSAGE", "Sends that person a Direct Message."
     def dm(screen_name, message)
       screen_name = screen_name.strip_ats
@@ -200,6 +227,7 @@ module T
     desc "follow SCREEN_NAME [SCREEN_NAME...]", "Allows you to start following users."
     def follow(screen_name, *screen_names)
       screen_names.unshift(screen_name)
+      screen_names.map!(&:strip_ats)
       screen_names.threaded_each do |screen_name|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
           client.follow(screen_name, :include_entities => false)
@@ -329,7 +357,7 @@ module T
     method_option :location, :aliases => "-l", :type => :boolean, :default => false
     def reply(status_id, message)
       status_id = status_id.strip_commas
-      status = client.status(status_id, :include_entities => false, :include_my_retweet => false, :trim_user => true)
+      status = client.status(status_id, :include_entities => false, :include_my_retweet => false)
       opts = {:in_reply_to_status_id => status.id, :include_entities => false, :trim_user => true}
       opts.merge!(:lat => location.lat, :long => location.lng) if options['location']
       reply = client.update("@#{status.user.screen_name} #{message}", opts)
@@ -341,6 +369,7 @@ module T
     desc "report_spam SCREEN_NAME [SCREEN_NAME...]", "Report users for spam."
     def report_spam(screen_name, *screen_names)
       screen_names.unshift(screen_name)
+      screen_names.map!(&:strip_ats)
       screen_names.threaded_each do |screen_name|
         screen_name.strip_ats
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
@@ -441,6 +470,7 @@ module T
     desc "unfollow SCREEN_NAME [SCREEN_NAME...]", "Allows you to stop following users."
     def unfollow(screen_name, *screen_names)
       screen_names.unshift(screen_name)
+      screen_names.map!(&:strip_ats)
       screen_names.threaded_each do |screen_name|
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
           client.unfollow(screen_name, :include_entities => false)
@@ -476,6 +506,7 @@ module T
     method_option :unsorted, :aliases => "-u", :type => :boolean, :default => false, :desc => "Output is not sorted."
     def users(screen_name, *screen_names)
       screen_names.unshift(screen_name)
+      screen_names.map!(&:strip_ats)
       users = client.users(screen_names, :include_entities => false)
       print_user_list(users)
     end

data/lib/t/delete.rb

@@ -17,6 +17,7 @@ module T
     desc "block SCREEN_NAME [SCREEN_NAME...]", "Unblock users."
     def block(screen_name, *screen_names)
       screen_names.unshift(screen_name)
+      screen_names.map!(&:strip_ats)
       screen_names.threaded_each do |screen_name|
         screen_name.strip_ats
         retryable(:tries => 3, :on => Twitter::Error::ServerError, :sleep => 0) do
@@ -49,7 +50,7 @@ module T
       status_ids.each do |status_id|
         unless options['force']
           status = client.status(status_id, :include_entities => false, :include_my_retweet => false, :trim_user => true)
-          return unless yes? "Are you sure you want to delete the favorite of @#{status.user.screen_name}'s status: \"#{status.text}\"? [y/N]"
+          return unless yes? "Are you sure you want to remove @#{status.user.screen_name}'s status: \"#{status.text}\" from your favorites? [y/N]"
         end
         status = client.unfavorite(status_id, :include_entities => false)
         say "@#{@rcfile.default_profile[0]} unfavorited @#{status.user.screen_name}'s status: \"#{status.text}\""

data/lib/t/list.rb

@@ -65,6 +65,7 @@ module T
     def members(*args)
       list = args.pop
       owner = args.pop || @rcfile.default_profile[0]
+      owner = owner.strip_ats
       users = collect_with_cursor do |cursor|
         client.list_members(owner, list, :cursor => cursor, :include_entities => false, :skip_status => true)
       end
@@ -100,6 +101,7 @@ module T
     def timeline(*args)
       list = args.pop
       owner = args.pop || @rcfile.default_profile[0]
+      owner = owner.strip_ats
       per_page = options['number'] || DEFAULT_NUM_RESULTS
       statuses = client.list_timeline(owner, list, :include_entities => false, :per_page => per_page)
       print_status_list(statuses)

data/lib/t/printable.rb

@@ -67,10 +67,10 @@ module T
           print_table(array)
         else
           if STDOUT.tty?
-            print_in_columns(users.map(&:screen_name))
+            print_in_columns(users.map{|user| "@#{user.screen_name}"})
           else
             users.each do |user|
-              say user.screen_name
+              say "@#{user.screen_name}"
             end
           end
         end

data/lib/t/version.rb

@@ -13,7 +13,7 @@ module T
 
     # @return [Integer]
     def self.patch
-      2
+      3
     end
 
     # @return [String, NilClass]

data/spec/cli_spec.rb

@@ -254,6 +254,112 @@ ID             Posted at     Screen name  Text
     end
   end
 
+  describe "#disciples" do
+    before do
+      stub_get("/1/followers/ids.json").
+        with(:query => {:cursor => "-1"}).
+        to_return(:body => fixture("followers_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1/friends/ids.json").
+        with(:query => {:cursor => "-1"}).
+        to_return(:body => fixture("friends_ids.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_get("/1/users/lookup.json").
+        with(:query => {:user_id => "213747670,428004849", :include_entities => "false"}).
+        to_return(:body => fixture("users.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+    end
+    it "should request the correct resource" do
+      @cli.disciples
+      a_get("/1/followers/ids.json").
+        with(:query => {:cursor => "-1"}).
+        should have_been_made
+      a_get("/1/friends/ids.json").
+        with(:query => {:cursor => "-1"}).
+        should have_been_made
+      a_get("/1/users/lookup.json").
+        with(:query => {:user_id => "213747670,428004849", :include_entities => "false"}).
+        should have_been_made
+    end
+    it "should have the correct output" do
+      @cli.disciples
+      $stdout.string.chomp.rstrip.should == "@pengwynn  @sferik"
+    end
+    context "--created" do
+      before do
+        @cli.options = @cli.options.merge(:created => true)
+      end
+      it "should sort by the time when Twitter acount was created" do
+        @cli.disciples
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
+      end
+    end
+    context "--favorites" do
+      before do
+        @cli.options = @cli.options.merge(:favorites => true)
+      end
+      it "should sort by number of favorites" do
+        @cli.disciples
+        $stdout.string.chomp.rstrip.should == "@pengwynn  @sferik"
+      end
+    end
+    context "--followers" do
+      before do
+        @cli.options = @cli.options.merge(:followers => true)
+      end
+      it "should sort by number of followers" do
+        @cli.disciples
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
+      end
+    end
+    context "--friends" do
+      before do
+        @cli.options = @cli.options.merge(:friends => true)
+      end
+      it "should sort by number of friends" do
+        @cli.disciples
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
+      end
+    end
+    context "--listed" do
+      before do
+        @cli.options = @cli.options.merge(:listed => true)
+      end
+      it "should sort by number of list memberships" do
+        @cli.disciples
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
+      end
+    end
+    context "--long" do
+      before do
+        @cli.options = @cli.options.merge(:long => true)
+      end
+      it "should list in long format" do
+        @cli.disciples
+        $stdout.string.should == <<-eos
+ID          Since         Tweets  Favorites  Listed  Following  Followers  Screen name  Name
+14,100,886  Mar  8  2008  3,913   32         185     1,871      2,767      @pengwynn    Wynn Netherland
+7,505,382   Jul 16  2007  2,962   727        29      88         898        @sferik      Erik Michaels-Ober
+        eos
+      end
+    end
+    context "--reverse" do
+      before do
+        @cli.options = @cli.options.merge(:reverse => true)
+      end
+      it "should reverse the order of the sort" do
+        @cli.disciples
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
+      end
+    end
+    context "--tweets" do
+      before do
+        @cli.options = @cli.options.merge(:tweets => true)
+      end
+      it "should sort by number of Tweets" do
+        @cli.disciples
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
+      end
+    end
+  end
+
   describe "#dm" do
     before do
       @cli.options = @cli.options.merge(:profile => fixture_path + "/.trc")
@@ -459,7 +565,7 @@ ID                       Posted at     Screen name    Text
     end
     it "should have the correct output" do
       @cli.followings
-      $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
+      $stdout.string.chomp.rstrip.should == "@pengwynn  @sferik"
     end
     context "--created" do
       before do
@@ -467,7 +573,7 @@ ID                       Posted at     Screen name    Text
       end
       it "should sort by the time when Twitter acount was created" do
         @cli.followings
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--favorites" do
@@ -476,7 +582,7 @@ ID                       Posted at     Screen name    Text
       end
       it "should sort by number of favorites" do
         @cli.followings
-        $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
+        $stdout.string.chomp.rstrip.should == "@pengwynn  @sferik"
       end
     end
     context "--followers" do
@@ -485,7 +591,7 @@ ID                       Posted at     Screen name    Text
       end
       it "should sort by number of followers" do
         @cli.followings
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--friends" do
@@ -494,7 +600,7 @@ ID                       Posted at     Screen name    Text
       end
       it "should sort by number of friends" do
         @cli.followings
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--listed" do
@@ -503,7 +609,7 @@ ID                       Posted at     Screen name    Text
       end
       it "should sort by number of list memberships" do
         @cli.followings
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--long" do
@@ -525,7 +631,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should reverse the order of the sort" do
         @cli.followings
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--tweets" do
@@ -534,7 +640,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of Tweets" do
         @cli.followings
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
   end
@@ -559,7 +665,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
     end
     it "should have the correct output" do
       @cli.followers
-      $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
+      $stdout.string.chomp.rstrip.should == "@pengwynn  @sferik"
     end
     context "--created" do
       before do
@@ -567,7 +673,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by the time when Twitter acount was created" do
         @cli.followers
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--favorites" do
@@ -576,7 +682,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of favorites" do
         @cli.followers
-        $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
+        $stdout.string.chomp.rstrip.should == "@pengwynn  @sferik"
       end
     end
     context "--followers" do
@@ -585,7 +691,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of followers" do
         @cli.followers
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--friends" do
@@ -594,7 +700,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of friends" do
         @cli.followers
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--listed" do
@@ -603,7 +709,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of list memberships" do
         @cli.followers
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--long" do
@@ -625,7 +731,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should reverse the order of the sort" do
         @cli.followers
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--tweets" do
@@ -634,7 +740,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of Tweets" do
         @cli.followers
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
   end
@@ -665,7 +771,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
     end
     it "should have the correct output" do
       @cli.friends
-      $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
+      $stdout.string.chomp.rstrip.should == "@pengwynn  @sferik"
     end
     context "--created" do
       before do
@@ -673,7 +779,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by the time when Twitter acount was created" do
         @cli.friends
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--favorites" do
@@ -682,7 +788,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of favorites" do
         @cli.friends
-        $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
+        $stdout.string.chomp.rstrip.should == "@pengwynn  @sferik"
       end
     end
     context "--followers" do
@@ -691,7 +797,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of followers" do
         @cli.friends
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--friends" do
@@ -700,7 +806,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of friends" do
         @cli.friends
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--listed" do
@@ -709,7 +815,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of list memberships" do
         @cli.friends
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--long" do
@@ -731,7 +837,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should reverse the order of the sort" do
         @cli.friends
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--tweets" do
@@ -740,7 +846,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of Tweets" do
         @cli.friends
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
   end
@@ -771,7 +877,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
     end
     it "should have the correct output" do
       @cli.leaders
-      $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
+      $stdout.string.chomp.rstrip.should == "@pengwynn  @sferik"
     end
     context "--created" do
       before do
@@ -779,7 +885,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by the time when Twitter acount was created" do
         @cli.leaders
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--favorites" do
@@ -788,7 +894,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of favorites" do
         @cli.leaders
-        $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
+        $stdout.string.chomp.rstrip.should == "@pengwynn  @sferik"
       end
     end
     context "--followers" do
@@ -797,7 +903,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of followers" do
         @cli.leaders
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--friends" do
@@ -806,7 +912,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of friends" do
         @cli.leaders
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--listed" do
@@ -815,7 +921,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of list memberships" do
         @cli.leaders
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--long" do
@@ -837,7 +943,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should reverse the order of the sort" do
         @cli.leaders
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--tweets" do
@@ -846,7 +952,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of Tweets" do
         @cli.leaders
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
   end
@@ -971,7 +1077,7 @@ ID                       Posted at     Screen name    Text
     before do
       @cli.options = @cli.options.merge(:profile => fixture_path + "/.trc", :location => true)
       stub_get("/1/statuses/show/55709764298092545.json").
-        with(:query => {:include_entities => "false", :include_my_retweet => "false", :trim_user => "true"}).
+        with(:query => {:include_entities => "false", :include_my_retweet => "false"}).
         to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       stub_post("/1/statuses/update.json").
         with(:body => {:in_reply_to_status_id => "55709764298092545", :status => "@sferik Testing", :lat => "37.76969909668", :long => "-122.39330291748", :include_entities => "false", :trim_user => "true"}).
@@ -984,7 +1090,7 @@ ID                       Posted at     Screen name    Text
     it "should request the correct resource" do
       @cli.reply("55709764298092545", "Testing")
       a_get("/1/statuses/show/55709764298092545.json").
-        with(:query => {:include_entities => "false", :include_my_retweet => "false", :trim_user => "true"}).
+        with(:query => {:include_entities => "false", :include_my_retweet => "false"}).
         should have_been_made
       a_post("/1/statuses/update.json").
         with(:body => {:in_reply_to_status_id => "55709764298092545", :status => "@sferik Testing", :lat => "37.76969909668", :long => "-122.39330291748", :include_entities => "false", :trim_user => "true"}).
@@ -1217,7 +1323,7 @@ URL          https://twitter.com/sferik/status/55709764298092545
     end
     it "should have the correct output" do
       @cli.suggest
-      $stdout.string.chomp.rstrip.should == "antpires     jtrupiano    maccman      mlroach      stuntmann82"
+      $stdout.string.chomp.rstrip.should == "@antpires     @jtrupiano    @maccman      @mlroach      @stuntmann82"
     end
     context "--created" do
       before do
@@ -1225,7 +1331,7 @@ URL          https://twitter.com/sferik/status/55709764298092545
       end
       it "should sort by the time when Twitter acount was created" do
         @cli.suggest
-        $stdout.string.chomp.rstrip.should == "maccman      mlroach      jtrupiano    stuntmann82  antpires"
+        $stdout.string.chomp.rstrip.should == "@maccman      @mlroach      @jtrupiano    @stuntmann82  @antpires"
       end
     end
     context "--favorites" do
@@ -1234,7 +1340,7 @@ URL          https://twitter.com/sferik/status/55709764298092545
       end
       it "should sort by number of favorites" do
         @cli.suggest
-        $stdout.string.chomp.rstrip.should == "stuntmann82  antpires     maccman      mlroach      jtrupiano"
+        $stdout.string.chomp.rstrip.should == "@stuntmann82  @antpires     @maccman      @mlroach      @jtrupiano"
       end
     end
     context "--followers" do
@@ -1243,7 +1349,7 @@ URL          https://twitter.com/sferik/status/55709764298092545
       end
       it "should sort by number of followers" do
         @cli.suggest
-        $stdout.string.chomp.rstrip.should == "stuntmann82  antpires     mlroach      jtrupiano    maccman"
+        $stdout.string.chomp.rstrip.should == "@stuntmann82  @antpires     @mlroach      @jtrupiano    @maccman"
       end
     end
     context "--friends" do
@@ -1252,7 +1358,7 @@ URL          https://twitter.com/sferik/status/55709764298092545
       end
       it "should sort by number of friends" do
         @cli.suggest
-        $stdout.string.chomp.rstrip.should == "stuntmann82  antpires     mlroach      jtrupiano    maccman"
+        $stdout.string.chomp.rstrip.should == "@stuntmann82  @antpires     @mlroach      @jtrupiano    @maccman"
       end
     end
     context "--listed" do
@@ -1261,7 +1367,7 @@ URL          https://twitter.com/sferik/status/55709764298092545
       end
       it "should sort by number of list memberships" do
         @cli.suggest
-        $stdout.string.chomp.rstrip.should == "stuntmann82  antpires     mlroach      jtrupiano    maccman"
+        $stdout.string.chomp.rstrip.should == "@stuntmann82  @antpires     @mlroach      @jtrupiano    @maccman"
       end
     end
     context "--long" do
@@ -1300,7 +1406,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should reverse the order of the sort" do
         @cli.suggest
-        $stdout.string.chomp.rstrip.should == "stuntmann82  mlroach      maccman      jtrupiano    antpires"
+        $stdout.string.chomp.rstrip.should == "@stuntmann82  @mlroach      @maccman      @jtrupiano    @antpires"
       end
     end
     context "--tweets" do
@@ -1309,7 +1415,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of Tweets" do
         @cli.suggest
-        $stdout.string.chomp.rstrip.should == "stuntmann82  antpires     jtrupiano    maccman      mlroach"
+        $stdout.string.chomp.rstrip.should == "@stuntmann82  @antpires     @jtrupiano    @maccman      @mlroach"
       end
     end
   end
@@ -1541,7 +1647,7 @@ ID                       Posted at     Screen name    Text
     end
     it "should have the correct output" do
       @cli.users("sferik", "pengwynn")
-      $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
+      $stdout.string.chomp.rstrip.should == "@pengwynn  @sferik"
     end
     context "--created" do
       before do
@@ -1549,7 +1655,7 @@ ID                       Posted at     Screen name    Text
       end
       it "should sort by the time when Twitter acount was created" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--favorites" do
@@ -1558,7 +1664,7 @@ ID                       Posted at     Screen name    Text
       end
       it "should sort by number of favorites" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
+        $stdout.string.chomp.rstrip.should == "@pengwynn  @sferik"
       end
     end
     context "--followers" do
@@ -1567,7 +1673,7 @@ ID                       Posted at     Screen name    Text
       end
       it "should sort by number of followers" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--friends" do
@@ -1576,7 +1682,7 @@ ID                       Posted at     Screen name    Text
       end
       it "should sort by number of friends" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--listed" do
@@ -1585,7 +1691,7 @@ ID                       Posted at     Screen name    Text
       end
       it "should sort by number of list memberships" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--long" do
@@ -1607,7 +1713,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should reverse the order of the sort" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--tweets" do
@@ -1616,7 +1722,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of Tweets" do
         @cli.users("sferik", "pengwynn")
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
   end

data/spec/delete_spec.rb

@@ -126,7 +126,7 @@ describe T::Delete do
           to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
       end
       it "should request the correct resource" do
-        $stdout.should_receive(:print).with("Are you sure you want to delete the favorite of @sferik's status: \"The problem with your code is that it's doing exactly what you told it to do.\"? [y/N] ")
+        $stdout.should_receive(:print).with("Are you sure you want to remove @sferik's status: \"The problem with your code is that it's doing exactly what you told it to do.\" from your favorites? [y/N] ")
         $stdin.should_receive(:gets).and_return("yes")
         @delete.favorite("28439861609")
         a_get("/1/statuses/show/28439861609.json").
@@ -138,7 +138,7 @@ describe T::Delete do
       end
       context "yes" do
         it "should have the correct output" do
-          $stdout.should_receive(:print).with("Are you sure you want to delete the favorite of @sferik's status: \"The problem with your code is that it's doing exactly what you told it to do.\"? [y/N] ")
+          $stdout.should_receive(:print).with("Are you sure you want to remove @sferik's status: \"The problem with your code is that it's doing exactly what you told it to do.\" from your favorites? [y/N] ")
           $stdin.should_receive(:gets).and_return("yes")
           @delete.favorite("28439861609")
           $stdout.string.should =~ /^@testcli unfavorited @sferik's status: "The problem with your code is that it's doing exactly what you told it to do\."$/
@@ -146,7 +146,7 @@ describe T::Delete do
       end
       context "no" do
         it "should have the correct output" do
-          $stdout.should_receive(:print).with("Are you sure you want to delete the favorite of @sferik's status: \"The problem with your code is that it's doing exactly what you told it to do.\"? [y/N] ")
+          $stdout.should_receive(:print).with("Are you sure you want to remove @sferik's status: \"The problem with your code is that it's doing exactly what you told it to do.\" from your favorites? [y/N] ")
           $stdin.should_receive(:gets).and_return("no")
           @delete.favorite("28439861609")
           $stdout.string.chomp.should be_empty

data/spec/list_spec.rb

@@ -89,15 +89,15 @@ describe T::List do
     end
     it "should have the correct output" do
       @list.members("presidents")
-      $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
+      $stdout.string.chomp.rstrip.should == "@pengwynn  @sferik"
     end
     context "--created" do
       before do
         @list.options = @list.options.merge(:created => true)
       end
-      it "should sort by the time when Twitter acount was created" do
+      it "should sort by the time wshen Twitter account was created" do
         @list.members("presidents")
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--favorites" do
@@ -106,7 +106,7 @@ describe T::List do
       end
       it "should sort by number of favorites" do
         @list.members("presidents")
-        $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
+        $stdout.string.chomp.rstrip.should == "@pengwynn  @sferik"
       end
     end
     context "--followers" do
@@ -115,7 +115,7 @@ describe T::List do
       end
       it "should sort by number of followers" do
         @list.members("presidents")
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--friends" do
@@ -124,7 +124,7 @@ describe T::List do
       end
       it "should sort by number of friends" do
         @list.members("presidents")
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--listed" do
@@ -133,7 +133,7 @@ describe T::List do
       end
       it "should sort by number of list memberships" do
         @list.members("presidents")
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--long" do
@@ -155,7 +155,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should reverse the order of the sort" do
         @list.members("presidents")
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "--tweets" do
@@ -164,7 +164,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should sort by number of Tweets" do
         @list.members("presidents")
-        $stdout.string.chomp.rstrip.should == "sferik    pengwynn"
+        $stdout.string.chomp.rstrip.should == "@sferik    @pengwynn"
       end
     end
     context "with a screen name passed" do
@@ -181,7 +181,7 @@ ID          Since         Tweets  Favorites  Listed  Following  Followers  Scree
       end
       it "should have the correct output" do
         @list.members("presidents")
-        $stdout.string.chomp.rstrip.should == "pengwynn  sferik"
+        $stdout.string.chomp.rstrip.should == "@pengwynn  @sferik"
       end
     end
   end

data/t.gemspec

@@ -0,0 +1,37 @@
+# encoding: utf-8
+require File.expand_path("../lib/t/version", __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.add_dependency 'actionpack', ['>= 2.3.11', '< 4']
+  gem.add_dependency 'activesupport', ['>= 2.3.11', '< 4']
+  gem.add_dependency 'launchy', '~> 2.0'
+  gem.add_dependency 'geokit', '~> 1.6'
+  gem.add_dependency 'highline', '~> 1.6'
+  gem.add_dependency 'json', '~> 1.6'
+  gem.add_dependency 'oauth', '~> 0.4'
+  gem.add_dependency 'retryable', '~> 1.2'
+  gem.add_dependency 'thor', '~> 0.15.0.rc2'
+  gem.add_dependency 'twitter', ['~> 2.2', '>= 2.2.3']
+  gem.add_development_dependency 'pry'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'timecop'
+  gem.add_development_dependency 'webmock'
+  gem.author = "Erik Michaels-Ober"
+  gem.bindir = 'bin'
+  gem.description = %q{A command-line power tool for Twitter.}
+  gem.email = 'sferik@gmail.com'
+  gem.executables = %w(t)
+  gem.files = %w(LICENSE.md README.md Rakefile t.gemspec)
+  gem.files += Dir.glob("lib/**/*.rb")
+  gem.files += Dir.glob("bin/**/*")
+  gem.files += Dir.glob("spec/**/*")
+  gem.homepage = 'http://github.com/sferik/t'
+  gem.name = 't'
+  gem.require_paths = ['lib']
+  gem.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if gem.respond_to? :required_rubygems_version=
+  gem.summary = %q{CLI for Twitter}
+  gem.test_files = Dir.glob("spec/**/*")
+  gem.version = T::Version.to_s
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: t
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000 Z
+date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -295,6 +295,7 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
+- t.gemspec
 - bin/t
 - lib/t/cli.rb
 - lib/t/collectable.rb