ocular 0.1.24 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 316022fd097e085fa6bfd91b6ce1baf46f12d458
-  data.tar.gz: e10b9dbc099127070f54681b9ea215acd8220466
+  metadata.gz: 346fb90fde94ec9a944987f5ef76a56b48ffb4d3
+  data.tar.gz: fc4978bea80ddcd4125b06195f4628e89117d88c
 SHA512:
-  metadata.gz: 3c1f85f5447e80ec369749deee353020c57c156a4696e809300508d387bca78ce853ea1d3575e667f0b93c10e772f48e55de481be25cf7fde8a2a67fb94ff5f8
-  data.tar.gz: 9ce0461428b50be7e453caeb5c2df77c9099ef7ee2ffd061a983a824618e1fa3d02764fe5d973cec3172ad485c23bdcb1213f1f8f2f7058735e9ea77fa6c8ce9
+  metadata.gz: dbfa6ebe7acea6d508aa40ce6c8029b542ae7de26cad14d627a9cb481547482e9699aef52c0f461c38d43d2fb17ba815002ef3070e2493ed53edbf22329fbc4f
+  data.tar.gz: a854606b97573b2500f338e39b0cf43e1d821487f0f347d6833924f0c6f1f507f48016b860e957ae13a7e85a772a6c76c155ba354d6259a805ef780299e4dcf4

data/lib/ocular/dsl/dsl.rb

@@ -21,4 +21,5 @@ require 'ocular/dsl/mysql.rb'
 require 'ocular/dsl/rabbitmq.rb'
 require 'ocular/dsl/graphite.rb'
 require 'ocular/dsl/cache.rb'
+require 'ocular/dsl/file.rb'
 

data/lib/ocular/dsl/file.rb

@@ -0,0 +1,16 @@
+require 'logger'
+require 'net/http'
+require 'cgi'
+
+class Ocular
+    module DSL
+        module File
+
+            def getfullpath(file)
+                return dirname + file
+            end
+
+        end
+
+    end
+end

data/lib/ocular/dsl/fog.rb

@@ -44,6 +44,20 @@ class Ocular
                 return instances
             end
 
+            add_help "get_servers_in_autoscaling_group(group_name)", "Returns instances in an autoscaling group by exact name"
+            def get_servers_in_autoscaling_group(group_name)
+                instances = []
+                for group in autoscaling.groups
+                    if group.id == group_name
+                        for i in group.instances
+                            instances << aws.servers.get(i.id)
+                        end
+                    end
+                end
+
+                return instances
+            end
+
             add_help "find_server_by_ip", "Returns Fog::Compute::AWS::Server or nil"
             def find_server_by_ip(ip)
                 ret = aws().servers.all("private-ip-address" => ip)

data/lib/ocular/dsl/graphite.rb

@@ -67,7 +67,7 @@ class Ocular
                 end
 
                 return values
-            end
+            end   
 
         end
 

data/lib/ocular/dsl/runcontext.rb

@@ -20,6 +20,7 @@ class Ocular
             include Ocular::DSL::RabbitMQ
             include Ocular::DSL::Graphite
             include Ocular::DSL::Cache
+            include Ocular::DSL::File
 
             include Ocular::Inputs::Cron::DSL
 

data/lib/ocular/event/eventfactory.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 require 'ocular/inputs/handlers.rb'
 require 'ocular/event/eventbase.rb'
 require 'ocular/inputs/http_input.rb'
@@ -9,11 +11,12 @@ class Ocular
     module Event
         class DefinitionProxy
             attr_accessor :events
-            attr_reader :script_name, :do_fork, :logger
+            attr_reader :script_name, :do_fork, :logger, :dirname
             attr_accessor :handlers, :events
 
-            def initialize(script_name, handlers)
+            def initialize(script_name, dirname, handlers)
                 @script_name = script_name
+                @dirname = dirname
                 @events = {}
                 @logger = ::Ocular.logger
                 @handlers = handlers
@@ -29,6 +32,7 @@ class Ocular
             include Ocular::DSL::RabbitMQ
             include Ocular::DSL::Graphite
             include Ocular::DSL::Cache
+            include Ocular::DSL::File
 
             include Ocular::Inputs::HTTP::DSL
             include Ocular::Inputs::HTTP::ErrorDSL
@@ -61,14 +65,16 @@ class Ocular
                     name = file
                 end
 
-                proxy = DefinitionProxy.new(name, @handlers)
+                pn = Pathname.new(file)
+
+                proxy = DefinitionProxy.new(name, pn.dirname, @handlers)
                 proxy.from_file(file)
                 @files[name] = proxy
                 return proxy
             end
 
             def load_from_block(name, &block)
-                proxy = DefinitionProxy.new(name, @handlers)
+                proxy = DefinitionProxy.new(name, "./", @handlers)
                 proxy.instance_eval(&block)
                 @files[name] = proxy
                 return proxy

data/lib/ocular/version.rb

@@ -1,3 +1,3 @@
 class Ocular
-    Version = "0.1.24"
+    Version = "0.1.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocular
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.26
 platform: ruby
 authors:
 - Juho Mäkinen
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rye
@@ -17,13 +17,13 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.13
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.13
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -31,13 +31,13 @@ dependencies:
     - - '='
       - !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
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -45,13 +45,13 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.16.0
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.16.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -59,13 +59,13 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.6.4
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.6.4
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
@@ -73,13 +73,13 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.5.3
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.5.3
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -87,13 +87,13 @@ dependencies:
     - - '='
       - !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.9.2
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: etcd
   requirement: !ruby/object:Gem::Requirement
@@ -101,13 +101,13 @@ dependencies:
     - - '='
       - !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
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
@@ -115,13 +115,13 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.2.0
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.2.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: ruby-kafka
   requirement: !ruby/object:Gem::Requirement
@@ -129,13 +129,13 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.3.2
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.3.2
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -143,13 +143,13 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.4.3
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.4.3
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
@@ -157,27 +157,13 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.3.1
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.3.1
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jolokia
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.0
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.0
-  prerelease: false
-  type: :runtime
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -185,13 +171,13 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.4.0
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.4.0
-  prerelease: false
-  type: :development
 description: |+
   Framework to automate responses for infrastructure events.
 
@@ -215,6 +201,7 @@ files:
 - lib/ocular/dsl/cache.rb
 - lib/ocular/dsl/dsl.rb
 - lib/ocular/dsl/etcd.rb
+- lib/ocular/dsl/file.rb
 - lib/ocular/dsl/fog.rb
 - lib/ocular/dsl/graphite.rb
 - lib/ocular/dsl/logging.rb
@@ -248,7 +235,7 @@ homepage: http://github.com/garo/ocular
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -263,9 +250,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.4
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.5.1
+signing_key: 
 specification_version: 4
 summary: Tool to create simple operational scripts
 test_files: []