marionette 0.0.7 → 0.0.8

data/README.md

@@ -5,9 +5,10 @@ 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.
 
-
-
-For more about Headstartapp see <http://headstartapp.com>.
+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).
+From version 0.0.6 onward, marionette polls before receives.
 
 
 Installation
@@ -47,15 +48,14 @@ Ruby:
 
     puppet = HeadStartApp::Marionette::Connect.new(:uri=>"192.168.1.1:5555) puppet
     master = HeadStartApp::Marionette::Connect.new(:uri=>"192.168.1.1:5555").master
-    message = {:run=>{:system=>true,:facter=>true},:system=>{:command=>"echo 'test @ #{Time.now}' > /tmp/test.out"}}
-    master.send message
-    master.receive
+    message = {:run=>[:system,:facter,:puppet],:system=>{:command=>"echo 'test @ #{Time.now}' > /tmp/test.out"}}
+    master.talk messagee
 
     # Results:
     # 
     # 1) on the pupet, /tmp/test.out contains "test #{Time.now}"
-    # 2) master.receive returns puppet's facts as a hash.
-    # 3) Note: this example does not execute a puppet run. 
+    # 2) returns puppet's facts as a hash.
+    # 3) completes a puppet run. 
 
 
 
@@ -86,11 +86,7 @@ MISC:
 To Do
 ----
 
-1) Complete implementation for puppet runs.
-
-2) Example of executing a run.
-
-3) Instructions for setting up SSH Tunnel to secure marionette.
+1) Instructions for setting up SSH Tunnel to secure marionette.
 
 
 

data/lib/marionette/puppet.rb

@@ -39,9 +39,9 @@ module HeadStartApp
           
           # Execute a puppet run and/or ad hoc system commands
           @response = Marshal.load(@response)
-          puppet_run if @response[:run][:puppet]
-          system_run if @response[:run][:system]
-          facter_run if @response[:run][:facter]
+          puppet_run if @response[:run].include? :puppet
+          system_run if @response[:run].include? :system
+          facter_run if @response[:run].include? :facter
           
         rescue
           
@@ -84,9 +84,9 @@ module HeadStartApp
       def puppet_run
   
         if @response[:puppet].nil?
-          system "puppetd --onetime --no-daemonize"
+          system "puppet agent --server master.headstartapp.com --verbose --waitforcert 5 --no-daemonize --onetime --logdest /var/log/puppet.log"
         else
-          system "puppetd #{@response[:puppet][:args]}"
+          system "puppet #{@response[:puppet][:args]}"
         end
   
       end

data/lib/marionette/version.rb

@@ -1,5 +1,5 @@
 module HeadStartApp
   module Marionette
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end  
 end

data/marionette.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Dan Lee"]
   s.email       = ["dan@headstartapp.com"]
-  s.homepage    = "http://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.}
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: marionette
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Dan Lee
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 -08:00
+date: 2011-01-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,7 +130,7 @@ files:
 - lib/marionette/version.rb
 - marionette.gemspec
 has_rdoc: true
-homepage: http://headstartapp.com
+homepage: https://github.com/headstartapp/marionette
 licenses: []
 
 post_install_message: