tuomas-tweetwine 0.1.0 → 0.1.1

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+=== 0.1.1 released 2009-04-23
+
+* 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.

data/README.rdoc

@@ -23,9 +23,9 @@ read the configuration file for authentication.
 
 The supported commands are
 
-<tt>friends</tt>:: Fetch friends' statuses (the contents of the user's home).
-<tt>user [name]</tt>:: Fetch a specific user's statuses, identified by the argument; if given no argument, fetch your own statuses.
-<tt>msg [status]</tt>:: Send a status update, but confirm the action first before actually sending. The status update can either be given as an argument or via STDIN if no argument is given.
+<tt>friends</tt>:: Fetch friends' latest statuses (the contents of the user's home).
+<tt>user [name]</tt>:: Fetch a specific user's latest statuses, identified by the argument; if given no argument, fetch your own statuses.
+<tt>update [status]</tt>:: Send a status update, but confirm the action first before actually sending. The status update can either be given as an argument or via STDIN if no argument is given.
 
 If <tt>[command]</tt> is not given, it defaults to <tt>friends</tt>.
 

data/Rakefile

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

data/bin/tweetwine

@@ -37,8 +37,8 @@ Usage: tweetwine [options...] [command]
   -a, --auth <username>:<password>  Authentication data.
   -c, --color                       Colorize output with ANSI escape codes.
   -h, --help                        This help message.
-  -n, --num <num>                   The number of statuses to show, defaults
-                                    to #{DEFAULT_OPTIONS[:num_statuses]}.
+  -n, --num <num>                   The number of statuses to fetch,
+                                    defaults to #{DEFAULT_OPTIONS[:num_statuses]}.
 
   END
   exit(1)

data/lib/tweetwine/client.rb

@@ -5,7 +5,7 @@ module Tweetwine
   class ClientError < RuntimeError; end
 
   class Client
-    COMMANDS = %w{friends user msg}
+    COMMANDS = %w{friends user update}
 
     MAX_NUM_STATUSES = 20
     MAX_STATUS_LENGTH = 140
@@ -15,29 +15,29 @@ module Tweetwine
       @base_url = "https://#{@username}:#{password}@twitter.com/"
       @colorize = options[:colorize] || false
       @num_statuses = options[:num_statuses] || MAX_NUM_STATUSES
+      @io = IO.new(options)
     end
 
     def friends
-      print_statuses JSON.parse(get("statuses/friends_timeline.json?count=#{@num_statuses}"))
+      @io.show_statuses JSON.parse(get("statuses/friends_timeline.json?count=#{@num_statuses}"))
     end
 
     def user(user = @username)
-      print_statuses JSON.parse(get("statuses/user_timeline/#{user}.json?count=#{@num_statuses}"))
+      @io.show_statuses JSON.parse(get("statuses/user_timeline/#{user}.json?count=#{@num_statuses}"))
     end
 
-    def msg(status = nil)
-      unless status
-        printf "New status: "
-        status = $stdin.gets
+    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}")
       end
-      if confirm_user_action("Really send?")
-        msg = status[0...MAX_STATUS_LENGTH]
-        body = {:status => msg }
-        status = JSON.parse(post("statuses/update.json", body))
-        puts "Sent status update.\n\n"
-        print_statuses([status])
+      if @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])
       else
-        puts "Cancelled."
+        @io.info "Cancelled."
       end
     end
 
@@ -56,26 +56,5 @@ module Tweetwine
     rescue RestClient::Exception => e
       raise ClientError, e.message
     end
-
-    def confirm_user_action(msg)
-      printf "#{msg} [yN] "
-      confirmation = $stdin.gets.strip
-      confirmation.downcase[0,1] == "y"
-    end
-
-    def print_statuses(statuses)
-      statuses.each do |status|
-        time_diff_value, time_diff_unit = Util.humanize_time_diff(Time.now, status["created_at"])
-        from_user = status["user"]["screen_name"]
-        from_user = Util.colorize(:green, from_user) if @colorize
-        text = status["text"]
-        text = Util.colorize(:red, text, /@\w+/) if @colorize
-        puts <<-END
-#{from_user}, #{time_diff_value} #{time_diff_unit} ago:
-#{text}
-
-        END
-      end
-    end
   end
 end

data/lib/tweetwine/io.rb

@@ -0,0 +1,65 @@
+module Tweetwine
+  class IO
+    def initialize(options)
+      @input = options[:input] || $stdin
+      @output = options[:output] || $stdout
+      @colorize = options[:colorize] || false
+    end
+
+    def prompt(prompt)
+      @output.print "#{prompt}: "
+      @input.gets.strip!
+    end
+
+    def info(msg)
+      @output.puts(msg)
+    end
+
+    def warn(msg)
+      @output.puts "Warning: #{msg}"
+    end
+
+    def confirm(msg)
+      @output.print "#{msg} [yN] "
+      confirmation = @input.gets.strip
+      confirmation.downcase[0,1] == "y"
+    end
+
+    def show_statuses(statuses)
+      statuses.each do |status|
+        time_diff_value, time_diff_unit = Util.humanize_time_diff(Time.now, status["created_at"])
+        from_user = status["user"]["screen_name"]
+        from_user = colorize(:green, from_user) if @colorize
+        text = status["text"]
+        text = colorize(:red, text, /@\w+/) if @colorize
+        @output.puts <<-END
+#{from_user}, #{time_diff_value} #{time_diff_unit} ago:
+#{text}
+
+        END
+      end
+    end
+
+    private
+
+    COLOR_CODES = {
+      :green    => "\033[32m",
+      :red      => "\033[31m",
+      :neutral  => "\033[0m"
+    }
+
+    def colorize(color, str, matcher = nil)
+      color_code = COLOR_CODES[color.to_sym]
+
+      unless matcher
+        colorize_str(color_code, str)
+      else
+        str.gsub(matcher) { |s| colorize_str(color_code, s) }
+      end
+    end
+
+    def colorize_str(color_code, str)
+      "#{color_code}#{str}#{COLOR_CODES[:neutral]}"
+    end
+  end
+end

data/lib/tweetwine/util.rb

@@ -2,21 +2,6 @@ require "time"
 
 module Tweetwine
   module Util
-    COLOR_CODES = {
-      :green  => "\033[32m",
-      :red    => "\033[31m"
-    }
-
-    def self.colorize(color, str, matcher = nil)
-      color_code = COLOR_CODES[color.to_sym]
-
-      unless matcher
-        colorize_str(color_code, str)
-      else
-        str.gsub(matcher) { |s| colorize_str(color_code, s) }
-      end
-    end
-
     def self.humanize_time_diff(from, to)
       from = Time.parse(from.to_s) unless from.is_a? Time
       to = Time.parse(to.to_s) unless to.is_a? Time
@@ -35,10 +20,6 @@ module Tweetwine
 
     private
 
-    def self.colorize_str(color_code, str)
-      "#{color_code}#{str}\033[0m"
-    end
-
     def self.pluralize_unit(value, unit)
       if ["hour", "day"].include?(unit) && value > 1
         unit = unit + "s"

data/lib/tweetwine.rb

@@ -1,3 +1,3 @@
-%w{util config client}.each do |f|
+%w{util config io client}.each do |f|
   require File.dirname(__FILE__) << "/tweetwine/#{f}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tuomas-tweetwine
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Tuomas Kareinen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-22 00:00:00 -07:00
+date: 2009-04-23 00:00:00 -07:00
 default_executable: tweetwine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,6 +49,7 @@ files:
 - lib/tweetwine
 - lib/tweetwine/client.rb
 - lib/tweetwine/config.rb
+- lib/tweetwine/io.rb
 - lib/tweetwine/util.rb
 - lib/tweetwine.rb
 has_rdoc: true
@@ -56,7 +57,7 @@ homepage: http://github.com/tuomas/tweetwine
 post_install_message: 
 rdoc_options: 
 - --title
-- Tweetwine 0.1.0
+- Tweetwine 0.1.1
 - --main
 - README.rdoc
 - --exclude
@@ -81,7 +82,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A simple Twitter agent for command line use
 test_files: []