ocular 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80d3eab4870432f28e3a67ed391012aa4cbd0d3d
-  data.tar.gz: d899c2f9ec2020c3d18bf82dc61543bbb8e1163c
+  metadata.gz: ba3d7f05bc363f6bde68a3499ac349554297e908
+  data.tar.gz: 4b9e52b2e61dbf40f3af58357086bb9bafe6c1db
 SHA512:
-  metadata.gz: b51e2835fb8aa855eeb85a342782d6e0d7c2e7a5b8293f0fe4aaae6c135727a82952a8b4fd85296eec3f5f3802175d6db511274097f6eaebc1a063e9d82282a1
-  data.tar.gz: c8a79305a5259ea4d6f782a81c91ea41c918910603105d885db97cc2b39d14f1a74a326d2a8584b1e26254e0fdb58475cdf7088535b6aef10b5a71d95efd22ae
+  metadata.gz: f73554edcfac13aee2be802f97d04357b795940ec552fefcae627a5fb8488148b608df5c187e6b06aaee8d8895a153f99c6f0a8023622711aca5458454689b5c
+  data.tar.gz: 4c2eb3ca28d08d38057963cf0b0da384f4f020f7feeafade71c0edd7fe0bae85df6d113cdf89fd618eec0f7e5313a9615beb578dc38213dc4076926ad22b91cb

data/lib/ocular/dsl/dsl.rb

@@ -0,0 +1,4 @@
+require 'ocular/dsl/etcd.rb'
+require 'ocular/dsl/fog.rb'
+require 'ocular/dsl/logging.rb'
+require 'ocular/dsl/ssh.rb'

data/lib/ocular/dsl/etcd.rb

@@ -0,0 +1,28 @@
+require 'logger'
+require 'etcd'
+
+class Ocular
+    module DSL
+        module Etcd
+            @@__etcd_instance = nil
+
+            def etcd()
+                if @@__etcd_instance
+                    return @@__etcd_instance
+                end
+                
+                settings = ::Ocular::Settings::get(:inputs)[:etcd] || {}
+                @@__etcd_instance = ::Etcd.client(
+                    host: (settings[:host] || "localhost"),
+                    port: (settings[:port] || 2379),
+                    usern_name: (settings[:port] || nil),
+                    password: (settings[:port] || nil),
+                    )
+
+                return @@__etcd_instance
+            end
+
+        end
+
+    end
+end

data/lib/ocular/dsl/runcontext.rb

@@ -11,6 +11,8 @@ class Ocular
 
             include Ocular::DSL::Logging
             include Ocular::DSL::SSH
+            include Ocular::DSL::Fog
+            include Ocular::DSL::Etcd
 
             def initialize
                 @run_id = SecureRandom.uuid()

data/lib/ocular/event/eventbase.rb

@@ -35,13 +35,8 @@ class Ocular
                     r = Results.new
 
                     begin
-                        retval = context.instance_eval(&@callback)
-
-                        # This check is to make sure that whatever we return that it can be serialised
-                        if String === retval or Array === retval
-                            r.response = retval
-                        end
-
+                        r.response = __call(context, @callback)
+                        #r.response = context.instance_eval(&@callback)
                     rescue Exception => error
                         r.error = error
                     end
@@ -49,12 +44,15 @@ class Ocular
                     response_data = Marshal.dump(r)
                     writer.puts(response_data)
                     writer.close
+
                 end
                 writer.close
 
-                Process.wait(child_pid)
-                r = Marshal.load(reader.read)
+                data = reader.read
+                r = Marshal.load(data)
                 reader.close
+                Process.wait(child_pid)
+
 
                 if r.error
                     raise r.error
@@ -63,7 +61,21 @@ class Ocular
             end
 
             def exec_nofork(context)
-                return context.instance_eval(&@callback)
+                return __call(context, @callback)
+                #context.instance_eval(&@callback)
+            end
+
+            def __call(context, callback)
+                # we use this trickery to workaround the LocalJumpError so that we can use return
+                context.define_singleton_method(:_, &callback)
+                p = context.method(:_).to_proc
+
+                reply = p.call()
+                if context.respond_to?(:exec_wrapper)
+                    return context.exec_wrapper(reply)
+                else
+                    return reply
+                end
             end
 
         end

data/lib/ocular/event/eventfactory.rb

@@ -21,6 +21,8 @@ class Ocular
             include Ocular::DSL::Logging
             include Ocular::DSL::SSH
             include Ocular::DSL::Fog
+            include Ocular::DSL::Etcd
+
             include Ocular::Inputs::HTTP::DSL
 
             def fork(value)

data/lib/ocular/inputs/http_input.rb

@@ -5,6 +5,7 @@ require 'rack/protection'
 require 'uri'
 
 require 'ocular/inputs/base.rb'
+require 'ocular/dsl/dsl.rb'
 require 'ocular/dsl/runcontext.rb'
 
 # Some of this code is copied from the excellent Sinatra Ruby web library by
@@ -40,6 +41,27 @@ class Ocular
 
                 class WebRunContext < ::Ocular::DSL::RunContext
                     attr_accessor :request, :response, :params, :env
+
+                    def initialize()
+                        super()
+                        @headers = {}
+                    end
+
+                    def content_type(type)
+                        @headers["Content-Type"] = type
+                    end
+
+                    def exec_wrapper(res)
+                        if Fixnum === res
+                            res = [res, @headers, nil]
+                        end
+
+                        if String === res
+                            res = [200, @headers, res]
+                        end
+
+                        return res
+                    end
                 end
 
 
@@ -258,7 +280,6 @@ class Ocular
                     end
                 end
 
-
                 def safe_ignore(ignore)
                     unsafe_ignore = []
                     ignore = ignore.gsub(/%[\da-fA-F]{2}/) do |hex|
@@ -388,6 +409,20 @@ class Ocular
                     end
                 ensure
                     
+                end
+
+                def invoke(context)
+                    res = catch(:halt) { yield(context) }
+
+                    if Array === res and Fixnum === res.first
+                        res = res.dup
+                        status(context, res.shift)
+                        body(context, res.pop)
+                        headers(context, *res)
+                    elsif res.respond_to? :each
+                        body(context, res)
+                    end
+                    nil # avoid double setting the same response tuple twice
                 end                
 
                 def handle_exception!(context, error)
@@ -400,7 +435,6 @@ class Ocular
                         puts "Internal Server Error: #{error}"
                         puts error.backtrace
                     end
-
                 end
 
                 def call_block(context)
@@ -443,21 +477,6 @@ class Ocular
                     @params = original if original
                 end                
 
-                def invoke(context)
-                    res = catch(:halt) { yield(context) }
-
-                    res = [res] if Fixnum === res or String === res
-                    if Array === res and Fixnum === res.first
-                        res = res.dup
-                        status(context, res.shift)
-                        body(context, res.pop)
-                        headers(context, *res)
-                    elsif res.respond_to? :each
-                        body(context, res)
-                    end
-                    nil # avoid double setting the same response tuple twice
-                end
-
                 # Creates a Hash with indifferent access.
                 def indifferent_hash
                     Hash.new {|hash,key| hash[key.to_s] if Symbol === key }

data/lib/ocular/ocular.rb

@@ -3,9 +3,7 @@ require 'ocular/version'
 require 'ocular/settings'
 require 'ocular/event/eventbase'
 require 'ocular/event/eventfactory'
-require 'ocular/dsl/logging'
-require 'ocular/dsl/fog'
-require 'ocular/dsl/ssh'
+require 'ocular/dsl/dsl'
 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.4"
+    Version = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocular
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rye
@@ -94,6 +94,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: etcd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +142,8 @@ files:
 - lib/blocktest.rb
 - lib/ocular.rb
 - lib/ocular/daemon.rb
+- lib/ocular/dsl/dsl.rb
+- lib/ocular/dsl/etcd.rb
 - lib/ocular/dsl/fog.rb
 - lib/ocular/dsl/logging.rb
 - lib/ocular/dsl/runcontext.rb