tuomas-tweetwine 0.1.2 → 0.1.3

data/CHANGELOG.rdoc

@@ -1,15 +1,21 @@
+=== 0.1.3 released 2009-05-05
+
+* Empty status update indicates cancellation of the command
+* Other minor improvements
+
 === 0.1.2 released 2009-05-04
 
-* Renamed command "friends" to "home".
-* Added command "mentions".
-* Improved command line argument and configuration file parsing.
+* Renamed command "friends" to "home"
+* Added command "mentions"
+* When showing a status, indicate if it is a reply
+* Improved command line argument and configuration file parsing
 
 === 0.1.1 released 2009-04-23
 
-* Renamed command "msg" to "update".
-* If status update if longer than 140 characters, warn about it.
+* Renamed command "msg" to "update"
+* If status update if longer than 140 characters, warn about it
 
 === 0.1.0 released 2009-04-22
 
-* Initial release with minimal functionality.
-* Usable for quickly checking friends' statuses and sending status updates.
+* Initial release with minimal functionality
+* Usable for quickly checking friends' statuses and sending status updates

data/Rakefile

@@ -2,7 +2,7 @@ require "rubygems"
 
 full_name = "Tweetwine"
 package_name = "tweetwine"
-version = "0.1.2"
+version = "0.1.3"
 
 require "lib/#{package_name}"
 

data/bin/tweetwine

@@ -36,7 +36,7 @@ Usage: tweetwine [options...] [command]
         end
       end.parse!(args)
     rescue OptionParser::ParseError => e
-      raise ArgumentError.new(e)
+      raise ArgumentError, e.message
     end
     options
   end

data/lib/tweetwine/client.rb

@@ -22,7 +22,7 @@ module Tweetwine
         if (1..MAX_NUM_STATUSES).include? options[:num_statuses]
           options[:num_statuses]
         else
-          raise ArgumentError, "Invalid number of statuses to show -- must be between 1..#{Client::MAX_NUM_STATUSES}"
+          raise ArgumentError, "Invalid number of statuses to show -- must be between 1..#{MAX_NUM_STATUSES}"
         end
       else
         DEFAULT_NUM_STATUSES
@@ -31,24 +31,24 @@ module Tweetwine
     end
 
     def home
-      @io.show_statuses JSON.parse(get("statuses/friends_timeline.json?count=#{@num_statuses}"))
+      get_and_show "statuses/friends_timeline.json?count=#{@num_statuses}"
     end
 
     def mentions
-      @io.show_statuses JSON.parse(get("statuses/mentions.json?count=#{@num_statuses}"))
+      get_and_show "statuses/mentions.json?count=#{@num_statuses}"
     end
 
     def user(user = @username)
-      @io.show_statuses JSON.parse(get("statuses/user_timeline/#{user}.json?count=#{@num_statuses}"))
+      get_and_show "statuses/user_timeline/#{user}.json?count=#{@num_statuses}"
     end
 
     def update(new_status = nil)
       new_status = @io.prompt("Status update") unless new_status
       if new_status.length > MAX_STATUS_LENGTH
         new_status = new_status[0...MAX_STATUS_LENGTH]
-        @io.warn("Update will be truncated: #{new_status}")
+        @io.warn("Status will be truncated: #{new_status}")
       end
-      if @io.confirm("Really send?")
+      if !new_status.empty? && @io.confirm("Really send?")
         status = JSON.parse(post("statuses/update.json", {:status => new_status}))
         @io.info "Sent status update.\n\n"
         @io.show_statuses([status])
@@ -59,6 +59,10 @@ module Tweetwine
 
     private
 
+    def get_and_show(rest_url)
+      @io.show_statuses JSON.parse(get(rest_url))
+    end
+
     def get(rest_url)
       rest_client_action(:get, @base_url + rest_url)
     end

data/lib/tweetwine/io.rb

@@ -27,7 +27,7 @@ module Tweetwine
 
     def show_statuses(statuses)
       statuses.each do |status|
-        time_diff_value, time_diff_unit = Util.humanize_time_diff(Time.now, status["created_at"])
+        time_diff_value, time_diff_unit = Util.humanize_time_diff(status["created_at"], Time.now)
         from_user = status["user"]["screen_name"]
         from_user = colorize(:green, from_user) if @colorize
         in_reply_to = status["in_reply_to_screen_name"]

data/lib/tweetwine/startup_config.rb

@@ -13,7 +13,7 @@ module Tweetwine
     def parse(args = [], config_file = nil, &cmd_parser)
       options = parse_options(args, config_file, &cmd_parser)
       command = if args.empty? then @supported_commands.first else args.shift.to_sym end
-      raise ArgumentError, "Unknown command." unless @supported_commands.include? command
+      raise ArgumentError, "Unknown command" unless @supported_commands.include? command
       @options, @command, @args = options, command, args
       self
     end

data/test/client_test.rb

@@ -9,6 +9,7 @@ class ClientTest < Test::Unit::TestCase
       assert_raises(ArgumentError) { Client.new({}) }
       assert_raises(ArgumentError) { Client.new({ :password => "bar" }) }
       assert_raises(ArgumentError) { Client.new({ :username => "", :password => "bar" }) }
+      assert_nothing_raised { Client.new({ :username => "foo", :password => "bar" }) }
     end
 
     should "use default num of statuses if not configured otherwise" do
@@ -112,7 +113,7 @@ class ClientTest < Test::Unit::TestCase
       @client.user
     end
 
-    should "post a status update, when positive confirmation" do
+    should "post a status update via argument, when positive confirmation" do
       status = {
         "created_at" => Time.at(1).to_s,
         "user" => { "username" => "foo" },
@@ -127,7 +128,23 @@ class ClientTest < Test::Unit::TestCase
       @client.update("wondering about")
     end
 
-    should "cancel a status update, when negative confirmation" do
+    should "post a status update via prompt, when positive confirmation" do
+      status = {
+        "created_at" => Time.at(1).to_s,
+        "user" => { "username" => "foo" },
+        "text" => "wondering about"
+      }
+      RestClient.expects(:post) \
+                .with("https://foo:bar@twitter.com/statuses/update.json", {:status => "wondering about"}) \
+                .returns(status.to_json)
+      @io.expects(:prompt).with("Status update").returns("wondering about")
+      @io.expects(:confirm).with("Really send?").returns(true)
+      @io.expects(:info).with("Sent status update.\n\n")
+      @io.expects(:show_statuses).with([status])
+      @client.update
+    end
+
+    should "cancel a status update via argument, when negative confirmation" do
       RestClient.expects(:post).never
       @io.expects(:confirm).with("Really send?").returns(false)
       @io.expects(:info).with("Cancelled.")
@@ -135,7 +152,33 @@ class ClientTest < Test::Unit::TestCase
       @client.update("wondering about")
     end
 
-    should "truncate a status update too long and warn the user" do
+    should "cancel a status update via prompt, when negative confirmation" do
+      RestClient.expects(:post).never
+      @io.expects(:prompt).with("Status update").returns("wondering about")
+      @io.expects(:confirm).with("Really send?").returns(false)
+      @io.expects(:info).with("Cancelled.")
+      @io.expects(:show_statuses).never
+      @client.update
+    end
+
+    should "cancel a status update via argument, when empty status" do
+      RestClient.expects(:post).never
+      @io.expects(:confirm).never
+      @io.expects(:info).with("Cancelled.")
+      @io.expects(:show_statuses).never
+      @client.update("")
+    end
+
+    should "cancel a status update via prompt, when empty status" do
+      RestClient.expects(:post).never
+      @io.expects(:prompt).with("Status update").returns("")
+      @io.expects(:confirm).never
+      @io.expects(:info).with("Cancelled.")
+      @io.expects(:show_statuses).never
+      @client.update
+    end
+
+    should "truncate a status update with too long argument and warn the user" do
       long_status_update = "x aaa bbb ccc ddd eee fff ggg hhh iii jjj kkk lll mmm nnn ooo ppp qqq rrr sss ttt uuu vvv www xxx yyy zzz 111 222 333 444 555 666 777 888 999 000"
       truncated_status_update = "x aaa bbb ccc ddd eee fff ggg hhh iii jjj kkk lll mmm nnn ooo ppp qqq rrr sss ttt uuu vvv www xxx yyy zzz 111 222 333 444 555 666 777 888 99"
       status = {
@@ -147,7 +190,7 @@ class ClientTest < Test::Unit::TestCase
       RestClient.expects(:post) \
                 .with("https://foo:bar@twitter.com/statuses/update.json", {:status => truncated_status_update}) \
                 .returns(status.to_json)
-      @io.expects(:warn).with("Update will be truncated: #{truncated_status_update}")
+      @io.expects(:warn).with("Status will be truncated: #{truncated_status_update}")
       @io.expects(:confirm).with("Really send?").returns(true)
       @io.expects(:info).with("Sent status update.\n\n")
       @io.expects(:show_statuses).with([status])

data/test/startup_config_test.rb

@@ -22,6 +22,24 @@ class StartupConfigTest < Test::Unit::TestCase
       assert_equal :default_action, @config.command
     end
 
+    should "check that given command is supported" do
+      @config.parse(%w{default_action}) { |args| {} }
+      assert_equal :default_action, @config.command
+
+      @config.parse(%w{another_action}) { |args| {} }
+      assert_equal :another_action, @config.command
+    end
+
+    should "parse cmdline args, command, and leftover args" do
+      @config.parse(%w{--opt foo another_action left overs}) do |args|
+         args.slice!(0..1)
+         {:opt => "foo"}
+      end
+      assert_equal({:opt => "foo"}, @config.options)
+      assert_equal :another_action, @config.command
+      assert_equal %w{left overs},  @config.args
+    end
+
     context "when given no cmdline args and a config file" do
       setup do
         @config.parse([], TEST_CONFIG_FILE)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tuomas-tweetwine
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Tuomas Kareinen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-04 00:00:00 -07:00
+date: 2009-05-05 00:00:00 -07:00
 default_executable: tweetwine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,7 +63,7 @@ homepage: http://github.com/tuomas/tweetwine
 post_install_message: 
 rdoc_options: 
 - --title
-- Tweetwine 0.1.2
+- Tweetwine 0.1.3
 - --main
 - README.rdoc
 - --exclude