khronos 0.0.2 → 0.0.3.pre1

data/khronos.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |s|
   s.add_dependency "activesupport",   "~> 3.2.8"
   s.add_dependency "eventmachine",    "~> 1.0.0.beta.4"
   s.add_dependency "em-http-request", "~> 1.0.3"
+  s.add_dependency "rest-client",     "~> 1.6.7"
+  s.add_dependency "girl_friday",     "~> 0.10.0"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/khronos/scheduler.rb

@@ -3,24 +3,17 @@ require 'json'
 
 module Khronos
   class Scheduler
-    module Methods
-      def run(schedule)
-        client = TCPSocket.new( Config.instance.runner['host'], Config.instance.runner['port'] )
-        client.puts( schedule.to_json )
 
-        while !(client.closed?) && (message = client.gets)
-          puts message.inspect
-          client.close
-        end
-      end
+    def self.run(schedule, runner=nil)
+      schedule.update_attributes(:active => false)
+      schedule.save
+      runner.enqueue(schedule)
+    end
 
-      def fetch(target_time=Time.now)
-        Storage::Schedule.where(['at <= ?', target_time]).where(:active => true)
-      end
+    def self.fetch(target_time=Time.now)
+      Storage::Schedule.where(['at <= ?', target_time]).where(:active => true)
     end
 
-    include Methods
-    extend Methods
   end
 end
 

data/lib/khronos/server/controller.rb

@@ -1,11 +1,11 @@
 module Khronos
   module Server
     class Controller
-      attr_reader :storage, :scheduler
+      attr_reader :storage
 
-      def initialize
+      def initialize(runner=nil)
         @storage = Storage.new
-        @scheduler = Khronos::Scheduler.new
+        @runner = runner
       end
 
       def logger=(logger)
@@ -15,11 +15,8 @@ module Khronos
       def check_schedule!
         puts "Check... #{Time.now}"
         count = 0
-        @scheduler.fetch(Time.now).each do |schedule|
-          schedule.update_attributes(:active => false)
-          schedule.save
-
-          @scheduler.run(schedule)
+        Khronos::Scheduler.fetch(Time.now).each do |schedule|
+          Khronos::Scheduler.run(schedule, @runner)
           count += 1
         end
         puts "Tick. #{count} jobs to run."

data/lib/khronos/server/em_runner.rb

@@ -0,0 +1,56 @@
+require 'json'
+require 'eventmachine'
+require 'em-http'
+
+#
+# DEPRECATED:
+# This class was used just for testing purpose.
+#
+
+module Khronos
+  module Server
+
+    class Runner < EventMachine::Connection
+      def post_init
+        puts "-- someone connected to the server!"
+      end
+
+      def receive_data json
+        puts "Receive data to run: #{json}"
+        schedule = JSON.parse(json)
+        send_data ">>> you sent: #{schedule.inspect}"
+
+        # Close connection with client immediatelly
+        close_connection
+
+        if (url = schedule['task_url'])
+          http = EventMachine::HttpRequest.new(url).get :redirects => 5
+          http.callback do
+            puts "#{url}\n#{http.response_header.status} - #{http.response.length} bytes\n"
+            puts http.response
+          end
+
+          http.errback do
+            puts "#{url}\n" + http.error
+          end
+
+          enqueue_recurrency!(schedule)
+        end
+
+      end
+
+      def enqueue_recurrency!(schedule)
+        url = "http://#{Config.instance.scheduler['host']}"
+        url += ":#{Config.instance.scheduler['port']}" if Config.instance.scheduler['port']
+        url += "/task?id=#{schedule['id']}"
+        EventMachine::HttpRequest.new(url).patch :redirects => 2
+      end
+
+      def unbind
+        puts "-- someone disconnected from the echo server!"
+      end
+
+    end
+
+  end
+end

data/lib/khronos/server/runner.rb

@@ -1,51 +1,48 @@
+require 'rest-client'
 require 'json'
-require 'eventmachine'
-require 'em-http'
+require 'girl_friday'
 
 module Khronos
   module Server
 
-    class Runner < EventMachine::Connection
-      def post_init
-        puts "-- someone connected to the server!"
+    class Runner < GirlFriday::WorkQueue
+      attr_reader :queue
+
+      def initialize(*args)
+        @queue = self
+        super(*args) do |schedule|
+          self.process(schedule)
+        end
       end
 
-      def receive_data json
-        puts "Receive data to run: #{json}"
-        schedule = JSON.parse(json)
-        send_data ">>> you sent: #{schedule.inspect}"
+      def enqueue(schedule)
+        @queue.push(schedule.to_json)
+      end
 
-        # Close connection with client immediatelly
-        close_connection
+      def process(json)
+        schedule = JSON.parse(json)
+        puts "Process => #{schedule.inspect}"
 
         if (url = schedule['task_url'])
-          http = EventMachine::HttpRequest.new(url).get :redirects => 5
-          http.callback do
-            puts "#{url}\n#{http.response_header.status} - #{http.response.length} bytes\n"
-            puts http.response
-          end
-
-          http.errback do
-            puts "#{url}\n" + http.error
+          begin
+            response = RestClient.get(url)
+            puts "Callback: success. response length: #{response.length.inspect}"
+          rescue Exception => e
+            puts "Callback: error. (#{e.inspect})"
           end
-
-          enqueue_recurrency!(schedule)
+          calculate_recurrency!(schedule)
         end
-
       end
 
-      def enqueue_recurrency!(schedule)
+      def calculate_recurrency!(schedule)
         url = "http://#{Config.instance.scheduler['host']}"
         url += ":#{Config.instance.scheduler['port']}" if Config.instance.scheduler['port']
         url += "/task?id=#{schedule['id']}"
-        EventMachine::HttpRequest.new(url).patch :redirects => 2
-      end
-
-      def unbind
-        puts "-- someone disconnected from the echo server!"
+        RestClient.patch(url)
       end
 
     end
 
   end
 end
+

data/lib/khronos/version.rb

@@ -1,3 +1,3 @@
 module Khronos
-  VERSION = '0.0.2'
+  VERSION = '0.0.3.pre1'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: khronos
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - Endel Dreyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-09 00:00:00.000000000 Z
+date: 2012-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -139,6 +139,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.7
+- !ruby/object:Gem::Dependency
+  name: girl_friday
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 description: Ruby HTTP Job Scheduler Interface. An advanced Cron replacement for the
   cloud.
 email:
@@ -164,6 +196,7 @@ files:
 - lib/khronos/scheduler.rb
 - lib/khronos/server.rb
 - lib/khronos/server/controller.rb
+- lib/khronos/server/em_runner.rb
 - lib/khronos/server/runner.rb
 - lib/khronos/server/scheduler.rb
 - lib/khronos/storage.rb
@@ -209,9 +242,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24