t 1.3.0 → 1.3.1

data/spec/set_spec.rb

@@ -24,154 +24,130 @@ describe T::Set do
     end
     it "should have the correct output" do
       @set.active("testcli", "abc123")
-      $stdout.string.chomp.should == "Active account has been updated to testcli."
+      expect($stdout.string.chomp).to eq "Active account has been updated to testcli."
     end
     it "should accept an account name without a consumer key" do
       @set.active("testcli")
-      $stdout.string.chomp.should == "Active account has been updated to testcli."
+      expect($stdout.string.chomp).to eq "Active account has been updated to testcli."
     end
     it "should be case insensitive" do
       @set.active("TestCLI", "abc123")
-      $stdout.string.chomp.should == "Active account has been updated to testcli."
+      expect($stdout.string.chomp).to eq "Active account has been updated to testcli."
     end
     it "should raise an error if username is ambiguous" do
-      lambda do
+      expect do
         @set.active("test", "abc123")
-      end.should raise_error(ArgumentError, /Username test is ambiguous/)
+      end.to raise_error(ArgumentError, /Username test is ambiguous/)
     end
     it "should raise an error if the username is not found" do
-      lambda do
+      expect do
         @set.active("clitest")
-      end.should raise_error(ArgumentError, /Username clitest is not found/)
+      end.to raise_error(ArgumentError, /Username clitest is not found/)
     end
   end
 
   describe "#bio" do
     before do
       @set.options = @set.options.merge("profile" => fixture_path + "/.trc")
-      stub_post("/1.1/account/update_profile.json").
-        with(:body => {:description => "Vagabond."}).
-        to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/account/update_profile.json").with(:body => {:description => "Vagabond."}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @set.bio("Vagabond.")
-      a_post("/1.1/account/update_profile.json").
-        with(:body => {:description => "Vagabond."}).
-        should have_been_made
+      expect(a_post("/1.1/account/update_profile.json").with(:body => {:description => "Vagabond."})).to have_been_made
     end
     it "should have the correct output" do
       @set.bio("Vagabond.")
-      $stdout.string.chomp.should == "@testcli's bio has been updated."
+      expect($stdout.string.chomp).to eq "@testcli's bio has been updated."
     end
   end
 
   describe "#language" do
     before do
       @set.options = @set.options.merge("profile" => fixture_path + "/.trc")
-      stub_post("/1.1/account/settings.json").
-        with(:body => {:lang => "en"}).
-        to_return(:body => fixture("settings.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/account/settings.json").with(:body => {:lang => "en"}).to_return(:body => fixture("settings.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @set.language("en")
-      a_post("/1.1/account/settings.json").
-        with(:body => {:lang => "en"}).
-        should have_been_made
+      expect(a_post("/1.1/account/settings.json").with(:body => {:lang => "en"})).to have_been_made
     end
     it "should have the correct output" do
       @set.language("en")
-      $stdout.string.chomp.should == "@testcli's language has been updated."
+      expect($stdout.string.chomp).to eq "@testcli's language has been updated."
     end
   end
 
   describe "#location" do
     before do
       @set.options = @set.options.merge("profile" => fixture_path + "/.trc")
-      stub_post("/1.1/account/update_profile.json").
-        with(:body => {:location => "San Francisco"}).
-        to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/account/update_profile.json").with(:body => {:location => "San Francisco"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @set.location("San Francisco")
-      a_post("/1.1/account/update_profile.json").
-        with(:body => {:location => "San Francisco"}).
-        should have_been_made
+      expect(a_post("/1.1/account/update_profile.json").with(:body => {:location => "San Francisco"})).to have_been_made
     end
     it "should have the correct output" do
       @set.location("San Francisco")
-      $stdout.string.chomp.should == "@testcli's location has been updated."
+      expect($stdout.string.chomp).to eq "@testcli's location has been updated."
     end
   end
 
   describe "#name" do
     before do
       @set.options = @set.options.merge("profile" => fixture_path + "/.trc")
-      stub_post("/1.1/account/update_profile.json").
-        with(:body => {:name => "Erik Michaels-Ober"}).
-        to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/account/update_profile.json").with(:body => {:name => "Erik Michaels-Ober"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @set.name("Erik Michaels-Ober")
-      a_post("/1.1/account/update_profile.json").
-        with(:body => {:name => "Erik Michaels-Ober"}).
-        should have_been_made
+      expect(a_post("/1.1/account/update_profile.json").with(:body => {:name => "Erik Michaels-Ober"})).to have_been_made
     end
     it "should have the correct output" do
       @set.name("Erik Michaels-Ober")
-      $stdout.string.chomp.should == "@testcli's name has been updated."
+      expect($stdout.string.chomp).to eq "@testcli's name has been updated."
     end
   end
 
   describe "#profile_background_image" do
     before do
       @set.options = @set.options.merge("profile" => fixture_path + "/.trc")
-      stub_post("/1.1/account/update_profile_background_image.json").
-        to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/account/update_profile_background_image.json").to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @set.profile_background_image(fixture_path + "/we_concept_bg2.png")
-      a_post("/1.1/account/update_profile_background_image.json").
-        should have_been_made
+      expect(a_post("/1.1/account/update_profile_background_image.json")).to have_been_made
     end
     it "should have the correct output" do
       @set.profile_background_image(fixture_path + "/we_concept_bg2.png")
-      $stdout.string.chomp.should == "@testcli's background image has been updated."
+      expect($stdout.string.chomp).to eq "@testcli's background image has been updated."
     end
   end
 
   describe "#profile_image" do
     before do
       @set.options = @set.options.merge("profile" => fixture_path + "/.trc")
-      stub_post("/1.1/account/update_profile_image.json").
-        to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/account/update_profile_image.json").to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @set.profile_image(fixture_path + "/me.jpg")
-      a_post("/1.1/account/update_profile_image.json").
-        should have_been_made
+      expect(a_post("/1.1/account/update_profile_image.json")).to have_been_made
     end
     it "should have the correct output" do
       @set.profile_image(fixture_path + "/me.jpg")
-      $stdout.string.chomp.should == "@testcli's image has been updated."
+      expect($stdout.string.chomp).to eq "@testcli's image has been updated."
     end
   end
 
   describe "#url" 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"), :headers => {:content_type => "application/json; charset=utf-8"})
+      stub_post("/1.1/account/update_profile.json").with(:body => {:url => "https://github.com/sferik"}).to_return(:body => fixture("sferik.json"), :headers => {:content_type => "application/json; charset=utf-8"})
     end
     it "should request the correct resource" do
       @set.url("https://github.com/sferik")
-      a_post("/1.1/account/update_profile.json").
-        with(:body => {:url => "https://github.com/sferik"}).
-        should have_been_made
+      expect(a_post("/1.1/account/update_profile.json").with(:body => {:url => "https://github.com/sferik"})).to have_been_made
     end
     it "should have the correct output" do
       @set.url("https://github.com/sferik")
-      $stdout.string.chomp.should == "@testcli's URL has been updated."
+      expect($stdout.string.chomp).to eq "@testcli's URL has been updated."
     end
   end
 

data/spec/stream_spec.rb

@@ -25,13 +25,13 @@ describe T::Stream do
   end
 
 
-	describe '#all' do
-    context '--csv' do
+	describe "#all" do
+    context "--csv" do
       before :each do
         @stream.options = @stream.options.merge("csv" => true)
       end
 
-      it 'outputs headings when the stream initializes' do
+      it "outputs headings when the stream initializes" do
         @tweetstream_client.stub(:on_timeline_status).and_return
         @tweetstream_client.stub(:on_inited).and_yield
 
@@ -49,12 +49,12 @@ describe T::Stream do
       end
     end
 
-    context '--long' do
+    context "--long" do
       before :each do
         @stream.options = @stream.options.merge("long" => true)
       end
 
-      it 'outputs headings when the stream initializes' do
+      it "outputs headings when the stream initializes" do
         @tweetstream_client.stub(:on_inited).and_yield
         @tweetstream_client.stub(:on_timeline_status).and_return
 
@@ -72,48 +72,48 @@ describe T::Stream do
       end
     end
 
-    context 'normal usage' do
+    context "normal usage" do
       before :each do
         @tweetstream_client.stub(:on_timeline_status).
           and_yield(@status)
       end
 
-      it 'prints the tweet status' do
+      it "prints the tweet status" do
         @stream.should_receive(:print_message)
         @stream.all
       end
     end
 
-    it 'invokes TweetStream::Client#sample' do
+    it "invokes TweetStream::Client#sample" do
       @tweetstream_client.should_receive(:sample)
       @stream.all
     end
 	end
 
-  describe '#matrix' do
+  describe "#matrix" do
     before :each do
       @tweetstream_client.stub(:on_timeline_status).
         and_yield(@status)
     end
 
-    it 'outputs the tweet status' do
+    it "outputs the tweet status" do
       @stream.should_receive(:say).with(any_args)
       @stream.matrix
     end
 
-    it 'invokes TweetStream::Client.sample' do
+    it "invokes TweetStream::Client.sample" do
       @tweetstream_client.should_receive(:sample)
       @stream.matrix
     end
   end
 
-  describe '#search' do
+  describe "#search" do
     before :each do
       @tweetstream_client.stub(:on_timeline_status).
         and_yield(@status)
     end
 
-    context '--csv' do
+    context "--csv" do
       before :each do
         @stream.options = @stream.options.merge("csv" => true)
       end
@@ -126,7 +126,7 @@ describe T::Stream do
       end
     end
 
-    context '--long' do
+    context "--long" do
       before :each do
         @stream.options = @stream.options.merge("long" => true)
       end
@@ -141,19 +141,19 @@ describe T::Stream do
       end
     end
 
-    context 'normal usage' do
+    context "normal usage" do
       before :each do
         @tweetstream_client.stub(:on_timeline_status).
           and_yield(@status)
       end
 
-      it 'prints the tweet status' do
+      it "prints the tweet status" do
         @stream.should_receive(:print_message)
         @stream.search('t gem')
       end
     end
 
-    it 'performs a REST search when the stream initializes' do
+    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
 
@@ -163,7 +163,7 @@ describe T::Stream do
       @stream.search('t', 'gem')
     end
 
-    it 'invokes TweetStream::Client#track' do
+    it "invokes TweetStream::Client#track" do
       @tweetstream_client.stub(:on_timeline_status).and_return
 
       @tweetstream_client.should_receive(:track).with(['t gem'])
@@ -171,13 +171,13 @@ describe T::Stream do
     end
   end
 
-  describe '#timeline' do
+  describe "#timeline" do
     before :each do
       @tweetstream_client.stub(:on_timeline_status).
         and_yield(@status)
     end
 
-    context '--csv' do
+    context "--csv" do
       before :each do
         @stream.options = @stream.options.merge("csv" => true)
       end
@@ -190,7 +190,7 @@ describe T::Stream do
       end
     end
 
-    context '--long' do
+    context "--long" do
       before :each do
         @stream.options = @stream.options.merge("long" => true)
       end
@@ -205,19 +205,19 @@ describe T::Stream do
       end
     end
 
-    context 'normal usage' do
+    context "normal usage" do
       before :each do
         @tweetstream_client.stub(:on_timeline_status).
           and_yield(@status)
       end
 
-      it 'prints the tweet status' do
+      it "prints the tweet status" do
         @stream.should_receive(:print_message)
         @stream.timeline
       end
     end
 
-    it 'performs a REST search when the stream initializes' do
+    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
 
@@ -227,7 +227,7 @@ describe T::Stream do
       @stream.timeline
     end
 
-    it 'invokes TweetStream::Client#userstream' do
+    it "invokes TweetStream::Client#userstream" do
       @tweetstream_client.stub(:on_timeline_status).and_return
 
       @tweetstream_client.should_receive(:userstream)
@@ -235,18 +235,18 @@ describe T::Stream do
     end
   end
 
-  describe '#users' do
+  describe "#users" do
     before :each do
       @tweetstream_client.stub(:on_timeline_status).
         and_yield(@status)
     end
 
-    context '--csv' do
+    context "--csv" do
       before :each do
         @stream.options = @stream.options.merge("csv" => true)
       end
 
-      it 'outputs headings when the stream initializes' do
+      it "outputs headings when the stream initializes" do
         @tweetstream_client.stub(:on_timeline_status).and_return
         @tweetstream_client.stub(:on_inited).and_yield
 
@@ -262,12 +262,12 @@ describe T::Stream do
       end
     end
 
-    context '--long' do
+    context "--long" do
       before :each do
         @stream.options = @stream.options.merge("long" => true)
       end
 
-      it 'outputs headings when the stream initializes' do
+      it "outputs headings when the stream initializes" do
         @tweetstream_client.stub(:on_inited).and_yield
         @tweetstream_client.stub(:on_timeline_status).and_return
 
@@ -285,19 +285,19 @@ describe T::Stream do
       end
     end
 
-    context 'normal usage' do
+    context "normal usage" do
       before :each do
         @tweetstream_client.stub(:on_timeline_status).
           and_yield(@status)
       end
 
-      it 'prints the tweet status' do
+      it "prints the tweet status" do
         @stream.should_receive(:print_message)
         @stream.users('123')
       end
     end
 
-    it 'invokes TweetStream::Client#follow' do
+    it "invokes TweetStream::Client#follow" do
       @tweetstream_client.stub(:on_timeline_status).and_return
 
       @tweetstream_client.should_receive(:follow).with([123, 456, 789])

data/spec/utils_spec.rb

@@ -21,74 +21,74 @@ describe T::Utils do
 
   describe "#distance_of_time_in_words" do
     it "returns \"a split second\" if difference is less than a second" do
-      @test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 24, 16, 20, 0))).should == "a split second"
+      expect(@test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 24, 16, 20, 0)))).to eq "a split second"
     end
     it "returns \"a second\" if difference is a second" do
