epodder 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ecd79269c9453422ef0c084f210dc069f65c290b
+  data.tar.gz: 3fecdad4ad7a39555589713bb6798f26c6906bc2
+SHA512:
+  metadata.gz: bb4d61a4fbb044c995646026948546d678cf3c92806d69d2c9871b9cfd60750b500b0e7c58f6b8b17cd2a81cce8be6832929396293a73a21d60130e6076c1ad5
+  data.tar.gz: 94c55e0cff2e673c57a2ea998dfa32e7974453287314dccae05f418d753a32ed1a719f6894a08a0b5fde79db85b958aacaef288b515031f85878f3ab775d8816

data/bin/epodder

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

data/lib/arguments.rb

@@ -48,8 +48,6 @@ module Epodder
     def method_missing(name, value=nil, *args)
       if @args.has_key? name
         @args[name]
-      else
-        nil
       end
     end
 

data/lib/configuration/configurator.rb

@@ -1,6 +1,6 @@
 #TODO clean up nil!!
 module Epodder
-  class Configurator
+  class Configurator < Eclass
     @@default_path = "~/.epodder/"
     @@db_path = "epodder.db"
     @@yaml_path = "epodder.yaml"
@@ -62,6 +62,7 @@ module Epodder
       false
     end
 
+
     def start_logging
       logger = Yell.new :name => 'log' do |l|
         if @args.log_file.nil?

data/lib/database/episode.rb

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

data/lib/database/podcast.rb

@@ -1,5 +1,5 @@
 module Epodder
-  class Podcast
+  class Podcast < Eclass
     include DataMapper::Resource
     property :id,       Serial
     property :title,    String, :length=> 500

data/lib/epodder.rb

@@ -1,33 +1,26 @@
 module Epodder
-  require "rubygems"
-  require "bundler/setup"
-  require 'require_all'
-  require 'data_mapper'
-  require 'cmdparse'
-  require 'yell'
+	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/catchup.rb

@@ -4,16 +4,12 @@ module Epodder
       if args.empty?
         podcasts = Podcast.all
       else
-        podcasts = args.map {|id| Podcast.get(id)}
+        podcasts = args.map {|id| Podcast.get(id.to_i)}
       end
-      catchup_podcasts podcasts
-    end
-
-  def catchup_podcasts podcasts
-     podcasts.each do |podcast|
+      podcasts.each do |podcast|
         Episode.all(:downloaded => false, :podcast => podcast).update(:downloaded => true)
       end
-  end
+    end
   end
 
 end

data/lib/verb/clean.rb

@@ -8,7 +8,7 @@ module Epodder
       if args.empty?
         podcasts = Podcast.all
       else
-        podcasts = args.map{|podcast| Podcast.get(podcast)}
+        podcasts = args.map{|podcast| Podcast.get(podcast.to_i)}
       end
       podcasts.each do |podcast|
         count = 0
@@ -17,15 +17,13 @@ module Epodder
         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)
-        puts "know episodes was #{known_episodes.length - feed_episodes.length} longer than feed episodes"
+        episodes_length = episodes.length
         episodes.map{|episode| Episode.all(:url => episode)}.each do |episode|
-          count += 1
-          win = episode.destroy
-          if !win
+          if !episode.destroy
             episode.errors.each {|error| puts error}
           end
         end
-        puts "#{podcast.title} -- cleaned #{count} episodes"
+        puts "#{podcast.title} -- cleaned #{episodes_length} episodes"
       end
     end
 

data/lib/verb/download.rb

@@ -9,11 +9,12 @@ module Epodder
     end
 
     def download args
-      look_for_episodes lookup_args(args)
+      each_argument(args) do |podcast|
+        look_for_episodes podcast
+      end
     end
 
-    def look_for_episodes podcasts
-      podcasts.each do |podcast|
+    def look_for_episodes podcast
         episodes = Episode.all(:downloaded => false, :podcast => podcast)
         episodes.select{|ep| !ep.nil?}.each do |episode|
           puts episode.podcast.title
@@ -22,14 +23,13 @@ module Epodder
           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 Exception => e
+      rescue StandardError => e
         puts e
       end
     end

data/lib/verb/remove.rb

@@ -6,6 +6,12 @@ module Epodder
     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"

data/lib/verb/update.rb

@@ -11,53 +11,52 @@ module Epodder
     end
 
     def update args
-      check_for_new_episodes lookup_args(args)
+      each_argument(args) do |podcast|
+        check_for_new_episodes podcast
+      end
     end
 
-    def check_for_new_episodes podcasts
-      podcasts.each do |podcast|
-        @podcast = podcast
-        @podcast_urls = @podcast.episodes.map {|episode| episode.url}
+    def check_for_new_episodes podcast
         max_pub = get_max_pubdate podcast
         open_podcast podcast, max_pub
-      end
     end
 
     def get_max_pubdate podcast
-      Episode.max(:pub_date, :conditions => { :podcast => podcast}) || Time.at(0).to_date
+      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, max_pub
+          parse_feed feed, podcast, max_pub
         end
-      rescue Exception => e
-        puts e
+      rescue StandardError => e
+        puts "#{podcast.title} - #{e}"
       end
     end
 
-    def parse_feed feed, max_pub
+    def parse_feed feed, database_podcast, max_pub
       podcast = FeedMe.parse feed.body
       podcast.emulate_atom!
-      @count = 0
-      podcast.items.each do |item|
-        add_eligable_episodes item, max_pub
-      end
-      puts "#{@podcast.title} has #{@count} new episodes" if @count > 0
+      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 add_eligable_episodes item, max_pub
-      if item.enclosure && item.pubdate.to_date > max_pub.to_date
+    def add_eligible_episode podcast, item
         begin
-          @count += 1
           ep = Episode.first_or_create(
             :title => item.title,
             :url => item.enclosure.url,
             :pub_date => item.pubdate.to_date,
             :downloaded => false,
-            :podcast => @podcast
+            :podcast => podcast
           )
           ep.errors.each do |error|
             @log.error error
@@ -65,8 +64,8 @@ module Epodder
 
         rescue Exception => e
           @log.error e
+          raise e
         end
-      end
     end
 
   end

data/lib/verb/verb.rb

@@ -1,24 +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)}
-      end
-    end
+		def lookup_args args
+			if args.empty?
+				podcasts = Podcast.all
+			else
+				podcasts = args.map {|id| Podcast.get(id.to_i)}
+			end
+		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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epodder
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 0.0.5
 platform: ruby
 authors:
 - Eric Bergstrom
@@ -14,145 +13,225 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: feedme
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cmdparse
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: data_mapper
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dm-sqlite-adapter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yell
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  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'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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'
+- !ruby/object:Gem::Dependency
+  name: excellent
+  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'
+- !ruby/object:Gem::Dependency
+  name: flog
+  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'
+- !ruby/object:Gem::Dependency
+  name: flay
+  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'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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: 
@@ -163,7 +242,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/arguments.rb
-- lib/configuration/configuration.rb
 - lib/configuration/configurator.rb
 - lib/database/episode.rb
 - lib/database/podcast.rb
@@ -181,26 +259,25 @@ files:
 - bin/epodder
 homepage: http://github.com/scribe/epodder
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby re-do of hpodder
 test_files: []

data/lib/configuration/configuration.rb

@@ -1,4 +0,0 @@
-module Epodder
-module Configuration
-end
-end