marionette 0.0.1 → 0.0.2

data/.gitignore

@@ -1,3 +1,5 @@
 pkg/*
 *.gem
 .bundle
+*.output
+*.pid

data/README.md

@@ -7,27 +7,54 @@ master and executes puppet runs on demand. Marionette uses fast and lightweight
 
 For more about Headstartapp see <http://headstartapp.com>.
 
+
 Installation
 ------------
 
+If you're using RVM, run this under the system context.
+Be sure to have the appropriate port open (for the following example, port 5555) 
+on the puppet node.
+    
     gem install marionette
 
+
+
 Example
 -------
 
+In this example, puppet and master are on the same local network and the puppet's ip is 192.168.1.1.
+
+Note: By default, Marionette connects to "tcp://127.0.0.1:5555"
+
+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. 
+
+
     Ruby:
 
+    require 'rubygems'
     require 'marionette'
-    # By default, Marionette connects to "tcp://master.headstartapp.com:5555"
-    Headstartapp::Marionette::Connect.new.master
-    # Connect to a different master
-    Headstartapp::Marionette::Connect.new("tcp://master.example.com:5555").master
 
+    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
+
+
+
+    CLI (start marionette-puppet as a daemon):
+
+    marionette start tcp://192.168.1.1:5555
+
+
+
+    Rake (set up marionette as a service:
 
-    CLI (start as a daemon):
+    rake setup-service
 
-    marionette-master start tcp://master.example.com:5555
-    marionette-puppet start tcp://master.example.com:5555
 
 
 Meta

data/Rakefile

@@ -1,2 +1,99 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+require 'rake'
+
+namespace :marionette do
+
+  # task description
+  desc 'Set up marionette as a service (run this as sudo/root)'
+  
+  # define task:
+  # 1) write to init.d/marionette
+  # 2) set permissions
+  # 3) set ifconfig
+  # 4) start service
+  task :service do
+
+    script = <<CODE
+#!/bin/bash
+
+### BEGIN INIT INFO
+# Provides: marionette
+# Default-Start:  2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start and stop marionette
+# Description: 0mq connection for puppet and master.
+# chkconfig:   - 85 15 
+### END INIT INFO
+
+# source function library
+. /etc/rc.d/init.d/functions
+
+RETVAL=0
+prog="marionette"
+
+set -e
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DESC="marionette daemon"
+NAME=marionette
+DAEMON=/usr/local/bin/$NAME
+PIDFILE=/var/run/$NAME.pid
+LOGFILE=/var/log/$NAME.log
+SCRIPTNAME=/etc/init.d/$NAME
+IP=`ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}'`
+TCP=tcp://$IP:5555
+
+# Gracefully exit if the package has been removed.
+# test -x $DAEMON || exit 0
+
+d_start() {
+  $DAEMON start $TCP || echo -en "\n already running"
+}
+
+d_stop() {
+  kill -9 `cat $PIDFILE` || echo -en "\n not running"
+}
+
+case "$1" in
+  start)
+    echo -n "Starting $DESC: $NAME"
+    d_start
+        echo "."
+  ;;
+  stop)
+    echo -n "Stopping $DESC: $NAME"
+    d_stop
+        echo "."
+  ;;
+  restart)
+    echo -n "Restarting $DESC: $NAME"
+    d_stop
+    sleep 5
+    d_start
+    echo "."
+  ;;
+  *)
+    echo "Usage: $SCRIPTNAME {start|stop|restart}" >&2
+    exit 3
+  ;;
+esac
+
+exit 0
+
+CODE
+    file = File.open('/etc/init.d/marionette','w')
+    file.write script
+    file.close
+    
+    system "chmod 755 /etc/init.d/marionette"
+    system "chkconfig marionette on"
+    system "service marionette start"
+  end
+  
+  # set "service" as the default task
+  task :default => [:service]
+
+end
+

data/bin/{marionette-puppet → marionette}

@@ -6,8 +6,7 @@ require 'marionette'
 
 tcp = ARGV[1] rescue nil
 options = { :uri => tcp } unless ARGV.nil?
-puts "Connecting on #{tcp}..."
 
-Daemons.run_proc('marionette-puppet',:dir => '/var/run', :log_output => true) do
+Daemons.run_proc('marionette',:dir_mode => :system, :log_output => true) do
   HeadStartApp::Marionette::Connect.new(options).puppet
 end

data/lib/marionette/puppet.rb

@@ -2,11 +2,12 @@ module HeadStartApp
   module Marionette
 
     require 'uri'
+    require 'facter'
   
   
     # Puppet class is the active ZMQ connection on the puppet node
     class Puppet
-      attr_accessor :socket, :thread
+      attr_accessor :socket, :thread, :message
   
       def initialize(socket)
 
@@ -19,13 +20,13 @@ module HeadStartApp
       def start
         
         # Kill existing and create new pull-loop thread
-        @thread.kill unless @thread.nil?
-        Thread.abort_on_exception = true
-        @thread = Thread.new do 
+        # @thread.kill unless @thread.nil?
+        # Thread.abort_on_exception = true
+        # @thread = Thread.new do 
           while true do
             pull
           end
-        end
+        # end
         
       end
       
@@ -35,12 +36,16 @@ module HeadStartApp
         # Stand by for a response msg
         @response = @socket.recv
         
+        # Sets default message to current time
+        @message = "Response from node @ #{Time.now}."
+        
         begin
           
           # 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]
           
         rescue
           
@@ -51,7 +56,7 @@ module HeadStartApp
 
         # Send back system stats
         # @socket.send Marshal.dump(stats)
-        @socket.send Marshal.dump(Time.now)
+        @socket.send Marshal.dump(@message)
 
       end
       
@@ -89,8 +94,16 @@ module HeadStartApp
         end
   
       end
+      
+      # Fetches facts collection
+      def facter_run
+        
+        Facter.loadfacts
+        @message = Facter.collection.to_hash
+        
+      end
   
-      # Gathers stats
+      # Some stats
       # - to be set up as a fact(s) later
       def stats
   

data/lib/marionette/version.rb

@@ -1,5 +1,5 @@
 module HeadStartApp
   module Marionette
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end  
 end

data/marionette.gemspec

@@ -17,13 +17,13 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.executables << 'marionette-master'
-  s.executables << 'marionette-puppet'
+  s.executables << 'marionette'
+  s.add_dependency('facter')
   s.add_dependency('zmq')
   s.add_dependency('ffi')
   s.add_dependency('ffi-rzmq')
   s.add_dependency('daemons')
   s.require_paths = ["lib"]
   s.bindir        = "bin"
-  s.require_paths = ["lib"]
-end
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: marionette
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Dan Lee
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-08 00:00:00 -08:00
+date: 2011-01-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: zmq
+  name: facter
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ffi
+  name: zmq
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,7 +47,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: ffi-rzmq
+  name: ffi
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -61,7 +61,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: daemons
+  name: ffi-rzmq
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -74,14 +74,26 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: daemons
+  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
 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
 executables: 
-- marionette-master
-- marionette-puppet
-- marionette-master
-- marionette-puppet
+- marionette
+- marionette
 extensions: []
 
 extra_rdoc_files: []
@@ -92,8 +104,7 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
-- bin/marionette-master
-- bin/marionette-puppet
+- bin/marionette
 - lib/marionette.rb
 - lib/marionette/connect.rb
 - lib/marionette/master.rb
@@ -130,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: marionette
-rubygems_version: 1.4.1
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: 0MQ connection between puppet and master.

data/bin/marionette-master

@@ -1,9 +0,0 @@
-#!/usr/local/bin/ruby
-
-require 'rubygems'
-require 'daemons'
-require 'marionette'
- 
-Daemons.run_proc('marionette-master',:dir => '/var/run', :log_output => true) do
-  HeadStartApp::Marionette::Connect.new.master
-end