t 1.7.2 → 2.0.0

data/spec/set_spec.rb

@@ -136,18 +136,18 @@ describe T::Set do
     end
   end
 
-  describe "#url" do
+  describe "#website" do
     before do
       @set.options = @set.options.merge("profile" => fixture_path + "/.trc")
       stub_post("/1.1/account/update_profile.json").with(:body => {:url => "https://github.com/sferik"}).to_return(:body => fixture("sferik.json"))
     end
     it "requests the correct resource" do
-      @set.url("https://github.com/sferik")
+      @set.website("https://github.com/sferik")
       expect(a_post("/1.1/account/update_profile.json").with(:body => {:url => "https://github.com/sferik"})).to have_been_made
     end
     it "has the correct output" do
-      @set.url("https://github.com/sferik")
-      expect($stdout.string.chomp).to eq "@testcli's URL has been updated."
+      @set.website("https://github.com/sferik")
+      expect($stdout.string.chomp).to eq "@testcli's website has been updated."
     end
   end
 

data/spec/stream_spec.rb

@@ -3,8 +3,8 @@ require 'helper'
 describe T::Stream do
   let(:t_class) {
     klass = Class.new
-    klass.stub(:options=).and_return
-    klass.stub(:options).and_return({})
+    allow(klass).to receive(:options=).and_return
+    allow(klass).to receive(:options).and_return({})
     klass
   }
 
@@ -14,14 +14,11 @@ describe T::Stream do
 
   before :each do
     T::RCFile.instance.path = fixture_path + "/.trc"
-
-    @tweetstream_client = stub('TweetStream::Client').as_null_object
-
+    @client = double('Twitter::Streaming::Client').as_null_object
     @stream = T::Stream.new
-    @stream.stub(:client) { @tweetstream_client }
-    @stream.stub(:say).and_return
-
-    STDOUT.stub(:tty?).and_return(true)
+    allow(@stream).to receive(:client) { @client }
+    allow(@stream).to receive(:say).and_return
+    allow(STDOUT).to receive(:tty?).and_return(true)
   end
 
 	describe "#all" do
@@ -29,21 +26,17 @@ describe T::Stream do
       before :each do
         @stream.options = @stream.options.merge("csv" => true)
       end
-
       it "outputs headings when the stream initializes" do
-        @tweetstream_client.stub(:on_timeline_status).and_return
-        @tweetstream_client.stub(:on_inited).and_yield
-
-        @stream.should_receive(:say).with("ID,Posted at,Screen name,Text\n")
+        allow(@client).to receive(:sample).and_return
+        allow(@client).to receive(:before_request).and_yield
+        expect(@stream).to receive(:say).with("ID,Posted at,Screen name,Text\n")
         @stream.all
       end
-
       it "outputs in CSV format" do
-        @tweetstream_client.stub(:on_inited).and_return
-        @tweetstream_client.stub(:on_timeline_status).
+        allow(@client).to receive(:before_request).and_return
+        allow(@client).to receive(:sample).
           and_yield(@status)
-
-        @stream.should_receive(:print_csv_tweet).with(any_args)
+        expect(@stream).to receive(:print_csv_tweet).with(any_args)
         @stream.all
       end
     end
@@ -54,61 +47,59 @@ describe T::Stream do
       end
 
       it "outputs headings when the stream initializes" do
-        @tweetstream_client.stub(:on_inited).and_yield
-        @tweetstream_client.stub(:on_timeline_status).and_return
-
-        @stream.should_receive(:print_table).with(any_args)
+        allow(@client).to receive(:before_request).and_yield
+        allow(@client).to receive(:sample).and_return
+        expect(@stream).to receive(:print_table).with(any_args)
         @stream.all
       end
 
       it "outputs in long text format" do
-        @tweetstream_client.stub(:on_inited).and_return
-        @tweetstream_client.stub(:on_timeline_status).
+        allow(@client).to receive(:before_request).and_return
+        allow(@client).to receive(:sample).
           and_yield(@status)
-
-        @stream.should_receive(:print_table).with(any_args)
+        expect(@stream).to receive(:print_table).with(any_args)
         @stream.all
       end
     end
 
     context "normal usage" do
       before :each do
-        @tweetstream_client.stub(:on_timeline_status).
+        allow(@client).to receive(:sample).
           and_yield(@status)
       end
 
       it "prints the tweet status" do
-        @stream.should_receive(:print_message)
+        expect(@stream).to receive(:print_message)
         @stream.all
       end
     end
 
-    it "invokes TweetStream::Client#sample" do
-      @tweetstream_client.should_receive(:sample)
+    it "invokes Twitter::Streaming::Client#sample" do
+      expect(@client).to receive(:sample)
       @stream.all
     end
   end
 
   describe "#matrix" do
     before :each do
-      @tweetstream_client.stub(:on_timeline_status).
+      allow(@client).to receive(:sample).
         and_yield(@status)
     end
 
     it "outputs the tweet status" do
-      @stream.should_receive(:say).with(any_args)
+      expect(@stream).to receive(:say).with(any_args)
       @stream.matrix
     end
 
-    it "invokes TweetStream::Client.sample" do
-      @tweetstream_client.should_receive(:sample)
+    it "invokes Twitter::Streaming::Client.sample" do
+      expect(@client).to receive(:sample)
       @stream.matrix
     end
   end
 
   describe "#search" do
     before :each do
-      @tweetstream_client.stub(:on_timeline_status).
+      allow(@client).to receive(:filter).with(:track => ["gem"]).
         and_yield(@status)
     end
 
@@ -118,10 +109,9 @@ describe T::Stream do
       end
 
       it "outputs in CSV format" do
-        @tweetstream_client.stub(:on_inited).and_return
-
-        @stream.should_receive(:print_csv_tweet).with(any_args)
-        @stream.search('t gem')
+        allow(@client).to receive(:before_request).and_return
+        expect(@stream).to receive(:print_csv_tweet).with(any_args)
+        @stream.search('gem')
       end
     end
 
@@ -131,48 +121,43 @@ describe T::Stream do
       end
 
       it "outputs in long text format" do
-        @tweetstream_client.stub(:on_inited).and_return
-        @tweetstream_client.stub(:on_timeline_status).
+        allow(@client).to receive(:before_request).and_return
+        allow(@client).to receive(:filter).with(:track => ["gem"]).
           and_yield(@status)
-
-        @stream.should_receive(:print_table).with(any_args)
-        @stream.search('t gem')
+        expect(@stream).to receive(:print_table).with(any_args)
+        @stream.search('gem')
       end
     end
 
     context "normal usage" do
       before :each do
-        @tweetstream_client.stub(:on_timeline_status).
+        allow(@client).to receive(:filter).with(:track => ["gem"]).
           and_yield(@status)
       end
-
       it "prints the tweet status" do
-        @stream.should_receive(:print_message)
-        @stream.search('t gem')
+        expect(@stream).to receive(:print_message)
+        @stream.search('gem')
       end
     end
 
     it "performs a REST search when the stream initializes" do
-      @tweetstream_client.stub(:on_timeline_status).and_return
-      @tweetstream_client.stub(:on_inited).and_yield
-
-      T::Search.stub(:new).and_return(t_class)
-      t_class.should_receive(:all).with('t OR gem').and_return
-
+      allow(@client).to receive(:filter).and_return
+      allow(@client).to receive(:before_request).and_yield
+      allow(T::Search).to receive(:new).and_return(t_class)
+      expect(t_class).to receive(:all).with('t OR gem').and_return
       @stream.search('t', 'gem')
     end
 
-    it "invokes TweetStream::Client#track" do
-      @tweetstream_client.stub(:on_timeline_status).and_return
-
-      @tweetstream_client.should_receive(:track).with(['t gem'])
-      @stream.search('t gem')
+    it "invokes Twitter::Streaming::Client#filter" do
+      allow(@client).to receive(:filter).and_return
+      expect(@client).to receive(:filter).with(:track => ['gem'])
+      @stream.search('gem')
     end
   end
 
   describe "#timeline" do
     before :each do
-      @tweetstream_client.stub(:on_timeline_status).
+      allow(@client).to receive(:user).
         and_yield(@status)
     end
 
@@ -182,9 +167,8 @@ describe T::Stream do
       end
 
       it "outputs in CSV format" do
-        @tweetstream_client.stub(:on_inited).and_return
-
-        @stream.should_receive(:print_csv_tweet).with(any_args)
+        allow(@client).to receive(:before_request).and_return
+        expect(@stream).to receive(:print_csv_tweet).with(any_args)
         @stream.timeline
       end
     end
@@ -195,48 +179,45 @@ describe T::Stream do
       end
 
       it "outputs in long text format" do
-        @tweetstream_client.stub(:on_inited).and_return
-        @tweetstream_client.stub(:on_timeline_status).
+        allow(@client).to receive(:before_request).and_return
+        allow(@client).to receive(:user).
           and_yield(@status)
-
-        @stream.should_receive(:print_table).with(any_args)
+        expect(@stream).to receive(:print_table).with(any_args)
         @stream.timeline
       end
     end
 
     context "normal usage" do
       before :each do
-        @tweetstream_client.stub(:on_timeline_status).
+        allow(@client).to receive(:user).
           and_yield(@status)
       end
 
       it "prints the tweet status" do
-        @stream.should_receive(:print_message)
+        expect(@stream).to receive(:print_message)
         @stream.timeline
       end
     end
 
     it "performs a REST search when the stream initializes" do
-      @tweetstream_client.stub(:on_timeline_status).and_return
-      @tweetstream_client.stub(:on_inited).and_yield
-
-      T::CLI.stub(:new).and_return(t_class)
-      t_class.should_receive(:timeline).and_return
+      allow(@client).to receive(:user).and_return
+      allow(@client).to receive(:before_request).and_yield
+      allow(T::CLI).to receive(:new).and_return(t_class)
+      expect(t_class).to receive(:timeline).and_return
 
       @stream.timeline
     end
 
-    it "invokes TweetStream::Client#userstream" do
-      @tweetstream_client.stub(:on_timeline_status).and_return
-
-      @tweetstream_client.should_receive(:userstream)
+    it "invokes Twitter::Streaming::Client#userstream" do
+      allow(@client).to receive(:user).and_return
+      expect(@client).to receive(:user)
       @stream.timeline
     end
   end
 
   describe "#users" do
     before :each do
-      @tweetstream_client.stub(:on_timeline_status).
+      allow(@client).to receive(:follow).
         and_yield(@status)
     end
 
@@ -246,17 +227,15 @@ describe T::Stream do
       end
 
       it "outputs headings when the stream initializes" do
-        @tweetstream_client.stub(:on_timeline_status).and_return
-        @tweetstream_client.stub(:on_inited).and_yield
-
-        @stream.should_receive(:say).with("ID,Posted at,Screen name,Text\n")
+        allow(@client).to receive(:follow).and_return
+        allow(@client).to receive(:before_request).and_yield
+        expect(@stream).to receive(:say).with("ID,Posted at,Screen name,Text\n")
         @stream.users('123')
       end
 
       it "outputs in CSV format" do
-        @tweetstream_client.stub(:on_inited).and_return
-
-        @stream.should_receive(:print_csv_tweet).with(any_args)
+        allow(@client).to receive(:before_request).and_return
+        expect(@stream).to receive(:print_csv_tweet).with(any_args)
         @stream.users('123')
       end
     end
@@ -267,39 +246,36 @@ describe T::Stream do
       end
 
       it "outputs headings when the stream initializes" do
-        @tweetstream_client.stub(:on_inited).and_yield
-        @tweetstream_client.stub(:on_timeline_status).and_return
-
-        @stream.should_receive(:print_table).with(any_args)
+        allow(@client).to receive(:before_request).and_yield
+        allow(@client).to receive(:follow).and_return
+        expect(@stream).to receive(:print_table).with(any_args)
         @stream.users('123')
       end
 
       it "outputs in long text format" do
-        @tweetstream_client.stub(:on_inited).and_return
-        @tweetstream_client.stub(:on_timeline_status).
+        allow(@client).to receive(:before_request).and_return
+        allow(@client).to receive(:follow).
           and_yield(@status)
-
-        @stream.should_receive(:print_table).with(any_args)
+        expect(@stream).to receive(:print_table).with(any_args)
         @stream.users('123')
       end
     end
 
     context "normal usage" do
       before :each do
-        @tweetstream_client.stub(:on_timeline_status).
+        allow(@client).to receive(:follow).
           and_yield(@status)
       end
 
       it "prints the tweet status" do
-        @stream.should_receive(:print_message)
+        expect(@stream).to receive(:print_message)
         @stream.users('123')
       end
     end
 
-    it "invokes TweetStream::Client#follow" do
-      @tweetstream_client.stub(:on_timeline_status).and_return
-
-      @tweetstream_client.should_receive(:follow).with([123, 456, 789])
+    it "invokes Twitter::Streaming::Client#follow" do
+      allow(@client).to receive(:follow).and_return
+      expect(@client).to receive(:follow).with([123, 456, 789])
       @stream.users('123', '456', '789')
     end
   end

