epodder 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecd79269c9453422ef0c084f210dc069f65c290b
-  data.tar.gz: 3fecdad4ad7a39555589713bb6798f26c6906bc2
+  metadata.gz: 94d4f519a9c0b22eded9199580b110f7ef13a660
+  data.tar.gz: e03b1b144d3b3e2a955d6155c5ba0143228c03dd
 SHA512:
-  metadata.gz: bb4d61a4fbb044c995646026948546d678cf3c92806d69d2c9871b9cfd60750b500b0e7c58f6b8b17cd2a81cce8be6832929396293a73a21d60130e6076c1ad5
-  data.tar.gz: 94c55e0cff2e673c57a2ea998dfa32e7974453287314dccae05f418d753a32ed1a719f6894a08a0b5fde79db85b958aacaef288b515031f85878f3ab775d8816
+  metadata.gz: 158d4961b2e61a76f6a55bc3e21ed77c0db38c7a3b5a729d0946dfb17202df49095feb46298fe0212aa63c18786912fc0a901f5d20e319c7d306d6c5e222f021
+  data.tar.gz: 07dcb752b375fc2d72a1448804b070df1788aa29586564cb57d95d89e59062bc8b891545b4921b3acb0c52e7f8965376ede7189edc120c6565dcdec9ba8ba8ef

data/lib/arguments.rb

@@ -1,55 +1,55 @@
 module Epodder
-  class Arguments
-    attr_accessor :args
+    class Arguments
+        attr_accessor :args
 
-    def initialize 
-      @args = Hash.new
-      @args[:arguments] = []
-      verb = Struct.new(:name,:desc,:block)
-      @verbs = [
-        verb.new('add','Add a new podcast.', Proc.new {|args| @args[:action] = :add; @args[:arguments] = args}),
-        verb.new('catchup','Mark older episodes as downloaded.', Proc.new {|args| @args[:action] = :catchup; @args[:arguments] = args}),
-        verb.new('remove','Remove a feed by supplying an id.', Proc.new {|args| @args[:action] = :remove; @args[:arguments] = args}),
-        verb.new('lscasts','List podcasts.', Proc.new {|args| @args[:action] = :list_podcast; @args[:arguments] = args}),
-        verb.new('lseps','List episodes of a podcast by id.', Proc.new {|args| @args[:action] = :list_episodes; @args[:arguments] = args}),
-        verb.new('fetch','Update then download podcasts', Proc.new {|args| @args[:action] = :fetch; @args[:arguments] = args}),
-        verb.new('download','Download podcasts specified by a list of id or all podcasts', Proc.new {|args| @args[:action] = :download; @args[:arguments] = args}),
-        verb.new('update','Update podcasts specified by a list of id or all podcasts', Proc.new {|args| @args[:action] = :update; @args[:arguments] = args}),
-        verb.new("clean", "Remove old content from the database", Proc.new {|args| @args[:action] = :clean; @args[:arguments] = args})
-      ]
-      get_args
-    end
+        def initialize 
+            @args = Hash.new
+            @args[:arguments] = []
+            verb = Struct.new(:name,:desc,:block)
+            @verbs = [
+                verb.new('add','Add a new podcast.', Proc.new {|args| @args[:action] = :add; @args[:arguments] = args}),
+                verb.new('catchup','Mark older episodes as downloaded.', Proc.new {|args| @args[:action] = :catchup; @args[:arguments] = args}),
+                verb.new('remove','Remove a feed by supplying an id.', Proc.new {|args| @args[:action] = :remove; @args[:arguments] = args}),
+                verb.new('lscasts','List podcasts.', Proc.new {|args| @args[:action] = :list_podcast; @args[:arguments] = args}),
+                verb.new('lseps','List episodes of a podcast by id.', Proc.new {|args| @args[:action] = :list_episodes; @args[:arguments] = args}),
+                verb.new('fetch','Update then download podcasts', Proc.new {|args| @args[:action] = :fetch; @args[:arguments] = args}),
+                verb.new('download','Download podcasts specified by a list of id or all podcasts', Proc.new {|args| @args[:action] = :download; @args[:arguments] = args}),
+                verb.new('update','Update podcasts specified by a list of id or all podcasts', Proc.new {|args| @args[:action] = :update; @args[:arguments] = args}),
+                verb.new("clean", "Remove old content from the database", Proc.new {|args| @args[:action] = :clean; @args[:arguments] = args})
+            ]
+            get_args
+        end
 
-    def get_args
-      @args[:path] = "~/.epodder"
-      cmd = CmdParse::CommandParser.new( true, true )
-      cmd.program_name = "ePodder"
-      cmd.program_version = [0, 0, 2]
-      cmd.options = CmdParse::OptionParserWrapper.new do |opt|
-        opt.separator "Global options:"
-        opt.on("-v", "--verbose", "Be verbose when outputting info") {|t| @args[:verbose] = true }
-        opt.on("-c", "--conf-dir [PATH]", "Set the configuration directory") {|path| @args[:path] = path}
-        opt.on("-l", "--log-path [PATH]", "Set logging to the specified file") {|path| @args[:log_file] = path}
-      end
+        def get_args
+            @args[:path] = "~/.epodder"
+            cmd = CmdParse::CommandParser.new( true, true )
+            cmd.program_name = "ePodder"
+            cmd.program_version = [0, 0, 7]
+            cmd.options = CmdParse::OptionParserWrapper.new do |opt|
+                opt.separator "Global options:"
+                opt.on("-v", "--verbose", "Be verbose when outputting info") {|t| @args[:verbose] = true }
+                opt.on("-c", "--conf-dir [PATH]", "Set the configuration directory") {|path| @args[:path] = path}
+                opt.on("-l", "--log-path [PATH]", "Set logging to the specified file") {|path| @args[:log_file] = path}
+            end
 
-      cmd.add_command( CmdParse::HelpCommand.new )
-      cmd.add_command( CmdParse::VersionCommand.new)
+            cmd.add_command( CmdParse::HelpCommand.new )
+            cmd.add_command( CmdParse::VersionCommand.new)
 
-      @verbs.each do |verb|
-        command = CmdParse::Command.new(verb.name, false, false)
-        command.short_desc = verb.desc
-        command.set_execution_block(&verb.block)
-        cmd.add_command(command)
-      end
+            @verbs.each do |verb|
+                command = CmdParse::Command.new(verb.name, false, false)
+                command.short_desc = verb.desc
+                command.set_execution_block(&verb.block)
+                cmd.add_command(command)
+            end
 
-      cmd.parse
-    end
+            cmd.parse
+        end
 
-    def method_missing(name, value=nil, *args)
-      if @args.has_key? name
-        @args[name]
-      end
-    end
+        def method_missing(name, value=nil, *args)
+            if @args.has_key? name
+                @args[name]
+            end
+        end
 
-  end
+    end
 end

data/lib/configuration/configurator.rb

@@ -1,86 +1,86 @@
 #TODO clean up nil!!
 module Epodder
-  class Configurator < Eclass
-    @@default_path = "~/.epodder/"
-    @@db_path = "epodder.db"
-    @@yaml_path = "epodder.yaml"
-    @@default = {
-      :path_to_db => "epodder.db",
-      :path_to_download => "~/podcasts"
-    }
+    class Configurator < Eclass
+        @@default_path = "~/.epodder/"
+        @@db_path = "epodder.db"
+        @@yaml_path = "epodder.yaml"
+        @@default = {
+            :path_to_db => "epodder.db",
+            :path_to_download => "~/podcasts"
+        }
 
-    def initialize args
-      @args = args
-      load_working_dir! @args.path
-      load_config!
-      start_logging
-      load_download_dir!
-      load_database!
-    end
+        def initialize args
+            @args = args
+            load_working_dir! @args.path
+            load_config!
+            start_logging
+            load_download_dir!
+            load_database!
+        end
 
 
-    def load_config!
-      #Check to see if we have a config file or if we need to create it
-      if !File.exists? @@yaml_path
-        begin
-          File.open(@@yaml_path, "w") do |io|
-            YAML.dump(@@default, io)
-          end
-        rescue SystemCallError, NameError => error
-          puts "Could not load #{@@yaml_path}: #{error}"
-          exit
+        def load_config!
+            #Check to see if we have a config file or if we need to create it
+            if !File.exists? @@yaml_path
+                begin
+                    File.open(@@yaml_path, "w") do |io|
+                        YAML.dump(@@default, io)
+                    end
+                rescue SystemCallError, NameError => error
+                    puts "Could not load #{@@yaml_path}: #{error}"
+                    exit
+                end
+            end 
+            @conf = YAML.load_file(@@yaml_path)
         end
-      end 
-      @conf = YAML.load_file(@@yaml_path)
-    end
 
-    private
+        private
 
-    def load_download_dir!
-      Dir.mkdir File.expand_path(@conf[:path_to_download]) unless Dir.exists?(File.expand_path(@conf[:path_to_download]))
-      File.symlink(File.expand_path(@conf[:path_to_download]), "download") unless File.exists? "download"
-    end
+        def load_download_dir!
+            Dir.mkdir File.expand_path(@conf[:path_to_download]) unless Dir.exists?(File.expand_path(@conf[:path_to_download]))
+            File.symlink(File.expand_path(@conf[:path_to_download]), "download") unless File.exists? "download"
+        end
 
-    def load_database!
-      #Datamapper magic goes here
-      DataMapper.setup(:default, "sqlite://#{Dir.pwd}/#{@conf[:path_to_db]}")
-      DataMapper.finalize
-      DataMapper.auto_upgrade!
-    end
+        def load_database!
+            #Datamapper magic goes here
+            DataMapper.setup(:default, "sqlite://#{Dir.pwd}/#{@conf[:path_to_db]}")
+            DataMapper.finalize
+            DataMapper.auto_upgrade!
+        end
 
-    def load_working_dir! path
-      @path = File.expand_path(path || @@default_path)
-      Dir.mkdir @path unless Dir.exists? @path
-      Dir.chdir @path unless file_error
-    end
+        def load_working_dir! path
+            @path = File.expand_path(path || @@default_path)
+            Dir.mkdir @path unless Dir.exists? @path
+            Dir.chdir @path unless file_error
+        end
 
-    def file_error
-      if !File.directory?(@path) || !File.readable?(@path) || !File.writable?(@path)
-        puts "#{@path} is not a directory or is not writable"
-        exit
-      end
-      false
-    end
+        def file_error
+            if !File.directory?(@path) || !File.readable?(@path) || !File.writable?(@path)
+                puts "#{@path} is not a directory or is not writable"
+                exit
+            end
+            false
+        end
 
 
-    def start_logging
-      logger = Yell.new :name => 'log' do |l|
-        if @args.log_file.nil?
-          if @args.verbose
-            l.adapter :stdout, "epodder.log", :level => Yell.level(:info)
-          else
-            l.adapter :stdout, "epodder.log", :level => Yell.level(:error)
-          end
-        else
-          if @args.verbose
-            l.adapter :datefile, "epodder.log", :level => Yell.level(:info)
-          else
-            l.adapter :datefile, "epodder.log", :level => Yell.level(:error)
-          end
+        def start_logging
+            logger = Yell.new :name => 'log' do |l|
+                if @args.log_file.nil?
+                    if @args.verbose
+                        l.adapter :stdout, "epodder.log", :level => Yell.level(:info)
+                    else
+                        l.adapter :stdout, "epodder.log", :level => Yell.level(:error)
+                    end
+                else
+                    if @args.verbose
+                        l.adapter :datefile, "epodder.log", :level => Yell.level(:info)
+                    else
+                        l.adapter :datefile, "epodder.log", :level => Yell.level(:error)
+                    end
+                end
+            end
+            logger.info "Loaded Logger"
         end
-      end
-        logger.info "Loaded Logger"
-    end
 
-  end
+    end
 end

data/lib/database/episode.rb

@@ -1,36 +1,36 @@
 require 'data_mapper'
 module Epodder
-  class Episode < Eclass
-    include DataMapper::Resource
+    class Episode < Eclass
+        include DataMapper::Resource
 
-    property :id,         Serial
-    property :title,      String, :length=> 500
-    property :url,        URI
-    property :downloaded, Boolean
-    property :pub_date,   DateTime
+        property :id,         Serial
+        property :title,      String, :length=> 500
+        property :url,        URI
+        property :downloaded, Boolean
+        property :pub_date,   DateTime
 
-    belongs_to :podcast
+        belongs_to :podcast
 
-    def self.lookup episode
-      if episode.enclosure
-        @episode = Episode.first_or_create(
-          :title => episode.title,
-          :url => episode.enclosure.url,
-          :pub_date => episode.pubdate,
-          :downloaded => false
-        )
-      end
-    end
+        def self.lookup episode
+            if episode.enclosure
+                @episode = Episode.first_or_create(
+                    :title => episode.title,
+                    :url => episode.enclosure.url,
+                    :pub_date => episode.pubdate,
+                    :downloaded => false
+                )
+            end
+        end
 
-    def mark_as_downloaded
-      self.downloaded = true
-      success = self.save
-      if !success
-        self.errors.each do |e|
-          puts e
+        def mark_as_downloaded
+            self.downloaded = true
+            success = self.save
+            if !success
+                self.errors.each do |e|
+                    puts e
+                end
+            end
         end
-      end
-    end
 
-  end
+    end
 end

data/lib/database/podcast.rb

@@ -1,10 +1,10 @@
 module Epodder
-  class Podcast < Eclass
-    include DataMapper::Resource
-    property :id,       Serial
-    property :title,    String, :length=> 500
-    property :uri,      URI
-    has n, :episodes, :constraint => :destroy
+    class Podcast < Eclass
+        include DataMapper::Resource
+        property :id,       Serial
+        property :title,    String, :length=> 500
+        property :uri,      URI
+        has n, :episodes, :constraint => :destroy
 
-  end
+    end
 end

data/lib/eclass.rb

@@ -1,7 +1,7 @@
 module Epodder
-  class Eclass
-    def initialize
-      @log = Yell['log']
+    class Eclass
+        def initialize
+            @log = Yell['log']
+        end
     end
-  end
 end

data/lib/epodder.rb

@@ -1,26 +1,26 @@
 module Epodder
-	require_all File.dirname(File.dirname(__FILE__)) << '/lib'
+    require_all File.dirname(File.dirname(__FILE__)) << '/lib'
 
-	@@verbose = false
+    @@verbose = false
 
-	def verbose?
-		@@verbose
-	end
+    def verbose?
+        @@verbose
+    end
 
-	def verbose= state
-		@@verbose = state
-	end
+    def verbose= state
+        @@verbose = state
+    end
 
-	def self.do_verb verb, args
-		c = Epodder.const_get(verb.to_s.capitalize)
-		verb_object = c.send :new
-		verb_object.send verb, args
-	end
+    def self.do_verb verb, args
+        c = Epodder.const_get(verb.to_s.capitalize)
+        verb_object = c.send :new
+        verb_object.send verb, args
+    end
 
-	def self.run
-		args = Arguments.new
-		Configurator.new(args) 
-		do_verb args.action, args.arguments
-	end
+    def self.run
+        args = Arguments.new
+        Configurator.new(args) 
+        do_verb args.action, args.arguments
+    end
 
 end

data/lib/verb/add.rb

@@ -1,35 +1,35 @@
 module Epodder
-  class Add < Verb
-    def initialize
-      @mechanize = Mechanize.new
-    end
+    class Add < Verb
+        def initialize
+            @mechanize = Mechanize.new
+        end
 
-    def add args
-      args.each do |url|
-        lookup_podcast url
-      end
-    end
+        def add args
+            args.each do |url|
+                lookup_podcast url
+            end
+        end
 
-    def lookup_podcast url
-      @mechanize.get(url) do |feed|
-        save_podcast feed, url
-      end
-    end
+        def lookup_podcast url
+            @mechanize.get(url) do |feed|
+                save_podcast feed, url
+            end
+        end
 
-    def save_podcast feed, url
-      cast = FeedMe.parse feed.body
-      cast.emulate_atom!
-      podcast = Podcast.first_or_create(
-        :title => cast.title,
-        :uri => url
-      )
-      podcast.save
+        def save_podcast feed, url
+            cast = FeedMe.parse feed.body
+            cast.emulate_atom!
+            podcast = Podcast.first_or_create(
+                :title => cast.title,
+                :uri => url
+            )
+            podcast.save
 
-      podcast.errors.each do |error|
-        @log.error error
-      end
-     puts "#{podcast.id} - #{podcast.title}"
-    end
+            podcast.errors.each do |error|
+                @log.error error
+            end
+            puts "#{podcast.id} - #{podcast.title}"
+        end
 
-  end
+    end
 end

data/lib/verb/catchup.rb

@@ -1,15 +1,15 @@
 module Epodder
-  class Catchup < Verb
-    def catchup args
-      if args.empty?
-        podcasts = Podcast.all
-      else
-        podcasts = args.map {|id| Podcast.get(id.to_i)}
-      end
-      podcasts.each do |podcast|
-        Episode.all(:downloaded => false, :podcast => podcast).update(:downloaded => true)
-      end
+    class Catchup < Verb
+        def catchup args
+            if args.empty?
+                podcasts = Podcast.all
+            else
+                podcasts = args.map {|id| Podcast.get(id.to_i)}
+            end
+            podcasts.each do |podcast|
+                Episode.all(:downloaded => false, :podcast => podcast).update(:downloaded => true)
+            end
+        end
     end
-  end
 
 end

data/lib/verb/clean.rb

@@ -1,47 +1,46 @@
 module Epodder
-  class Clean < Verb
-    def initialize
-      @mechanize = @mechanize = Mechanize.new
-    end
+    class Clean < Verb
+        def initialize
+            @mechanize = @mechanize = Mechanize.new
+        end
 
-    def clean args
-      if args.empty?
-        podcasts = Podcast.all
-      else
-        podcasts = args.map{|podcast| Podcast.get(podcast.to_i)}
-      end
-      podcasts.each do |podcast|
-        count = 0
-        known_episodes = Episode.all(:downloaded => true, :podcast => podcast)
-        feed_episodes = open_podcast podcast, DateTime.now
-        known_episodes = known_episodes.map{|episode| episode.url.to_s}
-        feed_episodes = feed_episodes.map{|episode|@episode = episode; episode.enclosure.url}
-        episodes = (known_episodes - feed_episodes)
-        episodes_length = episodes.length
-        episodes.map{|episode| Episode.all(:url => episode)}.each do |episode|
-          if !episode.destroy
-            episode.errors.each {|error| puts error}
-          end
+        def clean args
+            if args.empty?
+                podcasts = Podcast.all
+            else
+                podcasts = args.map{|podcast| Podcast.get(podcast.to_i)}
+            end
+            podcasts.each do |podcast|
+                known_episodes = Episode.all(:downloaded => true, :podcast => podcast)
+                feed_episodes = open_podcast podcast, DateTime.now
+                known_episodes = known_episodes.map{|episode| episode.url.to_s}
+                feed_episodes = feed_episodes.map{|episode|@episode = episode; episode.enclosure.url}
+                episodes = (known_episodes - feed_episodes)
+                episodes_length = episodes.length
+                episodes.map{|episode| Episode.all(:url => episode)}.each do |episode|
+                    if !episode.destroy
+                        episode.errors.each {|error| puts error}
+                    end
+                end
+                puts "#{podcast.title} -- cleaned #{episodes_length} episodes"
+            end
         end
-        puts "#{podcast.title} -- cleaned #{episodes_length} episodes"
-      end
-    end
 
-    def open_podcast podcast, max_pub
-      begin
-        @mechanize.get(podcast.uri) do |feed|
-          return parse_feed feed, max_pub
+        def open_podcast podcast, max_pub
+            begin
+                @mechanize.get(podcast.uri) do |feed|
+                    return parse_feed feed, max_pub
+                end
+            rescue Exception => e
+                puts e
+            end
         end
-      rescue Exception => e
-        puts e
-      end
-    end
 
-    def parse_feed feed, max_pub
-      podcast = FeedMe.parse feed.body
-      podcast.emulate_atom!
-      temp = podcast.items.select {|item| !item.enclosure.nil?}
-      temp.select {|item| !item.enclosure.empty?}
+        def parse_feed feed, max_pub
+            podcast = FeedMe.parse feed.body
+            podcast.emulate_atom!
+            temp = podcast.items.select {|item| !item.enclosure.nil?}
+            temp.select {|item| !item.enclosure.empty?}
+        end
     end
-  end
 end

data/lib/verb/download.rb

@@ -1,38 +1,36 @@
-require 'mechanize'
-#require 'mechanize/progressbar'
-#require 'progress'
+require 'downspout'
 module Epodder
-  class Download < Verb
+    class Download < Verb
 
-    def initialize
-      @mechanize = Mechanize.new
-    end
+        def initialize
+        end
 
-    def download args
-      each_argument(args) do |podcast|
-        look_for_episodes podcast
-      end
-    end
+        def download args
+            each_argument(args) do |podcast|
+                look_for_episodes podcast
+            end
+        end
 
-    def look_for_episodes podcast
-        episodes = Episode.all(:downloaded => false, :podcast => podcast)
-        episodes.select{|ep| !ep.nil?}.each do |episode|
-          puts episode.podcast.title
-          title = (episode.podcast.title).strip
-          Dir.mkdir "download/#{title}" unless Dir.exists? "download/#{title}"
-          puts "Downloading #{title} - #{episode.title || episode.id}"
-          download_episode episode
+        def look_for_episodes podcast
+            episodes = Episode.all(:downloaded => false, :podcast => podcast)
+            episodes.select{|ep| !ep.nil?}.each do |episode|
+                puts episode.podcast.title
+                title = (episode.podcast.title).strip
+                Dir.mkdir "download/#{title}" unless Dir.exists? "download/#{title}"
+                puts "Downloading #{title} - #{episode.title || episode.id}"
+                download_episode episode
+            end
         end
-    end
 
-    def download_episode episode
-      begin
-        @mechanize.get(episode.url).save_as("download/#{episode.podcast.title.strip}/#{episode.url.to_s.match('((?!\/).)*$')}")
-        episode.mark_as_downloaded
-      rescue StandardError => e
-        puts e
-      end
-    end
+        def download_episode episode
+            begin
+                Downspout::Config.max_redirects = 100
+                Downspout.download_url_to_path(episode.url, "download/#{episode.podcast.title.strip}/#{episode.url.to_s.match('((?!\/).)*$')}")
+                episode.mark_as_downloaded
+            rescue StandardError => e
+                puts e
+            end
+        end
 
-  end
+    end
 end

data/lib/verb/fetch.rb

@@ -1,12 +1,12 @@
 module Epodder
-  class Fetch < Verb
-    def initialize
-    #Nothing to do in initalize
-    end
+    class Fetch < Verb
+        def initialize
+            #Nothing to do in initalize
+        end
 
-    def fetch args
-      Update.new.update args
-      Download.new.download args
+        def fetch args
+            Update.new.update args
+            Download.new.download args
+        end
     end
-  end
 end

data/lib/verb/list.rb

@@ -1,14 +1,14 @@
 module Epodder
-  class List_podcast < Verb
-    def initialize
-    #Nothing to do in initalize
-    end
+    class List_podcast < Verb
+        def initialize
+            #Nothing to do in initalize
+        end
 
-    def list_podcast *args
-      Podcast.all.each do |pod|
-        puts "#{pod.id} : \"#{pod.title}\""
-      end
-    end
+        def list_podcast *args
+            Podcast.all.each do |pod|
+                puts "#{pod.id} : \"#{pod.title}\""
+            end
+        end
 
-  end
+    end
 end

data/lib/verb/remove.rb

@@ -1,24 +1,24 @@
 require 'highline/import'
 module Epodder
-  class Remove < Verb
-    def initialize
+    class Remove < Verb
+        def initialize
 
-    end
+        end
 
-    def remove args
-	each_argument(args) do |podcast|
-        	input = ask("Remove #{podcast.id} : #{podcast.title}? Type \"YES\" to remove")
-        	if input == "YES"
-          		podcast.destroy
-        	end
-      	end
-      args.map{|id| Podcast.get(id)}.each do |podcast|
-        input = ask("Remove #{podcast.id} : #{podcast.title}? Type \"YES\" to remove")
-        if input == "YES"
-          podcast.destroy
+        def remove args
+            each_argument(args) do |podcast|
+                input = ask("Remove #{podcast.id} : #{podcast.title}? Type \"YES\" to remove")
+                if input == "YES"
+                    podcast.destroy
+                end
+            end
+            args.map{|id| Podcast.get(id)}.each do |podcast|
+                input = ask("Remove #{podcast.id} : #{podcast.title}? Type \"YES\" to remove")
+                if input == "YES"
+                    podcast.destroy
+                end
+            end
         end
-      end
-    end
 
-  end
+    end
 end

data/lib/verb/update.rb

@@ -3,70 +3,70 @@ require 'feedme'
 require 'mechanize'
 #require 'progress'
 module Epodder
-  class Update < Verb
+    class Update < Verb
 
