marionette 0.0.3 → 0.0.4

data/README.md

@@ -38,18 +38,9 @@ Example
 The following has been tested on Centos 5.5 running Ruby 1.8.7-p174 and p302.
 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:
+Ruby:
 
     require 'rubygems'
     require 'marionette'
@@ -60,21 +51,46 @@ Results:
     master.send message
     master.receive
 
+    # 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. 
 
 
-    CLI:
 
-    marionette start tcp://192.168.1.1:5555 # start marionette as a daemon
+CLI:
 
+    # To start marionette as a daemon
+    marionette start tcp://192.168.1.1:5555
 
+    # To setup marionette as a service
+    # pass the tcp address if you don't want to accept the default on eth1.
+    marionette-setup
+    marionette-setup tcp://192.168.1.1:5555
 
-    MISC:
+
+
+MISC:
+    # By default, the tcp connection is on eth1 over port 5555.
+    # Tcp location is read from /etc/marionette.tcp.  Update if necessary.
 
     # run as root
     chkconfig marionette on     # start marionette daemon at boot
     service marionette start    # start marionette as a service
     service marionette restart  # restart marionette service
     service marionette stop     # stop marionette service
+    
+
+
+To Do
+----
+
+1) Complete implementation for puppet runs.
+
+2) Example of executing a run.
+
+3) Instructions for setting up SSH Tunnel to secure marionette.
 
 
 

data/Rakefile

@@ -1,97 +1,3 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-def setup_service
-  # Set up marionette as a service to start at boot.
-  # define task:
-  # 1) write to init.d/marionette
-  # 2) set permissions
-  # 3) set ifconfig
-  # 4) start service
-
-
-  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
-TCPFILE=/etc/marionette.tcp
-SCRIPTNAME=/etc/init.d/$NAME
-TCP=`cat $TCPFILE`
-
-# Gracefully exit if the package has been removed.
-# test -x $DAEMON || exit 0
-echo "connecting on $TCP..."
-
-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
-  
-  ip = `sudo /sbin/ifconfig eth1 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}'`
-
-  file = File.open('/etc/marionette.tcp','w')
-  file.write ip
-  file.close
-  
-  file = File.open('/etc/init.d/marionette','w')
-  file.write script
-  file.close
-  
-  system "sudo chmod 755 /etc/init.d/marionette"
-
-end
-
-setup_service

data/bin/marionette-setup

@@ -0,0 +1,23 @@
+#!/usr/local/bin/ruby
+
+require 'rubygems'
+require 'daemons'
+require 'marionette'
+
+tcp = ARGV[1] rescue nil
+options = { :uri => tcp } unless ARGV.nil?
+
+HeadStartApp::Marionette.setup(options)
+
+puts <<CODE
+Marionette is now ready to run as a service.
+
+Here's a quick cheat sheet:
+
+    chkconfig marionette on     # start service at boot
+    service marionette start    # start as a service
+    service marionette restart  # restart service
+    service marionette stop     # stop service
+
+
+CODE

data/lib/marionette/connect.rb

@@ -2,6 +2,7 @@ module HeadStartApp
   module Marionette
 
     require 'uri'
+    require 'marionette/setup'
     require 'marionette/master'
     require 'marionette/puppet'
   

data/lib/{tasks/marionette.rake → marionette/setup.rb}

@@ -1,21 +1,22 @@
-# This rake task sets up marionette as a service to start at boot.
-# rake marionette:service
-
-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
+module HeadStartApp
+  module Marionette
+
+    # Setup method configures the server for running marionette as a service at boot up.
+    def setup(options={})
+
+      # 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?
+
+      # Set up marionette as a service to start at boot.
+      # define task:
+      # 1) write to init.d/marionette
+      # 2) set permissions
+      # 3) set ifconfig
+      # 4) start service
+    
+    
+      script = <<CODE
 #!/bin/bash
 
 ### BEGIN INIT INFO
@@ -47,7 +48,7 @@ TCP=`cat $TCPFILE`
 
 # Gracefully exit if the package has been removed.
 # test -x $DAEMON || exit 0
-echo `connecting on $TCP...`
+echo "connecting on $TCP..."
 
 d_start() {
   $DAEMON start $TCP || echo -en "\n already running"
@@ -84,23 +85,21 @@ esac
 exit 0
 
 CODE
-
-    ip = `ifconfig eth1 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}'`
-
-    file = File.open('/etc/init.d/marionette','w')
-    file.write script
-    file.close
-    
-    file = File.open('/etc/marionette.tcp','w')
-    file.write ip
-    file.close
+  
+      file = File.open('/etc/marionette.tcp','w')
+      file.write "tcp://#{ip}:5555"
+      file.close
+      
+      file = File.open('/etc/init.d/marionette','w')
+      file.write script
+      file.close
+      
+      system "sudo chmod 755 /etc/init.d/marionette"
+
+    end
+
+    module_function :setup
     
-    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/lib/marionette/version.rb

@@ -1,5 +1,5 @@
 module HeadStartApp
   module Marionette
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end  
 end

data/marionette.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   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'
+  s.executables << 'marionette-setup'
   s.add_dependency('bundler')
   s.add_dependency('facter')
   s.add_dependency('zmq')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: marionette
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Dan Lee
@@ -107,7 +107,9 @@ email:
 - dan@headstartapp.com
 executables: 
 - marionette
+- marionette-setup
 - marionette
+- marionette-setup
 extensions: []
 
 extra_rdoc_files: []
@@ -119,12 +121,13 @@ files:
 - README.md
 - Rakefile
 - bin/marionette
+- bin/marionette-setup
 - lib/marionette.rb
 - lib/marionette/connect.rb
 - lib/marionette/master.rb
 - lib/marionette/puppet.rb
+- lib/marionette/setup.rb
 - lib/marionette/version.rb
-- lib/tasks/marionette.rake
 - marionette.gemspec
 has_rdoc: true
 homepage: http://headstartapp.com