epodder 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3e6c2fa3630be50d6529e958889d1033e7bbefe
-  data.tar.gz: b08d84f6d0b89c8983b92f554350de0f7bf46c81
+  metadata.gz: 4bea1932278738114b2e24bc872f9b0deee91132
+  data.tar.gz: 717b6c65da3663b6137cf8fec0c870d887b72b21
 SHA512:
-  metadata.gz: 9327a39d1905c3fae8d7a96bb81af8691b9783dba48cb9c165dec2ab1c8b57669a499225ec42892c6a580b435254cc534550cff3e6cff5db9d4cd467b343cc4d
-  data.tar.gz: 28f535afc6306d253cd5888cb72d4d28c2d7b2a7628014869f29e01270b9a3e7f19e50bad9f35eac271c8be63292d633032c064cd6f624608009a5962d1dc103
+  metadata.gz: e1cf85fed5a7f82b90c12bb3fc65fc2b5f041a982fe0f3676bd6a6a2e260a8c1e4d7929568a75e269a8dbd7410d682f9d50ccfc3673834433408b673db3ab83a
+  data.tar.gz: 100b30c91da8eeb9c32e61b5d937551cc37e512931c0c4eabfc25dd62c439bac416be7eeca145356a8d544a655f55a7ea00c5325b9ed0a111ce8b17073c4b4d3

data/bin/epodder

@@ -1,9 +1,6 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'bundler/setup'
-require 'require_all'
-require 'cmdparse'
-require 'yell'
 
 require_relative '../lib/epodder'
 

data/lib/arguments.rb

@@ -3,6 +3,7 @@ module Epodder
         attr_accessor :args
 
         def initialize
+            require 'cmdparse'
             @args = {}
             @args[:arguments] = []
             verb = Struct.new(:name, :desc, :block)
@@ -21,10 +22,10 @@ module Epodder
         end
 
         def get_args
-            @args[:path] = '~/.epodder'
-            cmd = CmdParse::CommandParser.new(true, true)
-            cmd.program_name = 'ePodder'
-            cmd.program_version = [0, 0, 8]
+            @args[:path] = "~/.epodder"
+            cmd = CmdParse::CommandParser.new( true, true )
+            cmd.program_name = "ePodder"
+            cmd.program_version = [0, 0, 10]
             cmd.options = CmdParse::OptionParserWrapper.new do |opt|
                 opt.separator 'Global options:'
                 opt.on('-v', '--verbose', 'Be verbose when outputting info') { |t| @args[:verbose] = true }

data/lib/database/episode.rb

@@ -1,6 +1,6 @@
-require 'data_mapper'
 module Epodder
     class Episode < Eclass
+        require 'data_mapper'
         include DataMapper::Resource
 
         property :id,         Serial

data/lib/database/podcast.rb

@@ -1,5 +1,6 @@
 module Epodder
     class Podcast < Eclass
+        require 'data_mapper'
         include DataMapper::Resource
         property :id,       Serial
         property :title,    String, length: 500

data/lib/epodder.rb

@@ -1,5 +1,20 @@
 module Epodder
-    require_all File.dirname(File.dirname(__FILE__)) << '/lib'
+    require 'yell'
+    require_relative 'arguments'
+    require_relative 'eclass'
+    require_relative 'arguments'
+    require_relative 'configuration/configurator'
+    require_relative 'database/episode'
+    require_relative 'database/podcast'
+    require_relative 'verb/verb'
+    require_relative 'verb/add'
+    require_relative 'verb/catchup'
+    require_relative 'verb/clean'
+    require_relative 'verb/download'
+    require_relative 'verb/fetch'
+    require_relative 'verb/list'
+    require_relative 'verb/remove'
+    require_relative 'verb/update'
 
     @@verbose = false
 

data/lib/verb/download.rb

@@ -1,7 +1,7 @@
-require 'downspout'
 module Epodder
     class Download < Verb
 
+        require 'downspout'
         def download(args)
             each_argument(args) do |podcast|
                 look_for_episodes podcast
@@ -23,13 +23,11 @@ module Epodder
             begin
                 Downspout::Config.max_redirects = 100
                 Downspout::Config.enable_curb! if Downspout::Config.curb_available?
-                Downspout.download_url_to_path(episode.url, "download/#{episode.podcast.title.strip}/#{episode.url.to_s.match('((?!\/).)*$')}")
+                download = Downspout.download_url_to_path(episode.url, "download/#{episode.podcast.title.strip}/#{episode.url.to_s.match('((?!\/).)*$')}")
+                puts download
                 episode.mark_as_downloaded
             rescue StandardError => e
-                puts e
-                puts e.backtrace
-            ensure
-                episode.mark_as_downloaded if File.exists? "download/#{episode.podcast.title.strip}/#{episode.url.to_s.match('((?!\/).)*$')}"
+                puts "#{episode.url} generated #{e}"
             end
         end
 

data/lib/verb/remove.rb

@@ -1,8 +1,8 @@
-require 'highline/import'
 module Epodder
     class Remove < Verb
-        def initialize
 
+        def initialize
+            require 'highline/import'
         end
 
         def remove(args)

data/lib/verb/update.rb

@@ -1,10 +1,12 @@
-require 'date'
-require 'feedzirra'
 module Epodder
     class Update < Verb
 
         def initialize
             super
+            require 'date'
+            require 'feedme'
+            require 'mechanize'
+            @mechanize = Mechanize.new
         end
 
         def update(args)
@@ -24,37 +26,34 @@ module Epodder
 
         def open_podcast(podcast, max_pub)
             begin
-                @log.info "Maximum pubdate for #{podcast.title} - #{podcast.id} is #{max_pub}"
-                parse_feed podcast.uri, podcast, max_pub
+                @mechanize.get(podcast.uri) do |feed|
+                    @log.info "Maximum pubdate for #{podcast.title} - #{podcast.id} is #{max_pub}"
+                    parse_feed feed, podcast, max_pub
+                end
             rescue StandardError => e
                 puts "#{podcast.title} - #{e}"
             end
         end
 
         def parse_feed(feed, database_podcast, max_pub)
-            podcast = Feedzirra::Feed.fetch_and_parse(feed.to_s)
-            unless podcast.is_a? Fixnum
-                pending_episodes = podcast.entries.select {|item| is_valid? item, max_pub}
-            else
-                raise "HTTP Error #{podcast}"
-            end
-            pending_episodes.each {|episode| add_eligible_episode database_podcast, episode }
+            podcast = FeedMe.parse feed.body
+            podcast.emulate_atom!
+            pending_episodes = podcast.items.select { |item| is_valid? item, max_pub }
+            pending_episodes.each { |pending_episode| add_eligible_episode database_podcast, pending_episode }
             length = pending_episodes.length
             puts "#{database_podcast.title} has #{length} new episodes" if length > 0
         end
 
         def is_valid?(item, max_pub)
-            enclosure = item.respond_to? :enclosure_url
-            published = item.published.to_date
-            enclosure && (published > max_pub.to_date)
+            item.enclosure && item.pubdate.to_date > max_pub.to_date
         end
 
         def add_eligible_episode(podcast, item)
             begin
                 ep = Episode.first_or_create(
                     title: item.title,
-                    url: item.enclosure_url,
-                    pub_date: item.published.to_date,
+                    url: item.enclosure.url,
+                    pub_date: item.pubdate.to_date,
                     downloaded: false,
                     podcast: podcast
                 )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epodder
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Eric Bergstrom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-11 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: require_all
+  name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: downspout
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: downspout
+  name: home_run
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: home_run
+  name: feedme
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: feedzirra
+  name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -262,6 +262,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: bandwidthoracle@gmail.com
 executables:
@@ -304,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby re-do of hpodder