poolparty 0.2.18 → 0.2.69

data/bin/server-fire-cmd

@@ -11,4 +11,4 @@ end
 
 @command = o.command if o.command
 
-puts %x[#{@command}].chomp
+print %x[#{@command}].chomp

data/bin/server-get-load

@@ -5,25 +5,14 @@ require "poolpartycl"
 
 available_monitors = PoolParty::Monitors.available_monitors
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
+  # opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
   opts.on('-m name', '--monitor monitor_name', "Monitor name (default: cpu) (Available monitors: #{available_monitors.join(", ")})") {|c| optioner.monitorname c}
 end
 
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-include Remote
-
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
 @monitor = o.monitorname ? o.monitorname : "cpu"
-
-@clouds.each do |name, cloud|
-  
-  with_cloud(cloud, {:testing => o.testing, :monitorname => @monitor }) do
-    if PoolParty::Monitors.available_monitors.include?(monitorname.downcase.to_sym)
-      print "PoolParty::Monitors::#{monitorname.capitalize}Monitor".constantize.run
-    else
-      puts "Unknown monitor"
-    end
-  end  
   
+if PoolParty::Monitors.available_monitors.include?(@monitor.downcase.to_sym)
+  print "PoolParty::Monitors::#{@monitor.capitalize}Monitor".constantize.run.to_f
+else
+  puts "Unknown monitor"
 end

data/bin/server-list-active

@@ -8,18 +8,11 @@ o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
 end
 
-load_pool(o.spec || Binary.get_existing_spec_location)
-
 @ctype = (o.classname || "name").downcase.to_sym
 
-include Remote
-
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
-
-@clouds.each do |name, cloud|
-  
-  with_cloud(cloud, {:location => @location, :ctype => @ctype}) do
-    puts "#{list_of_running_instances.map{|a| "#{a.send ctype}" }.join("\t")}"
+o.loaded_clouds.each do |cloud|
+  with_cloud(cloud, {:ctype => @ctype}) do
+    print "#{list_of_running_instances.collect{|a| "#{a.send ctype}" }.join("\t")}"
   end  
   
 end

data/bin/server-rerun

@@ -11,12 +11,12 @@ load_pool(o.spec || Binary.get_existing_spec_location)
 
 include Remote
 
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
+@clouds = extract_cloud_from_options o
 
-@clouds.each do |name, cloud|
+@clouds.each do |cl|
   
-  with_cloud(cloud, {:testing => o.testing}) do
-    cmd = master.puppet_runner_command
+  with_cloud(cl, {:testing => o.testing}) do
+    cmd = PoolParty::Remote::RemoteInstance.puppet_runner_command
     %x[#{cmd}] unless testing
     puts cmd
   end  

data/bin/server-send-command

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+@command = ARGV[-1] || ""
+
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-c command', '--command command', 'Command to run')    { |c| optioner.command c }
+end
+
+@command,@args = Arr.split(" ")[0], Arr.split(" ")[1..-1]
+
+o.loaded_clouds do |cloud|
+  with_cloud(cloud, {:command => @command, :command_args => @args}) do
+    cloud.send command.to_sym, command_args
+  end  
+end

data/bin/server-show-stats

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-n name', '--name name', 'Host name')    { |h| optioner.hostname h }
+end
+
+o.loaded_clouds.each do |cloud|
+  
+  with_cloud(cloud) do    
+    puts header("Stats")
+    puts rules_values
+  end  
+  
+end

data/bin/server-start-client

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-n name', '--name name', 'Host name')    { |h| optioner.hostname h }
+end
+
+o.loaded_clouds.each do |cloud|
+  
+  with_cloud(cloud) do
+        
+    # ruby /var/lib/gems/1.8/bin/server-start-client    
+    already_running = %x[ps aux | grep beam | grep -v grep | grep client]
+    if already_running.chomp.empty?
+      
+      boot_file = "#{Messenger.append_dir}/pm_client_rel-0.1"
+
+      Kernel.system "cd #{Messenger.append_dir} && rake build_boot_scripts"  unless ::File.file?("#{boot_file}.boot") || testing    
+      command = Messenger.erl_command("client", "-boot #{boot_file} #{noshell ? "" : "-detached -heart -noshell"}", 7049, 7050)
+      vputs "Running #{command}"
+      
+      Kernel.system "export HOME=/root && #{command}" unless testing
+    end
+  end  
+  
+end
+

data/bin/server-start-master

@@ -3,25 +3,24 @@ $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
 
-available_monitors = PoolParty::Monitors.available_monitors
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-n name', '--name name', 'Host name')    { |h| optioner.hostname h }
 end
 
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-include Remote
-
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
-
-@clouds.each do |name, cloud|
+o.loaded_clouds.each do |cloud|
   
-  with_cloud(cloud, {:testing => o.testing }) do
-    
-    boot_file = "#{Messenger.append_dir}/pm_master_rel-0.1"
-    command = Messenger.erl_command("pp_master", "-boot #{boot_file} #{noshell ? "" : "-detached -heart"}")
-
-    Kernel.system command
+  with_cloud(cloud) do
+            
+    already_running = %x[ps aux | grep beam | grep -v grep | grep master]        
+    if already_running.chomp.empty?    
+      
+      boot_file = "#{Messenger.append_dir}/pm_master_rel-0.1"
+      Kernel.system ". /etc/profile && server-build-messenger"  unless ::File.file?("#{boot_file}.boot") || testing    
+      command = Messenger.erl_command("master", "-boot #{boot_file} #{noshell ? "" : "-noshell -detached -heart"}")    
+      vputs "Running #{command}"
+      
+      Kernel.system "export HOME=/root && #{command}" unless testing
+    end
   end  
   
 end

data/bin/server-start-node

@@ -3,31 +3,30 @@ $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
 
-available_monitors = PoolParty::Monitors.available_monitors
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-n name', '--name name', 'Host name')    { |h| optioner.hostname h }
   opts.on('-l', '--no-shell', 'No shell') {optioner.noshell true}
 end
 
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-include Remote
+available_monitors = PoolParty::Monitors.available_monitors
 
-@clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
 @hostname = o.hostname ? o.hostname : `hostname`.chomp
-
 @hostname = "node0" if @hostname == "master" # Quick fix to make sure we have a node running on the master as well
 
-@clouds.each do |name, cloud|
+o.loaded_clouds.each do |cloud|
   
-  with_cloud(cloud, {:testing => o.testing, :hostname => @hostname, :noshell => o.noshell }) do
-    # TODO: Change this to be app specfic
-    # SECURITY RISK
-    
-    boot_file = "#{Messenger.append_dir}/pm_node_rel-0.1"
-    command = Messenger.erl_command(hostname, "-boot #{boot_file} #{noshell ? "" : "-detached -heart"}")
-    
-    Kernel.system command
+  with_cloud(cloud, {:hostname => @hostname}) do
+    # TODO: Change this to be app specfic    
+    already_running = %x[ps aux | grep beam | grep -v grep | grep node]
+    if already_running.chomp.empty?    
+      boot_file = "#{Messenger.append_dir}/pm_node_rel-0.1"
+
+      Kernel.system ". /etc/profile && server-build-messenger"  unless ::File.file?("#{boot_file}.boot") || testing
+      command = Messenger.erl_command(hostname, "-boot #{boot_file} #{noshell ? "" : "-noshell -detached -heart"} -- #{available_monitors.join(" ")}")    
+      vputs "Running #{command}"
+      
+      Kernel.system "export HOME=/root && #{command}" unless testing
+    end
   end  
   
 end

data/bin/server-stop-client

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+ps aux | grep -v grep | grep client_service | awk '{print $2}' | xargs kill

data/bin/server-stop-master

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+ps aux | grep -v grep | grep pm_master | awk '{print $2}' | xargs kill

data/bin/server-stop-node

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+ps aux | grep -v grep | grep pm_node | awk '{print $2}' | xargs kill

data/bin/server-update-hosts

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-n name', '--name name', 'Update hosts for local pool named [name]')    { |p| optioner.cloudname p }
+end
+
+o.loaded_clouds.each do |cloud|
+  with_cloud(cloud) do
+    puts "Cloud: #{name}"
+    
+    new_hosts_listing = returning Array.new do |arr|
+      
+      puts list_of_running_instances
+      
+      list_of_running_instances.each do |ri|
+        vputs ri.hosts_file_listing_for(self)
+        arr << ri.hosts_file_listing_for(self)
+      end
+      other_clouds.each do |other|
+        other.list_of_running_instances.each do |ri|
+          vputs ri.hosts_file_listing_for(self)
+          arr << ri.hosts_file_listing_for(self)
+        end
+      end
+    end.join("\n")
+    
+    if testing
+      puts new_hosts_listing
+    else
+      new_hosts_file = "#{Base.manifest_path}/classes/hosts.pp"
+      
+      arr = returning Array.new do |arr|
+        new_hosts_listing.split(/\n/).each do |line|
+          parts = line.split(/\t/).map {|a| a.chomp }
+          ip,hostname,aliases = parts[0], parts[1], parts[2..-1]
+          puts "ip: #{ip} for #{hostname}"
+          arr << PoolParty::Resources::Host.new(:name => hostname, :ip => Resolv::DNS.new.getaddress(ip).to_s, :alias => aliases).to_string
+        end
+      end
+      
+      ::File.open(new_hosts_file, "w+") {|f| f << arr.join("\n") }
+    end
+    
+  end
+end

data/config/hoe.rb

@@ -1,9 +1,10 @@
-require 'PoolParty/version'
+require 'poolparty'
 
 AUTHOR = 'Ari Lerner'  # can also be an array of Authors
 EMAIL = "ari.lerner@citrusbyte.com"
 DESCRIPTION =<<-EOM      
-  Self-healing, auto-scaling cloud computing tool
+  Self-healing, auto-scaling system administration, provisioning
+  and maintaining tool that makes cloud computing fun and easy
 EOM
 GEM_NAME = 'poolparty' # what ppl will type to install your gem
 RUBYFORGE_PROJECT = 'poolparty' # The unix name for your project
@@ -12,7 +13,6 @@ HOMEPATH = "http://#{GEM_NAME}.rubyforge.org"
 DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
 EXTRA_DEPENDENCIES = [
  ['activesupport'],
- ['open4'],
  ['logging'],
  ["ruby2ruby"]
 ]    # An array of rubygem dependencies [name, version]
@@ -64,6 +64,7 @@ $hoe = Hoe.new(GEM_NAME, VERS) do |p|
   p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
   p.test_globs = ["test/**/test_*.rb"]
   p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
+  # p.files = %w(Rakefile History.txt README.txt) + Dir.glob("{examples,lib,specs,tasks,script,generators,bin}/**/*")
 
   # == Optional
   p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")

data/examples/plugin_without_plugin_directory.rb

@@ -1,6 +1,5 @@
-require File.dirname(__FILE__) + "/pool/test_plugins/webserver"
-
 pool :app do
+  require File.dirname(__FILE__) + "/pool/test_plugins/webserver"
   
   instances 2..10
   

data/generators/poolspec/USAGE

@@ -1,5 +1,5 @@
 Description:
-  
+  Create a basic pool.spec template
   
 Usage:
-  
+  pool spec [name]

data/generators/poolspec/poolspec_generator.rb

@@ -21,7 +21,7 @@ class PoolspecGenerator < RubiGen::Base
       m.directory ''
       BASEDIRS.each { |path| m.directory path }
       
-      m.template "pool_spec_template.erb", "#{@name}.rb"
+      m.template "pool_spec_template.erb", "pool.spec"
       # Create stubs
       # m.template "template.rb",  "some_file_after_erb.rb"
       # m.template_copy_each ["template.rb", "template2.rb"]
@@ -61,5 +61,6 @@ EOS
     # Installation skeleton.  Intermediate directories are automatically
     # created so don't sweat their absence here.
     BASEDIRS = %w(
+      plugins
     )
 end

data/generators/poolspec/templates/pool_spec_template.erb

@@ -1,9 +1,10 @@
 # Basic poolparty template
 
 pool :<%= name -%> do
-
-  cloud :app do
+  plugin_directory "#{File.dirname(__FILE__)}/plugins"
   
+  cloud :app do
+    instances 2..5
   end
 
 end

data/lib/erlang/messenger/Rakefile

@@ -14,6 +14,12 @@ rule ".beam" =>  ["%{ebin,src}X.erl"] do |t|
 end
 
 task :compile => ['ebin'] + OBJ
+task :dcompile do
+  Dir["#{::File.dirname(__FILE__)}/src/*.erl"].each do |t|
+    Kernel.system "erlc -pa ebin -W #{ERLC_FLAGS} -Ddebug -o ebin #{t}"
+  end  
+end
+
 task :default => :compile
 
 task :run_tests => [:compile] do
@@ -33,6 +39,12 @@ task :run_tests => [:compile] do
   end
 end
 
+desc "Clean the beams from the ebin directory"
+task :clean do
+  cmd = "rm ebin/*.beam"
+  Kernel.system cmd
+end
+
 desc "Recompile the sources"
 task :recompile => [:clean, :compile]
 

data/lib/erlang/messenger/ebin/client.app

@@ -0,0 +1,19 @@
+{application, client,
+  [
+		% Quick description of the server
+		{description, "Client Server for PoolParty"},
+		% Version
+		{vsn, "0.1"},
+		% All modules used by the application.  
+		{modules, [client_app, pm_client, client_server, pm_client_supervisor, utils]},
+		% All the registered names in the application
+		{registered, [client_server, pm_client_supervisor]},
+		% These must be started for application to run
+		{applications, [kernel, stdlib]},
+		% Environment vars
+		{env, []},
+		% Module and Args used to start
+		{mod, {client_app, []}},
+		{start_phases, []}
+	]
+}.

data/lib/erlang/messenger/ebin/master.app

@@ -5,7 +5,7 @@
 		% Version
 		{vsn, "0.1"},
 		% All modules used by the application.  
-		{modules, [master_app, pm_master, pm_master_supervisor, utils]},
+		{modules, [master_app, pm_master, pm_master_supervisor, utils, pm_event_manager, pm_master_event_handler]},
 		% All the registered names in the application
 		{registered, [pm_master, pm_master_supervisor]},
 		% These must be started for application to run

data/lib/erlang/messenger/ebin/node.app

@@ -5,7 +5,7 @@
 		% Version
 		{vsn, "0.1"},
 		% All modules used by the application.  
-		{modules, [node_app, pm_node, pm_node_supervisor, utils]},
+		{modules, [node_app, pm_node, pm_node_supervisor, utils, pm_event_manager]},
 		% All the registered names in the application
 		{registered, [pm_node, pm_node_supervisor]},
 		% These must be started for application to run

data/lib/erlang/messenger/ebin/pm_client_rel-0.1.rel

@@ -0,0 +1 @@
+{release, {"client","0.1"}, {erts,"5.6.5"},[{kernel,"2.12.5"},{stdlib,"1.15.5"},{inets,"5.0.12"},{crypto,"1.5.3"},{sasl,"2.1.5.4"},{client,"0.1"}]}.

data/lib/erlang/messenger/ebin/pm_master_rel-0.1.rel

@@ -1 +1 @@
-{release, {"master","0.1"}, {erts,"5.6.2"},[{kernel,"2.12.2"},{stdlib,"1.15.2"},{inets,"5.0.5"},{crypto,"1.5.1.1"},{sasl,"2.1.5.2"},{master,"0.1"}]}.
+{release, {"master","0.1"}, {erts,"5.6.5"},[{kernel,"2.12.5"},{stdlib,"1.15.5"},{inets,"5.0.12"},{crypto,"1.5.3"},{sasl,"2.1.5.4"},{master,"0.1"}]}.

data/lib/erlang/messenger/ebin/pm_node_rel-0.1.rel

@@ -1 +1 @@
-{release, {"node","0.1"}, {erts,"5.6.2"},[{kernel,"2.12.2"},{stdlib,"1.15.2"},{inets,"5.0.5"},{crypto,"1.5.1.1"},{sasl,"2.1.5.2"},{node,"0.1"}]}.
+{release, {"node","0.1"}, {erts,"5.6.5"},[{kernel,"2.12.5"},{stdlib,"1.15.5"},{inets,"5.0.12"},{crypto,"1.5.3"},{sasl,"2.1.5.4"},{node,"0.1"}]}.

data/lib/erlang/messenger/include/defines.hrl

@@ -0,0 +1,27 @@
+% Includes file for the PoolParty Messenger
+
+% -define(debug, true).
+
+-ifdef(debug).
+
+-define (MASTER_LOCATION, erlang:list_to_atom(lists:append("master@", element(2, inet:gethostname()))) ).
+-define (TRACE(X, M), io:format("TRACE ~p:~p ~p ~p~n" ,[?MODULE, ?LINE, X, M])).
+-define (UPDATE_TIME, 2000).
+
+-else.
+
+-define (MASTER_LOCATION, master@master).
+-define (TRACE(X, M), void).
+-define (UPDATE_TIME, 10000).
+
+-endif.
+
+-define (MASTER_NODE_NAME, master).
+-define (MASTER_SERVER, global:whereis_name(pm_master)).
+
+-define(NUM_LOADS_TO_STORE, 5).
+-define(DICT, dict).
+
+-record (node, {
+				load
+				}).

data/lib/erlang/messenger/lib/eunit/.svn/all-wcprops

@@ -0,0 +1,53 @@
+K 25
+svn:wc:ra_dav:version-url
+V 34
+/contribs/!svn/ver/263/trunk/eunit
+END
+sys.config
+K 25
+svn:wc:ra_dav:version-url
+V 43
+/contribs/!svn/ver/2/trunk/eunit/sys.config
+END
+AUTHORS
+K 25
+svn:wc:ra_dav:version-url
+V 42
+/contribs/!svn/ver/188/trunk/eunit/AUTHORS
+END
+CHANGELOG
+K 25
+svn:wc:ra_dav:version-url
+V 44
+/contribs/!svn/ver/188/trunk/eunit/CHANGELOG
+END
+NOTES
+K 25
+svn:wc:ra_dav:version-url
+V 40
+/contribs/!svn/ver/243/trunk/eunit/NOTES
+END
+COPYING
+K 25
+svn:wc:ra_dav:version-url
+V 42
+/contribs/!svn/ver/103/trunk/eunit/COPYING
+END
+vsn.mk
+K 25
+svn:wc:ra_dav:version-url
+V 41
+/contribs/!svn/ver/173/trunk/eunit/vsn.mk
+END
+README
+K 25
+svn:wc:ra_dav:version-url
+V 41
+/contribs/!svn/ver/188/trunk/eunit/README
+END
+Makefile
+K 25
+svn:wc:ra_dav:version-url
+V 43
+/contribs/!svn/ver/244/trunk/eunit/Makefile
+END

data/lib/erlang/messenger/lib/eunit/.svn/entries

@@ -0,0 +1,140 @@
+8
+
+dir
+263
+http://svn.process-one.net/contribs/trunk/eunit
+http://svn.process-one.net/contribs
+
+
+
+2008-10-12T12:17:56.811879Z
+263
+rcarlsson
+
+
+svn:special svn:externals svn:needs-lock
+
+
+
+
+
+
+
+
+
+
+
+5c723cce-c907-0410-9aa2-ab8348fff7a4
+
+sys.config
+file
+
+
+
+
+2008-10-18T23:25:36.000000Z
+744963246b247a2697b2d20bd2b61b9d
+2005-12-13T09:23:28.451293Z
+1
+mremond
+
+include
+dir
+
+doc
+dir
+
+AUTHORS
+file
+
+
+
+
+2008-10-18T23:25:36.000000Z
+9258f48f6d3acb437f24458ac709f5e1
+2007-04-05T21:05:53.050552Z
+188
+rcarlsson
+
+src
+dir
+
+CHANGELOG
+file
+
+
+
+
+2008-10-18T23:25:36.000000Z
+2e8f527255f044aac308e478aa4f8d13
+2007-04-05T21:05:53.050552Z
+188
+rcarlsson
+
+NOTES
+file
+
+
+
+
+2008-10-18T23:25:36.000000Z
+df955ca0fe7f7c875e7fa5f85f146c9b
+2008-01-31T21:19:53.389336Z
+243
+rcarlsson
+has-props
+
+COPYING
+file
+
+
+
+
+2008-10-18T23:25:36.000000Z
+dcf3c825659e82539645da41a7908589
+2006-05-06T17:19:27.890502Z
+103
+rcarlsson
+
+vsn.mk
+file
+
+
+
+
+2008-10-18T23:25:36.000000Z
+852cba3a30a2bba927a07323fa24b0a9
+2007-03-22T19:33:23.813670Z
+173
+rcarlsson
+
+ebin
+dir
+
+README
+file
+
+
+
+
+2008-10-18T23:25:36.000000Z
+87be236e598babe0bfc99f571fa7a804
+2007-04-05T21:05:53.050552Z
+188
+rcarlsson
+
+Makefile
+file
+
+
+
+
+2008-10-18T23:25:36.000000Z
+0c1a84572a2c98f5fbc973dca93bef70
+2008-01-31T21:21:05.519789Z
+244
+rcarlsson
+
+examples
+dir
+