rubypodder 0.1.1 → 0.1.2

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/gempackagetask'
 spec = Gem::Specification.new do |s|
     s.platform  =   Gem::Platform::RUBY
     s.name      =   "rubypodder"
-    s.version   =   "0.1.1"
+    s.version   =   "0.1.2"
     s.author    =   "Lex Miller"
     s.email     =   "lex.miller @nospam@ gmail.com"
     s.summary   =   "A podcast aggregator without an interface"

data/bin/rubypodder

@@ -1,2 +1,8 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require 'rubypodder'
+require 'optparse'
+opts = OptionParser.new
+opts.on("-v", "--version") { puts RubyPodder::Version; exit }
+opts.on("-h", "--help")    { puts opts.to_s + "See http://rubypodder.rubyforge.org/\n"; exit }
+opts.parse(*ARGV)
 RubyPodder.new.run

data/lib/rubypodder.rb

@@ -17,6 +17,8 @@ end
 
 class RubyPodder
 
+  Version = 'rubypodder v0.1.2'
+
   attr_reader :conf_file, :log_file, :done_file, :date_dir
 
   def initialize(file_base="~/.rubypodder/rp")
@@ -78,9 +80,13 @@ class RubyPodder
   def download(url)
     return if already_downloaded(url)
     @log.info("  Downloading: #{url}")
-    file_name = dest_file_name(url)
-    rio(file_name) < rio(url)
-    record_download(url)
+    begin
+      file_name = dest_file_name(url)
+      rio(file_name) < rio(url)
+      record_download(url)
+    rescue
+      @log.error("  Failed to download #{url}")
+    end
   end
 
   def remove_dir_if_empty(dirname)
@@ -94,9 +100,14 @@ class RubyPodder
   end
 
   def run
-    @log.info("Starting")
+    @log.info("Starting (#{Version})")
     read_feeds.each do |url|
-      http_body = rio(url).contents
+      begin
+        http_body = rio(url).contents
+      rescue
+        @log.error("  Can't read from #{url}")
+        next
+      end
       rss = parse_rss(http_body)
       @log.info("Channel: #{rss.channel.title}")
       rss.items.each do |item|

data/tests/tc_rubypodder.rb

@@ -189,6 +189,13 @@ class TC_RubyPodder < Test::Unit::TestCase
     assert(!File.exists?(dest_file))
   end
 
+  def test_download_error_is_logged
+    @rp.download("http://very.very.broken.url/oh/no/oh/dear.xml")
+    File.open( @rp.log_file ) do |f|
+      assert(f.any? { |line| line =~ /ERROR/ }, "Error in download should be logged")
+    end
+  end
+
   def test_remove_dir_if_empty
     system("mkdir -p " + @subdir)
     @rp.remove_dir_if_empty(@subdir)
@@ -199,4 +206,22 @@ class TC_RubyPodder < Test::Unit::TestCase
     assert(File.exists?(@subdir))
   end
 
+  def test_log_contains_version
+    File.open("/tmp/test_rp.conf", "w") { |file| file.write("# Empty config file\n") }
+    @rp = RubyPodder.new("/tmp/test_rp")
+    @rp.run
+    File.open( @rp.log_file ) do |f|
+      assert(f.any? { |line| line =~ /Starting.+#{RubyPodder::Version}/ }, "'Starting' log entry should contain '#{RubyPodder::Version}'")
+    end
+  end
+
+  def test_log_contains_error_for_unreadable_feed_url
+    File.open("/tmp/test_rp.conf", "w") { |file| file.write("http://very.very.broken.url/oh/no/oh/dear.xml\n") }
+    @rp = RubyPodder.new("/tmp/test_rp")
+    @rp.run
+    File.open( @rp.log_file ) do |f|
+      assert(f.any? { |line| line =~ /ERROR/ }, "Error in feed url should be logged")
+    end
+  end
+
 end

data/tests/tc_stdout.rb

@@ -0,0 +1,52 @@
+require 'test/unit'
+
+class StringStream < String
+  def write(message)
+    self.<< message
+  end
+end
+
+def wrap(&b)
+  raise "Expected block!" unless block_given?
+  s = StringStream.new
+  old = $stdout.clone
+  $stdout = s
+  b.call
+  $stdout = old
+  s
+end
+
+def last_log
+  log = '/tmp/.rubypodder/rp.log'
+  File.exists?(log) ? File.mtime('/tmp/.rubypodder/rp.log') : Time.at(0)
+end
+
+def exits_without_doing_anything(&b)
+  raise "Expected block!" unless block_given?
+  before = last_log
+  b.call
+  after = last_log
+  before == after
+end
+
+class TC_stdout < Test::Unit::TestCase
+  def setup
+    ENV['HOME'] = "/tmp"
+    @bindir = File.join(File.dirname(__FILE__), "..", "bin")
+  end
+
+  def teardown
+    system("rm -rf " + "/tmp/.rubypodder")
+  end
+
+  def test_version
+    assert_equal "rubypodder v0.1.2\n", wrap { puts `ruby #{@bindir}/rubypodder --version` }
+    assert exits_without_doing_anything { `ruby #{@bindir}/rubypodder --version` }, "--version doesn't exit immediately"
+  end
+
+  def test_help
+    assert_match %r{See http://rubypodder.rubyforge.org/}, wrap { puts `ruby #{@bindir}/rubypodder --help` }
+    assert exits_without_doing_anything { `ruby #{@bindir}/rubypodder --help` }, "--help doesn't exit immediately"
+  end
+
+end

data/tests/ts_rubypodder.rb

@@ -0,0 +1,4 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "tests")
+require 'test/unit'
+require 'tc_rubypodder.rb'
+require 'tc_stdout.rb'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: rubypodder
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2007-01-22 00:00:00 +13:00
+  version: 0.1.2
+date: 2007-02-25 00:00:00 +13:00
 summary: A podcast aggregator without an interface
 require_paths: 
   - lib
@@ -31,11 +31,15 @@ authors:
 files: 
   - lib/rubypodder.rb
   - tests/tc_rubypodder.rb
+  - tests/ts_rubypodder.rb
+  - tests/tc_stdout.rb
   - Rakefile
   - README
   - MIT-LICENSE
 test_files: 
   - tests/tc_rubypodder.rb
+  - tests/ts_rubypodder.rb
+  - tests/tc_stdout.rb
 rdoc_options: []
 extra_rdoc_files: 
   - README