tweetwine 0.3.1 → 0.3.2

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+=== 0.3.2 released 2010-11-17
+
+* Drop <tt>json</tt> gem dependency from gemspec in order to allow the user to
+  choose the JSON parser implementation
+* Minor cleanups
+
 === 0.3.1 released 2010-11-14
 
 * Fix regression bug: shorten HTTPS URLs also

data/Gemfile

@@ -1,17 +1,17 @@
 source :rubygems
 
-gem "nokogiri", "~> 1.4.3"
-gem "oauth",    "~> 0.4.4"
-gem "json",     ">= 1.0.0", :platforms => [:ruby_18, :jruby]
+gem 'json',     '>= 1.0.0', :platforms => [:ruby_18, :jruby]
+gem 'nokogiri', '~> 1.4.4'
+gem 'oauth',    '~> 0.4.4'
 
 group :test do
-  gem "contest",        "~> 0.1.2"
-  gem "coulda",         "~> 0.6.0"
-  gem "gem-man",        "~> 0.2.0"
-  gem "mcmire-matchy",  "~> 0.5.2", :require => "matchy"
-  gem "mocha",          "=  0.9.8"
-  gem "open4",          "~> 1.0.1"
-  gem "ronn",           "~> 0.7.3"
-  gem "timecop",        "~> 0.3.5"
-  gem "webmock",        "~> 1.6.1"
+  gem 'contest',        '~> 0.1.2'
+  gem 'coulda',         '~> 0.6.0'
+  gem 'gem-man',        '~> 0.2.0'
+  gem 'mcmire-matchy',  '~> 0.5.2', :require => 'matchy'
+  gem 'mocha',          '=  0.9.8'
+  gem 'open4',          '~> 1.0.1'
+  gem 'ronn',           '~> 0.7.3'
+  gem 'timecop',        '~> 0.3.5'
+  gem 'webmock',        '~> 1.6.1'
 end

data/README.md

@@ -1,10 +1,9 @@
-tweetwine -- a simple Twitter command line agent
-================================================
+tweetwine
+=========
 
 ## DESCRIPTION
 
-Tweetwine is designed for checking the latest tweets from the command line
-quickly.
+Tweetwine shows the latest tweets from the command line quickly.
 
 The program can show the home timeline of the authenticated user, the latest
 tweets of friends and followers, and the latest tweets that mention the user.