-    def initialize
-      super
-      @mechanize = Mechanize.new
-    end
+        def initialize
+            super
+            @mechanize = Mechanize.new
+        end
 
-    def update args
-      each_argument(args) do |podcast|
-        check_for_new_episodes podcast
-      end
-    end
+        def update args
+            each_argument(args) do |podcast|
+                check_for_new_episodes podcast
+            end
+        end
 
-    def check_for_new_episodes podcast
-        max_pub = get_max_pubdate podcast
-        open_podcast podcast, max_pub
-    end
+        def check_for_new_episodes podcast
+            max_pub = get_max_pubdate podcast
+            open_podcast podcast, max_pub
+        end
 
-    def get_max_pubdate podcast
-      Episode.max(:pub_date, :conditions => { :podcast => podcast }) || Time.at(0).to_date
-    end
+        def get_max_pubdate podcast
+            Episode.max(:pub_date, :conditions => { :podcast => podcast }) || Time.at(0).to_date
+        end
 
-    def open_podcast podcast, max_pub
-      begin
-        @mechanize.get(podcast.uri) do |feed|
-          @log.info "Maximum pubdate for #{podcast.title} - #{podcast.id} is #{max_pub}"
-          parse_feed feed, podcast, max_pub
+        def open_podcast podcast, max_pub
+            begin
+                @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
-      rescue StandardError => e
-        puts "#{podcast.title} - #{e}"
-      end
-    end
 
-    def parse_feed feed, database_podcast, max_pub
-      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
-     item.enclosure && item.pubdate.to_date > max_pub.to_date 
-    end
+        def parse_feed feed, database_podcast, max_pub
+            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 add_eligible_episode podcast, item
-        begin
-          ep = Episode.first_or_create(
-            :title => item.title,
-            :url => item.enclosure.url,
-            :pub_date => item.pubdate.to_date,
-            :downloaded => false,
-            :podcast => podcast
-          )
-          ep.errors.each do |error|
-            @log.error error
-          end
+        def is_valid? item, max_pub
+            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.pubdate.to_date,
+                    :downloaded => false,
+                    :podcast => podcast
+                )
+                ep.errors.each do |error|
+                    @log.error error
+                end
 
-        rescue Exception => e
-          @log.error e
-          raise e
+            rescue Exception => e
+                @log.error e
+                raise e
+            end
         end
-    end
 
-  end
+    end
 end

data/lib/verb/verb.rb

@@ -1,37 +1,37 @@
 module Epodder
-	class Verb < Eclass
-		def verb_struct
-			super
-			Struct.new(:name,:description,:block)
-		end
+    class Verb < Eclass
+        def verb_struct
+            super
+            Struct.new(:name,:description,:block)
+        end
 
-		def add_command (cmd, args)
-			command = CmdParse::Command.new(@verb.name,false,false)
-			command.short_desc = @verb.description
-			command.set_execution_block(&@verb.block)
-			cmd.add_command(command)
-		end
+        def add_command (cmd, args)
+            command = CmdParse::Command.new(@verb.name,false,false)
+            command.short_desc = @verb.description
+            command.set_execution_block(&@verb.block)
+            cmd.add_command(command)
+        end
 
-		def lookup_args args
-			if args.empty?
-				podcasts = Podcast.all
-			else
-				podcasts = args.map {|id| Podcast.get(id.to_i)}
-			end
-		end
+        def lookup_args args
+            if args.empty?
+                podcasts = Podcast.all
+            else
+                podcasts = args.map {|id| Podcast.get(id.to_i)}
+            end
+        end
 
-		def each_argument args, &block
-			podcasts = nil
-			if args.empty?
-				podcasts = Podcast.all
-			else
-				podcasts = args.map {|id| Podcast.get(id.to_i)}
-			end
-			podcasts.each do |podcast|
-				yield podcast
-			end
-		end
+        def each_argument args, &block
+            podcasts = nil
+            if args.empty?
+                podcasts = Podcast.all
+            else
+                podcasts = args.map {|id| Podcast.get(id.to_i)}
+            end
+            podcasts.each do |podcast|
+                yield podcast
+            end
+        end
 
 
-	end
+    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epodder
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Eric Bergstrom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -136,6 +136,62 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: downspout
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: home_run
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: feedzirra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -276,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.4
 signing_key: 
 specification_version: 4
 summary: Ruby re-do of hpodder