tuomas-tweetwine 0.1.4 → 0.1.5

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+=== 0.1.5 released 2009-06-06
+
+* URLs of http(s) scheme are highlighted. Changed colors.
+* Friendly abort message when interrupting the program with Ctrl+C.
+
 === 0.1.4 released 2009-05-12
 
 * Command line option "--page N" fetches a specific status page

data/Rakefile

@@ -2,7 +2,7 @@ require "rubygems"
 
 full_name = "Tweetwine"
 package_name = "tweetwine"
-version = "0.1.4"
+version = "0.1.5"
 
 require "lib/#{package_name}"
 
@@ -24,7 +24,7 @@ spec = Gem::Specification.new do |s|
   s.executables = ["tweetwine"]
 
   s.add_dependency("json", ">= 1.1.4")
-  s.add_dependency("rest-client", ">= 0.9.2")
+  s.add_dependency("rest-client", ">= 1.0.0")
 
   s.has_rdoc = true
   s.extra_rdoc_files = FileList["*.rdoc"].to_a

data/bin/tweetwine

@@ -5,6 +5,15 @@ require "optparse"
 
 require File.dirname(__FILE__) << "/../lib/tweetwine"
 
+EXIT_HELP = 1
+EXIT_SIGINT = 2
+EXIT_ERROR = 64
+
+trap("INT") do
+  puts "\nAbort."
+  exit(EXIT_SIGINT)
+end
+
 include Tweetwine
 
 begin
@@ -35,7 +44,7 @@ Usage: tweetwine [options...] [command]
         end
         opt.on_tail("-h", "--help", "Show this help message") do
           puts opt
-          exit(1)
+          exit(EXIT_HELP)
         end
       end.parse!(args)
     rescue OptionParser::ParseError => e
@@ -47,5 +56,5 @@ Usage: tweetwine [options...] [command]
   client.send(config.command, *config.args)
 rescue ArgumentError, ClientError => e
   puts "Error: #{e.message}"
-  exit(2)
+  exit(EXIT_ERROR)
 end

data/lib/tweetwine/client.rb

@@ -18,8 +18,8 @@ module Tweetwine
       raise ArgumentError, "No authentication data given" if @username.empty?
       @base_url = "https://#{@username}:#{options[:password]}@twitter.com/"
       @colorize = options[:colorize] || false
-      @num_statuses = parse_positive_int_option(options[:num_statuses], DEFAULT_NUM_STATUSES, 1, "number of statuses_to_show")
-      @page_num = parse_positive_int_option(options[:page_num], DEFAULT_PAGE_NUM, 1, "page number")
+      @num_statuses = parse_int_gt_option(options[:num_statuses], DEFAULT_NUM_STATUSES, 1, "number of statuses_to_show")
+      @page_num = parse_int_gt_option(options[:page_num], DEFAULT_PAGE_NUM, 1, "page number")
       @io = IO.new(options)
     end
 
@@ -52,7 +52,7 @@ module Tweetwine
 
     private
 
-    def parse_positive_int_option(value, default, min, name_for_error)
+    def parse_int_gt_option(value, default, min, name_for_error)
       if value
         value = value.to_i
         if value >= min

data/lib/tweetwine/io.rb

@@ -38,7 +38,10 @@ module Tweetwine
           ""
         end
         text = status["text"]
-        text = colorize(:red, text, /@\w+/) if @colorize
+        if @colorize
+          text = colorize(:yellow, text, NICK_REGEX)
+          text = colorize(:cyan, text, URL_REGEX)
+        end
         @output.puts <<-END
 #{from_user}, #{in_reply_to}#{time_diff_value} #{time_diff_unit} ago:
 #{text}
@@ -50,9 +53,17 @@ module Tweetwine
     private
 
     COLOR_CODES = {
-      :green    => "\033[32m",
-      :red      => "\033[31m"
-    }
+      :cyan     => 36,
+      :green    => 32,
+      :magenta  => 35,
+      :yellow   => 33
+    }.inject({}) do |result, pair|
+      result[pair.first.to_sym] = "\033[#{pair.last}m"
+      result
+    end
+
+    NICK_REGEX = /@\w+/
+    URL_REGEX = /(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/\S*)?/i
 
     def colorize(color, str, matcher = nil)
       color_code = COLOR_CODES[color.to_sym]

data/test/io_test.rb

@@ -108,7 +108,7 @@ Hi, @barman! Lulz woo!
       Util.expects(:humanize_time_diff).returns([2, "secs"])
       @output.expects(:puts).with(<<-END
 \033[32mfooman\033[0m, 2 secs ago:
-Hi, \033[31m@barman\033[0m! Lulz woo!
+Hi, \033[33m@barman\033[0m! Lulz woo!
 
       END
       )
@@ -121,13 +121,13 @@ Hi, \033[31m@barman\033[0m! Lulz woo!
           "created_at" => Time.at(1),
           "in_reply_to_screen_name" => "barman",
           "user" => { "screen_name" => "fooman" },
-          "text" => "Hi, @barman! Lulz woo!"
+          "text" => "Hi, @barman! Check this: http://www.foo.com. Nice, isn't it?"
         }
       ]
       Util.expects(:humanize_time_diff).returns([2, "secs"])
       @output.expects(:puts).with(<<-END
 \033[32mfooman\033[0m, in reply to \033[32mbarman\033[0m, 2 secs ago:
-Hi, \033[31m@barman\033[0m! Lulz woo!
+Hi, \033[33m@barman\033[0m! Check this: \033[36mhttp://www.foo.com\033[0m. Nice, isn't it?
 
       END
       )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tuomas-tweetwine
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Tuomas Kareinen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-12 00:00:00 -07:00
+date: 2009-06-06 00:00:00 -07:00
 default_executable: tweetwine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.2
+        version: 1.0.0
     version: 
 description: A simple but tasty Twitter agent for command line use, made for fun.
 email: tkareine@gmail.com
@@ -63,7 +63,7 @@ homepage: http://github.com/tuomas/tweetwine
 post_install_message: 
 rdoc_options: 
 - --title
-- Tweetwine 0.1.4
+- Tweetwine 0.1.5
 - --main
 - README.rdoc
 - --exclude