-      @test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 24, 16, 20, 1))).should == "a second"
+      expect(@test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 24, 16, 20, 1)))).to eq "a second"
     end
     it "returns \"2 seconds\" if difference is 2 seconds" do
-      @test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 24, 16, 20, 2))).should == "2 seconds"
+      expect(@test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 24, 16, 20, 2)))).to eq "2 seconds"
     end
     it "returns \"59 seconds\" if difference is just shy of 1 minute" do
-      @test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 24, 16, 20, 59.9))).should == "59 seconds"
+      expect(@test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 24, 16, 20, 59.9)))).to eq "59 seconds"
     end
     it "returns \"a minute\" if difference is 1 minute" do
-      @test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 24, 16, 21, 0))).should == "a minute"
+      expect(@test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 24, 16, 21, 0)))).to eq "a minute"
     end
     it "returns \"2 minutes\" if difference is 2 minutes" do
-      @test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 24, 16, 22, 0))).should == "2 minutes"
+      expect(@test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 24, 16, 22, 0)))).to eq "2 minutes"
     end
     it "returns \"59 minutes\" if difference is just shy of 1 hour" do
-      @test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 24, 17, 19, 59.9))).should == "59 minutes"
+      expect(@test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 24, 17, 19, 59.9)))).to eq "59 minutes"
     end
     it "returns \"an hour\" if difference is 1 hour" do
-      @test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 24, 17, 20, 0))).should == "an hour"
+      expect(@test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 24, 17, 20, 0)))).to eq "an hour"
     end
     it "returns \"2 hours\" if difference is 2 hours" do
-      @test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 24, 18, 20, 0))).should == "2 hours"
+      expect(@test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 24, 18, 20, 0)))).to eq "2 hours"
     end
     it "returns \"23 hours\" if difference is just shy of 23.5 hours" do
-      @test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 25, 15, 49, 59.9))).should == "23 hours"
+      expect(@test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 25, 15, 49, 59.9)))).to eq "23 hours"
     end
     it "returns \"a day\" if difference is 23.5 hours" do
-      @test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 25, 15, 50, 0))).should == "a day"
+      expect(@test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 25, 15, 50, 0)))).to eq "a day"
     end
     it "returns \"2 days\" if difference is 2 days" do
-      @test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 26, 16, 20, 0))).should == "2 days"
+      expect(@test.send(:distance_of_time_in_words, (Time.utc(2011, 11, 26, 16, 20, 0)))).to eq "2 days"
     end
     it "returns \"29 days\" if difference is just shy of 29.5 days" do
-      @test.send(:distance_of_time_in_words, (Time.utc(2011, 12, 24, 4, 19, 59.9))).should == "29 days"
+      expect(@test.send(:distance_of_time_in_words, (Time.utc(2011, 12, 24, 4, 19, 59.9)))).to eq "29 days"
     end
     it "returns \"a month\" if difference is 29.5 days" do
-      @test.send(:distance_of_time_in_words, (Time.utc(2011, 12, 24, 4, 20, 0))).should == "a month"
+      expect(@test.send(:distance_of_time_in_words, (Time.utc(2011, 12, 24, 4, 20, 0)))).to eq "a month"
     end
     it "returns \"2 months\" if difference is 2 months" do
-      @test.send(:distance_of_time_in_words, (Time.utc(2012, 1, 24, 16, 20, 0))).should == "2 months"
+      expect(@test.send(:distance_of_time_in_words, (Time.utc(2012, 1, 24, 16, 20, 0)))).to eq "2 months"
     end
     it "returns \"11 months\" if difference is just shy of 11.5 months" do
-      @test.send(:distance_of_time_in_words, (Time.utc(2012, 11, 8, 11, 19, 59.9))).should == "11 months"
+      expect(@test.send(:distance_of_time_in_words, (Time.utc(2012, 11, 8, 11, 19, 59.9)))).to eq "11 months"
     end
     it "returns \"a year\" if difference is 11.5 months" do
-      @test.send(:distance_of_time_in_words, (Time.utc(2012, 11, 8, 11, 20, 0))).should == "a year"
+      expect(@test.send(:distance_of_time_in_words, (Time.utc(2012, 11, 8, 11, 20, 0)))).to eq "a year"
     end
     it "returns \"2 years\" if difference is 2 years" do
-      @test.send(:distance_of_time_in_words, (Time.utc(2013, 11, 24, 16, 20, 0))).should == "2 years"
+      expect(@test.send(:distance_of_time_in_words, (Time.utc(2013, 11, 24, 16, 20, 0)))).to eq "2 years"
     end
   end
 
   describe "#strip_tags" do
     it "returns string sans tags" do
-      @test.send(:strip_tags, '<a href="http://twitter.com/#!/download/iphone" rel="nofollow">Twitter for iPhone</a>').should == "Twitter for iPhone"
+      expect(@test.send(:strip_tags, '<a href="http://twitter.com/#!/download/iphone" rel="nofollow">Twitter for iPhone</a>')).to eq "Twitter for iPhone"
     end
   end
 
   describe "#number_with_delimiter" do
     it "returns number with delimiter" do
-      @test.send(:number_with_delimiter, 1234567890).should == "1,234,567,890"
+      expect(@test.send(:number_with_delimiter, 1234567890)).to eq "1,234,567,890"
     end
     context "with custom delimiter" do
       it "returns number with custom delimiter" do
-        @test.send(:number_with_delimiter, 1234567890, ".").should == "1.234.567.890"
+        expect(@test.send(:number_with_delimiter, 1234567890, ".")).to eq "1.234.567.890"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: t
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy