ocular 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba3d7f05bc363f6bde68a3499ac349554297e908
-  data.tar.gz: 4b9e52b2e61dbf40f3af58357086bb9bafe6c1db
+  metadata.gz: 36bed9da6ba25bfdd86c18ec3de32295c847ed10
+  data.tar.gz: e8c372858270c7497f080251fd0ff42c0d1183be
 SHA512:
-  metadata.gz: f73554edcfac13aee2be802f97d04357b795940ec552fefcae627a5fb8488148b608df5c187e6b06aaee8d8895a153f99c6f0a8023622711aca5458454689b5c
-  data.tar.gz: 4c2eb3ca28d08d38057963cf0b0da384f4f020f7feeafade71c0edd7fe0bae85df6d113cdf89fd618eec0f7e5313a9615beb578dc38213dc4076926ad22b91cb
+  metadata.gz: b29306534a2ddc5947988858f4b0330468f501fa09374158ad8c1dc86894619e2a626c0242d52759fa4e8ed316e9b0de9b4020aaf1d16012d5bf5d026bd31206
+  data.tar.gz: 3c4b7a4a81cdc76799616bf5e4e71fb3fd34f51ba4d0399dca67b0bb790dc838fe63494b159d5d15c1659f6d75cde6102142e661a2930d50fb286b788ed91058

data/bin/ocular

@@ -88,7 +88,48 @@ else
   # Start shell mode
 
   if ARGV.length == 0
-      puts "Missing script file to run. use -h to get more info"
+      puts "Missing script file to run, starting ocular interactive shell. use -h to get more info"
+
+      ARGV.clear
+      require 'irb'
+      IRB.setup nil
+
+      IRB.conf[:PROMPT] = {}
+      IRB.conf[:IRB_NAME] = 'ocular'
+      IRB.conf[:PROMPT][:MY_PROJECT] = {
+        :PROMPT_I => '%N:%03n:%i> ',
+        :PROMPT_N => '%N:%03n:%i> ',
+        :PROMPT_S => '%N:%03n:%i%l ',
+        :PROMPT_C => '%N:%03n:%i* ',
+        :RETURN => "# => %s\n"
+      }
+      IRB.conf[:PROMPT_MODE] = :MY_PROJECT
+
+      IRB.conf[:RC] = false
+
+      require 'irb/completion'
+      require 'irb/ext/save-history'
+      IRB.conf[:READLINE] = true
+      IRB.conf[:SAVE_HISTORY] = 1000
+      IRB.conf[:HISTORY_FILE] = '~/.ocular_history'
+
+      context = Ocular::DSL::RunContext.new
+
+      irb = IRB::Irb.new(IRB::WorkSpace.new(context))
+      IRB.conf[:MAIN_CONTEXT] = irb.context
+
+      trap("SIGINT") do
+        IRB.irb.signal_handle
+      end
+
+      begin
+        catch(:IRB_EXIT) do
+          irb.eval_input
+        end
+      ensure
+        IRB.irb_at_exit
+      end
+
       exit
   end
 
@@ -96,7 +137,7 @@ else
   proxy = ef.load_from_file(ARGV.shift)
 
   context = Ocular::DSL::RunContext.new
-  eventbase = proxy.events["onEvent"][nil]
+  eventbase = proxy.events["onEvent"]["cli"]
   eventbase.exec(context)
 
 end

data/lib/ocular/dsl/dsl.rb

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

data/lib/ocular/dsl/orbit.rb

@@ -0,0 +1,32 @@
+require 'logger'
+require 'etcd'
+
+class Ocular
+    module DSL
+        module Orbit
+
+            class OrbitFunctions
+                def initialize(etcd)
+                    @etcd = etcd
+                end
+
+                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
+                    end
+
+                    return orbit_endpoints
+                end
+            end
+
+
+            def orbit()
+                return OrbitFunctions.new(etcd())
+            end
+        end
+
+    end
+end

data/lib/ocular/dsl/runcontext.rb

@@ -13,6 +13,7 @@ class Ocular
             include Ocular::DSL::SSH
             include Ocular::DSL::Fog
             include Ocular::DSL::Etcd
+            include Ocular::DSL::Orbit
 
             def initialize
                 @run_id = SecureRandom.uuid()

data/lib/ocular/version.rb

@@ -1,3 +1,3 @@
 class Ocular
-    Version = "0.1.5"
+    Version = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocular
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rye
@@ -146,6 +146,7 @@ files:
 - lib/ocular/dsl/etcd.rb
 - lib/ocular/dsl/fog.rb
 - lib/ocular/dsl/logging.rb
+- lib/ocular/dsl/orbit.rb
 - lib/ocular/dsl/runcontext.rb
 - lib/ocular/dsl/ssh.rb
 - lib/ocular/event/eventbase.rb