marionette 0.0.8 → 0.0.9

data/README.md

@@ -5,10 +5,11 @@ 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.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.
+* From version 0.0.9 onward, Marionette.setup automatically run 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).
+* From version 0.0.6 onward, marionette polls before receives.
 
 
 Installation

data/bin/marionette

@@ -4,8 +4,12 @@ require 'rubygems'
 require 'daemons'
 require 'marionette'
 
-tcp = ARGV[1] rescue nil
-options = { :uri => tcp } unless ARGV.nil?
+options = nil
+
+if ARGV.size > 1
+  tcp = ARGV[1] rescue nil
+  options = { :uri => tcp }
+end
 
 Daemons.run_proc('marionette',:dir_mode => :system, :log_output => true) do
   HeadStartApp::Marionette::Connect.new(options).puppet

data/lib/marionette/connect.rb

@@ -15,8 +15,13 @@ module HeadStartApp
       def initialize(options = nil)
         
         # Set default(s)
-        options = { :uri => `cat /etc/marionette.tcp` } if options.nil?
-        
+        if options.nil?
+
+          HeadStartApp::Marionette.setup() if not File.exists? "/etc/marionette.tcp"
+          options = { :uri => `cat /etc/marionette.tcp` }
+
+        end
+                
         # Set URI
         @uri = URI(options[:uri])
   

data/lib/marionette/master.rb

@@ -18,26 +18,85 @@ module HeadStartApp
       # Sends a msg to puppet node
       # and stands by for a reply
       # and processes reply
-      def talk(msg)
+      def talk(msg, send_guarantee = false, poll_guarantee = false)
         
         # Initial connection to socket 
         @socket = socket_connect
+        @poll = true
 
-        # Repeat until talk succeeds.
-        while true do
+        # Initiate send
+        begin
+          
+          # if send successful start polling
+          @socket.send_string Marshal.dump(msg), ZMQ::NOBLOCK
+          
+        rescue
+          
+          if send_guarantee
+            
+            # Keep sending till successful
+            while true do
+              
+              begin
+              
+                @socket.send_string Marshal.dump(msg), ZMQ::NOBLOCK
+                break
+              
+              rescue
+                
+                # sleep half a second before next attempt
+                sleep 500
+              
+              end
+
+            end
+  
+          else
+            
+            # don't poll if send failed and no guarantee 
+            @poll = false
+            
+          end
+          
+        end
+
+        if poll?
+          
+          options = {:max => 10, :interval => 500}
+          poller = Poller.new @socket, options
+
+          if not poller.pull? and poll_guarantee
+            
+            # Repeat poll till reply receive-able
+            while true do
+              
+              @socket = socket_reconnect(@socket)
+              poller = Poller.new @socket, options
+              break if poller.pull?
+
+            end
 
-          # Send the message
-          @socket.send_string Marshal.dump(msg)
+          end
+
+          if poller.pull?
+
+            # Fetch reply
+            @reply = process_message(@socket.recv_string)
+
+          else
+
+            # Polled but no reply
+            @reply = "Polled #{options[:max]} times every #{options[:interval]} milliseconds but no reply."
 
-          # Poll server until it is receive-able and re-poll if necessary
-          poller = Poller.new @socket, {:max => 10, :interval => 500}
-          break if poller.pull?
-          @socket = socket_reconnect(@socket)
+          end
+
+        else
           
+          # Send failed
+          @reply = "Send failed!"
+
         end
         
-        @reply = process_message(@socket.recv_string)
-
       end
       
       private
@@ -50,6 +109,10 @@ module HeadStartApp
           
         end
         
+        def poll?
+          @poll
+        end
+        
         # Connect master to puppet socket
         def socket_connect(uri = @uri)
 
@@ -79,6 +142,22 @@ module HeadStartApp
           end
           
         end
+
+        def send_successful
+
+          while true do
+  
+            # Send the message and catch send failure
+            begin
+              
+              @socket.send_string Marshal.dump(msg), ZMQ::NOBLOCK
+    
+            rescue
+              
+            end
+          end
+          
+        end        
         
         class Poller < ZMQ::Poller
           attr_accessor :pull, :reconnect

data/lib/marionette/setup.rb

@@ -5,8 +5,8 @@ module HeadStartApp
     def setup(options={})
 
       # Set default(s)
-      ip = `sudo /sbin/ifconfig eth1 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}'`
-      options = { :uri => "tcp://#{ip.strip}:5555" } if options.nil?
+      ip = `ifconfig eth1 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}'`
+      options[:uri] = "tcp://#{ip.strip}:5555" if options.nil? or options[:uri].nil? or options[:uri].blank?
 
       # 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.8"
+    VERSION = "0.0.9"
   end  
 end

data/marionette.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.executables << 'marionette'
   s.executables << 'marionette-setup'
+  s.add_dependency('puppet')
   s.add_dependency('bundler')
   s.add_dependency('facter')
   s.add_dependency('zmq')

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: marionette
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Dan Lee
@@ -19,89 +18,96 @@ date: 2011-01-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: puppet
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: facter
+  name: bundler
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: zmq
+  name: facter
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: ffi
+  name: zmq
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: ffi-rzmq
+  name: ffi
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: daemons
+  name: ffi-rzmq
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: daemons
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        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.
 email: 
 - dan@headstartapp.com
@@ -143,7 +149,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -152,14 +157,13 @@ 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.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: 0MQ connection between puppet and master.