ocular 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 902d76652adad957cc5559fe95d7876e81fa4359
-  data.tar.gz: c895d66f55f1564956ff5dbe6ad158d1af75dd77
+  metadata.gz: b75a01c08fb7b6a2ff960807a32756141e464168
+  data.tar.gz: 37aaefaa23b2948b71e08ab2d9b1b3a869ddb68a
 SHA512:
-  metadata.gz: 85917e966df5b3b644d89585d22432a99352b6080133aae5bce6d5f236798c8a25465155182f64f2d25e02040ce06eea4ed62b5fd4089f9c4c8066c4a2c2d7c2
-  data.tar.gz: 75a436317585523e6bed22576fe0e86de251f5d3f849bbbfca0e8609add6b88eb4fea703205bcbf763d9ed39ec9bd0f521c18fc9e297bc882b806bd2a1dc0491
+  metadata.gz: e88d5e11511d01257c91a8437435ef910c530b2fa18e8d4e2d60e26a5d444b4e567ccf1d59ba04b82ae490e39e5c95526ca17a1dff194b3dd6842854c5a38eff
+  data.tar.gz: cc915062ae0f0eac29ff93a3d9ea96b7ca1e9f25cfea0b757cc303fea89b126fae9703c9d5f718634ef596af7c4d2deae7f9fb2220b48e5272e2082626baf345

data/bin/ocular

@@ -24,7 +24,7 @@ class OptparseExample
     options.settings = nil
     options.root = nil
     options.check = nil
-    options.level = "DEBUG"
+    options.level = "INFO"
 
     opt_parser = OptionParser.new do |opts|
       opts.banner = "Usage in shell mode: \"ocular [options] <script file>\" or server mode: \"ocular --server [options]\""
@@ -78,9 +78,10 @@ class OptparseExample
 end  # class OptparseExample
 
 options = OptparseExample.parse(ARGV)
-
+settings_file = nil
 begin
-  Ocular::Settings.load_from_file(Ocular::Settings.find_settings_file_from_system(options.settings))
+  settings_file = Ocular::Settings.find_settings_file_from_system(options.settings)
+  Ocular::Settings.load_from_file(settings_file)
 rescue Errno::ENOENT
   puts "Could not find #{options.settings} in any search path."
   puts "Please create a yaml settings file in either ~/.ocular.yaml or /etc/ocular.yaml"
@@ -127,6 +128,8 @@ end
 
 Ocular.set_global_logger(logger)
 
+logger.debug("- Loaded ocular settings from #{settings_file}")
+
 if options.server or options.syntax
   if !options.root && !Ocular::Settings.get(:script_root)
     puts "Please specify --root or set script_root in the settings.yaml"

data/lib/ocular/daemon.rb

@@ -37,6 +37,7 @@ class Ocular
         end
 
         def start_input_handlers()
+            puts "derp"
             @eventfactory.start_input_handlers()
         end
 

data/lib/ocular/dsl/dsl.rb

@@ -17,4 +17,5 @@ require 'ocular/dsl/fog.rb'
 require 'ocular/dsl/logging.rb'
 require 'ocular/dsl/ssh.rb'
 require 'ocular/dsl/orbit.rb'
+require 'ocular/dsl/mysql.rb'
 

data/lib/ocular/dsl/etcd.rb

@@ -13,12 +13,17 @@ class Ocular
                     return @@__etcd_instance
                 end
 
-                settings = ::Ocular::Settings::get(:inputs)[:etcd] || {}
+
+                datasources = ::Ocular::Settings::get(:datasources)
+                if !datasources
+                    raise "No etcd client settings"
+                end
+                settings = datasources[:etcd] || {}
                 @@__etcd_instance = ::Etcd.client(
                     host: (settings[:host] || "localhost"),
                     port: (settings[:port] || 2379),
-                    usern_name: (settings[:port] || nil),
-                    password: (settings[:port] || nil),
+                    user_name: (settings[:user_name] || nil),
+                    password: (settings[:password] || nil),
                     )
 
                 return @@__etcd_instance

data/lib/ocular/dsl/mysql.rb

@@ -0,0 +1,28 @@
+require 'logger'
+require 'mysql2'
+
+class Ocular
+    module DSL
+        module MySQL
+
+            add_help "mysql", "Returns a mysql client instance"
+
+            def mysql()
+                datasources = ::Ocular::Settings::get(:datasources)                
+                if !datasources or !datasources[:mysql]
+                    raise "No mysql client settings"
+                end
+                settings = datasources[:mysql] || {}
+                return Mysql2::Client.new(
+                    host: (settings[:host] || "localhost"),
+                    port: (settings[:port] || 3306),
+                    username: (settings[:username] || nil),
+                    password: (settings[:password] || nil),
+                    database: (settings[:database] || "ocular")
+                    )
+            end
+
+        end
+
+    end
+end

data/lib/ocular/dsl/runcontext.rb

@@ -15,6 +15,7 @@ class Ocular
             include Ocular::DSL::Fog
             include Ocular::DSL::Etcd
             include Ocular::DSL::Orbit
+            include Ocular::DSL::MySQL
 
             include Ocular::Inputs::Cron::DSL
 

data/lib/ocular/event/eventbase.rb

@@ -46,8 +46,7 @@ class Ocular
                         r.error = error
                     end
 
-                    response_data = Marshal.dump(r)
-                    writer.puts(response_data)
+                    Marshal.dump(r, writer)
                     writer.close
 
                 end

data/lib/ocular/event/eventfactory.rb

@@ -24,8 +24,10 @@ class Ocular
             include Ocular::DSL::SSH
             include Ocular::DSL::Fog
             include Ocular::DSL::Etcd
+            include Ocular::DSL::MySQL
 
             include Ocular::Inputs::HTTP::DSL
+            include Ocular::Inputs::HTTP::ErrorDSL
             include Ocular::Inputs::Cron::DSL
             include Ocular::Inputs::Trigger::DSL
 

data/lib/ocular/inputs/cron_input.rb

@@ -84,7 +84,6 @@ class Ocular
                         ::Ocular.logger.debug "Scheduling cron.every(#{rule}) for block #{block}"
 
                         id = @handler.scheduler.every(rule, :overlap => false) do
-                            puts "derp!"
                             context = ::Ocular::DSL::RunContext.new(@logger)
                             context.log_cause("cron.every", {:rule => rule})
                             eventbase.exec(context)

data/lib/ocular/inputs/handlers.rb

@@ -18,7 +18,9 @@ class Ocular
             end
 
             def start()
+                puts "Starting handlers..."
                 @handlers.each do |name, handler|
+                    puts "Staring handler #{name} with #{handler}"
                     handler.start()
                 end
             end

data/lib/ocular/inputs/http_input.rb

@@ -18,7 +18,6 @@ class Ocular
 
             module DSL
 
-
                 def onGET(path, opts = {}, &block)                    
                     handler = handlers.get(::Ocular::Inputs::HTTP::Input)
                     handler.add_get(script_name, path, opts, self, &block)
@@ -35,13 +34,35 @@ class Ocular
                 end
             end
 
+            module ErrorDSL
+                class ClientError < ::Exception
+                    def initialize(status, message)
+                        @status = status
+                        @message = message
+                    end
+
+                    def http_status
+                        puts "http_status called: #{@status}"
+                        return @status
+                    end
+
+                    def to_s
+                        puts "to_s called: #{@message}"
+                        return @message
+                    end
+                end
+            end
+
             class Input < ::Ocular::Inputs::Base
 
                 attr_reader :routes
 
+
                 class WebRunContext < ::Ocular::DSL::RunContext
                     attr_accessor :request, :response, :params, :env
 
+                    include ::Ocular::Inputs::HTTP::ErrorDSL
+
                     def initialize()
                         super(Ocular::Logging::ConsoleLogger.new) 
                         @headers = {}
@@ -268,6 +289,8 @@ class Ocular
                 end
 
                 def route(verb, path, options, proxy, &block)
+                    ::Ocular.logger.debug("Binding #{verb} #{path} to block #{block}")
+
                     eventbase = Ocular::DSL::EventBase.new(proxy, &block)
                     (proxy.events[verb] ||= {})[path] = eventbase
 
@@ -369,6 +392,17 @@ class Ocular
                     end
                 end
 
+                def encoded(char)
+                    enc = URI_INSTANCE.escape(char)
+                    enc = "(?:#{escaped(char, enc).join('|')})" if enc == char
+                    enc = "(?:#{enc}|#{encoded('+')})" if char == " "
+                    enc
+                end
+
+                def escaped(char, enc = URI_INSTANCE.escape(char))
+                    [Regexp.escape(enc), URI_INSTANCE.escape(char, /./)]
+                end
+
                 def call(env)
                     dup.call!(env)
                 end
@@ -413,6 +447,7 @@ class Ocular
                     invoke(context) do |context|
                         route!(context)
                     end
+
                 rescue ::Exception => error
                     invoke(context) do |context|
                         handle_exception!(context, error)
@@ -440,6 +475,10 @@ class Ocular
 
                     if error.respond_to? :http_status
                         context.response.status = error.http_status
+
+                        if error.respond_to? :to_s
+                            puts error.to_s
+                        end
                     else
                         context.response.status = 500
                         puts "Internal Server Error: #{error}"

data/lib/ocular/version.rb

@@ -1,3 +1,3 @@
 class Ocular
-    Version = "0.1.13"
+    Version = "0.1.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocular
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rye
@@ -136,6 +136,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.3.2
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +188,7 @@ files:
 - lib/ocular/dsl/etcd.rb
 - lib/ocular/dsl/fog.rb
 - lib/ocular/dsl/logging.rb
+- lib/ocular/dsl/mysql.rb
 - lib/ocular/dsl/orbit.rb
 - lib/ocular/dsl/runcontext.rb
 - lib/ocular/dsl/ssh.rb