ocular 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33d5f708edcb7dd43619b5222bfa86e5897d84ef
-  data.tar.gz: 9dcd6fd9dba29ebebc23c0ea227d12cf73b64da0
+  metadata.gz: f9744f295fb350d3864ab65a80a3506281f776f3
+  data.tar.gz: 453713667fc0c6c7eec8b359dbab2b49d4523b25
 SHA512:
-  metadata.gz: 3c2c902cde308bab0ce9885c4d64f665b9a10c296f3ac52ebe3fd53c3ef05e924762ad3ee088c9ccdfa1f2c6f896facc3524ebb836c3fb1ae036009236d68b17
-  data.tar.gz: a2b3a5f4a76be86332520655793958c81f996513be1fb2cc2a84f26c3a3c235a0e01ac4fd700af3ff3727f0801d88f66ae85184bb6879fc92bc1d944a8c0b8b8
+  metadata.gz: c4efd125317945bc07ae03513116e087884895988bfa2d2d92f61326aa9da7d2d9f1d0418b18f005c6c25f5e779c0bd6ebda18c0281b86c5e9ea8a17518bfcbe
+  data.tar.gz: 456e9158a506e24382c8a1fa03c6d17ab87ea2fa2b0a8afe11689c7170ab9b267724dff8a1b823506d89d08f3d6c9b6a0c10b07b4e601aa3dd8a0d453ea91210

data/bin/ocular

@@ -114,13 +114,18 @@ else
   if ARGV.length == 0
       puts "Missing script file to run, starting ocular interactive shell. use \"ocular -h\" to get full options"
       puts ""
-      longest_name = $dsl_help.keys.max_by(&:length).length
+      longest_name = [$dsl_help.keys.max_by(&:length).length, $dsl_event_help.keys.max_by(&:length).length].max
       $dsl_help.each do |cmd, help|
         spacing = " "*(longest_name.to_i+1-cmd.length)
         puts "  #{cmd}#{spacing}#{help}"
       end
       puts ""
-
+      puts "Event triggering functions:"
+      $dsl_event_help.each do |cmd, help|
+        spacing = " "*(longest_name.to_i+1-cmd.length)
+        puts "  #{cmd}#{spacing}#{help}"
+      end
+      puts ""
       ARGV.clear
       require 'irb'
       IRB.setup nil
@@ -144,7 +149,9 @@ else
       IRB.conf[:SAVE_HISTORY] = 1000
       IRB.conf[:HISTORY_FILE] = '~/.ocular_history'
 
-      context = Ocular::DSL::RunContext.new
+      ef = Ocular::Event::EventFactory.new
+
+      context = Ocular::DSL::REPLRunContext.new(ef.handlers)
 
       irb = IRB::Irb.new(IRB::WorkSpace.new(context))
       IRB.conf[:MAIN_CONTEXT] = irb.context

data/lib/ocular/dsl/dsl.rb

@@ -5,6 +5,12 @@ def add_help(name, help)
     $dsl_help[name] = help
 end
 
+$dsl_event_help = {}
+
+def add_event_help(name, help)
+    $dsl_event_help[name] = help
+end
+
 
 require 'ocular/dsl/etcd.rb'
 require 'ocular/dsl/fog.rb'

data/lib/ocular/dsl/orbit.rb

@@ -12,13 +12,18 @@ class Ocular
                     @etcd = etcd
                 end
 
-                add_help "orbit::get_service_endpoints(service_name)", "Returns an array of ips running service_name"
+                add_help "orbit.get_service_endpoints(service_name)", "Returns an array of ips running service_name"
                 def get_service_endpoints(service_name)
                     orbit_endpoints = []
-                    endpoints = @etcd.get("/orbit/services/#{service_name}/endpoints").node.children
-                    endpoints.each do |node|
-                      ip = node.key.match(/.*endpoints.(.+?):.+/).captures[0]
-                      orbit_endpoints << ip
+                    begin
+                        endpoints = @etcd.get("/orbit/services/#{service_name}/endpoints").node.children
+                        pp endpoints
+                        endpoints.each do |node|
+                          ip = node.key.match(/.*endpoints.(.+?):.+/).captures[0]
+                          orbit_endpoints << ip
+                        end
+                    rescue ::Etcd::KeyNotFound
+                        return []
                     end
 
                     return orbit_endpoints

data/lib/ocular/dsl/runcontext.rb

@@ -1,5 +1,6 @@
 
 require 'securerandom'
+require 'ocular/inputs/cron_input'
 
 class Ocular
     module DSL
@@ -15,6 +16,8 @@ class Ocular
             include Ocular::DSL::Etcd
             include Ocular::DSL::Orbit
 
+            include Ocular::Inputs::Cron::DSL
+
             def initialize
                 @run_id = SecureRandom.uuid()
                 @logger = Ocular::DSL::Logger.new
@@ -25,7 +28,7 @@ class Ocular
                 if self.proxy
                     self.proxy.send(method_sym, *arguments, &block)
                 else
-                    raise NoMethodError("undefined method `#{method_sym}` in event #{self.class_name}")
+                    raise NoMethodError, "undefined method `#{method_sym}` in event #{self.class_name}"
                 end
             end
 
@@ -39,5 +42,18 @@ class Ocular
                 end
             end
         end
+
+        class REPLRunContext < RunContext
+            attr_reader :handlers
+            attr_reader :events
+            attr_reader :do_fork
+
+            def initialize(handlers)
+                super()
+                @events = {}
+                @handlers = handlers
+                @do_fork = false
+            end
+        end
     end
 end

data/lib/ocular/event/eventfactory.rb

@@ -1,6 +1,7 @@
 require 'ocular/inputs/handlers.rb'
 require 'ocular/event/eventbase.rb'
 require 'ocular/inputs/http_input.rb'
+require 'ocular/inputs/cron_input.rb'
 
 class Ocular
     module Event
@@ -24,6 +25,7 @@ class Ocular
             include Ocular::DSL::Etcd
 
             include Ocular::Inputs::HTTP::DSL
+            include Ocular::Inputs::Cron::DSL
 
             def fork(value)
                 @do_fork = value

data/lib/ocular/inputs/cron_input.rb

@@ -0,0 +1,111 @@
+
+require 'ocular/inputs/base.rb'
+require 'ocular/dsl/dsl.rb'
+require 'ocular/dsl/runcontext.rb'
+require 'rufus/scheduler'
+
+class Ocular
+    module Inputs
+
+        module Cron
+
+            module DSL
+
+                add_event_help "cron.in(rule)", "Schedule event to be executed in 'rule'. eg: '1m'"
+                add_event_help "cron.at(rule)", "Schedule event to be executed at 'rule'. eg: '2030/12/12 23:30:00'"
+                add_event_help "cron.every(rule)", "Schedule event to be executed every 'rule'. eg: '15m'"
+                add_event_help "cron.cron(rule)", "Schedule event with cron syntax. eg: '5 0 * * *'"
+                def cron()
+                    handler = handlers.get(::Ocular::Inputs::Cron::Input)
+                    return Input::DSLProxy.new(self, handler)
+                end
+
+            end
+
+            class Input < ::Ocular::Inputs::Base
+
+                attr_reader :routes
+                attr_reader :scheduler
+
+                def initialize(settings_factory)
+                    settings = settings_factory[:http]
+
+                    @scheduler = ::Rufus::Scheduler.new
+
+                end
+
+                def start()
+
+                end
+
+                def stop()
+                    @scheduler.shutdown
+                end
+
+                class DSLProxy
+                    def initialize(proxy, handler)
+                        @proxy = proxy
+                        @handler = handler
+                    end
+
+                    def in(rule, &block)
+                        eventbase = Ocular::DSL::EventBase.new(&block)
+                        eventbase.proxy = @proxy
+
+                        id = @handler.scheduler.in(rule) do
+                            context = ::Ocular::DSL::RunContext.new
+                            eventbase.exec(context)
+                        end
+
+                        @proxy.events[id] = eventbase
+
+                        return id
+                    end
+
+                    def at(rule, &block)
+                        eventbase = Ocular::DSL::EventBase.new(&block)
+                        eventbase.proxy = @proxy
+
+                        id = @handler.scheduler.at(rule) do
+                            context = ::Ocular::DSL::RunContext.new
+                            eventbase.exec(context)
+                        end
+
+                        @proxy.events[id] = eventbase
+
+                        return id
+                    end
+
+                    def every(rule, &block)
+                        eventbase = Ocular::DSL::EventBase.new(&block)
+                        eventbase.proxy = @proxy
+
+                        id = @handler.scheduler.every(rule) do
+                            context = ::Ocular::DSL::RunContext.new
+                            eventbase.exec(context)
+                        end
+
+                        @proxy.events[id] = eventbase
+
+                        return id
+                    end
+
+                    def cron(rule, &block)
+                        eventbase = Ocular::DSL::EventBase.new(&block)
+                        eventbase.proxy = @proxy
+
+                        id = @handler.scheduler.cron(rule) do
+                            context = ::Ocular::DSL::RunContext.new
+                            eventbase.exec(context)
+                        end
+
+                        @proxy.events[id] = eventbase
+
+                        return id
+                    end
+                end
+
+            end
+        end
+    end
+end

data/lib/ocular/ocular.rb

@@ -4,6 +4,7 @@ require 'ocular/settings'
 require 'ocular/event/eventbase'
 require 'ocular/event/eventfactory'
 require 'ocular/dsl/dsl'
+require 'ocular/inputs/cron_input'
 require 'ocular/dsl/runcontext'
 require 'ocular/inputs/handlers'
 require 'ocular/inputs/base'

data/lib/ocular/version.rb

@@ -1,3 +1,3 @@
 class Ocular
-    Version = "0.1.7"
+    Version = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocular
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Juho Mäkinen
@@ -108,6 +108,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: rufus-scheduler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +166,7 @@ files:
 - lib/ocular/event/eventbase.rb
 - lib/ocular/event/eventfactory.rb
 - lib/ocular/inputs/base.rb
+- lib/ocular/inputs/cron_input.rb
 - lib/ocular/inputs/handlers.rb
 - lib/ocular/inputs/http_input.rb
 - lib/ocular/mixin/from_file.rb