ocular 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 981e6e95004d5057487b4fc0d616bdd9640b6c29
-  data.tar.gz: db69ab3985347e0b4f06db7a568827fa8d33fe41
+  metadata.gz: 44118cd5f02b3dc8ef6388b180368295a0d9fa33
+  data.tar.gz: f9742f999a9dee9e10afcc0b1fde77c91dd7a0b3
 SHA512:
-  metadata.gz: 8b9bcc9b27e6126d2c5600100163175cfb49d61c3eec68059fa7922b8998cff0f45a65f1caec2ab00b2b488268216a70d39bdcede89dc3aa44965a258b6ea91d
-  data.tar.gz: 6f76ad19c003a5c2477cd950db9ed3e354425c0aca5e15b0f7fd6ab90226c028b91a2ce613ae73712f352a2f0c8e9d2f7ce1a669262ea3629fd5ed38fe167cd6
+  metadata.gz: e394d8d393db01c4fe7e3d00e57a29b8150eff97eb495c61897f4b00e3bebac985f82931060a08821d2d4230e23990f2d4a85c5a592e7625c2fb6e9366ba890f
+  data.tar.gz: a4d83f22add7eeefda8f3bfb36ad3e6016b981b8c20574982efe94a9d661e0f418eba0ce0eac000ed9ee62f2301d51c3b6ba5e09926c07ac0140f092a5685e88

data/bin/ocular

@@ -0,0 +1,102 @@
+#!/usr/bin/ruby
+
+require 'ocular'
+require 'optparse'
+require 'ostruct'
+require 'pp'
+
+
+class OptparseExample
+
+  #
+  # Return a structure describing the options.
+  #
+  def self.parse(args)
+    # The options specified on the command line will be collected in *options*.
+    # We set default values here.
+    options = OpenStruct.new
+    options.library = []
+    options.inplace = false
+    options.encoding = "utf8"
+    options.transfer_type = :auto
+    options.verbose = false
+    options.server = false
+    options.settings = "~/.ocular.yaml"
+    options.root = nil
+
+    opt_parser = OptionParser.new do |opts|
+      opts.banner = "Usage in shell mode: \"ocular [options] <script file>\" or server mode: \"ocular --server [options]\""
+
+      opts.separator ""
+      opts.separator "Specific options:"
+
+
+      opts.separator ""
+      opts.separator "Common options:"
+
+      # No argument, shows at tail.  This will print an options summary.
+      # Try it and see!
+      opts.on_tail("-h", "--help", "Show this message") do
+        puts opts
+        exit
+      end
+
+      # Another typical switch to print the version.
+      opts.on_tail("--version", "Show version") do
+        puts Ocular::Version
+        exit
+      end
+
+      opts.on("--server", "Start in server mode") do
+        options.server = true
+      end
+
+      opts.on("--root PATH", "Script root path") do |path|
+        options.root = path
+      end
+
+      opts.on("--settings FILE", "Full path and file name to the settings yaml file. Default: #{options.settings}") do |path|
+        options.settings = path
+      end
+
+    end
+
+    opt_parser.parse!(args)
+    options
+  end  # parse()
+
+end  # class OptparseExample
+
+options = OptparseExample.parse(ARGV)
+
+Ocular::Settings.load_from_file(File.expand_path(options.settings))
+
+if options.server
+  if !options.root && !Ocular::Settings.get(:script_root)
+    puts "Please specify --root or set script_root in the settings.yaml"
+    exit
+  end
+
+  daemon = Ocular::Daemon.new(options.root || Ocular::Settings.get(:script_root))
+  daemon.load_script_files()
+  daemon.start_input_handlers()
+
+  puts "server started"
+  daemon.wait()
+
+else
+  # Start shell mode
+
+  if ARGV.length == 0
+      puts "Missing script file to run. use -h to get more info"
+      exit
+  end
+
+  ef = Ocular::Event::EventFactory.new
+  proxy = ef.load_from_file(ARGV.shift)
+
+  context = Ocular::DSL::RunContext.new
+  eventbase = proxy.events[0]
+  eventbase.exec(context)
+
+end

data/lib/ocular/daemon.rb

@@ -0,0 +1,59 @@
+require 'ocular/utils.rb'
+require 'pp'
+
+class Ocular
+    class Daemon
+
+        attr_accessor :eventfactory
+
+        def initialize(root_path)
+
+            @root_path = root_path
+            @eventfactory = ::Ocular::Event::EventFactory.new
+        end
+
+        def get_script_files(root)
+            return Dir::glob("#{root}/**/*.rb")
+        end
+
+        def get_name_from_file(filename)
+
+            # -4 will strip the ".rb" away from the end
+            name = filename[@root_path.length..-4]
+
+            # If root_path is empty then we need to strip the '/' from the beginning
+            if name[0] == '/'
+                name = name[1..-1]
+            end
+
+            return name
+        end
+
+        def load_script_files()
+            files = self.get_script_files(@root_path)
+            for file in files
+                @eventfactory.load_from_file(file, get_name_from_file(file))
+            end
+        end
+
+        def start_input_handlers()
+            @eventfactory.start_input_handlers()
+        end
+
+        def stop_input_handlers()
+            @eventfactory.stop_input_handlers()
+        end
+
+        def wait()
+            while true
+                begin
+                    sleep 60
+                rescue Interrupt
+                    stop_input_handlers()
+                    puts "\nGoing to exit"
+                    return
+                end
+            end
+        end
+    end
+end

data/lib/ocular/dsl/fog.rb

@@ -13,8 +13,8 @@ class Ocular
                 
                 @@__aws_instance = ::Fog::Compute.new({
                     :provider => 'AWS',
-                    :aws_access_key_id => ::Ocular::Settings::get('aws')['aws_access_key_id'],
-                    :aws_secret_access_key => ::Ocular::Settings::get('aws')['aws_secret_access_key']
+                    :aws_access_key_id => ::Ocular::Settings::get(:aws)[:aws_access_key_id],
+                    :aws_secret_access_key => ::Ocular::Settings::get(:aws)[:aws_secret_access_key]
                     })
 
                 return @@__aws_instance
@@ -22,8 +22,8 @@ class Ocular
 
             def autoscaling()
                 return ::Fog::AWS::AutoScaling.new({
-                    :aws_access_key_id => ::Ocular::Settings::get('aws')['aws_access_key_id'],
-                    :aws_secret_access_key => ::Ocular::Settings::get('aws')['aws_secret_access_key']
+                    :aws_access_key_id => ::Ocular::Settings::get(:aws)[:aws_access_key_id],
+                    :aws_secret_access_key => ::Ocular::Settings::get(:aws)[:aws_secret_access_key]
                     })
             end
 

data/lib/ocular/dsl/ssh.rb

@@ -6,7 +6,7 @@ class Ocular
         module SSH
 
             def ssh_to(hostname)
-                settings = ::Ocular::Settings::get('ssh').inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+                settings = ::Ocular::Settings::get(:ssh)
                 settings[:password_prompt] = false
                 settings[:safe] = false
 

data/lib/ocular/event/eventfactory.rb

@@ -1,49 +1,73 @@
+require 'ocular/inputs/handlers.rb'
 require 'ocular/event/eventbase.rb'
+require 'ocular/inputs/http_input.rb'
 
 class Ocular
     module Event
         class DefinitionProxy
-          attr_accessor :events
-          attr_accessor :klass_name
-
-          def initialize(klass_name)
-            self.klass_name = klass_name
-            @events = []
-            @logger = Ocular::DSL::Logger.new
-          end
-
-          include Ocular::Mixin::FromFile
-          include Ocular::DSL::Logging
-          include Ocular::DSL::SSH
-          include Ocular::DSL::Fog
-
-          def onEvent(factory_class, &block)
-            eventbase = Ocular::DSL::EventBase.new(&block)
-            eventbase.proxy = self
-            @events << eventbase
-          end
+            attr_accessor :events
+            attr_reader :script_name
+            attr_accessor :handlers
+
+            def initialize(script_name, handlers)
+                @script_name = script_name
+                @events = []
+                @logger = Ocular::DSL::Logger.new
+                @handlers = handlers
+            end
+
+            include Ocular::Mixin::FromFile
+            include Ocular::DSL::Logging
+            include Ocular::DSL::SSH
+            include Ocular::DSL::Fog
+            include Ocular::Inputs::HTTP::DSL
+
+            def onEvent(factory_class, &block)
+                eventbase = Ocular::DSL::EventBase.new(&block)
+                eventbase.proxy = self
+                @events << eventbase
+            end
         end
 
         class EventFactory
 
+            attr_accessor :handlers
+            attr_accessor :files
+
             def initialize
                 @files = {}
+                @handlers = ::Ocular::Inputs::Handlers.new
             end
             
-            def load_from_file(file)
-                proxy = DefinitionProxy.new(file)
+            def load_from_file(file, name = nil)
+                if !name
+                    name = file
+                end
+
+                proxy = DefinitionProxy.new(name, @handlers)
                 proxy.from_file(file)
-                @files[file] = proxy
+                @files[name] = proxy
                 return proxy
             end
 
             def load_from_block(name, &block)
-                proxy = DefinitionProxy.new(name)
+                proxy = DefinitionProxy.new(name, @handlers)
                 proxy.instance_eval(&block)
                 @files[name] = proxy
                 return proxy
             end
 
+            def get(name)
+                return @files[name]
+            end
+
+            def start_input_handlers()
+                @handlers.start()
+            end
+
+            def stop_input_handlers()
+                @handlers.stop()
+            end
         end
     end
-end
+end

data/lib/ocular/event/forker.rb

@@ -0,0 +1,35 @@
+require 'ocular/mixin/from_file'
+require 'ocular/dsl/fog'
+require 'ocular/dsl/ssh'
+require 'ocular/dsl/logging'
+
+class Ocular
+    module Event
+
+        class Forker
+
+            def initialize(&block)
+                puts "Forker created with block #{block}"
+              @callback = block
+            end
+
+            def get_proc()
+                cb = @callback
+
+                def proxy(&block)
+                    return block
+                end
+
+                p = proxy do |*args|
+                    puts "Calling proc callback: #{cb}"
+                    cb.call(*args)
+                end
+
+                puts "returning p: #{p}"
+
+                return p
+            end
+        end
+    end
+end
+

data/lib/ocular/inputs/base.rb

@@ -0,0 +1,17 @@
+
+class Ocular
+    module Inputs
+        class Base
+
+            def initialize(settings)
+            end
+
+            def start()
+            end
+
+            def stop()
+            end
+
+        end
+    end
+end

data/lib/ocular/inputs/handlers.rb

@@ -0,0 +1,33 @@
+require 'pp'
+
+class Ocular
+    module Inputs
+        class Handlers
+
+            def initialize
+                @handlers = Hash.new
+            end
+
+            def get(klass)
+                if @handlers[klass]
+                    return @handlers[klass]
+                end
+
+                @handlers[klass] = klass.new(::Ocular::Settings.get(:inputs))
+                return @handlers[klass]
+            end
+
+            def start()
+                @handlers.each do |name, handler|
+                    handler.start()
+                end
+            end
+
+            def stop()
+                @handlers.each do |name, handler|
+                    handler.stop()
+                end
+            end            
+        end
+    end
+end

data/lib/ocular/inputs/http_input.rb

@@ -0,0 +1,110 @@
+require 'sinatra/base'
+require 'puma'
+require 'rack'
+require 'rack/server'
+require 'ocular/inputs/base.rb'
+
+class Ocular
+    module Inputs
+
+        module HTTP
+
+            module DSL
+
+                def onGET(path, opts = {}, &block)
+                    handler = handlers.get(::Ocular::Inputs::HTTP::Input)
+                    handler.add_get(script_name, path, opts, &block)
+                end
+
+                def onPOST(path, opts = {}, &block)
+                    handler = handlers.get(::Ocular::Inputs::HTTP::Input)
+                    handler.add_post(script_name, path, opts, &block)
+                end
+
+            end
+
+            class Input < ::Ocular::Inputs::Base
+                DEFAULT_SETTINGS = {
+                    :host => '0.0.0.0',
+                    :port => 8080,
+                    :verbose => false,
+                    :silent => false
+                }
+
+                class SinatraApp < Sinatra::Base
+                    configure do
+                        set :server, :puma
+                    end
+
+                    get '/noop' do
+                        puts "/check called"
+                        "OK\n"
+                    end
+                end
+
+                def generate_uri_from_names(script_name, path)
+                    puts "generate_uri_from_names: #{script_name}, #{path}"
+                    if path[0] == "/"
+                        path = path[1..-1]
+                    end
+                    
+                    if script_name && script_name != ""
+                        name = script_name + "/" + path
+                    else
+                        name = path
+                    end
+
+                    return "/" + name
+                end
+
+                def add_get(script_name, path, options = {}, &block)
+                    name = generate_uri_from_names(script_name, path)
+                    puts "adding get at #{name}"
+                    @app_class.get(name, options, &block)
+                end
+
+                def add_post(script_name, path, options = {}, &block)
+                    name = generate_uri_from_names(script_name, path)                    
+                    @app_class.post(name, options, &block)
+                end
+
+                def initialize(settings_factory)
+                    settings = settings_factory[:http]
+
+                    @settings = DEFAULT_SETTINGS.merge(settings)
+                    @stopsignal = Queue.new()
+                    @thread = nil
+
+                    @app_class = Class.new(SinatraApp)
+
+                end
+
+                def start()
+                    @app = @app_class.new
+                    if @settings[:Verbose]
+                      @app = Rack::CommonLogger.new(@app, STDOUT)
+                    end
+
+                    @thread = Thread.new do
+                        events_hander = @settings[:Silent] ? ::Puma::Events.strings : ::Puma::Events.stdio
+                        server   = ::Puma::Server.new(@app, events_hander)
+
+                        server.add_tcp_listener @settings[:host], @settings[:port]
+                        server.min_threads = 0
+                        server.max_threads = 16
+
+                        server.run
+                        @stopsignal.pop
+                        server.stop(true)
+                    end
+                end
+
+                def stop()
+                    @stopsignal << "EXIT"
+                    @thread.join
+                end
+
+            end
+        end
+    end
+end

data/lib/ocular/ocular.rb

@@ -7,3 +7,7 @@ require 'ocular/dsl/logging'
 require 'ocular/dsl/fog'
 require 'ocular/dsl/ssh'
 require 'ocular/dsl/runcontext'
+require 'ocular/inputs/handlers'
+require 'ocular/inputs/base'
+require 'ocular/inputs/http_input'
+require 'ocular/daemon'

data/lib/ocular/settings.rb

@@ -1,5 +1,6 @@
 require 'singleton'
 require 'yaml'
+require 'ocular/utils.rb'
 
 class Ocular
     class Settings
@@ -8,12 +9,28 @@ class Ocular
         include Singleton
 
         def initialize()
-            filename = ENV['OCULAR_SETTINGS']
-            self.settings = YAML::load_file(filename)
+        end
+
+        def self.find_settings_file_from_system()
+            filename = nil
+            if ENV['OCULAR_SETTINGS'] != nil
+                filename = File.expand_path(ENV['OCULAR_SETTINGS'])
+            end
+
+            if !filename or !File.exists?(filename)
+                filename = File.expand_path('~/.ocular.yaml')
+            end
+
+            if !filename or !File.exists?(filename)
+                filename = File.expand_path('/etc/ocular.yaml')
+            end
+
+            return filename
         end
 
         def self.load_from_file(filename)
-            @settings = YAML::load_file(filename)
+            #puts "Loaded settings from #{filename}"
+            @settings = ::Ocular::deep_symbolize(YAML::load_file(filename))
         end
 
         def self.get(key)

data/lib/ocular/utils.rb

@@ -0,0 +1,7 @@
+class Ocular
+    def self.deep_symbolize(obj)
+        return obj.inject({}){|memo,(k,v)| memo[k.to_sym] =  deep_symbolize(v); memo} if obj.is_a? Hash
+        return obj.inject([]){|memo,v    | memo           << deep_symbolize(v); memo} if obj.is_a? Array
+        return obj
+    end
+end

data/lib/ocular/version.rb

@@ -1,3 +1,3 @@
 class Ocular
-    Version = "0.1.2"
+    Version = "0.1.3"
 end

data/spec/settings_spec.rb

@@ -4,7 +4,7 @@ RSpec.describe Ocular::Settings do
 
     it "get receiver settings" do
         ::Ocular::Settings.load_from_file('spec/data/settings.yaml')
-        a = ::Ocular::Settings.get("test_setting")
+        a = ::Ocular::Settings.get(:test_setting)
         expect(a).to eq("Hello, World!")
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocular
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rye
@@ -28,16 +28,58 @@ dependencies:
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.37.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.37.0
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.16.0
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.4.7
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -60,24 +102,32 @@ description: |+
   The goal is that a new script could be written really quickly to automate a previously manual infrastructure maintenance job instead of doing the manual job yet another time. Scripts are written in Ruby with a simple Ocular DSL which allows the script to easily respond to multitude different events.
 
 email: juho@unity3d.com
-executables: []
+executables:
+- ocular
 extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- bin/ocular
 - examples/converge-broken-array.rb
 - examples/ssh-example.rb
 - lib/blocktest.rb
 - lib/ocular.rb
+- lib/ocular/daemon.rb
 - lib/ocular/dsl/fog.rb
 - lib/ocular/dsl/logging.rb
 - lib/ocular/dsl/runcontext.rb
 - lib/ocular/dsl/ssh.rb
 - lib/ocular/event/eventbase.rb
 - lib/ocular/event/eventfactory.rb
+- lib/ocular/event/forker.rb
+- lib/ocular/inputs/base.rb
+- lib/ocular/inputs/handlers.rb
+- lib/ocular/inputs/http_input.rb
 - lib/ocular/mixin/from_file.rb
 - lib/ocular/ocular.rb
 - lib/ocular/settings.rb
+- lib/ocular/utils.rb
 - lib/ocular/version.rb
 - spec/blocktest_spec.rb
 - spec/settings_spec.rb