marionette 0.0.5 → 0.0.6

data/lib/marionette/connect.rb

@@ -15,7 +15,7 @@ module HeadStartApp
       def initialize(options = nil)
         
         # Set default(s)
-        options = { :uri => "tcp://127.0.0.1:5555" } if options.nil?
+        options = { :uri => `cat /etc/marionette.tcp` } if options.nil?
         
         # Set URI
         @uri = URI(options[:uri])

data/lib/marionette/master.rb

@@ -27,7 +27,20 @@ module HeadStartApp
       # Processes and returns response 
       def receive
         
-        # Stand by for a response
+        # Poll server until it is receive-able
+        poller = ZMQ::Poller.new
+        poller.register_readable @socket
+        
+        while true do
+          
+          poll_reply = poller.poll 500
+          key = poll_reply.keys.first # fetch the first and only hash key
+          
+          break if poll_reply[key][:revents] == 1 # fetch revents
+          
+        end
+        
+        # Receive message
         begin
           
           response = socket.recv_string

data/lib/marionette/puppet.rb

@@ -19,14 +19,10 @@ module HeadStartApp
       # Starts send and response thread
       def start
         
-        # Kill existing and create new pull-loop thread
-        # @thread.kill unless @thread.nil?
-        # Thread.abort_on_exception = true
-        # @thread = Thread.new do 
-          while true do
-            pull
-          end
-        # end
+        # Continually pull down requests
+        while true do
+          pull
+        end
         
       end
       
@@ -98,25 +94,14 @@ module HeadStartApp
       # Fetches facts collection
       def facter_run
         
-        Facter.loadfacts
-        @message = Facter.collection.to_hash
-        
+        # Load facts from cli to reduce ruby memory footprint
+        facts = `facter`
+        facts = facts.split "\n"
+        facts.collect! {|f| ff=f.split("=>"); {ff[0].strip.to_sym => ff[1]}}.compact
+        @message = facts
+
       end
   
-      # Some stats
-      # - to be set up as a fact(s) later
-      def stats
-  
-        stats = {}
-        stats[:disk] = `df -h -P` rescue nil
-        stats[:network] = `vnstat` rescue nil
-        stats[:memory] = `vmstat -a` rescue nil
-        stats[:process] = `monit status` rescue nil
-        stats[:cpu] = `mpstat -P ALL | awk 'NR>2' | cut -c14-` rescue nil
-        stats
-  
-      end
-        
     end
     
   end

data/lib/marionette/setup.rb

@@ -6,7 +6,7 @@ module HeadStartApp
 
       # Set default(s)
       ip = `sudo /sbin/ifconfig eth1 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}'`
-      options = { :uri => "tcp://#{ip}:5555" } if options.nil?
+      options = { :uri => "tcp://#{ip.strip}:5555" } if options.nil?
 
       # Set up marionette as a service to start at boot.
       # define task:

data/lib/marionette/version.rb

@@ -1,5 +1,5 @@
 module HeadStartApp
   module Marionette
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: marionette
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Dan Lee
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 -08:00
+date: 2011-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency