ocular 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de167ed33e75bba8f6482de164f5b1f7c1fea60a
-  data.tar.gz: f9ce4d9717736477221e9a456bfafcd1d6a4d0f9
+  metadata.gz: 981e6e95004d5057487b4fc0d616bdd9640b6c29
+  data.tar.gz: db69ab3985347e0b4f06db7a568827fa8d33fe41
 SHA512:
-  metadata.gz: 260602dd6cef56943d98f5a6271dfd5cded3753a222c1e14d3ba6eb437e45e048f1074b63a09e6e18684c415aeb1856a0dc8837680c1f0b512cf0f078e2b637f
-  data.tar.gz: 84e6e806f943dff204d98a39dcf125dbf9a8cf61f7db2f1a0c5b53c2bcb5a7afe6f1fa28e1c68cd9c739a5d9732b7e51b73b12c796d6ad095a8c305ed38215e2
+  metadata.gz: 8b9bcc9b27e6126d2c5600100163175cfb49d61c3eec68059fa7922b8998cff0f45a65f1caec2ab00b2b488268216a70d39bdcede89dc3aa44965a258b6ea91d
+  data.tar.gz: 6f76ad19c003a5c2477cd950db9ed3e354425c0aca5e15b0f7fd6ab90226c028b91a2ce613ae73712f352a2f0c8e9d2f7ce1a669262ea3629fd5ed38fe167cd6

data/examples/converge-broken-array.rb

@@ -0,0 +1,24 @@
+
+onEvent nil do
+    debug("Converging array #{ARGV[0]}")
+    for i in autoscaling.groups.get(ARGV[0]).instances
+        server = aws.servers.get(i.id)
+        hostname = server.private_ip_address
+        debug("Connecting to #{hostname}")
+        c = ssh_to(hostname)
+
+        uptime = c.execute("cat /proc/uptime")[0].to_i
+        if uptime < 2700
+            debug("Uptime of #{hostname} is less than 2700: #{uptime}")
+        else
+            running_containers = c.sudo("docker ps | tail -n +2").length
+            if running_containers == 0
+                info("No running containers in host #{hostname}, running converge")
+                log(c.execute("sudo converge.sh | sudo tee -a /var/log/init.err"))
+            else
+                info("Host #{hostname} ok with #{running_containers} running containers")
+            end
+        end        
+    end
+end
+

data/examples/ssh-example.rb

@@ -1,11 +1,12 @@
 require 'pp'
 
 onEvent nil do
-    asdf("localhost")
+    ssh_example(ARGV[0])
 end
 
-def asdf(host)
+def ssh_example(host)
+    debug("Connecting to #{host}")
     r = ssh_to(host)
-    pp r.execute("ls")
+    pp r.execute("ls /")
 end
 

data/lib/ocular/dsl/fog.rb

@@ -0,0 +1,33 @@
+require 'logger'
+require 'fog'
+
+class Ocular
+    module DSL
+        module Fog
+            @@__aws_instance = nil
+
+            def aws()
+                if @@__aws_instance
+                    return @@__aws_instance
+                end
+                
+                @@__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']
+                    })
+
+                return @@__aws_instance
+            end
+
+            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']
+                    })
+            end
+
+        end
+
+    end
+end

data/lib/ocular/dsl/logging.rb

@@ -10,19 +10,19 @@ class Ocular
             alias log debug
 
             def info(message = nil, &block)
-                add(Severity::INFO, nil, message, &block)
+                @logger.add(Logger::Severity::INFO, message, @run_id, &block)
             end
 
             def warn(message = nil, &block)
-                add(Severity::INFO, nil, message, &block)
+                @logger.add(Logger::Severity::WARN, message, @run_id, &block)
             end
 
             def error(message = nil, &block)
-                add(Severity::INFO, nil, message, &block)
+                @logger.add(Logger::Severity::ERROR, message, @run_id, &block)
             end
 
             def fatal(message = nil, &block)
-                add(Severity::INFO, nil, message, &block)
+                @logger.add(Logger::Severity::FATAL, message, @run_id, &block)
             end
 
 

data/lib/ocular/dsl/ssh.rb

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

data/lib/ocular/event/eventbase.rb

@@ -1,4 +1,5 @@
 require 'ocular/mixin/from_file'
+require 'ocular/dsl/fog'
 require 'ocular/dsl/ssh'
 require 'ocular/dsl/logging'
 
@@ -7,6 +8,7 @@ class Ocular
 
         class EventBase
             include Ocular::DSL::SSH
+            include Ocular::DSL::Fog
             include Ocular::DSL::Logging
 
             attr_accessor :proxy
@@ -17,7 +19,6 @@ class Ocular
             end
 
             def exec(run_context)
-                puts "Running #{run_context}"
                 run_context.proxy = self.proxy
                 run_context.instance_eval(&@callback)
             end

data/lib/ocular/event/eventfactory.rb

@@ -14,6 +14,8 @@ class Ocular
 
           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)

data/lib/ocular/ocular.rb

@@ -1,7 +1,9 @@
 
 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/runcontext'

data/lib/ocular/settings.rb

@@ -0,0 +1,24 @@
+require 'singleton'
+require 'yaml'
+
+class Ocular
+    class Settings
+        attr_accessor :settings
+
+        include Singleton
+
+        def initialize()
+            filename = ENV['OCULAR_SETTINGS']
+            self.settings = YAML::load_file(filename)
+        end
+
+        def self.load_from_file(filename)
+            @settings = YAML::load_file(filename)
+        end
+
+        def self.get(key)
+            return @settings[key]
+        end
+
+    end
+end

data/lib/ocular/version.rb

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

data/spec/settings_spec.rb

@@ -0,0 +1,11 @@
+require 'ocular'
+
+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")
+        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.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Juho Mäkinen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-19 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rye
@@ -24,6 +24,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.13
+- !ruby/object:Gem::Dependency
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -51,9 +65,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
+- examples/converge-broken-array.rb
 - examples/ssh-example.rb
 - lib/blocktest.rb
 - lib/ocular.rb
+- lib/ocular/dsl/fog.rb
 - lib/ocular/dsl/logging.rb
 - lib/ocular/dsl/runcontext.rb
 - lib/ocular/dsl/ssh.rb
@@ -61,8 +77,10 @@ files:
 - lib/ocular/event/eventfactory.rb
 - lib/ocular/mixin/from_file.rb
 - lib/ocular/ocular.rb
+- lib/ocular/settings.rb
 - lib/ocular/version.rb
 - spec/blocktest_spec.rb
+- spec/settings_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/garo/ocular
 licenses: