marionette 0.0.11 → 0.0.12

data/README.md

@@ -5,7 +5,8 @@ Marionette connects a headstartapp server instance (puppet node) to its
 master and executes puppet runs on demand. Marionette uses fast and lightweight 
 0MQ <http://zeromq.org> messaging system.
 
-* From version 0.0.9 onward, Marionette.setup automatically run at connect.
+* From version 0.0.12 onward, Puppet.message returns an array and includes system command results.
+* From version 0.0.9 onward, Marionette.setup automatically ran at connect.
 * From version 0.0.8 onward, use puppet agent for puppet runs
 * From version 0.0.7 onward, talk replaces send and receive.
 * From version 0.0.7 onward, marionette reconnects after n-poll attempts (10 by default).

data/lib/marionette/puppet.rb

@@ -2,7 +2,6 @@ module HeadStartApp
   module Marionette
 
     require 'uri'
-    require 'facter'
   
   
     # Puppet class is the active ZMQ connection on the puppet node
@@ -12,6 +11,7 @@ module HeadStartApp
       def initialize(socket)
 
         @socket = socket
+        @messages = []
         start
         
       end
@@ -33,7 +33,7 @@ module HeadStartApp
         @response = @socket.recv
         
         # Sets default message to current time
-        @message = "Response from node @ #{Time.now}."
+        @message << "Response from node @ #{Time.now}."
         
         begin
           
@@ -52,7 +52,7 @@ module HeadStartApp
 
         # Send back system stats
         # @socket.send Marshal.dump(stats)
-        @socket.send Marshal.dump(@message)
+        @socket.send Marshal.dump(@messages)
 
       end
       
@@ -76,7 +76,7 @@ module HeadStartApp
       # Executes ad hoc system command msg'd from the master
       def system_run
   
-        system "#{@response[:system][:command]}"
+        @message << `#{@response[:system][:command]}`
   
       end
       
@@ -84,9 +84,9 @@ module HeadStartApp
       def puppet_run
   
         if @response[:puppet].nil?
-          system "puppet agent --server master.runrails.com --verbose --waitforcert 5 --no-daemonize --onetime --logdest /var/log/puppet.log"
+          @message << `puppet agent --server master.runrails.com --verbose --waitforcert 5 --no-daemonize --onetime --logdest /var/log/puppet.log`
         else
-          system "puppet #{@response[:puppet][:args]}"
+          @message << `puppet agent #{@response[:puppet][:args]}`
         end
   
       end
@@ -98,7 +98,7 @@ module HeadStartApp
         facts = `facter`
         facts = facts.split "\n"
         facts.collect! {|f| ff=f.split("=>"); {ff[0].strip.to_sym => ff[1]}}.compact
-        @message = facts
+        @message << facts
 
       end
   

data/lib/marionette/version.rb

@@ -1,5 +1,5 @@
 module HeadStartApp
   module Marionette
-    VERSION = "0.0.11"
+    VERSION = "0.0.12"
   end  
 end

data/marionette.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ["dan@headstartapp.com"]
   s.homepage    = "https://github.com/headstartapp/marionette"
   s.summary     = %q{0MQ connection between puppet and master.}
-  s.description = %q{Marionette connects a headstartapp server instance (puppet node) to its master and executes puppet runs on demand. Marionette uses fast and lightweight 0MQ <http://zeromq.org> messaging system.}
+  s.description = %q{Marionette connects a puppet node to its master and executes puppet runs on demand. Marionette uses fast and lightweight 0MQ <http://zeromq.org> messaging system.}
 
   s.rubyforge_project = "marionette"
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: marionette
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
 - Dan Lee
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 -08:00
+date: 2011-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -38,6 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -51,6 +54,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -64,6 +68,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -77,6 +82,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -90,6 +96,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -103,12 +110,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id007
-description: Marionette connects a headstartapp server instance (puppet node) to its master and executes puppet runs on demand. Marionette uses fast and lightweight 0MQ <http://zeromq.org> messaging system.
+description: Marionette connects a puppet node to its master and executes puppet runs on demand. Marionette uses fast and lightweight 0MQ <http://zeromq.org> messaging system.
 email: 
 - dan@headstartapp.com
 executables: 
@@ -149,6 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -157,13 +166,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: marionette
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: 0MQ connection between puppet and master.