Fix the progressbar require path in uri_utilities.rb.

Replace the makefile with a Rakefile.
Update all of the test code to run under `rake test`.
Add a short README.

diff --git a/Rakefile b/Rakefile
new file mode 100644 (file)
index 0000000..ce0bc56
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,26 @@
+require 'rake/testtask'
+
+desc "Clean up generated files"
+task :clean do
+  `rm -f whatever-dl-*.gem`
+end
+
+
+desc "Build the gem"
+task :build => :clean do
+  `gem build whatever-dl.gemspec`
+end
+
+
+desc "Install the gem locally (user install)"
+task :install => :build do
+  `gem install --user-install whatever-dl-*.gem`
+end
+
+Rake::TestTask.new do |t|
+  t.pattern = 'test/*test.rb'
+  t.libs << 'test'
+end
+
+desc "Run tests"
+task :default => :test

diff --git a/doc/README b/doc/README
new file mode 100644 (file)
index 0000000..1983fe1
--- /dev/null
+++ b/doc/README
@@ -0,0 +1,13 @@
+Installation
+------------
+
+To install the gem locally (as the current user), simply run,
+
+  rake install
+
+You should then be able to run the script out of,
+
+  $HOME/.gem/ruby/*/bin
+
+It might make sense to add that to your path. I don't know how this
+gem thing works so much yet.

diff --git a/lib/whatever-dl/uri_utilities.rb b/lib/whatever-dl/uri_utilities.rb
index 78966e81cc7b00c30ecb51720dd52dba17335ba4..f7ff3180de845194d6f6f6602b483ed58d11af5b 100644 (file)
--- a/lib/whatever-dl/uri_utilities.rb
+++ b/lib/whatever-dl/uri_utilities.rb
@@ -17,7 +17,7 @@
 #
 
 require 'open-uri'
-require 'vendor/ruby-progressbar/progressbar'
+require 'ruby-progressbar/progressbar'
 
 # Just a couple of convenience methods for URIs.
 # These could be monkey-patched in, but with only

diff --git a/makefile b/makefile
deleted file mode 100644 (file)
index ccaac1c..0000000
--- a/makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-.PHONY : build test
-
-all: install
-
-# Ruby 1.9 doesn't include the current directory in the load path, so
-# we pass them on the command-line.
-test:
-       ruby -I. test/test_suite.rb
-
-remote_test:
-       ruby -I. test/remote_test_suite.rb
-
-clean:
-       rm -f whatever-dl-*.gem
-
-build: clean
-       gem build whatever-dl.gemspec
-
-install: build
-       gem install --user-install whatever-dl-*.gem

diff --git a/test/bliptv_test.rb b/test/bliptv_test.rb
index 1a1348e72b28911a353eb6dfd5e50bc1ab728f3a..af524e3de89ff50ecb1d34d75978b00a6f2f5b2a 100644 (file)
--- a/test/bliptv_test.rb
+++ b/test/bliptv_test.rb
@@ -17,7 +17,7 @@
 #
 
 require 'test/unit'
-require 'src/websites/bliptv'
+require 'whatever-dl/websites/bliptv'
 
 class BliptvTest < Test::Unit::TestCase
 

diff --git a/test/dailymotion_test.rb b/test/dailymotion_test.rb
index 25ae4630490daf1d11a6cf1f21de5d387cd251b4..8f02baf23f91cf8621080f8bd820bc186e205973 100644 (file)
--- a/test/dailymotion_test.rb
+++ b/test/dailymotion_test.rb
@@ -17,7 +17,7 @@
 #
 
 require 'test/unit'
-require 'src/websites/dailymotion'
+require 'whatever-dl/websites/dailymotion'
 
 
 class DailymotionTest < Test::Unit::TestCase

diff --git a/test/efukt_test.rb b/test/efukt_test.rb
index 26383f514ef510170a24ce2fe738d292ea55c27c..f1e45d8027f75cc3939e73b23e75041b30d34475 100644 (file)
--- a/test/efukt_test.rb
+++ b/test/efukt_test.rb
@@ -17,7 +17,7 @@
 #
 
 require 'test/unit'
-require 'src/websites/efukt'
+require 'whatever-dl/websites/efukt'
 
 
 class EfuktTest < Test::Unit::TestCase

diff --git a/test/fuckedtube_test.rb b/test/fuckedtube_test.rb
index 21d43191decbd9de7c70682a70f6e1adc32545f6..9d1d9c7976a4bce0e0a22a1c71c97fd33ed63952 100644 (file)
--- a/test/fuckedtube_test.rb
+++ b/test/fuckedtube_test.rb
@@ -17,7 +17,7 @@
 #
 
 require 'test/unit'
-require 'src/websites/fuckedtube'
+require 'whatever-dl/websites/fuckedtube'
 
 
 class FuckedtubeTest < Test::Unit::TestCase

diff --git a/test/howcast_test.rb b/test/howcast_test.rb
index 91c1d6a336c7dcaab4ceb3f185b76df169321351..cf0183236cb8a79b9058d4d75c50a43876e1ca78 100644 (file)
--- a/test/howcast_test.rb
+++ b/test/howcast_test.rb
@@ -17,7 +17,7 @@
 #
 
 require 'test/unit'
-require 'src/websites/howcast'
+require 'whatever-dl/websites/howcast'
 
 # Unit tests for the Howcast class.
 # This class is easy because get_video_url is

diff --git a/test/infoq_test.rb b/test/infoq_test.rb
index d6cdf44054bf0c655f8e5d83c8d2374b1ba483f0..1001357e00f07363b1286a5228d935033264c8a4 100644 (file)
--- a/test/infoq_test.rb
+++ b/test/infoq_test.rb
@@ -17,7 +17,7 @@
 #
 
 require 'test/unit'
-require 'src/websites/infoq'
+require 'whatever-dl/websites/infoq'
 
 # Unit tests for the Infoq class. Basically just checking
 # the results of parse_video_url for now.

diff --git a/test/megaporn_test.rb b/test/megaporn_test.rb
index 6b353995bae14420dbd10080c69d8a9f1c58cd11..17c59329dea31d02e37c30f278d2fbb7e9f9f36e 100644 (file)
--- a/test/megaporn_test.rb
+++ b/test/megaporn_test.rb
@@ -17,7 +17,7 @@
 #
 
 require 'test/unit'
-require 'src/websites/megaporn'
+require 'whatever-dl/websites/megaporn'
 
 
 class MegapornTest < Test::Unit::TestCase

diff --git a/test/motherless_test.rb b/test/motherless_test.rb
index 7c91a820c40182cd3381bbb51b4c6292253468ff..dd53414d4847bcb714fad166b7e69a1468340477 100644 (file)
--- a/test/motherless_test.rb
+++ b/test/motherless_test.rb
@@ -17,7 +17,7 @@
 #
 
 require 'test/unit'
-require 'src/websites/motherless'
+require 'whatever-dl/websites/motherless'
 
 class MotherlessTest < Test::Unit::TestCase
 

diff --git a/test/progressbar_test.rb b/test/progressbar_test.rb
new file mode 100644 (file)
index 0000000..37627e7
--- /dev/null
+++ b/test/progressbar_test.rb
@@ -0,0 +1,19 @@
+#
+# Copyright Michael Orlitzky
+#
+# http://michael.orlitzky.com/
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# http://www.fsf.org/licensing/licenses/gpl.html
+#
+
+require 'ruby-progressbar/test'

diff --git a/test/redtube_test.rb b/test/redtube_test.rb
index 39ee92a8c57c84d4bc654da40387f8491f40deca..26ff8b28bb8ff97153155779b4a9554cc865cbb7 100644 (file)
--- a/test/redtube_test.rb
+++ b/test/redtube_test.rb
@@ -17,7 +17,7 @@
 #
 
 require 'test/unit'
-require 'src/websites/redtube'
+require 'whatever-dl/websites/redtube'
 
 # Unit tests for the Redtube class. Basically just checking
 # the results of get_video_url for known ids.

diff --git a/test/tnaflix_test.rb b/test/tnaflix_test.rb
index 3bd42d06c081a98dcc88682086b2b73bd8769971..411851baa3b6eea3135f046a17d9a80e0a57940f 100644 (file)
--- a/test/tnaflix_test.rb
+++ b/test/tnaflix_test.rb
@@ -17,7 +17,7 @@
 #
 
 require 'test/unit'
-require 'src/websites/tnaflix'
+require 'whatever-dl/websites/tnaflix'
 
 class TnaflixTest < Test::Unit::TestCase
 

diff --git a/test/uri_utilities_test.rb b/test/uri_utilities_test.rb
index 60a266b6bc8ac4894520de171cf744c3c977435c..bb4bf7fccd595fdab2c5efc9b8e24afc78e48f02 100644 (file)
--- a/test/uri_utilities_test.rb
+++ b/test/uri_utilities_test.rb
@@ -17,7 +17,7 @@
 #
 
 require 'test/unit'
-require 'src/uri_utilities.rb'
+require 'whatever-dl/uri_utilities.rb'
 
 class UriUtilitiesTest < Test::Unit::TestCase
 

diff --git a/test/veoh_test.rb b/test/veoh_test.rb
index fdb5bbf17b8d94e9a61ae1221c49def148366113..3ae9fb4ff0b47e778929138b565fc20fe259ae5a 100644 (file)
--- a/test/veoh_test.rb
+++ b/test/veoh_test.rb
@@ -17,7 +17,7 @@
 #
 
 require 'test/unit'
-require 'src/websites/veoh'
+require 'whatever-dl/websites/veoh'
 
 class VeohTest < Test::Unit::TestCase
 

diff --git a/test/vimeo_test.rb b/test/vimeo_test.rb
index 203afae47a74ef91a33c6a04e66d39e37fe06834..e332aa3ad47fbceaa37e7c9519ea19fb9bc32308 100644 (file)
--- a/test/vimeo_test.rb
+++ b/test/vimeo_test.rb
@@ -17,7 +17,7 @@
 #
 
 require 'test/unit'
-require 'src/websites/vimeo'
+require 'whatever-dl/websites/vimeo'
 
 # There are no remote tests for Vimeo because they use
 # an expiration timestamp to change certain values in the

diff --git a/test/website_test.rb b/test/website_test.rb
index 2c3f25db9e77d194dc4123ed7acf0a510ca78add..d0219b80af8a4d85c8930062c4d5c59fddb0893f 100644 (file)
--- a/test/website_test.rb
+++ b/test/website_test.rb
@@ -17,15 +17,10 @@
 #
 
 require 'test/unit'
+require 'whatever-dl'
 
 # Tests common to all websites.
 
-# All of the website classes are located in one
-# directory, so we can 'require' them automatically.
-Dir.glob('src/websites/*.rb').each do |r|
-  require r
-end
-
 class WebsiteTest < Test::Unit::TestCase
 
   def test_nobody_owns_misc_urls

diff --git a/test/yikers_test.rb b/test/yikers_test.rb
index 7bb8150d74f8d3a9a6ac8edc07295c84777b32d2..5b6f7f4287bbd517f41a86a0906a1c9999b3d145 100644 (file)
--- a/test/yikers_test.rb
+++ b/test/yikers_test.rb
@@ -17,7 +17,7 @@
 #
 
 require 'test/unit'
-require 'src/websites/yikers'
+require 'whatever-dl/websites/yikers'
 
 class YikersTest < Test::Unit::TestCase
 

diff --git a/test/youporn_test.rb b/test/youporn_test.rb
index 24d86431124755cb54085294adbada1396d9222b..a8b21aeea77c45fe3eb0e132bfa2705fb9f7fb6c 100644 (file)
--- a/test/youporn_test.rb
+++ b/test/youporn_test.rb
@@ -17,7 +17,7 @@
 #
 
 require 'test/unit'
-require 'src/websites/youporn'
+require 'whatever-dl/websites/youporn'
 
 # Unit tests for the Youporn class. Basically just checking
 # the results of parse_video_url for now.

diff --git a/test/youtube_test.rb b/test/youtube_test.rb
index bcb350db3aaad7eb2fd11753da2ce48c11514578..622ddc056ed6f86916e80f4ec6352bfa148ec72c 100644 (file)
--- a/test/youtube_test.rb
+++ b/test/youtube_test.rb
@@ -17,7 +17,7 @@
 #
 
 require 'test/unit'
-require 'src/websites/youtube'
+require 'whatever-dl/websites/youtube'
 
 class YoutubeTest < Test::Unit::TestCase