rubypodder 0.1.2 → 0.1.4

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.2"
+    s.version   =   "0.1.4"
     s.author    =   "Lex Miller"
     s.email     =   "lex.miller @nospam@ gmail.com"
     s.summary   =   "A podcast aggregator without an interface"
@@ -15,6 +15,8 @@ spec = Gem::Specification.new do |s|
     s.default_executable = "rubypodder"
     s.autorequire        = "rubypodder"
     s.add_dependency("rio")
+    s.add_dependency("rake")
+    s.add_dependency("mocha")
     s.test_files         = Dir.glob('tests/*.rb')
     s.has_rdoc           = true
     s.extra_rdoc_files   = ["README", "MIT-LICENSE"]
@@ -25,3 +27,6 @@ end
 task :default => "pkg/#{spec.name}-#{spec.version}.gem" do
     puts "generated latest version"
 end
+task :test do
+    ruby "tests/ts_rubypodder.rb"
+end

data/lib/rubypodder.rb

@@ -17,7 +17,7 @@ end
 
 class RubyPodder
 
-  Version = 'rubypodder v0.1.2'
+  Version = 'rubypodder v0.1.4'
 
   attr_reader :conf_file, :log_file, :done_file, :date_dir
 
@@ -83,9 +83,10 @@ class RubyPodder
     begin
       file_name = dest_file_name(url)
       rio(file_name) < rio(url)
-      record_download(url)
     rescue
       @log.error("  Failed to download #{url}")
+    else
+      record_download(url)
     end
   end
 
@@ -108,7 +109,12 @@ class RubyPodder
         @log.error("  Can't read from #{url}")
         next
       end
-      rss = parse_rss(http_body)
+      begin
+        rss = parse_rss(http_body)
+      rescue
+	@log.error("  Can't parse this feed")
+	next
+      end
       @log.info("Channel: #{rss.channel.title}")
       rss.items.each do |item|
         download(item.enclosure.url)

data/tests/tc_rubypodder.rb

@@ -1,6 +1,7 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require 'test/unit'
 require 'rubypodder'
+require 'mocha'
 
 class TC_RubyPodder < Test::Unit::TestCase
 
@@ -174,6 +175,9 @@ class TC_RubyPodder < Test::Unit::TestCase
     url1 = "http://www.google.com/index.html"
     assert(!@rp.already_downloaded(url1), "url1 should not be already downloaded before download of url1")
     @rp.download(url1)
+    File.open( @rp.log_file ) do |f|
+      return if (f.any? { |line| line =~ /ERROR/ }) # Don't test this case if no internet connection
+    end
     assert(@rp.already_downloaded(url1), "url1 should be already downloaded after download of url1")
     url2 = "http://www.google.co.nz/index.html"
     @rp.download(url2)
@@ -182,11 +186,11 @@ class TC_RubyPodder < Test::Unit::TestCase
   end
 
   def test_download_omits_done_items
-    @rp.download("http://www.google.com/index.html")
     dest_file = @rp.date_dir + "/" + "index.html"
     system("rm -rf " + dest_file)
+    @rp.record_download("http://www.google.com/index.html")
     @rp.download("http://www.google.com/index.html")
-    assert(!File.exists?(dest_file))
+    assert(!File.exists?(dest_file), "#{dest_file} should not be downloaded again if already recorded as done")
   end
 
   def test_download_error_is_logged
@@ -224,4 +228,12 @@ class TC_RubyPodder < Test::Unit::TestCase
     end
   end
 
+  def test_log_contains_error_for_unparsable_rss_source
+    @rp.stubs(:parse_rss).raises(RSS::NotWellFormedError, 'This is not well formed XML')
+    @rp.run
+    File.open( @rp.log_file ) do |f|
+      assert(f.any? { |line| line =~ /ERROR/ }, "Parse error in rss source should be logged")
+    end
+  end
+
 end

data/tests/tc_stdout.rb

@@ -40,7 +40,7 @@ class TC_stdout < Test::Unit::TestCase
   end
 
   def test_version
-    assert_equal "rubypodder v0.1.2\n", wrap { puts `ruby #{@bindir}/rubypodder --version` }
+    assert_equal "rubypodder v0.1.4\n", wrap { puts `ruby #{@bindir}/rubypodder --version` }
     assert exits_without_doing_anything { `ruby #{@bindir}/rubypodder --version` }, "--version doesn't exit immediately"
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: rubypodder
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
-date: 2007-02-25 00:00:00 +13:00
+  version: 0.1.4
+date: 2007-05-17 00:00:00 +09:00
 summary: A podcast aggregator without an interface
 require_paths: 
-  - lib
+- lib
 email: lex.miller @nospam@ gmail.com
 homepage: 
 rubyforge_project: 
@@ -18,44 +18,64 @@ bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
-  - Lex Miller
+- Lex Miller
 files: 
-  - lib/rubypodder.rb
-  - tests/tc_rubypodder.rb
-  - tests/ts_rubypodder.rb
-  - tests/tc_stdout.rb
-  - Rakefile
-  - README
-  - MIT-LICENSE
+- 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
+- tests/tc_rubypodder.rb
+- tests/ts_rubypodder.rb
+- tests/tc_stdout.rb
 rdoc_options: []
+
 extra_rdoc_files: 
-  - README
-  - MIT-LICENSE
+- README
+- MIT-LICENSE
 executables: 
-  - rubypodder
+- rubypodder
 extensions: []
+
 requirements: []
+
 dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: rio
-    version_requirement: 
-    version_requirements: !ruby/object:Gem::Version::Requirement 
-      requirements: 
-        - 
-          - ">"
-          - !ruby/object:Gem::Version 
-            version: 0.0.0
-      version: 
+- !ruby/object:Gem::Dependency 
+  name: rio
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 0.0.0
+    version: