tweetwine 0.4.1 → 0.4.2

data/test/unit/uri_test.rb

@@ -1,11 +1,11 @@
 # coding: utf-8
 
-require "unit_helper"
+require 'unit/helper'
 
-module Tweetwine::Test
+module Tweetwine::Test::Unit
 
-class UriTest < UnitTestCase
-  context "for percent-encoding strings" do
+class UriTest < TestCase
+  describe "for percent-encoding strings" do
     [
       %w{a a},
       %w{B B},
@@ -14,12 +14,12 @@ class UriTest < UnitTestCase
       %w{- dash},
       %w{_ underscore},
     ].each do |(char, desc)|
-      should "not encode safe characters, case #{desc}" do
+      it "does not encode safe characters, case #{desc}" do
         assert_equal char, Uri.percent_encode(char)
       end
     end
 
-    should "encode space character with percent-encoding, not with '+' character" do
+    it "encodes space character with percent-encoding, not with '+' character" do
       assert_equal "%20", Uri.percent_encode(" ")
     end
 
@@ -30,7 +30,7 @@ class UriTest < UnitTestCase
       %w{: %3A colon},
       %w{, %2C comma}
     ].each do |(char, expected, desc)|
-      should "encode unsafe characters that URI.encode leaves by default unencoded, case #{desc}" do
+      it "encodes unsafe characters that URI.encode leaves by default unencoded, case #{desc}" do
         assert_equal char, Uri.parser.escape(char)
         assert_equal expected, Uri.percent_encode(char)
       end

data/test/unit/url_shortener_test.rb

@@ -1,17 +1,17 @@
 # coding: utf-8
 
-require "unit_helper"
+require 'unit/helper'
 
-module Tweetwine::Test
+module Tweetwine::Test::Unit
 
-class UrlShortenerTest < UnitTestCase
-  setup do
+class UrlShortenerTest < TestCase
+  before do
     mock_http
   end
 