@@ -28,11 +27,11 @@ Install Tweetwine with RubyGems:
 The program is tested with Ruby 1.8.7 and 1.9.2.
 
 The program requires [oauth](http://oauth.rubyforge.org/) gem to be installed.
-In addition, the program needs [json](http://json.rubyforge.org/) gem on Ruby
-1.8.
+In addition, the program needs a JSON parser library, such as
+[json](http://json.rubyforge.org/) gem, on Ruby 1.8.
 
 This documentation page is also provided as a manual page. Use
-[gem-man](http://github.com/defunkt/gem-man) to see it:
+[gem-man](https://github.com/defunkt/gem-man) to see it:
 
     $ gem man tweetwine
 
@@ -129,4 +128,4 @@ Tweetwine is Copyright (c) 2009-2010 Tuomas Kareinen.
 
 ## SEE ALSO
 
-<http://github.com/tuomas/tweetwine>
+<https://github.com/tuomas/tweetwine>

data/Rakefile

@@ -1,11 +1,11 @@
 # coding: utf-8
 
-require "rake/clean"
+require 'rake/clean'
 
-$LOAD_PATH.unshift(File.expand_path("../lib/", __FILE__))
-name = "tweetwine"
+$LOAD_PATH.unshift(File.expand_path('lib', File.dirname(__FILE__)))
+name = 'tweetwine'
 require name
-version = Tweetwine::VERSION.dup
+version = Tweetwine.version.dup
 
 namespace :gem do
   CLOBBER.include "#{name}-*.gem"

data/lib/tweetwine/character_encoding.rb

@@ -3,7 +3,7 @@
 module Tweetwine
   class CharacterEncoding
     class << self
-      if "".respond_to?(:encode)
+      if defined? Encoding
         def to_utf8(str)
           result = str.encode('UTF-8')
           raise TranscodeError, "invalid UTF-8 byte sequence when transcoding '#{str}'" unless result.valid_encoding?

data/lib/tweetwine/cli.rb

@@ -238,7 +238,7 @@ Usage: #{CLI::EXEC_NAME} #{name} #{usage}
         sort     { |a, b| a.first.to_s <=> b.first.to_s }.
         map      { |cmd, klass| [cmd, klass.about] }
       CLI.ui.info <<-END
-A simple but tasty Twitter agent for command line use, made for fun.
+#{Tweetwine.summary}
 
 Usage: #{CLI::EXEC_NAME} [global_options...] [<command>] [command_options...]
 
@@ -372,7 +372,7 @@ Usage: #{CLI::EXEC_NAME} [global_options...] [<command>] [command_options...]
     about "Show program version and exit."
 
     def run
-      CLI.ui.info "tweetwine #{Tweetwine::VERSION}"
+      CLI.ui.info "tweetwine #{Tweetwine.version}"
     end
   end
 end

data/lib/tweetwine/twitter.rb

@@ -1,6 +1,5 @@
 # coding: utf-8
 
-require "json"
 require "uri"
 
 module Tweetwine

data/lib/tweetwine/url_shortener.rb

@@ -3,7 +3,8 @@
 module Tweetwine
   class UrlShortener
     def initialize(options)
-      raise "UrlShortener should be disabled" if options[:disable]
+      raise 'UrlShortener should be disabled' if options[:disable]
+      require 'nokogiri'
       @method = (options[:method] || :get).to_sym
       unless [:get, :post].include? @method
         raise CommandLineError, "Unsupported HTTP request method for URL shortening: #{@method}"
@@ -20,7 +21,6 @@ module Tweetwine
     end
 
     def shorten(url)
-      require "nokogiri"
       response = CLI.http.send(@method, *get_service_url_and_params(url))
       doc = Nokogiri::HTML(response)
       doc.xpath(@xpath_selector).first.to_s
@@ -44,7 +44,7 @@ module Tweetwine
         params = @extra_params.merge({ @url_param_name.to_sym => url_to_shorten })
         [service_url, params]
       else
-        raise "Unrecognized HTTP request method; should have been supported"
+        raise "Unrecognized HTTP request method #{@method}; should have been supported"
       end
     end
   end

data/lib/tweetwine.rb

@@ -1,9 +1,25 @@
 # coding: utf-8
 
+begin
+  require 'json'
+rescue LoadError
+  raise 'Could not load JSON library; do you have one installed as a gem?'
+end unless defined? JSON
+
 gem 'oauth', '~> 0.4.4'
 
 module Tweetwine
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
+
+  class << self
+    def version
+      VERSION
+    end
+
+    def summary
+      'Tweetwine shows the latest tweets from the command line quickly.'
+    end
+  end
 
   class Error < StandardError
     @status_code = 42

data/man/tweetwine.7

@@ -3,11 +3,8 @@
 .
 .TH "TWEETWINE" "7" "November 2010" "Tuomas Kareinen" "Tweetwine Manual"
 .
-.SH "NAME"
-\fBtweetwine\fR \- a simple Twitter command line agent
-.
 .SH "DESCRIPTION"
-Tweetwine is designed for checking the latest tweets from the command line quickly\.
+Tweetwine shows the latest tweets from the command line quickly\.
 .
 .P
 The program can show the home timeline of the authenticated user, the latest tweets of friends and followers, and the latest tweets that mention the user\. If that\'s not enough, Tweetwine can search statuses with arbitrary terms and send status updates\.
@@ -46,10 +43,10 @@ $ gem install tweetwine
 The program is tested with Ruby 1\.8\.7 and 1\.9\.2\.
 .
 .P
-The program requires oauth \fIhttp://oauth\.rubyforge\.org/\fR gem to be installed\. In addition, the program needs json \fIhttp://json\.rubyforge\.org/\fR gem on Ruby 1\.8\.
+The program requires oauth \fIhttp://oauth\.rubyforge\.org/\fR gem to be installed\. In addition, the program needs a JSON parser library, such as json \fIhttp://json\.rubyforge\.org/\fR gem, on Ruby 1\.8\.
 .
 .P
-This documentation page is also provided as a manual page\. Use gem\-man \fIhttp://github\.com/defunkt/gem\-man\fR to see it:
+This documentation page is also provided as a manual page\. Use gem\-man \fIhttps://github\.com/defunkt/gem\-man\fR to see it:
 .
 .IP "" 4
 .
@@ -187,4 +184,4 @@ fi
 Tweetwine is Copyright (c) 2009\-2010 Tuomas Kareinen\.
 .
 .SH "SEE ALSO"
-\fIhttp://github\.com/tuomas/tweetwine\fR
+\fIhttps://github\.com/tuomas/tweetwine\fR

data/man/tweetwine.7.ronn

@@ -1,10 +1,9 @@
-tweetwine -- a simple Twitter command line agent
-================================================
+tweetwine
+=========
 
 ## DESCRIPTION
 
-Tweetwine is designed for checking the latest tweets from the command line
-quickly.
+Tweetwine shows the latest tweets from the command line quickly.
 
 The program can show the home timeline of the authenticated user, the latest
 tweets of friends and followers, and the latest tweets that mention the user.
@@ -28,11 +27,11 @@ Install Tweetwine with RubyGems:
 The program is tested with Ruby 1.8.7 and 1.9.2.
 
 The program requires [oauth](http://oauth.rubyforge.org/) gem to be installed.
-In addition, the program needs [json](http://json.rubyforge.org/) gem on Ruby
-1.8.
+In addition, the program needs a JSON parser library, such as
+[json](http://json.rubyforge.org/) gem, on Ruby 1.8.
 
 This documentation page is also provided as a manual page. Use
-[gem-man](http://github.com/defunkt/gem-man) to see it:
+[gem-man](https://github.com/defunkt/gem-man) to see it:
 
     $ gem man tweetwine
 
@@ -129,4 +128,4 @@ Tweetwine is Copyright (c) 2009-2010 Tuomas Kareinen.
 
 ## SEE ALSO
 
-<http://github.com/tuomas/tweetwine>
+<https://github.com/tuomas/tweetwine>

data/test/example/application_behavior_example.rb

@@ -35,7 +35,7 @@ Feature "application behavior" do
 
       Then "the application shows help and exists with success status" do
         @output.should == <<-END
-A simple but tasty Twitter agent for command line use, made for fun.
+#{Tweetwine.summary}
 
 Usage: #{CLI::EXEC_NAME} [global_options...] [<command>] [command_options...]
 
@@ -147,7 +147,7 @@ Usage: tweetwine help [<command>]
       stub_http_request(METHOD, ACCESS_TOKEN_URL).to_return(:body => ACCESS_TOKEN_RESPONSE)
       stub_http_request(:get, @command_url).
           to_return(:status => [401, 'Unauthorized']).then.
-          to_return(:body => fixture("home.json"))
+          to_return(:body => fixture_file('home.json'))
       @output = nil
       @config_contents = nil
       @config_mode = nil

data/test/example/example_helper.rb

@@ -18,7 +18,7 @@ module Tweetwine::Test
   module Helper
     include WebMock::API
 
-    CONFIG_FILE = fixture_file('config_example.yaml')
+    CONFIG_FILE = fixture_path('config_example.yaml')
     PROJECT_DIR = File.expand_path('../..', File.dirname(__FILE__))
     PROXY_HOST = "proxy.net"
     PROXY_PORT = 8123
@@ -39,12 +39,6 @@ module Tweetwine::Test
       output.string.split("\n")
     end
 
-    def fixture(filename)
-      File.open(fixture_file(filename)) do |f|
-        f.readlines.join("\n")
-      end
-    end
-
     def in_temp_dir
       Dir.mktmpdir do |tmp_dir|
         Dir.chdir(tmp_dir) do |dir|

data/test/example/search_statuses_example.rb

@@ -9,7 +9,7 @@ Feature "search tweets" do
 
   SEARCH_OR_URL = "http://search.twitter.com/search.json?q=braid%20game&rpp=2&page=1"
   SEARCH_AND_URL = "http://search.twitter.com/search.json?q=braid%20OR%20game&rpp=2&page=1"
-  SEARCH_FIXTURE = fixture("search.json")
+  SEARCH_FIXTURE = fixture_file('search.json')
 
   Scenario "search words" do
     When "I start the application with command 'search' and search words" do

data/test/example/show_followers_example.rb

@@ -9,7 +9,7 @@ Feature "show followers" do
 
   Scenario "show followers" do
     When "I start the application with 'followers' command" do
-      stub_http_request(:get, "https://api.twitter.com/1/statuses/followers.json?count=20&page=1").to_return(:body => fixture("users.json"))
+      stub_http_request(:get, "https://api.twitter.com/1/statuses/followers.json?count=20&page=1").to_return(:body => fixture_file('users.json'))
       @output = start_cli %w{followers}
     end
 

data/test/example/show_friends_example.rb

@@ -9,7 +9,7 @@ Feature "show friends" do
 
   Scenario "show friends" do
     When "I start the application with 'followers' command" do
-      stub_http_request(:get, "https://api.twitter.com/1/statuses/friends.json?count=20&page=1").to_return(:body => fixture("users.json"))
+      stub_http_request(:get, "https://api.twitter.com/1/statuses/friends.json?count=20&page=1").to_return(:body => fixture_file('users.json'))
       @output = start_cli %w{friends}
     end
 

data/test/example/show_home_example.rb

@@ -9,7 +9,7 @@ Feature "show tweets from home timeline" do
 
   def setup
     super
-    stub_http_request(:get, "https://api.twitter.com/1/statuses/home_timeline.json?count=20&page=1").to_return(:body => fixture("home.json"))
+    stub_http_request(:get, "https://api.twitter.com/1/statuses/home_timeline.json?count=20&page=1").to_return(:body => fixture_file('home.json'))
   end
 
   Scenario "with colorization disabled" do

data/test/example/show_mentions_example.rb

@@ -9,7 +9,7 @@ Feature "show tweets mentioning the user" do
 
   Scenario "show tweets mentioning me" do
     When "I start the application with 'mentions' command" do
-      stub_http_request(:get, "https://api.twitter.com/1/statuses/mentions.json?count=20&page=1").to_return(:body => fixture("mentions.json"))
+      stub_http_request(:get, "https://api.twitter.com/1/statuses/mentions.json?count=20&page=1").to_return(:body => fixture_file('mentions.json'))
       @output = start_cli %w{mentions}
     end
 

data/test/example/show_user_example.rb

@@ -8,7 +8,7 @@ Feature "show user's tweets" do
   i_want_to "see that user's tweets"
 
   USER_URL = "https://api.twitter.com/1/statuses/user_timeline.json?count=20&page=1&screen_name=%s"
-  USER_FIXTURE = fixture("user.json")
+  USER_FIXTURE = fixture_file('user.json')
 
   Scenario "show my tweets" do
     When "I start the application with 'user' command without extra arguments" do

data/test/example/update_status_example.rb

@@ -8,12 +8,12 @@ Feature "update my status (send new tweet)" do
   as_a "authenticated user"
   i_want_to "update my status"
 
-  RUBYGEMS_FIXTURE = fixture('shorten_rubygems.html')
+  RUBYGEMS_FIXTURE = fixture_file('shorten_rubygems.html')
   RUBYGEMS_FULL_URL = 'http://rubygems.org/'
   RUBYGEMS_FULL_URL_ENC = 'http%3a%2f%2frubygems.org%2f'
   RUBYGEMS_SHORT_URL = 'http://is.gd/gGazV'
   RUBYGEMS_SHORT_URL_ENC = 'http%3a%2f%2fis.gd%2fgGazV'
-  RUBYLANG_FIXTURE = fixture('shorten_rubylang.html')
+  RUBYLANG_FIXTURE = fixture_file('shorten_rubylang.html')
   RUBYLANG_FULL_URL = 'http://ruby-lang.org/'
   RUBYLANG_FULL_URL_ENC = 'http%3a%2f%2fruby-lang.org%2f'
   RUBYLANG_SHORT_URL = 'http://is.gd/gGaM3'
@@ -23,9 +23,9 @@ Feature "update my status (send new tweet)" do
   STATUS_WITH_FULL_URLS = "ruby links: #{RUBYGEMS_FULL_URL} #{RUBYLANG_FULL_URL}"
   STATUS_WITH_SHORT_URLS = "ruby links: #{RUBYGEMS_SHORT_URL} #{RUBYLANG_SHORT_URL}"
   STATUS_WITHOUT_URLS = "bored. going to sleep."
-  UPDATE_FIXTURE_WITH_URLS = fixture("update_with_urls.json")
-  UPDATE_FIXTURE_WITHOUT_URLS = fixture("update_without_urls.json")
-  UPDATE_FIXTURE_UTF8 = fixture("update_utf8.json")
+  UPDATE_FIXTURE_WITH_URLS = fixture_file('update_with_urls.json')
+  UPDATE_FIXTURE_WITHOUT_URLS = fixture_file('update_without_urls.json')
+  UPDATE_FIXTURE_UTF8 = fixture_file('update_utf8.json')
   UPDATE_URL = "https://api.twitter.com/1/statuses/update.json"
 
   BODY_WITH_SHORT_URLS = "status=ruby%20links%3a%20#{RUBYGEMS_SHORT_URL_ENC}%20#{RUBYLANG_SHORT_URL_ENC}"
@@ -100,7 +100,7 @@ Feature "update my status (send new tweet)" do
     end
   end
 
-  if "".respond_to?(:encode)
+  if defined? Encoding
     Scenario "encode status in UTF-8 (String supports encoding)" do
       When "I start the application with 'update' command, input latin1 encoded status, and confirm" do
         @status_utf8 = "résumé"
@@ -136,7 +136,6 @@ Feature "update my status (send new tweet)" do
       Then "the application sends and shows the status" do
         @output[1].should == @status_latin1   # preview
         @output[5].should == "#{USER}, 9 hours ago:"
-        # TODO: we should convert status back to latin-1
         @output[6].should == @status_utf8
       end
     end

data/test/example/use_http_proxy_example.rb

@@ -9,7 +9,7 @@ Feature "using HTTP proxy" do
 
   def setup
     super
-    stub_http_request(:get, "https://api.twitter.com/1/statuses/home_timeline.json?count=20&page=1").to_return(:body => fixture("home.json"))
+    stub_http_request(:get, "https://api.twitter.com/1/statuses/home_timeline.json?count=20&page=1").to_return(:body => fixture_file('home.json'))
   end
 
   Scenario "enable proxy via environment variable" do

data/test/test_helper.rb

@@ -15,10 +15,16 @@ module Tweetwine
         File.stat(file).mode & 0777
       end
 
-      def fixture_file(filename)
+      def fixture_path(filename)
         File.dirname(__FILE__) << "/fixture/" << filename
       end
 
+      def fixture_file(filename)
+        File.open(fixture_path(filename)) do |f|
+          f.readlines.join("\n")
+        end
+      end
+
       def tmp_env(vars = {})
         originals = {}
         vars.each_pair do |key, value|

data/test/unit/character_encoding_test.rb

@@ -5,7 +5,7 @@ require "unit_helper"
 module Tweetwine::Test
 
 class CharacterEncodingTest < UnitTestCase
-  if "".respond_to?(:encode)
+  if defined? Encoding
     context "when transcoding to UTF-8 when String supports encoding" do
       should "transcode string to UTF-8" do
         str_utf8 = "groß résumé"

data/test/unit/config_test.rb

@@ -9,7 +9,7 @@ require "yaml"
 module Tweetwine::Test
 
 class ConfigTest < UnitTestCase
-  CONFIG_FILE = Helper.fixture_file('config_unit.yaml')
+  CONFIG_FILE = Helper.fixture_path('config_unit.yaml')
 
   context "when given command line arguments, no environment variables, no config file" do
     setup do
@@ -190,7 +190,7 @@ class ConfigTest < UnitTestCase
       end
 
       should "ignore nonexisting config file for initial read" do
-        assert_contains_in_order(@default_config.keys, @config.keys) do |a, b|
+        assert_contains_exactly(@default_config.keys, @config.keys) do |a, b|
           # On Ruby 1.8, Symbol does not have #<=> operator for comparison.
           a.to_s <=> b.to_s
         end

data/test/unit/twitter_test.rb

@@ -263,7 +263,7 @@ class ClientTest < UnitTestCase
         @twitter.update(long_status)
       end
 
-      if "".respond_to?(:encode)
+      if defined? Encoding
         should "encode status in UTF-8 (String supports encoding)" do
           status_utf8, status_latin1 = "résumé", "résumé".encode('ISO-8859-1')
           twitter_records, internal_records = create_test_twitter_status_records_from_rest_api({
@@ -447,6 +447,7 @@ class ClientTest < UnitTestCase
           end
 
           should "skip shortening URLs if required libraries are not found" do
+            Tweetwine::CLI.stubs(:url_shortener).raises(LoadError, 'gem not found')
             @oauth.expects(:request_signer)
             http_subresource = mock
             http_subresource.expects(:post).
@@ -455,7 +456,6 @@ class ClientTest < UnitTestCase
             @rest_api.expects(:[]).
                 with("statuses/update.json").
                 returns(http_subresource)
-            @url_shortener.expects(:shorten).with(@url).raises(LoadError, "gem not found")
             @ui.expects(:warn)
             @ui.expects(:show_status_preview).with(@status)
             @ui.expects(:confirm).with("Really send?").returns(true)
@@ -619,6 +619,52 @@ class ClientTest < UnitTestCase
       end
     end
   end
+
+  private
+
+  def create_test_twitter_status_records_from_rest_api(*internal_records)
+    twitter_records = internal_records.map do |internal_record|
+      {
+        "user"                    => { "screen_name" => internal_record[:from_user] },
+        "created_at"              => internal_record[:created_at],
+        "text"                    => internal_record[:status],
+        "in_reply_to_screen_name" => internal_record[:to_user]
+      }
+    end
+    [twitter_records, internal_records]
+  end
+
+  def create_test_twitter_user_records_from_rest_api(*internal_records)
+    twitter_records = internal_records.map do |internal_record|
+      twitter_record = { "screen_name" => internal_record[:from_user] }
+      if internal_record[:status]
+        twitter_record.merge!({
+          "status" => {
+            "created_at"              => internal_record[:created_at],
+            "text"                    => internal_record[:status],
+            "in_reply_to_screen_name" => internal_record[:to_user],
+          }
+        })
+      end
+      twitter_record
+    end
+    [twitter_records, internal_records]
+  end
+
+  def create_test_twitter_records_from_search_api(*internal_records)
+    twitter_search_records = internal_records.map do |internal_record|
+      {
+        "from_user"   => internal_record[:from_user],
+        "created_at"  => internal_record[:created_at],
+        "text"        => internal_record[:status],
+        "to_user"     => internal_record[:to_user]
+      }
+    end
+    twitter_records = {
+      "results" => twitter_search_records
+    }
+    [twitter_records, internal_records]
+  end
 end
 
 end

data/test/unit/unit_helper.rb

@@ -8,51 +8,30 @@ require "mocha"
 Mocha::Configuration.prevent(:stubbing_non_existent_method)
 
 module Tweetwine::Test
-  module Helper
-    extend self
-
-    def create_test_twitter_status_records_from_rest_api(*internal_records)
-      twitter_records = internal_records.map do |internal_record|
-        {
-          "user"                    => { "screen_name" => internal_record[:from_user] },
-          "created_at"              => internal_record[:created_at],
-          "text"                    => internal_record[:status],
-          "in_reply_to_screen_name" => internal_record[:to_user]
-        }
-      end
-      [twitter_records, internal_records]
+  module Assertions
+    # Asserts whether an Enumeration like object contains all the elements.
+    # Fails unless +actual+ contains the same elements as +expected+, ignoring
+    # the order of the elements.
+    #
+    # The method sorts +expected+ and +actual+ in order to compare them. By
+    # default, this sorting is done by calling #sort for each of them. If the
+    # method is called with a block, it is passed to the #sort calls.
+    def assert_contains_exactly(expected, actual, msg = '', &sorter)
+      expected = block_given? ? expected.sort(&sorter) : expected.sort
+      actual   = block_given? ? actual.sort(&sorter)   : actual.sort
+      assert_equal(expected, actual, msg)
     end
 
-    def create_test_twitter_user_records_from_rest_api(*internal_records)
-      twitter_records = internal_records.map do |internal_record|
-        twitter_record = { "screen_name" => internal_record[:from_user] }
-        if internal_record[:status]
-          twitter_record.merge!({
-            "status" => {
-              "created_at"              => internal_record[:created_at],
-              "text"                    => internal_record[:status],
-              "in_reply_to_screen_name" => internal_record[:to_user],
-            }
-          })
-        end
-        twitter_record
-      end
-      [twitter_records, internal_records]
+    # Fails unless +str+ is a full match to +regex+.
+    def assert_full_match(regex, str, msg = '')
+      match_data = regex.match(str)
+      assert(str == match_data.to_s, msg)
     end
 
-    def create_test_twitter_records_from_search_api(*internal_records)
-      twitter_search_records = internal_records.map do |internal_record|
-        {
-          "from_user"   => internal_record[:from_user],
-          "created_at"  => internal_record[:created_at],
-          "text"        => internal_record[:status],
-          "to_user"     => internal_record[:to_user]
-        }
-      end
-      twitter_records = {
-        "results" => twitter_search_records
-      }
-      [twitter_records, internal_records]
+    # Fails if +str+ is a full match to +regex+.
+    def assert_no_full_match(regex, str, msg = '')
+      match_data = regex.match(str)
+      assert(str != match_data.to_s, msg)
     end
   end
 
@@ -88,29 +67,11 @@ module Tweetwine::Test
     end
   end
 
-  module Assertions
-    def assert_contains_in_order(expected, actual, msg = "", &sorter)
-      expected = block_given? ? expected.sort(&sorter) : expected.sort
-      actual   = block_given? ? actual.sort(&sorter)   : actual.sort
-      assert_equal(expected, actual, msg)
-    end
-
-    def assert_full_match(regex, str, msg = "")
-      match_data = regex.match(str)
-      assert(str == match_data.to_s, msg)
-    end
-
-    def assert_no_full_match(regex, str, msg = "")
-      match_data = regex.match(str)
-      assert(str != match_data.to_s, msg)
-    end
-  end
-
   class UnitTestCase < ::Test::Unit::TestCase
     include WebMock::API
     include Tweetwine
     include Helper
-    include Doubles
     include Assertions
+    include Doubles
   end
 end

data/tweetwine.gemspec

@@ -1,52 +1,60 @@
 # coding: utf-8
 
-$LOAD_PATH.unshift(File.expand_path("../lib/", __FILE__))
-name = "tweetwine"
+$LOAD_PATH.unshift(File.expand_path('lib', File.dirname(__FILE__)))
+name = 'tweetwine'
 require name
-version = Tweetwine::VERSION.dup
+summary = Tweetwine.summary
+version = Tweetwine.version.dup
 
 Gem::Specification.new do |s|
-  s.specification_version = 2 if s.respond_to? :specification_version=
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-
   s.name = name
   s.version = version
-  s.homepage = "http://github.com/tuomas/tweetwine"
 
-  s.summary = "A simple Twitter command line agent"
-  s.description = "A simple but tasty Twitter agent for command line use, made for fun."
+  s.summary = summary
+  s.description = <<-END
+A simple but tasty Twitter agent for command line use, designed for quickly
+showing the latest tweets.
+  END
+
+  s.email = 'tkareine@gmail.com'
+  s.homepage = 'https://github.com/tuomas/tweetwine'
 
-  s.authors = "Tuomas Kareinen"
-  s.email = "tkareine@gmail.com"
+  s.authors = ['Tuomas Kareinen']
 
+  s.executables = %w{tweetwine}
   s.files = Dir[
-    "*.md",
-    "*.rdoc",
-    "LICENSE.txt",
-    "Gemfile",
-    "Rakefile",
-    "tweetwine.gemspec",
-    "{bin,contrib,example,lib,test}/**/*",
-    "man/**/*.[1-9]",
-    "man/**/*.ronn"
+    '*.md',
+    '*.rdoc',
+    'LICENSE.txt',
+    'Gemfile',
+    'Rakefile',
+    'tweetwine.gemspec',
+    '{bin,contrib,lib}/**/*',
+    'man/**/*.[1-9]',
+    'man/**/*.ronn'
   ]
-  s.require_paths = %w{lib}
-  s.executables = %w{tweetwine}
+  s.test_files = Dir['test/**/*']
+
+  s.add_dependency 'oauth', '~> 0.4.4'
+  s.add_development_dependency 'contest',       '~> 0.1.2'
+  s.add_development_dependency 'coulda',        '~> 0.6.0'
+  s.add_development_dependency 'gem-man',       '~> 0.2.0'
+  s.add_development_dependency 'mcmire-matchy', '~> 0.5.2'
+  s.add_development_dependency 'mocha',         '=  0.9.8'
+  s.add_development_dependency 'open4',         '~> 1.0.1'
+  s.add_development_dependency 'ronn',          '~> 0.7.3'
+  s.add_development_dependency 'timecop',       '~> 0.3.5'
+  s.add_development_dependency 'webmock',       '~> 1.6.1'
+
+  s.post_install_message = <<-END
+
+Tweetwine requires a JSON parser library. Ruby 1.9 comes bundled with one by
+default. For Ruby 1.8, you can install 'json' gem, for example.
 
-  s.add_dependency "oauth", "~> 0.4.4"
-  s.add_dependency "json",  ">= 1.0.0"
-  s.add_development_dependency "contest", "~> 0.1.2"
-  s.add_development_dependency "coulda",  "~> 0.6.0"
-  s.add_development_dependency "gem-man", "~> 0.2.0"
-  s.add_development_dependency "matchy",  "~> 0.5.2"
-  s.add_development_dependency "mocha",   "=  0.9.8"
-  s.add_development_dependency "open4",   "~> 1.0.1"
-  s.add_development_dependency "ronn",    "~> 0.7.3"
-  s.add_development_dependency "timecop", "~> 0.3.5"
-  s.add_development_dependency "webmock", "~> 1.6.1"
+  END
 
   s.has_rdoc = true
-  s.extra_rdoc_files = Dir["*.rdoc", "LICENSE.txt"]
-  s.rdoc_options << "--title"   << "#{name} #{version}" \
-                 << "--exclude" << "test"
+  s.extra_rdoc_files = Dir['*.rdoc', 'LICENSE.txt']
+  s.rdoc_options << '--title'   << "#{name} #{version}" \
+                 << '--exclude' << 'test'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Tuomas Kareinen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-14 00:00:00 +02:00
+date: 2010-11-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,25 +32,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: contest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,11 +46,11 @@ dependencies:
         - 2
         version: 0.1.2
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: coulda
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -76,11 +61,11 @@ dependencies:
         - 0
         version: 0.6.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: gem-man
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -91,11 +76,11 @@ dependencies:
         - 0
         version: 0.2.0
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: matchy
+  name: mcmire-matchy
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -106,11 +91,11 @@ dependencies:
         - 2
         version: 0.5.2
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -121,11 +106,11 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: open4
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -136,11 +121,11 @@ dependencies:
         - 1
         version: 1.0.1
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: ronn
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -151,11 +136,11 @@ dependencies:
         - 3
         version: 0.7.3
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: timecop
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -166,11 +151,11 @@ dependencies:
         - 5
         version: 0.3.5
   type: :development
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -181,8 +166,11 @@ dependencies:
         - 1
         version: 1.6.1
   type: :development
-  version_requirements: *id011
-description: A simple but tasty Twitter agent for command line use, made for fun.
+  version_requirements: *id010
+description: |
+  A simple but tasty Twitter agent for command line use, designed for quickly
+  showing the latest tweets.
+
 email: tkareine@gmail.com
 executables: 
 - tweetwine
@@ -214,6 +202,8 @@ files:
 - lib/tweetwine/url_shortener.rb
 - lib/tweetwine/util.rb
 - lib/tweetwine.rb
+- man/tweetwine.7
+- man/tweetwine.7.ronn
 - test/example/application_behavior_example.rb
 - test/example/example_helper.rb
 - test/example/search_statuses_example.rb
@@ -251,16 +241,16 @@ files:
 - test/unit/unit_helper.rb
 - test/unit/url_shortener_test.rb
 - test/unit/util_test.rb
-- man/tweetwine.7
-- man/tweetwine.7.ronn
 has_rdoc: true
-homepage: http://github.com/tuomas/tweetwine
+homepage: https://github.com/tuomas/tweetwine
 licenses: []
 
-post_install_message: 
+post_install_message: "\n\
+  Tweetwine requires a JSON parser library. Ruby 1.9 comes bundled with one by\n\
+  default. For Ruby 1.8, you can install 'json' gem, for example.\n\n"
 rdoc_options: 
 - --title
-- tweetwine 0.3.1
+- tweetwine 0.3.2
 - --exclude
 - test
 require_paths: 
@@ -286,7 +276,43 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
-summary: A simple Twitter command line agent
-test_files: []
-
+specification_version: 3
+summary: Tweetwine shows the latest tweets from the command line quickly.
+test_files: 
+- test/example/application_behavior_example.rb
+- test/example/example_helper.rb
+- test/example/search_statuses_example.rb
+- test/example/show_followers_example.rb
+- test/example/show_friends_example.rb
+- test/example/show_home_example.rb
+- test/example/show_mentions_example.rb
+- test/example/show_user_example.rb
+- test/example/update_status_example.rb
+- test/example/use_http_proxy_example.rb
+- test/fixture/config_example.yaml
+- test/fixture/config_unit.yaml
+- test/fixture/home.json
+- test/fixture/mentions.json
+- test/fixture/oauth.rb
+- test/fixture/search.json
+- test/fixture/shorten_rubygems.html
+- test/fixture/shorten_rubylang.html
+- test/fixture/update_utf8.json
+- test/fixture/update_with_urls.json
+- test/fixture/update_without_urls.json
+- test/fixture/user.json
+- test/fixture/users.json
+- test/test_helper.rb
+- test/unit/character_encoding_test.rb
+- test/unit/cli_test.rb
+- test/unit/config_test.rb
+- test/unit/http_test.rb
+- test/unit/oauth_test.rb
+- test/unit/obfuscate_test.rb
+- test/unit/option_parser_test.rb
+- test/unit/promise_test.rb
+- test/unit/twitter_test.rb
+- test/unit/ui_test.rb
+- test/unit/unit_helper.rb
+- test/unit/url_shortener_test.rb
+- test/unit/util_test.rb