epodder 0.0.3 → 0.0.4

data/lib/configuration/configurator.rb

@@ -1,3 +1,4 @@
+#TODO clean up nil!!
 module Epodder
   class Configurator
     @@default_path = "~/.epodder/"
@@ -48,21 +49,15 @@ module Epodder
     end
 
     def load_working_dir! path
-      @path = File.expand_path(path.nil? ? @@default_path : 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
-        puts "#{@path} is not a directory"
+      if !File.directory?(@path) || !File.readable?(@path) || !File.writable?(@path)
+        puts "#{@path} is not a directory or is not writable"
         exit
-      elsif !File.readable? @path
-        puts "Can not read #{@path}"
-        exit
-      elsif !File.writable? @path
-        puts "Can not write to #{@path}"
-        exit    
       end
       false
     end

data/lib/database/episode.rb

@@ -12,13 +12,14 @@ module Epodder
     belongs_to :podcast
 
     def self.lookup episode
-      return if episode.enclosure.nil?
-      @episode = Episode.first_or_create(
-        :title => episode.title,
-        :url => episode.enclosure.url,
-        :pub_date => episode.pubdate,
-        :downloaded => false
-      )
+      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

data/lib/verb/catchup.rb

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

data/lib/verb/download.rb

@@ -9,12 +9,7 @@ module Epodder
     end
 
     def download args
-      if args.empty?
-        podcasts = Podcast.all
-      else
-        podcasts = args.map {|id| Podcast.get(id)}
-      end
-      look_for_episodes podcasts
+      look_for_episodes lookup_args(args)
     end
 
     def look_for_episodes podcasts

data/lib/verb/remove.rb

@@ -5,7 +5,7 @@ module Epodder
 
     end
 
-    def remove *args
+    def remove args
       args.map{|id| Podcast.get(id)}.each do |podcast|
         input = ask("Remove #{podcast.id} : #{podcast.title}? Type \"YES\" to remove")
         if input == "YES"

data/lib/verb/update.rb

@@ -11,12 +11,7 @@ module Epodder
     end
 
     def update args
-      if args.empty?
-        podcasts = Podcast.all
-      else
-        podcasts = args.map {|id| Podcast.get(id)}
-      end
-      check_for_new_episodes podcasts if podcasts.any?
+      check_for_new_episodes lookup_args(args)
     end
 
     def check_for_new_episodes podcasts
@@ -54,7 +49,7 @@ module Epodder
     end
 
     def add_eligable_episodes item, max_pub
-      if !item.enclosure.nil? && item.pubdate.to_date > max_pub.to_date
+      if item.enclosure && item.pubdate.to_date > max_pub.to_date
         begin
           @count += 1
           ep = Episode.first_or_create(

data/lib/verb/verb.rb

@@ -12,5 +12,13 @@ module Epodder
       cmd.add_command(command)
     end
 
+    def lookup_args args
+      if args.empty?
+        podcasts = Podcast.all
+      else
+        podcasts = args.map {|id| Podcast.get(id)}
+      end
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epodder
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri