khronos 0.1.3 → 0.1.4

data/.rspec

@@ -1 +1,2 @@
 --color
+--format d

data/Gemfile

@@ -1,6 +1,8 @@
 source :rubygems
 gemspec
 
+gem 'rake'
+
 group :test do
   gem 'thin'
   gem 'simplecov', '= 0.6.4'
@@ -13,6 +15,7 @@ group :test do
   gem "factory_girl", "~> 4.0.0"
   gem "webmock", "~> 1.8.9"
   gem "database_cleaner"
+  gem 'netrc', '= 0.7.7'
 
   #
   # Used for time functions

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    khronos (0.1.3)
+    khronos (0.1.4)
       activerecord (~> 3.2.8)
       girl_friday (~> 0.10.0)
       json (~> 1.7.5)
@@ -63,6 +63,7 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
+    rake (0.9.2.2)
     rest-client (1.6.8)
       mime-types (>= 1.16)
       netrc
@@ -107,8 +108,10 @@ DEPENDENCIES
   mongo
   mongoid (~> 3.0.5)
   mysql2 (~> 0.3.11)
+  netrc (= 0.7.7)
   pg
   rack-test (~> 0.6.1)
+  rake
   rspec (~> 2.11.0)
   simplecov (= 0.6.4)
   sqlite3

data/README.md

@@ -1,4 +1,4 @@
-khronos
+khronos [![Build Status](https://secure.travis-ci.org/endel/khronos.png)](http://travis-ci.org/endel/khronos)
 ===
 
 Simple HTTP-based Job scheduling for the cloud.
@@ -10,7 +10,8 @@ Features
   - Configure recurrency per request
   - Log HTTP status code for every request made
   - Query the database via REST API
-  - Postgresql, MySQL and SQLite supported. (mongodb will be supported soon)
+
+Currently only PostgreSQL is supported. Patches for other databases are welcome.
 
 How it works
 ---
@@ -31,24 +32,24 @@ Create a scheduled task:
       :task_url => "http://myapp.com/do-something-awesome",
       :recurrency => 12.hours
     })
-    # => "{\"active\":true,\"at\":\"2012-09-15T21:24:56-03:00\",\"context\":\"test\",\"id\":1,\"recurrency\":1,\"task_url\":\"http://myapp.com/do-something-awesome\"}"
+    # => {"active":true,"at":"2012-09-15T21:24:56-03:00","context":"test","id":1,"recurrency":1,"task_url":"http://myapp.com/do-something-awesome"}
 
 Query for a scheduled task:
 
     RestClient.get('http://localhost:3000/task', :params => { :context => 'test' })
-    # => "{\"active\":true,\"at\":\"2012-09-15T21:24:56-03:00\",\"context\":\"test\",\"id\":1,\"recurrency\":1,\"task_url\":\"http://myapp.com/do-something-awesome\"}"
+    # => {"active":true,"at":"2012-09-15T21:24:56-03:00","context":"test","id":1,"recurrency":1,"task_url":"http://myapp.com/do-something-awesome"}
 
 Delete a scheduled task by query:
 
     RestClient.delete('http://localhost:3000/task', :params => { :status_code => 404 })
-    # => "{\"deleted\":3}"
+    # => {"deleted":3}
     RestClient.delete('http://localhost:3000/task', :params => { :id => 9 })
-    # => "{\"deleted\":1}"
+    # => {"deleted":1}
 
 Query for logs for tasks that already ran.
 
     RestClient.get('http://localhost:3000/schedule/logs', :params => { :status_code => 500 })
-    # => "[{\"id\":3,\"schedule_id\":1,\"started_at\":\"2012-09-15T13:38:48-03:00\",\"status_code\":500},{\"id\":5,\"schedule_id\":2,\"started_at\":\"2012-09-15T13:38:48-03:00\",\"status_code\":500}]"
+    # => [{"id":3,"schedule_id":1,"started_at":"2012-09-15T13:38:48-03:00","status_code":500},{"id":5,"schedule_id":2,"started_at":"2012-09-15T13:38:48-03:00","status_code":500}]
 
 Note: these examples are using [rest-client](https://github.com/archiloque/rest-client/) and [activesupport](https://github.com/rails/rails/tree/master/activesupport).
 

data/Rakefile

@@ -1,36 +1,20 @@
 $: << 'lib'
 
+require 'rake'
 require 'bundler/setup'
 
 ENV['RACK_ENV'] = ENV['ENV'] || 'test'
 require 'khronos'
 
-def load_migrations!
-  require 'khronos/storage/adapter/activerecord/migrations/schedule'
-  require 'khronos/storage/adapter/activerecord/migrations/schedule_log'
-end
-
-namespace :db do
-
-  desc 'Create the database.'
-  task :create do
-    adapter = Khronos::Storage::Adapter.get(ENV['KHRONOS_STORAGE'])
-    if adapter.name =~ /ActiveRecord/
-      load_migrations!
-      CreateSchedule.up
-      CreateScheduleLog.up
-    end
-  end
+require "rspec/core/rake_task"
 
-  desc 'Destroy entire database.'
-  task :drop do
-    adapter = Khronos::Storage::Adapter.get(ENV['KHRONOS_STORAGE'])
-    if adapter.name =~ /ActiveRecord/
-      load_migrations!
-      CreateSchedule.down
-      CreateScheduleLog.down
-    end
-  end
+desc "Run all specs"
+task :spec => ["spec:all"]
 
+desc "Run unit specs"
+RSpec::Core::RakeTask.new(:'spec:all') do |t|
+  t.rspec_opts = ['--colour']
+  t.pattern = 'spec/**/*_spec.rb'
 end
 
+task :default => :spec

data/lib/khronos.rb

@@ -7,7 +7,6 @@ require 'logger'
 module Khronos
   autoload :Config,     'khronos/config'
   autoload :Logger,     'khronos/logger'
-  autoload :Scheduler,  'khronos/scheduler'
 
   autoload :Storage,    'khronos/storage'
   autoload :Server,     'khronos/server'

data/lib/khronos/server/controller.rb

@@ -15,10 +15,12 @@ module Khronos
       def check_schedule!
         puts "Checking... #{Time.now}"
         count = 0
-        Khronos::Scheduler.fetch(Time.now).each do |schedule|
-          Khronos::Scheduler.run(schedule, @runner)
+
+        Storage::Schedule.fetch(Time.now).each do |schedule|
+          @runner.enqueue(schedule)
           count += 1
         end
+
         puts "Tick. #{count} jobs to run."
       end
 

data/lib/khronos/server/scheduler.rb

@@ -111,9 +111,8 @@ module Khronos
       #
       # @return [Hash] queued
       post '/task/run' do
-        schedule = Storage::Schedule.where(:id => params[:id]).first
-        Khronos::Scheduler.run(schedule) if schedule
-        {:queued => !schedule.nil?}.to_json
+        schedule = Storage::Schedule.where(:id => params[:id]).update_all(:at => Time.now)
+        {:queued => schedule}.to_json
       end
 
       # Schedule logs querying interface

data/lib/khronos/storage.rb

@@ -8,7 +8,6 @@ module Khronos
       raise RuntimeError.new("Please configure 'KHRONOS_STORAGE' on your environment variables.") if uri.nil?
 
       @adapter = Adapter.get(uri)
-      self.migrate! if @adapter.name =~ /ActiveRecord/
       self.class.send(:include, @adapter)
     end
 
@@ -24,24 +23,5 @@ module Khronos
       ScheduleLog.delete_all
     end
 
-    protected
-
-      def migrate!
-        require 'khronos/storage/adapter/activerecord/migrations/schedule'
-        require 'khronos/storage/adapter/activerecord/migrations/schedule_log'
-
-        unless ActiveRecord::Base.connection.table_exists?(:schedules)
-          Adapter::ActiveRecord::CreateSchedule.up
-        else
-          Logger.debug "Schedules table already exists."
-        end
-
-        unless ActiveRecord::Base.connection.table_exists?(:schedule_logs)
-          Adapter::ActiveRecord::CreateScheduleLog.up
-        else
-          Logger.debug "ScheduleLog table already exists."
-        end
-      end
-
   end
 end

data/lib/khronos/storage/adapter.rb

@@ -29,14 +29,10 @@ module Khronos
       def self.get(url)
         uri = parse_uri(url)
         framework = @frameworks[uri[:scheme]]
-
         require "khronos/storage/adapter/#{framework}"
 
         # Get and connect with the adapter class.
-        adapter = const_get(@classes[framework])
-
-        # uri.merge(:adapter => @adapters[uri[:scheme]] || uri[:scheme])
-        adapter.connect!(url)
+        const_get(@classes[framework]).connect!(url)
       end
 
     end

data/lib/khronos/storage/adapter/activerecord.rb

@@ -10,25 +10,33 @@ module Khronos
         def self.connect!(url)
           require 'active_record'
 
-          #if File.exists?("config/database.yml")
-            #::ActiveRecord::Base.establish_connection(YAML.load_file("config/database.yml")[ENV['RACK_ENV']])
-          #else
-            ::ActiveRecord::Base.establish_connection(url)
-            ::ActiveRecord::Base.include_root_in_json = false
-          #end
-
-          #
-          # ::ActiveRecord::Base.logger = ::Logger.new(STDOUT)
-          #
+          ::ActiveRecord::Base.establish_connection(url)
+          ::ActiveRecord::Base.include_root_in_json = false
           self
         end
 
         def self.included(base)
-          #puts "included in #{base}"
+          self.migrate!
         end
 
-        def self.extended(base)
-          #puts "extended in #{base.inspect}"
+
+        protected
+
+        def self.migrate!
+          require 'khronos/storage/adapter/activerecord/migrations/schedule'
+          require 'khronos/storage/adapter/activerecord/migrations/schedule_log'
+
+          unless ::ActiveRecord::Base.connection.table_exists?(:schedules)
+            ActiveRecord::CreateSchedule.up
+          else
+            Logger.debug "Schedules table already exists."
+          end
+
+          unless ::ActiveRecord::Base.connection.table_exists?(:schedule_logs)
+            ActiveRecord::CreateScheduleLog.up
+          else
+            Logger.debug "ScheduleLog table already exists."
+          end
         end
 
       end

data/lib/khronos/storage/adapter/activerecord/schedule.rb

@@ -9,6 +9,14 @@ module Khronos
           attr_accessible :context, :at, :recurrency, :task_url, :callbacks, :active
           has_many :logs, :class_name => ScheduleLog
 
+          class << self
+            def fetch(time)
+              self.find_by_sql([
+                "UPDATE #{self.table_name} SET active = false WHERE at <= ? AND active = true RETURNING *", time
+              ])
+            end
+          end
+
           def callbacks=(options)
             write_attribute(:callbacks, options.to_json)
           end

data/lib/khronos/version.rb

@@ -1,3 +1,3 @@
 module Khronos
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/spec/functional/adapters_spec.rb

@@ -31,7 +31,7 @@ describe Khronos::Storage do
       Khronos::Storage::Schedule.last.task_url.should == "http://some-service.com/task"
     end
 
-    it "should identify activerecord adapter for sqlite3" do
+    xit "should identify activerecord adapter for sqlite3" do
       client = subject.new('sqlite3://localhost/spec/tmp/sqlite3.db')
       Khronos::Storage::Schedule.should == Khronos::Storage::Adapter::ActiveRecord::Schedule
       Khronos::Storage::ScheduleLog.should == Khronos::Storage::Adapter::ActiveRecord::ScheduleLog

data/spec/functional/storage_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+
+describe Khronos::Storage do
+  subject { Khronos::Storage::Schedule }
+  let(:schedule) { subject }
+
+  before(:all) do
+    ENV['KHRONOS_STORAGE'] = 'postgresql://localhost:5432/khronos'
+
+    @storage = Khronos::Storage.new
+    @storage.truncate!
+
+    load_factory_girl!
+  end
+
+  it "fetch schedules by time" do
+    FactoryGirl.create(:schedule, :at => 1.minutes.from_now)
+    schedule.fetch(1.minutes.from_now).length.should == 1
+
+    FactoryGirl.create(:schedule, :at => 1.minutes.from_now)
+    FactoryGirl.create(:schedule, :at => 5.minutes.from_now)
+    schedule.fetch(5.minutes.from_now).length.should == 2
+
+    FactoryGirl.create(:schedule, :at => 1.minutes.from_now)
+    FactoryGirl.create(:schedule, :at => 5.minutes.from_now)
+    FactoryGirl.create(:schedule, :at => 10.minutes.from_now)
+    schedule.fetch(10.minutes.from_now).length.should == 3
+
+    FactoryGirl.create(:schedule, :at => 1.minutes.from_now)
+    FactoryGirl.create(:schedule, :at => 5.minutes.from_now)
+    FactoryGirl.create(:schedule, :at => 10.minutes.from_now)
+    FactoryGirl.create(:schedule, :at => 30.minutes.from_now)
+    schedule.fetch(30.minutes.from_now).length.should == 4
+
+    FactoryGirl.create(:schedule, :at => 1.minutes.from_now)
+    FactoryGirl.create(:schedule, :at => 5.minutes.from_now)
+    FactoryGirl.create(:schedule, :at => 10.minutes.from_now)
+    FactoryGirl.create(:schedule, :at => 30.minutes.from_now)
+    FactoryGirl.create(:schedule, :at => 60.minutes.from_now)
+    schedule.fetch(60.minutes.from_now).length.should == 5
+
+    schedule.fetch(60.minutes.from_now).length.should == 0
+  end
+
+end
+

data/spec/integration/scheduler_server_spec.rb

@@ -44,7 +44,7 @@ describe Khronos::Server::Scheduler do
       dummy_schedule = FactoryGirl.create(:schedule)
       post('/task/run', :id => dummy_schedule.id)
       last_response.status.should == 200
-      JSON.parse(last_response.body).should == {'queued' => true}
+      JSON.parse(last_response.body).should == {'queued' => 1}
     end
 
     it "should update schedule data" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: khronos
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -165,7 +165,6 @@ files:
 - lib/khronos.rb
 - lib/khronos/config.rb
 - lib/khronos/logger.rb
-- lib/khronos/scheduler.rb
 - lib/khronos/server.rb
 - lib/khronos/server/controller.rb
 - lib/khronos/server/runner.rb
@@ -189,7 +188,7 @@ files:
 - spec/functional/adapters_spec.rb
 - spec/functional/controller_spec.rb
 - spec/functional/misc_spec.rb
-- spec/functional/scheduler_spec.rb
+- spec/functional/storage_spec.rb
 - spec/integration/runner_server_spec.rb
 - spec/integration/scheduler_server_spec.rb
 - spec/spec_helper.rb
@@ -224,7 +223,7 @@ test_files:
 - spec/functional/adapters_spec.rb
 - spec/functional/controller_spec.rb
 - spec/functional/misc_spec.rb
-- spec/functional/scheduler_spec.rb
+- spec/functional/storage_spec.rb
 - spec/integration/runner_server_spec.rb
 - spec/integration/scheduler_server_spec.rb
 - spec/spec_helper.rb

data/lib/khronos/scheduler.rb

@@ -1,19 +0,0 @@
-require 'socket'
-require 'json'
-
-module Khronos
-  class Scheduler
-
-    def self.run(schedule, runner=nil)
-      schedule.update_attributes(:active => false)
-      schedule.save
-      runner.enqueue(schedule) if runner
-    end
-
-    def self.fetch(target_time=Time.now)
-      Storage::Schedule.where(['at <= ?', target_time]).where(:active => true)
-    end
-
-  end
-end
-

data/spec/functional/scheduler_spec.rb

@@ -1,30 +0,0 @@
-require 'spec_helper'
-
-describe Khronos::Scheduler do
-  subject { Khronos::Scheduler }
-  let(:scheduler) { subject }
-
-  before(:all) do
-    ENV['KHRONOS_STORAGE'] = 'sqlite3://localhost/spec/tmp/scheduler.db'
-
-    @storage = Khronos::Storage.new
-    @storage.truncate!
-
-    load_factory_girl!
-    FactoryGirl.create(:schedule, :at => 1.minutes.from_now)
-    FactoryGirl.create(:schedule, :at => 5.minutes.from_now)
-    FactoryGirl.create(:schedule, :at => 10.minutes.from_now)
-    FactoryGirl.create(:schedule, :at => 30.minutes.from_now)
-    FactoryGirl.create(:schedule, :at => 60.minutes.from_now)
-  end
-
-  it "fetch schedules by time" do
-    scheduler.fetch(1.minutes.from_now).length.should == 1
-    scheduler.fetch(5.minutes.from_now).length.should == 2
-    scheduler.fetch(10.minutes.from_now).length.should == 3
-    scheduler.fetch(30.minutes.from_now).length.should == 4
-    scheduler.fetch(60.minutes.from_now).length.should == 5
-  end
-
-end
-