-  context "for initialization" do
-    should "raise exception if service should be disabled" do
-      assert_raise(RuntimeError) do
+  describe "for initialization" do
+    it "raises exception if service should be disabled" do
+      assert_raises(RuntimeError) do
         UrlShortener.new(
           :disable          => true,
           :service_url      => "http://shorten.it/create",
@@ -20,8 +20,8 @@ class UrlShortenerTest < UnitTestCase
       end
     end
 
-    should "raise exception if service URL is not given" do
-      assert_raise(RequiredOptionError) do
+    it "raises exception if service URL is not given" do
+      assert_raises(RequiredOptionError) do
         UrlShortener.new(
           :service_url      => nil,
           :url_param_name   => "url",
@@ -29,8 +29,8 @@ class UrlShortenerTest < UnitTestCase
       end
     end
 
-    should "raise exception if URL parameter name is not given" do
-      assert_raise(RequiredOptionError) do
+    it "raises exception if URL parameter name is not given" do
+      assert_raises(RequiredOptionError) do
         UrlShortener.new(
           :service_url      => "http://shorten.it/create",
           :url_param_name   => nil,
@@ -38,8 +38,8 @@ class UrlShortenerTest < UnitTestCase
       end
     end
 
-    should "raise exception if XPath selector is not given" do
-      assert_raise(RequiredOptionError) do
+    it "raises exception if XPath selector is not given" do
+      assert_raises(RequiredOptionError) do
         UrlShortener.new(
           :service_url      => "http://shorten.it/create",
           :url_param_name   => "url",
@@ -47,7 +47,7 @@ class UrlShortenerTest < UnitTestCase
       end
     end
 
-    should "fallback to use GET method if method is not given explicitly" do
+    it "fallbacks to use GET method if method is not given explicitly" do
       url_shortener = UrlShortener.new(
         :service_url      => "http://shorten.it/create",
         :url_param_name   => "url",
@@ -56,8 +56,8 @@ class UrlShortenerTest < UnitTestCase
       url_shortener.shorten("http://www.ruby-doc.org/core/")
     end
 
-    should "raise exception if given HTTP request method is unsupported" do
-      assert_raise(CommandLineError) do
+    it "raises exception if given HTTP request method is unsupported" do
+      assert_raises(CommandLineError) do
         UrlShortener.new(
           :method           => "put",
           :service_url      => "http://shorten.it/create",
@@ -67,75 +67,73 @@ class UrlShortenerTest < UnitTestCase
     end
   end
 
-  context "at runtime" do
-    context "configured for HTTP GET" do
-      should "use parameters as URL query parameters, with just the URL parameter" do
-        url_shortener = UrlShortener.new(
-          :method           => "get",
-          :service_url      => "http://shorten.it/create",
-          :url_param_name   => "url",
-          :xpath_selector   => "//input[@id='short_url']/@value")
-        @http.expects(:get).
-          with("http://shorten.it/create?url=http://www.ruby-doc.org/core/")
-        url_shortener.shorten("http://www.ruby-doc.org/core/")
-      end
+  describe "when configured for HTTP GET" do
+    it "uses parameters as URL query parameters, with just the URL parameter" do
+      url_shortener = UrlShortener.new(
+        :method           => "get",
+        :service_url      => "http://shorten.it/create",
+        :url_param_name   => "url",
+        :xpath_selector   => "//input[@id='short_url']/@value")
+      @http.expects(:get).
+        with("http://shorten.it/create?url=http://www.ruby-doc.org/core/")
+      url_shortener.shorten("http://www.ruby-doc.org/core/")
+    end
 
-      should "use parameters as URL query parameters, with additional extra parameters" do
-        url_shortener = UrlShortener.new(
-          :method           => "get",
-          :service_url      => "http://shorten.it/create",
-          :url_param_name   => "url",
-          :extra_params     => {
-            :token => "xyz"
-          },
-          :xpath_selector   => "//input[@id='short_url']/@value")
-        @http.expects(:get).
-          with("http://shorten.it/create?token=xyz&url=http://www.ruby-doc.org/core/")
-        url_shortener.shorten("http://www.ruby-doc.org/core/")
-      end
+    it "uses parameters as URL query parameters, with additional extra parameters" do
+      url_shortener = UrlShortener.new(
+        :method           => "get",
+        :service_url      => "http://shorten.it/create",
+        :url_param_name   => "url",
+        :extra_params     => {
+          :token => "xyz"
+        },
+        :xpath_selector   => "//input[@id='short_url']/@value")
+      @http.expects(:get).
+        with("http://shorten.it/create?token=xyz&url=http://www.ruby-doc.org/core/")
+      url_shortener.shorten("http://www.ruby-doc.org/core/")
     end
+  end
 
-    context "configured for HTTP POST" do
-      should "use parameters as payload, with just the URL parameter" do
-        url_shortener = UrlShortener.new(
-          :method           => "post",
-          :service_url      => "http://shorten.it/create",
-          :url_param_name   => "url",
-          :xpath_selector   => "//input[@id='short_url']/@value")
-        @http.expects(:post).
-          with("http://shorten.it/create", {:url => "http://www.ruby-doc.org/core/"})
-        url_shortener.shorten("http://www.ruby-doc.org/core/")
-      end
+  describe "when configured for HTTP POST" do
+    it "uses parameters as payload, with just the URL parameter" do
+      url_shortener = UrlShortener.new(
+        :method           => "post",
+        :service_url      => "http://shorten.it/create",
+        :url_param_name   => "url",
+        :xpath_selector   => "//input[@id='short_url']/@value")
+      @http.expects(:post).
+        with("http://shorten.it/create", {:url => "http://www.ruby-doc.org/core/"})
+      url_shortener.shorten("http://www.ruby-doc.org/core/")
+    end
 
-      should "use parameters as payload, with additional extra parameters" do
-        url_shortener = UrlShortener.new(
-          :method           => "post",
-          :service_url      => "http://shorten.it/create",
-          :url_param_name   => "url",
-          :extra_params     => {
-            :token => "xyz"
-          },
-          :xpath_selector   => "//input[@id='short_url']/@value")
-        @http.expects(:post).
-          with("http://shorten.it/create",
-            :token => "xyz",
-            :url   => "http://www.ruby-doc.org/core/")
-        url_shortener.shorten("http://www.ruby-doc.org/core/")
-      end
+    it "uses parameters as payload, with additional extra parameters" do
+      url_shortener = UrlShortener.new(
+        :method           => "post",
+        :service_url      => "http://shorten.it/create",
+        :url_param_name   => "url",
+        :extra_params     => {
+          :token => "xyz"
+        },
+        :xpath_selector   => "//input[@id='short_url']/@value")
+      @http.expects(:post).
+        with("http://shorten.it/create",
+          :token => "xyz",
+          :url   => "http://www.ruby-doc.org/core/")
+      url_shortener.shorten("http://www.ruby-doc.org/core/")
     end
+  end
 
-    context "in erroenous network situations" do
-      should "pass exceptions through" do
-        url_shortener = UrlShortener.new(
-          :method           => "post",
-          :service_url      => "http://shorten.it/create",
-          :url_param_name   => "url",
-          :xpath_selector   => "//input[@id='short_url']/@value")
-        @http.expects(:post).
-          with("http://shorten.it/create", :url => "http://www.ruby-doc.org/core/").
-          raises(HttpError.new(404, "Not Found"))
-        assert_raise(HttpError) { url_shortener.shorten("http://www.ruby-doc.org/core/") }
-      end
+  describe "in erroenous network situations" do
+    it "passes exceptions through" do
+      url_shortener = UrlShortener.new(
+        :method           => "post",
+        :service_url      => "http://shorten.it/create",
+        :url_param_name   => "url",
+        :xpath_selector   => "//input[@id='short_url']/@value")
+      @http.expects(:post).
+        with("http://shorten.it/create", :url => "http://www.ruby-doc.org/core/").
+        raises(HttpError.new(404, "Not Found"))
+      assert_raises(HttpError) { url_shortener.shorten("http://www.ruby-doc.org/core/") }
     end
   end
 end

data/tweetwine.gemspec

@@ -3,23 +3,15 @@
 require File.expand_path('project', File.dirname(__FILE__))
 
 Gem::Specification.new do |s|
-  s.name        = Project.name
-  s.version     = Project.version
-  s.summary     = Project.summary
-  s.description = Project.description
-  s.email       = Project.email
-  s.homepage    = Project.homepage
-  s.authors     = Project.authors
-
-  s.files = `git ls-files`.split("\n") + Dir["#{Project.dirs.man}/**/*.[1-9]"]
-  s.test_files = `git ls-files -- #{Project.dirs.test}/*`.split("\n")
+  Project.spec.each { |(key, value)| s.send "#{key}=", value }
+
+  s.files = `git ls-files`.split("\n") + Dir["#{Project.dirs[:man]}/**/*.[1-9]"]
+  s.test_files = `git ls-files -- #{Project.dirs[:test]}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 
   s.add_dependency 'oauth', '~> 0.4.4'
-  s.add_development_dependency 'contest',       '~> 0.1.2'
-  s.add_development_dependency 'coulda',        '~> 0.6.3'
   s.add_development_dependency 'gem-man',       '~> 0.2.0'
-  s.add_development_dependency 'mcmire-matchy', '~> 0.5.2'
+  s.add_development_dependency 'minitest',      '~> 2.1.0'
   s.add_development_dependency 'mocha',         '~> 0.9.12'
   s.add_development_dependency 'open4',         '~> 1.0.1'
   s.add_development_dependency 'rake',          '~> 0.8.7'
@@ -34,7 +26,6 @@ default. For Ruby 1.8, you can install 'json' gem, for example.
 
   END
 
-  s.has_rdoc = true
   s.extra_rdoc_files = Dir['*.rdoc', 'LICENSE.txt']
-  s.rdoc_options << '--title' << Project.title << '--exclude' << Project.dirs.test
+  s.rdoc_options << '--title' << Project.extra[:title] << '--exclude' << Project.dirs[:test]
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: tweetwine
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Tuomas Kareinen
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 +02:00
-default_executable: 
+date: 2011-05-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: oauth
@@ -26,174 +20,97 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 4
-        - 4
         version: 0.4.4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: contest
+  name: gem-man
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 1
-        - 2
-        version: 0.1.2
+        version: 0.2.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: coulda
+  name: minitest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 6
-        - 3
-        version: 0.6.3
+        version: 2.1.0
   type: :development
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: gem-man
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
-        version: 0.2.0
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mcmire-matchy
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 5
-        - 2
-        version: 0.5.2
-  type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 0
-        - 9
-        - 12
         version: 0.9.12
   type: :development
-  version_requirements: *id006
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: open4
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
         version: 1.0.1
   type: :development
-  version_requirements: *id007
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id008
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: ronn
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        - 3
         version: 0.7.3
   type: :development
-  version_requirements: *id009
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: timecop
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 3
-        - 5
         version: 0.3.5
   type: :development
-  version_requirements: *id010
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 6
-        - 2
         version: 1.6.2
   type: :development
-  version_requirements: *id011
+  version_requirements: *id009
 description: |
   A simple but tasty Twitter agent for command line use, designed for quickly
   showing the latest tweets.
@@ -236,19 +153,7 @@ files:
 - lib/tweetwine/version.rb
 - man/tweetwine.7.ronn
 - project.rb
-- test/example/authorization_example.rb
-- test/example/example_helper.rb
-- test/example/global_options_example.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/example/user_help_example.rb
-- test/fixture/config_example.yaml
+- test/fixture/config_integration.yaml
 - test/fixture/config_unit.yaml
 - test/fixture/home.json
 - test/fixture/mentions.json
@@ -261,10 +166,24 @@ files:
 - test/fixture/update_without_urls.json
 - test/fixture/user.json
 - test/fixture/users.json
-- test/test_helper.rb
+- test/helper.rb
+- test/integration/authorization_test.rb
+- test/integration/global_options_test.rb
+- test/integration/helper.rb
+- test/integration/invalid_config_file_test.rb
+- test/integration/search_statuses_test.rb
+- test/integration/show_followers_test.rb
+- test/integration/show_friends_test.rb
+- test/integration/show_home_test.rb
+- test/integration/show_mentions_test.rb
+- test/integration/show_user_test.rb
+- test/integration/update_status_test.rb
+- test/integration/use_http_proxy_test.rb
+- test/integration/user_help_test.rb
 - test/unit/character_encoding_test.rb
 - test/unit/cli_test.rb
 - test/unit/config_test.rb
+- test/unit/helper.rb
 - test/unit/http_test.rb
 - test/unit/oauth_test.rb
 - test/unit/obfuscate_test.rb
@@ -275,23 +194,19 @@ files:
 - test/unit/tweet_test.rb
 - test/unit/twitter_test.rb
 - test/unit/ui_test.rb
-- test/unit/unit_helper.rb
 - test/unit/uri_test.rb
 - test/unit/url_shortener_test.rb
 - tweetwine.gemspec
 - man/tweetwine.7
-has_rdoc: true
 homepage: https://github.com/tkareine/tweetwine
 licenses: []
 
-post_install_message: |+
-  
-  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.
-  
+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.4.1
+- tweetwine 0.4.2
 - --exclude
 - test
 require_paths: 
@@ -301,40 +216,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Tweetwine shows the latest tweets from the command line quickly.
 test_files: 
-- test/example/authorization_example.rb
-- test/example/example_helper.rb
-- test/example/global_options_example.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/example/user_help_example.rb
-- test/fixture/config_example.yaml
+- test/fixture/config_integration.yaml
 - test/fixture/config_unit.yaml
 - test/fixture/home.json
 - test/fixture/mentions.json
@@ -347,10 +244,24 @@ test_files:
 - test/fixture/update_without_urls.json
 - test/fixture/user.json
 - test/fixture/users.json
-- test/test_helper.rb
+- test/helper.rb
+- test/integration/authorization_test.rb
+- test/integration/global_options_test.rb
+- test/integration/helper.rb
+- test/integration/invalid_config_file_test.rb
+- test/integration/search_statuses_test.rb
+- test/integration/show_followers_test.rb
+- test/integration/show_friends_test.rb
+- test/integration/show_home_test.rb
+- test/integration/show_mentions_test.rb
+- test/integration/show_user_test.rb
+- test/integration/update_status_test.rb
+- test/integration/use_http_proxy_test.rb
+- test/integration/user_help_test.rb
 - test/unit/character_encoding_test.rb
 - test/unit/cli_test.rb
 - test/unit/config_test.rb
+- test/unit/helper.rb
 - test/unit/http_test.rb
 - test/unit/oauth_test.rb
 - test/unit/obfuscate_test.rb
@@ -361,6 +272,5 @@ test_files:
 - test/unit/tweet_test.rb
 - test/unit/twitter_test.rb
 - test/unit/ui_test.rb
-- test/unit/unit_helper.rb
 - test/unit/uri_test.rb
 - test/unit/url_shortener_test.rb