ocular 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36bed9da6ba25bfdd86c18ec3de32295c847ed10
-  data.tar.gz: e8c372858270c7497f080251fd0ff42c0d1183be
+  metadata.gz: 33d5f708edcb7dd43619b5222bfa86e5897d84ef
+  data.tar.gz: 9dcd6fd9dba29ebebc23c0ea227d12cf73b64da0
 SHA512:
-  metadata.gz: b29306534a2ddc5947988858f4b0330468f501fa09374158ad8c1dc86894619e2a626c0242d52759fa4e8ed316e9b0de9b4020aaf1d16012d5bf5d026bd31206
-  data.tar.gz: 3c4b7a4a81cdc76799616bf5e4e71fb3fd34f51ba4d0399dca67b0bb790dc838fe63494b159d5d15c1659f6d75cde6102142e661a2930d50fb286b788ed91058
+  metadata.gz: 3c2c902cde308bab0ce9885c4d64f665b9a10c296f3ac52ebe3fd53c3ef05e924762ad3ee088c9ccdfa1f2c6f896facc3524ebb836c3fb1ae036009236d68b17
+  data.tar.gz: a2b3a5f4a76be86332520655793958c81f996513be1fb2cc2a84f26c3a3c235a0e01ac4fd700af3ff3727f0801d88f66ae85184bb6879fc92bc1d944a8c0b8b8

data/bin/ocular

@@ -69,7 +69,31 @@ end  # class OptparseExample
 
 options = OptparseExample.parse(ARGV)
 
-Ocular::Settings.load_from_file(Ocular::Settings.find_settings_file_from_system(options.settings))
+begin
+  Ocular::Settings.load_from_file(Ocular::Settings.find_settings_file_from_system(options.settings))
+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"
+  puts "Here's an example file:\n"
+  puts "
+aws:
+  aws_access_key_id: AKI...
+  aws_secret_access_key: ....
+ssh:
+  keys:
+  - /home/user/.ssh/id_dsa
+  user: ubuntu
+
+inputs:
+  http:
+    port: 8083
+  etcd:
+    host: etc
+    port: 4001
+
+"
+  exit -1
+end
 
 if options.server
   if !options.root && !Ocular::Settings.get(:script_root)
@@ -88,7 +112,14 @@ else
   # Start shell mode
 
   if ARGV.length == 0
-      puts "Missing script file to run, starting ocular interactive shell. use -h to get more info"
+      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
+      $dsl_help.each do |cmd, help|
+        spacing = " "*(longest_name.to_i+1-cmd.length)
+        puts "  #{cmd}#{spacing}#{help}"
+      end
+      puts ""
 
       ARGV.clear
       require 'irb'
@@ -106,7 +137,7 @@ else
       IRB.conf[:PROMPT_MODE] = :MY_PROJECT
 
       IRB.conf[:RC] = false
-
+      IRB.conf[:AUTO_INDENT] = true
       require 'irb/completion'
       require 'irb/ext/save-history'
       IRB.conf[:READLINE] = true

data/lib/ocular/dsl/dsl.rb

@@ -1,5 +1,14 @@
+
+$dsl_help = {}
+
+def add_help(name, help)
+    $dsl_help[name] = help
+end
+
+
 require 'ocular/dsl/etcd.rb'
 require 'ocular/dsl/fog.rb'
 require 'ocular/dsl/logging.rb'
 require 'ocular/dsl/ssh.rb'
-require 'ocular/dsl/orbit.rb'
+require 'ocular/dsl/orbit.rb'
+

data/lib/ocular/dsl/etcd.rb

@@ -6,11 +6,13 @@ class Ocular
         module Etcd
             @@__etcd_instance = nil
 
+            add_help "etcd", "Returns an etcd client instance"
+
             def etcd()
                 if @@__etcd_instance
                     return @@__etcd_instance
                 end
-                
+
                 settings = ::Ocular::Settings::get(:inputs)[:etcd] || {}
                 @@__etcd_instance = ::Etcd.client(
                     host: (settings[:host] || "localhost"),

data/lib/ocular/dsl/fog.rb

@@ -6,6 +6,7 @@ class Ocular
         module Fog
             @@__aws_instance = nil
 
+            add_help "aws", "Returns Fog::Compute instance"
             def aws()
                 if @@__aws_instance
                     return @@__aws_instance
@@ -20,6 +21,7 @@ class Ocular
                 return @@__aws_instance
             end
 
+            add_help "autoscaling", "Returns Fog::AWS::AutoScaling instance"
             def autoscaling()
                 return ::Fog::AWS::AutoScaling.new({
                     :aws_access_key_id => ::Ocular::Settings::get(:aws)[:aws_access_key_id],
@@ -27,6 +29,8 @@ class Ocular
                     })
             end
 
+
+            add_help "find_servers_in_autoscaling_groups(substring)", "Returns instances in an autoscaling group which name matches substring"
             def find_servers_in_autoscaling_groups(substring)
                 instances = []
                 for group in autoscaling.groups

data/lib/ocular/dsl/orbit.rb

@@ -5,11 +5,14 @@ class Ocular
     module DSL
         module Orbit
 
+            add_help "orbit", "Returns OrbitFunctions instance for accessing orbit control data"
+
             class OrbitFunctions
                 def initialize(etcd)
                     @etcd = etcd
                 end
 
+                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

data/lib/ocular/dsl/ssh.rb

@@ -5,6 +5,7 @@ class Ocular
     module DSL
         module SSH
 
+            add_help "ssh_to(hostname)", "Returns Rye::Box ready to execute commands on host hostname"
             def ssh_to(hostname)
                 settings = ::Ocular::Settings::get(:ssh)
                 settings[:password_prompt] = false

data/lib/ocular/event/eventbase.rb

@@ -1,6 +1,4 @@
 require 'ocular/mixin/from_file'
-require 'ocular/dsl/fog'
-require 'ocular/dsl/ssh'
 require 'ocular/dsl/logging'
 
 class Ocular

data/lib/ocular/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocular
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Juho Mäkinen