data/t.gemspec

@@ -5,19 +5,17 @@ require 't/version'
 
 Gem::Specification.new do |spec|
   spec.add_dependency 'launchy', '~> 2.3'
-  spec.add_dependency 'fastercsv', '~> 1.5'
   spec.add_dependency 'geokit', '~> 1.6'
   spec.add_dependency 'htmlentities', '~> 4.3'
   spec.add_dependency 'oauth', '~> 0.4'
-  spec.add_dependency 'oj', '~> 2.0'
   spec.add_dependency 'retryable', '~> 1.2'
   spec.add_dependency 'thor', ['>= 0.18.1', '< 2']
-  spec.add_dependency 'tweetstream', '~> 2.3'
-  spec.add_dependency 'twitter', '~> 4.4'
+  spec.add_dependency 'twitter', '~> 5.0'
   spec.add_development_dependency 'bundler', '~> 1.0'
   spec.author = "Erik Michaels-Ober"
   spec.bindir = 'bin'
   spec.cert_chain = ['certs/sferik.pem']
+  spec.date = '2013-11-18'
   spec.description = %q{A command-line power tool for Twitter.}
   spec.email = 'sferik@gmail.com'
   spec.executables = %w(t)
@@ -29,7 +27,8 @@ Gem::Specification.new do |spec|
   spec.licenses = ['MIT']
   spec.name = 't'
   spec.require_paths = ['lib']
-  spec.required_rubygems_version = '>= 1.3.6'
+  spec.required_ruby_version = '>= 1.9.2'
+  spec.required_rubygems_version = '>= 1.3.5'
   spec.signing_key = File.expand_path("~/.gem/private_key.pem") if $0 =~ /gem\z/
   spec.summary = %q{CLI for Twitter}
   spec.test_files = Dir.glob("spec/**/*")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: t
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   U0xxV3ZRUnNCbHlwSGZoczZKSnVMbHlaUEdoVTNSL3YKU2YzbFZLcEJDV2dS
   cEdUdnk0NVhWcEIrNTl5MzNQSm1FdVExUFRFT1l2UXlhbzlVS01BQWFBTi83
   cVdRdGpsMApobHc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -54,22 +54,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: fastercsv
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: geokit
   requirement: !ruby/object:Gem::Requirement
@@ -118,22 +102,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: retryable
   requirement: !ruby/object:Gem::Requirement
@@ -172,22 +140,6 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: '2'
-- !ruby/object:Gem::Dependency
-  name: tweetstream
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
@@ -195,7 +147,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -203,7 +155,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -238,6 +190,7 @@ files:
 - lib/t/core_ext/kernel.rb
 - lib/t/core_ext/string.rb
 - lib/t/delete.rb
+- lib/t/editor.rb
 - lib/t/list.rb
 - lib/t/printable.rb
 - lib/t/rcfile.rb
@@ -250,12 +203,13 @@ files:
 - lib/t.rb
 - spec/cli_spec.rb
 - spec/delete_spec.rb
+- spec/editor_spec.rb
 - spec/fixtures/200_direct_messages.json
 - spec/fixtures/200_statuses.json
 - spec/fixtures/501_ids.json
 - spec/fixtures/501_users_list.json
 - spec/fixtures/access_token
-- spec/fixtures/activity_summary.json
+- spec/fixtures/bearer_token.json
 - spec/fixtures/checkip.html
 - spec/fixtures/direct_message.json
 - spec/fixtures/direct_messages.json
@@ -317,13 +271,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.3.5
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -333,12 +287,13 @@ summary: CLI for Twitter
 test_files:
 - spec/cli_spec.rb
 - spec/delete_spec.rb
+- spec/editor_spec.rb
 - spec/fixtures/200_direct_messages.json
 - spec/fixtures/200_statuses.json
 - spec/fixtures/501_ids.json
 - spec/fixtures/501_users_list.json
 - spec/fixtures/access_token
-- spec/fixtures/activity_summary.json
+- spec/fixtures/bearer_token.json
 - spec/fixtures/checkip.html
 - spec/fixtures/direct_message.json
 - spec/fixtures/direct_messages.json
@@ -388,4 +343,3 @@ test_files:
 - spec/set_spec.rb
 - spec/stream_spec.rb
 - spec/utils_spec.rb
-has_rdoc: