junkie 0.0.12 → 0.0.13

data/junkie.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency('twitter', ["~> 4.4.0"])
   gem.add_runtime_dependency('thin')
   gem.add_runtime_dependency('sinatra')
-  gem.add_runtime_dependency('sinatra-websocket')
+  gem.add_runtime_dependency('sinatra-websocket', ["~> 0.2.1"])
 end

data/lib/junkie/patched/sjunkieex.rb

@@ -1,5 +1,3 @@
-require 'em-http'
-require 'fiber'
 require 'junkie/log'
 require 'sjunkieex'
 
@@ -81,22 +79,5 @@ module Junkie
       return []
     end
 
-    private
-
-    def get_page_data(link)
-      f = Fiber.current
-      http = EventMachine::HttpRequest.new(link).get :timeout => 10
-
-      http.callback { f.resume(http) }
-      http.errback  { f.resume(http) }
-
-      Fiber.yield
-
-      if http.error
-        raise IOError, http.error
-      end
-
-      http.response
-    end
   end
 end

data/lib/junkie/reactor.rb

@@ -39,33 +39,6 @@ module Junkie
       build_procs # has to be called here
     end
 
-    def build_procs
-
-      # Proc that looks for new episodes on Seriesjunkies.org and adds them to
-      # the episode_queue if they are new
-      @look_for_new_episodes = Proc.new {
-        in_fiber {
-
-          log.debug "Reload Sindex from file"
-          # TODO refactor this so that we can detect if we have to reload the
-          # index (by MD5sum)
-          sindex = Sindex::SeriesIndex.new(index_file: @config[:series_index_file])
-          sjunkieex = Sjunkieex::Interface.new(sindex)
-
-          log.info "Looking for new episodes"
-          sjunkieex.get_links_for_downloads.each do |episode|
-            identifier = "%s@%s" % [episode.id, episode.series]
-
-            if not @found_episodes.has_key? identifier
-              log.info("Found new episode '#{episode}'")
-
-              @channels[:episodes].push(episode)
-              @found_episodes[identifier] = episode
-            end
-          end
-        }
-      }
-    end
 
     ###########################################################################
     #################### The Reactor ##########################################
@@ -97,5 +70,48 @@ module Junkie
         Junkie::Webinterface::Interface.setup(@channels)
       end
     end
+
+    private
+
+    def build_procs
+
+      # Proc that looks for new episodes on Seriesjunkies.org and adds them to
+      # the episode_queue if they are new
+      @look_for_new_episodes = proc {
+
+        operation = proc {
+          log.debug "Reload Sindex from file"
+          sindex = Sindex::SeriesIndex.new(index_file: @config[:series_index_file])
+
+          sjunkieex = Sjunkieex::Interface.new(sindex)
+
+          log.info "Looking for new episodes"
+          sjunkieex.get_links_for_downloads
+        }
+
+        callback = proc { |episodes|
+
+          episodes.each do |episode|
+            identifier = "%s@%s" % [episode.id, episode.series]
+
+            if not @found_episodes.has_key? identifier
+              log.info("Found new episode '#{episode}'")
+
+              @channels[:episodes].push(episode)
+              @found_episodes[identifier] = episode
+            end
+          end
+
+          # send out the current time out of the websocket
+          @channels[:info].push({
+            key: "Last Episode Search",
+            desc: "The last time <strong>junkie</strong> has searched for new episodes",
+            value: Time.new.strftime("%d.%m.%Y %H:%M:%S")
+          })
+        }
+
+        EM.defer(operation, callback)
+      }
+    end
   end
 end

data/lib/junkie/version.rb

@@ -1,3 +1,3 @@
 module Junkie
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: junkie
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -208,17 +208,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.1
 description: TV series management application
 email:
 - philipp-boehm@live.de
@@ -277,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: TV series managament tool that does all the work you have with your series.
@@ -288,4 +288,3 @@ test_files:
 - spec/pyload_api_spec.rb
 - spec/pyload_observer_spec.rb
 - spec/spec_helper.rb
-has_rdoc: