hlspider 0.0.6 → 0.0.13

data/Gemfile

@@ -1,2 +1,4 @@
 gem 'eventmachine', :git => 'git://github.com/eventmachine/eventmachine.git', :require => 'eventmachine'
-gem 'robinhood'
+gem 'thor', '>= 0.14.0'
+gem 'em-synchrony', '>= 0.3.0.beta.1'
+gem 'em-http-request', '>= 1.0.0.beta.3'

data/hlspider.gemspec

@@ -19,9 +19,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency('thor')
+  s.add_dependency('thor', '>= 0.14.0')
   s.add_dependency('em-synchrony', '>= 0.3.0.beta.1')
   s.add_dependency('eventmachine', '>= 1.0.0.beta.3')
-  s.add_dependency('em-http-request', '>= 1.0.0.beta.3')
-  
+  s.add_dependency('em-http-request', '>= 1.0.0.beta.3')  
 end

data/lib/hlspider/spider.rb

@@ -4,16 +4,17 @@ require 'logger'
 
 module HLSpider
   class Spider
-    @@log = Logger.new('/tmp/hlspider.log')
-  
-    def initialize(playlists)
+    def initialize(playlists, logfile = "")
       @playlists = playlists
+      @log = Logger.new(logfile) unless logfile.empty?
     end  
   
     def crawl
       EM.synchrony do
         multi = EventMachine::Synchrony::Multi.new
         @playlists.each_with_index do |p,i|
+          log p
+          puts "Downloading: #{p}"
           multi.add :"#{i}", EventMachine::HttpRequest.new(p).aget
           @time = Time.now
         end  
@@ -24,22 +25,31 @@ module HLSpider
         res.requests.each do |req|
           responses << {:title => req.req.uri.to_s, :body => req.response}
         end
-        segments = Playlist.first_segment_numbers(responses).uniq
+        segments = Playlist.first_segment_numbers(responses)
+        log "--- #{segments.inspect} ---"
+        segments.uniq!
       
         if segments.size > 1 && ((segments[0].to_i - segments[1].to_i).abs > 1)
           p "Segments are off #{@time}"
-          @@log.error "**********"
-          @@log.error segments.inspect
-          @@log.error "**********"        
+          log "**********", "error"
+          log segments.inspect, "error"
+          log "**********", "error"
         else
           p "All Good. at #{segments[0]}"
-          @@log.debug "^^^^^^^^^^^"
-          @@log.debug segments.inspect
-          @@log.debug "^^^^^^^^^^^"
+          log "^^^^^^^^^^^"
+          log segments.inspect
+          log "^^^^^^^^^^^"
         end  
 
         EventMachine.stop
       end
     end
+    
+    private
+    
+    def log(str, type = 'info')
+      #need to work on this eval
+      #eval "@log.#{type} #{str}" if @log
+    end  
   end  
 end

data/lib/hlspider/version.rb

@@ -1,3 +1,3 @@
 module Hlspider
-  VERSION = "0.0.6"
+  VERSION = "0.0.13"
 end

data/lib/hlspider.rb

@@ -5,11 +5,12 @@ module HLSpider
   class HLSpider < ::Thor
     
     desc "crawl", "Crawl the specified playlists and make sure their segments align"
-    method_option :playlists, :type => :array, :default => [], :required => true
+    method_option :playlists, :type => :array,   :default => [], :required => true
     method_option :sleep,     :type => :numeric, :default => 5
+    method_option :log,       :type => :string,  :default => ""
     def crawl
       while true
-        Spider.new(playlists).crawl
+        Spider.new(options[:playlists], options[:log]).crawl
         sleep options[:sleep]
       end  
     end  

metadata

@@ -2,7 +2,7 @@
 name: hlspider
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.0.13
 platform: ruby
 authors: 
 - Brooke McKim
@@ -21,7 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.14.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency