Fix to default location

Author: sferik

lib/t/cli.rb

@@ -521,7 +521,7 @@ def open(user)
 
     desc "reply TWEET_ID MESSAGE", "Post your Tweet as a reply directed at another person."
     method_option "all", :aliases => "-a", :type => :boolean, :default => false, :desc => "Reply to all users mentioned in the Tweet."
-    method_option "location", :aliases => "-l", :type => :string, :default => nil, :desc => "Add location information. If the optional 'latitude,longitude' parameter is not supplied, looks up location by IP address."
+    method_option "location", :aliases => "-l", :type => :string, :default => "location", :desc => "Add location information. If the optional 'latitude,longitude' parameter is not supplied, looks up location by IP address."
     def reply(status_id, message)
       status = client.status(status_id.to_i, :include_my_retweet => false)
       users = Array(status.from_user)
@@ -532,7 +532,7 @@ def reply(status_id, message)
       require 't/core_ext/string'
       users.map!(&:prepend_at)
       opts = {:in_reply_to_status_id => status.id, :trim_user => true}
-      opts = add_location(options, opts)
+      add_location!(options, opts)
       reply = client.update("#{users.join(' ')} #{message}", opts)
       say "Reply posted by @#{@rcfile.active_profile[0]} to #{users.join(' ')}."
       say
@@ -739,13 +739,12 @@ def unfollow(user, *users)
     end
 
     desc "update [MESSAGE]", "Post a Tweet."
-    method_option "location", :aliases => "-l", :type => :string, :default => nil, :desc => "Add location information. If the optional 'latitude,longitude' parameter is not supplied, looks up location by IP address."
+    method_option "location", :aliases => "-l", :type => :string, :default => "location", :desc => "Add location information. If the optional 'latitude,longitude' parameter is not supplied, looks up location by IP address."
     method_option "file", :aliases => "-f", :type => :string, :desc => "The path to an image to attach to your tweet."
     def update(message=nil)
       message = T::Editor.gets if message.nil? || message.empty?
       opts = {:trim_user => true}
-      opts = add_location(options, opts)
-
+      add_location!(options, opts)
       status = if options['file']
         client.update_with_media(message, File.new(File.expand_path(options['file'])), opts)
       else
@@ -870,14 +869,11 @@ def pin_auth_parameters
       {:oauth_callback => 'oob'}
     end
 
-    def add_location(options, opts)
-      unless options['location'].nil?
-        lat, lng = options['location'].strip.empty? ?
-                      [location.lat, location.lng] :
-                      options['location'].split(',').map(&:to_f)
+    def add_location!(options, opts)
+      if options['location']
+        lat, lng = options['location'] == 'location' ? [location.lat, location.lng] : options['location'].split(',').map(&:to_f)
         opts.merge!(:lat => lat, :long => lng)
       end
-      opts
     end
 
     def location

spec/cli_spec.rb

@@ -2048,7 +2048,7 @@
     end
     context "--location" do
       before do
-        @cli.options = @cli.options.merge("location" => '')
+        @cli.options = @cli.options.merge("location" => "location")
         stub_get("/1.1/statuses/show/263813522369159169.json").with(:query => {:include_my_retweet => "false"}).to_return(:body => fixture("status_with_mention.json"))
         stub_post("/1.1/statuses/update.json").with(:body => {:in_reply_to_status_id => "263813522369159169", :status => "@joshfrench Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"}).to_return(:body => fixture("status.json"))
       end
@@ -3087,9 +3087,9 @@
         expect($stdout.string.split("\n").first).to eq "Tweet posted by @testcli."
       end
     end
-    context "with just location" do
+    context "--location" do
       before do
-        @cli.options = @cli.options.merge("location" => '')
+        @cli.options = @cli.options.merge("location" => "location")
         stub_post("/1.1/statuses/update.json").with(:body => {:status => "Testing", :lat => "37.76969909668", :long => "-122.39330291748", :trim_user => "true"}).to_return(:body => fixture("status.json"))
       end
       it "requests the correct resource" do
@@ -3103,7 +3103,7 @@
         expect($stdout.string.split("\n").first).to eq "Tweet posted by @testcli."
       end
     end
-    context "with location, latitude and longitude" do
+    context "--location 'latitude,longitude'" do
       before do
         @cli.options = @cli.options.merge("location" => "41.03132,28.9869")
         stub_post("/1.1/statuses/update.json").with(:body => {:status => "Testing", :lat => "41.03132", :long => "28.9869", :trim_user => "true"}).to_return(:body => fixture("status.json"))