t 1.0.1 → 1.1.0

data/lib/t/cli.rb

@@ -608,8 +608,9 @@ module T
     map %w(rts) => :retweets
 
     desc "ruler", "Prints a 140-character ruler"
+    method_option "indent", :aliases => "-i", :type => :numeric, :default => 0, :desc => "The number of space to print before the ruler."
     def ruler
-      say "----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|"
+      say "#{' ' * options['indent'].to_i}----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|"
     end
 
     desc "status STATUS_ID", "Retrieves detailed information about a Tweet."
@@ -752,10 +753,15 @@ module T
 
     desc "update MESSAGE", "Post a Tweet."
     method_option "location", :aliases => "-l", :type => :boolean, :default => false
+    method_option "file", :aliases => "-f", :type => :string, :desc => "The path to an image to attach to your tweet."
     def update(message)
       opts = {:trim_user => true}
       opts.merge!(:lat => location.lat, :long => location.lng) if options['location']
-      status = client.update(message, opts)
+      status = if options['file']
+        client.update_with_media(message, File.new(File.expand_path(options['file'])), opts)
+      else
+        client.update(message, opts)
+      end
       say "Tweet posted by @#{@rcfile.active_profile[0]}."
       say
       say "Run `#{File.basename($0)} delete status #{status.id}` to delete."

data/lib/t/rcfile.rb

@@ -12,7 +12,24 @@ module T
     end
 
     def [](username)
-      profiles[username]
+      profiles[find(username)]
+    end
+
+    def find(username)
+      possibilities = Array(find_case_insensitive_match(username) || find_case_insensitive_possibilities(username))
+      if possibilities.size == 1
+        possibilities.first
+      else
+        raise ArgumentError, "Username #{username} is #{possibilities.size < 1 ? 'not found.' : 'ambiguous, matching ' + possibilities.join(', ')}"
+      end
+    end
+
+    def find_case_insensitive_match(username)
+      profiles.keys.detect { |u| username.downcase == u.downcase }
+    end
+
+    def find_case_insensitive_possibilities(username)
+      profiles.keys.select { |u| username.downcase == u.downcase[0, username.length] }
     end
 
     def []=(username, profile)

data/lib/t/set.rb

@@ -19,8 +19,8 @@ module T
       screen_name = screen_name.strip_ats
       @rcfile.path = options['profile'] if options['profile']
       consumer_key = @rcfile[screen_name].keys.last if consumer_key.nil?
-      @rcfile.active_profile = {'username' => screen_name, 'consumer_key' => consumer_key}
-      say "Active account has been updated."
+      @rcfile.active_profile = {'username' => @rcfile[screen_name][consumer_key]["username"], 'consumer_key' => consumer_key}
+      say "Active account has been updated to #{@rcfile.active_profile[0]}."
     end
     map %w(default) => :active
 
@@ -48,6 +48,21 @@ module T
       say "@#{@rcfile.active_profile[0]}'s name has been updated."
     end
 
+    desc "profile_background_image FILE", "Sets the background image on your Twitter profile."
+    method_option "tile", :aliases => "-t", :type => :boolean, :default => false, :desc => "Whether or not to tile the background image."
+    def profile_background_image(file)
+      client.update_profile_background_image(File.new(File.expand_path(file)), :tile => options['tile'], :skip_status => true)
+      say "@#{@rcfile.active_profile[0]}'s background image has been updated."
+    end
+    map %w(background background_image) => :profile_background_image
+
+    desc "profile_image FILE", "Sets the image on your Twitter profile."
+    def profile_image(file)
+      client.update_profile_image(File.new(File.expand_path(file)))
+      say "@#{@rcfile.active_profile[0]}'s image has been updated."
+    end
+    map %w(avatar image) => :profile_image
+
     desc "url URL", "Sets the URL field on your profile."
     def url(url)
       client.update_profile(:url => url)

data/lib/t/version.rb

@@ -8,12 +8,12 @@ module T
 
     # @return [Integer]
     def self.minor
-      0
+      1
     end
 
     # @return [Integer]
     def self.patch
-      1
+      0
     end
 
     # @return [String, NilClass]

data/spec/cli_spec.rb

@@ -2357,7 +2357,7 @@ Hourly limit,Remaining hits,Reset time
       stub_request(:get, "http://checkip.dyndns.org/").
         to_return(:body => fixture("checkip.html"), :headers => {:content_type => "text/html"})
       stub_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169").
-        to_return(:body => fixture("xml.gp"), :headers => {:content_type => "application/xml"})
+        to_return(:body => fixture("geoplugin.xml"), :headers => {:content_type => "application/xml"})
     end
     it "should request the correct resource" do
       @cli.reply("55709764298092545", "Testing")
@@ -2705,6 +2705,16 @@ ID                  Posted at     Screen name    Text
       $stdout.string.chomp.size.should == 140
       $stdout.string.chomp.should == "----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|"
     end
+    context "with indentation" do
+      before do
+        @cli.options = @cli.options.merge("indent" => 2)
+      end
+      it "should have the correct output" do
+        @cli.ruler
+        $stdout.string.chomp.size.should == 142
+        $stdout.string.chomp.should == "  ----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|----|"
+      end
+    end
   end
 
   describe "#status" do
@@ -3485,7 +3495,7 @@ WOEID     Parent ID  Type       Name           Country
       stub_request(:get, "http://checkip.dyndns.org/").
         to_return(:body => fixture("checkip.html"), :headers => {:content_type => "text/html"})
       stub_request(:get, "http://www.geoplugin.net/xml.gp?ip=50.131.22.169").
-        to_return(:body => fixture("xml.gp"), :headers => {:content_type => "application/xml"})
+        to_return(:body => fixture("geoplugin.xml"), :headers => {:content_type => "application/xml"})
     end
     it "should request the correct resource" do
       @cli.update("Testing")
@@ -3501,6 +3511,22 @@ WOEID     Parent ID  Type       Name           Country
       @cli.update("Testing")
       $stdout.string.split("\n").first.should == "Tweet posted by @testcli."
     end
+    context "with file" do
+      before do
+        @cli.options = @cli.options.merge("file" => fixture_path + "/long.png")
+        stub_post("/1/statuses/update_with_media.json", "https://upload.twitter.com").
+          to_return(:body => fixture("status.json"), :headers => {:content_type => "application/json; charset=utf-8"})
+      end
+      it "should request the correct resource" do
+        @cli.update("Testing")
+        a_post("/1/statuses/update_with_media.json", "https://upload.twitter.com").
+          should have_been_made
+      end
+      it "should have the correct output" do
+        @cli.update("Testing")
+        $stdout.string.split("\n").first.should == "Tweet posted by @testcli."
+      end
+    end
   end
 
   describe "#users" do

data/spec/helper.rb

@@ -12,35 +12,35 @@ require 'rspec'
 require 'timecop'
 require 'webmock/rspec'
 
-def a_delete(path, endpoint=Twitter.endpoint)
+def a_delete(path, endpoint='https://api.twitter.com')
   a_request(:delete, endpoint + path)
 end
 
-def a_get(path, endpoint=Twitter.endpoint)
+def a_get(path, endpoint='https://api.twitter.com')
   a_request(:get, endpoint + path)
 end
 
-def a_post(path, endpoint=Twitter.endpoint)
+def a_post(path, endpoint='https://api.twitter.com')
   a_request(:post, endpoint + path)
 end
 
-def a_put(path, endpoint=Twitter.endpoint)
+def a_put(path, endpoint='https://api.twitter.com')
   a_request(:put, endpoint + path)
 end
 
-def stub_delete(path, endpoint=Twitter.endpoint)
+def stub_delete(path, endpoint='https://api.twitter.com')
   stub_request(:delete, endpoint + path)
 end
 
-def stub_get(path, endpoint=Twitter.endpoint)
+def stub_get(path, endpoint='https://api.twitter.com')
   stub_request(:get, endpoint + path)
 end
 
-def stub_post(path, endpoint=Twitter.endpoint)
+def stub_post(path, endpoint='https://api.twitter.com')
   stub_request(:post, endpoint + path)
 end
 
-def stub_put(path, endpoint=Twitter.endpoint)
+def stub_put(path, endpoint='https://api.twitter.com')
   stub_request(:put, endpoint + path)
 end
 

data/spec/set_spec.rb

@@ -20,11 +20,29 @@ describe T::Set do
 
   describe "#active" do
     before do
-      @set.options = @set.options.merge("profile" => fixture_path + "/.trc")
+      @set.options = @set.options.merge("profile" => fixture_path + "/.trc_set")
     end
     it "should have the correct output" do
       @set.active("testcli", "abc123")
-      $stdout.string.chomp.should == "Active account has been updated."
+      $stdout.string.chomp.should == "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."
+    end
+    it "should be case insensitive" do
+      @set.active("TestCLI", "abc123")
+      $stdout.string.chomp.should == "Active account has been updated to testcli."
+    end
+    it "should raise an error if username is ambiguous" do
+      lambda do
+        @set.active("test", "abc123")
+      end.should raise_error(ArgumentError, /Username test is ambiguous/)
+    end
+    it "should raise an error if the username is not found" do
+      lambda do
+        @set.active("clitest")
+      end.should raise_error(ArgumentError, /Username clitest is not found/)
     end
   end
 
@@ -104,6 +122,40 @@ describe T::Set do
     end
   end
 
+  describe "#profile_background_image" do
+    before do
+      @set.options = @set.options.merge("profile" => fixture_path + "/.trc")
+      stub_post("/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/account/update_profile_background_image.json").
+        should 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."
+    end
+  end
+
+  describe "#profile_image" do
+    before do
+      @set.options = @set.options.merge("profile" => fixture_path + "/.trc")
+      stub_post("/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/account/update_profile_image.json").
+        should 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."
+    end
+  end
+
   describe "#url" do
     before do
       @set.options = @set.options.merge("profile" => fixture_path + "/.trc")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: t
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -315,9 +315,12 @@ files:
 - spec/fixtures/followers_ids.json
 - spec/fixtures/friends_ids.json
 - spec/fixtures/gem.json
+- spec/fixtures/geoplugin.xml
 - spec/fixtures/list.json
 - spec/fixtures/lists.json
 - spec/fixtures/locations.json
+- spec/fixtures/long.png
+- spec/fixtures/me.jpg
 - spec/fixtures/not_found.json
 - spec/fixtures/rate_limit_status.json
 - spec/fixtures/recommendations.json
@@ -337,7 +340,7 @@ files:
 - spec/fixtures/true.json
 - spec/fixtures/users.json
 - spec/fixtures/users_list.json
-- spec/fixtures/xml.gp
+- spec/fixtures/we_concept_bg2.png
 - spec/helper.rb
 - spec/list_spec.rb
 - spec/rcfile_spec.rb
@@ -384,9 +387,12 @@ test_files:
 - spec/fixtures/followers_ids.json
 - spec/fixtures/friends_ids.json
 - spec/fixtures/gem.json
+- spec/fixtures/geoplugin.xml
 - spec/fixtures/list.json
 - spec/fixtures/lists.json
 - spec/fixtures/locations.json
+- spec/fixtures/long.png
+- spec/fixtures/me.jpg
 - spec/fixtures/not_found.json
 - spec/fixtures/rate_limit_status.json
 - spec/fixtures/recommendations.json
@@ -406,7 +412,7 @@ test_files:
 - spec/fixtures/true.json
 - spec/fixtures/users.json
 - spec/fixtures/users_list.json
-- spec/fixtures/xml.gp
+- spec/fixtures/we_concept_bg2.png
 - spec/helper.rb
 - spec/list_spec.rb
 - spec/rcfile_spec.rb