amiral 0.1.8 → 0.1.9

data/lib/amiral/agent.rb

@@ -40,6 +40,9 @@ module Amiral
                              :port => @settings[:port],
                              :driver => :hiredis,
                              :logger => @logger
+
+      # start a thread which will refresh fact every minute
+      FactProvider.refresh
     end
 
     def run args
@@ -62,7 +65,8 @@ module Amiral
             @logger.debug "incoming message"
             message = deserialize payload
         
-            if agent_matches? message['match']
+            if (agent_matches?(message['match']) and
+                PROVIDERS.has_key? message['command']['provider'])
               @logger.info "valid request type: #{message['command']['provider']}"
               uuid = uuidgen
               send_ack(:in_reply_to => message['reply_to'],

data/lib/amiral/fact_provider.rb

@@ -0,0 +1,34 @@
+require 'rubygems'
+require 'facter'
+
+module Amiral
+  class FactProvider
+    def self.refresh
+      Thread.new do
+        while true
+          Facter.loadfacts
+          if File.exist?("/etc/facts.txt")
+            File.readlines("/etc/facts.txt").each do |line|
+              if line =~ /^(.+)=(.+)$/
+                var = $1; val = $2
+                
+                Facter.add(var) do
+                  setcode { val }
+                end
+              end
+            end
+          end
+        end
+        sleep 60 # refresh every minute
+      end
+    end
+
+    def self.all
+      Facter.to_hash
+    end
+
+    def self.[](index)
+      Facter.value(index)
+    end
+  end
+end

data/lib/amiral/matcher.rb

@@ -1,5 +1,3 @@
-require 'rubygems'
-require 'facter'
 
 module Amiral
   class Matcher
@@ -21,7 +19,7 @@ module Amiral
 
       if @spec.has_key? :facts
         @spec[:facts].map do |k,v|
-          return false unless Facter.value(k).to_s =~ Regexp.new(v)
+          return false unless FactProvider[k].to_s =~ Regexp.new(v)
         end
       end
       true

data/lib/amiral/providers/facts.rb

@@ -1,10 +1,9 @@
-require 'facter'
 
 module Amiral
   module Providers
     class Facts
       def execute message
-        facts = Facter.to_hash
+        facts = Amiral::FactProvider.all
         {
           :exit => 0,
           :facts => facts,

data/lib/amiral/version.rb

@@ -1,3 +1,3 @@
 module Amiral
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
 end

data/lib/amiral.rb

@@ -1,3 +1,4 @@
+require 'amiral/fact_provider'
 require 'amiral/providers'
 require 'amiral/matcher'
 require 'amiral/message'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amiral
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -124,6 +124,7 @@ files:
 - bin/amiral.rb
 - lib/amiral.rb
 - lib/amiral/agent.rb
+- lib/amiral/fact_provider.rb
 - lib/amiral/matcher.rb
 - lib/amiral/message.rb
 - lib/amiral/providers.rb