auser-poolparty 0.2.16 → 0.2.20

data/Manifest.txt

@@ -25,9 +25,11 @@ bin/pool-list
 bin/pool-provision
 bin/pool-spec
 bin/pool-start
+bin/server-build-messenger
 bin/server-fire-cmd
 bin/server-get-load
 bin/server-list-active
+bin/server-list-responding
 bin/server-rerun
 bin/server-start-master
 bin/server-start-node
@@ -40,6 +42,7 @@ examples/with_apache_plugin.rb
 generators/poolspec/USAGE
 generators/poolspec/poolspec_generator.rb
 generators/poolspec/templates/pool_spec_template.erb
+lib/erlang/messenger/Emakefile
 lib/erlang/messenger/Makefile
 lib/erlang/messenger/README
 lib/erlang/messenger/Rakefile
@@ -48,6 +51,7 @@ lib/erlang/messenger/ebin/master.app
 lib/erlang/messenger/ebin/master_app.beam
 lib/erlang/messenger/ebin/node.app
 lib/erlang/messenger/ebin/node_app.beam
+lib/erlang/messenger/ebin/packager.app
 lib/erlang/messenger/ebin/pm_client.beam
 lib/erlang/messenger/ebin/pm_cluster.beam
 lib/erlang/messenger/ebin/pm_event_handler.beam
@@ -57,8 +61,63 @@ lib/erlang/messenger/ebin/pm_master_supervisor.beam
 lib/erlang/messenger/ebin/pm_node.beam
 lib/erlang/messenger/ebin/pm_node_rel-0.1.rel
 lib/erlang/messenger/ebin/pm_node_supervisor.beam
+lib/erlang/messenger/ebin/pm_packager.beam
 lib/erlang/messenger/ebin/utils.beam
-lib/erlang/messenger/logs/pool_log.log
+lib/erlang/messenger/lib/eunit/AUTHORS
+lib/erlang/messenger/lib/eunit/CHANGELOG
+lib/erlang/messenger/lib/eunit/COPYING
+lib/erlang/messenger/lib/eunit/Makefile
+lib/erlang/messenger/lib/eunit/NOTES
+lib/erlang/messenger/lib/eunit/README
+lib/erlang/messenger/lib/eunit/doc/edoc-info
+lib/erlang/messenger/lib/eunit/doc/erlang.png
+lib/erlang/messenger/lib/eunit/doc/eunit.html
+lib/erlang/messenger/lib/eunit/doc/index.html
+lib/erlang/messenger/lib/eunit/doc/modules-frame.html
+lib/erlang/messenger/lib/eunit/doc/overview-summary.html
+lib/erlang/messenger/lib/eunit/doc/overview.edoc
+lib/erlang/messenger/lib/eunit/doc/packages-frame.html
+lib/erlang/messenger/lib/eunit/doc/stylesheet.css
+lib/erlang/messenger/lib/eunit/ebin/autoload.beam
+lib/erlang/messenger/lib/eunit/ebin/code_monitor.beam
+lib/erlang/messenger/lib/eunit/ebin/eunit.app
+lib/erlang/messenger/lib/eunit/ebin/eunit.appup
+lib/erlang/messenger/lib/eunit/ebin/eunit.beam
+lib/erlang/messenger/lib/eunit/ebin/eunit_autoexport.beam
+lib/erlang/messenger/lib/eunit/ebin/eunit_data.beam
+lib/erlang/messenger/lib/eunit/ebin/eunit_lib.beam
+lib/erlang/messenger/lib/eunit/ebin/eunit_proc.beam
+lib/erlang/messenger/lib/eunit/ebin/eunit_serial.beam
+lib/erlang/messenger/lib/eunit/ebin/eunit_server.beam
+lib/erlang/messenger/lib/eunit/ebin/eunit_striptests.beam
+lib/erlang/messenger/lib/eunit/ebin/eunit_test.beam
+lib/erlang/messenger/lib/eunit/ebin/eunit_tests.beam
+lib/erlang/messenger/lib/eunit/ebin/eunit_tty.beam
+lib/erlang/messenger/lib/eunit/ebin/file_monitor.beam
+lib/erlang/messenger/lib/eunit/examples/eunit_examples.erl
+lib/erlang/messenger/lib/eunit/examples/fib.erl
+lib/erlang/messenger/lib/eunit/examples/tests.txt
+lib/erlang/messenger/lib/eunit/include/eunit.hrl
+lib/erlang/messenger/lib/eunit/src/Makefile
+lib/erlang/messenger/lib/eunit/src/autoload.erl
+lib/erlang/messenger/lib/eunit/src/code_monitor.erl
+lib/erlang/messenger/lib/eunit/src/eunit.app.src
+lib/erlang/messenger/lib/eunit/src/eunit.appup.src
+lib/erlang/messenger/lib/eunit/src/eunit.erl
+lib/erlang/messenger/lib/eunit/src/eunit_autoexport.erl
+lib/erlang/messenger/lib/eunit/src/eunit_data.erl
+lib/erlang/messenger/lib/eunit/src/eunit_internal.hrl
+lib/erlang/messenger/lib/eunit/src/eunit_lib.erl
+lib/erlang/messenger/lib/eunit/src/eunit_proc.erl
+lib/erlang/messenger/lib/eunit/src/eunit_serial.erl
+lib/erlang/messenger/lib/eunit/src/eunit_server.erl
+lib/erlang/messenger/lib/eunit/src/eunit_striptests.erl
+lib/erlang/messenger/lib/eunit/src/eunit_test.erl
+lib/erlang/messenger/lib/eunit/src/eunit_tests.erl
+lib/erlang/messenger/lib/eunit/src/eunit_tty.erl
+lib/erlang/messenger/lib/eunit/src/file_monitor.erl
+lib/erlang/messenger/lib/eunit/sys.config
+lib/erlang/messenger/lib/eunit/vsn.mk
 lib/erlang/messenger/pm_master_rel-0.1.boot
 lib/erlang/messenger/pm_master_rel-0.1.script
 lib/erlang/messenger/pm_node_rel-0.1.boot
@@ -72,17 +131,14 @@ lib/erlang/messenger/src/pm_master.erl
 lib/erlang/messenger/src/pm_master_supervisor.erl
 lib/erlang/messenger/src/pm_node.erl
 lib/erlang/messenger/src/pm_node_supervisor.erl
+lib/erlang/messenger/src/pm_packager.erl
 lib/erlang/messenger/src/utils.erl
-lib/erlang/messenger/tmp/templates/apache2.conf
-lib/erlang/messenger/tmp/templates/base.conf.erb
-lib/erlang/messenger/tmp/templates/browser_fixes.conf.erb
-lib/erlang/messenger/tmp/templates/mime-minimal.conf.erb
-lib/erlang/messenger/tmp/templates/virtual_host.conf.erb
 lib/poolparty.rb
 lib/poolparty/base_packages/haproxy.rb
 lib/poolparty/base_packages/heartbeat.rb
 lib/poolparty/base_packages/poolparty.rb
 lib/poolparty/base_packages/ruby.rb
+lib/poolparty/config/allowed_commands.yml
 lib/poolparty/core/array.rb
 lib/poolparty/core/exception.rb
 lib/poolparty/core/float.rb
@@ -102,9 +158,11 @@ lib/poolparty/exceptions/ResourceException.rb
 lib/poolparty/exceptions/RuntimeException.rb
 lib/poolparty/exceptions/SpecException.rb
 lib/poolparty/exceptions/TemplateNotFound.rb
+lib/poolparty/exceptions/UnacceptableCommand.rb
 lib/poolparty/helpers/binary.rb
 lib/poolparty/helpers/console.rb
 lib/poolparty/helpers/display.rb
+lib/poolparty/helpers/messenger.rb
 lib/poolparty/helpers/optioner.rb
 lib/poolparty/helpers/provisioner_base.rb
 lib/poolparty/helpers/provisioners/master.rb
@@ -144,7 +202,7 @@ lib/poolparty/pool/resources/cron.rb
 lib/poolparty/pool/resources/directory.rb
 lib/poolparty/pool/resources/exec.rb
 lib/poolparty/pool/resources/file.rb
-lib/poolparty/pool/resources/gem.rb
+lib/poolparty/pool/resources/gem_package.rb
 lib/poolparty/pool/resources/host.rb
 lib/poolparty/pool/resources/package.rb
 lib/poolparty/pool/resources/remote_file.rb
@@ -153,6 +211,12 @@ lib/poolparty/pool/resources/sshkey.rb
 lib/poolparty/pool/resources/symlink.rb
 lib/poolparty/pool/resources/variable.rb
 lib/poolparty/pool/script.rb
+lib/poolparty/pool/tmp/.ppkeys
+lib/poolparty/pool/tmp/happydayz
+lib/poolparty/pool/tmp/install_master.sh
+lib/poolparty/pool/tmp/pool.spec
+lib/poolparty/pool/tmp/poolparty.pp
+lib/poolparty/pool/tmp/tc-instances.list
 lib/poolparty/templates/authkeys
 lib/poolparty/templates/cib.xml
 lib/poolparty/templates/fileserver.conf
@@ -184,6 +248,7 @@ spec/poolparty/core/time_spec.rb
 spec/poolparty/dependency_resolutions/base_spec.rb
 spec/poolparty/helpers/binary_spec.rb
 spec/poolparty/helpers/display_spec.rb
+spec/poolparty/helpers/messenger_spec.rb
 spec/poolparty/helpers/optioner_spec.rb
 spec/poolparty/helpers/provisioner_base_spec.rb
 spec/poolparty/helpers/provisioners/master_spec.rb

data/PostInstall.txt

@@ -1,4 +1,4 @@
-Get ready to jump in the pool, you just installed poolpartyrb!
+Get ready to jump in the pool, you just installed PoolParty!
 
 To get started, run the generator:
 

data/Rakefile

@@ -22,4 +22,15 @@ task :gemspec  => [:spec, :clean_tmp, :"manifest:refresh", :local_deploy, :clean
   ::File.open("#{GEM_NAME.downcase}.gemspec", "w+") do |f|
     f << res
   end
+end
+
+desc "Generate gemspec for github"
+task :githubspec => [:gemspec] do
+  filepath = ::File.join(::File.dirname(__FILE__), "poolparty.gemspec")
+  data = open(filepath).read
+  spec = eval("$SAFE = 3\n#{data}")
+  yml = YAML.dump spec
+  File.open(filepath, "w+") do |f|
+    f << yml
+  end
 end

data/bin/cloud-provision

@@ -3,30 +3,26 @@ $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-c [master|slaves|all]', '--class [master|slave|all]', 'Provision class (default: all)')    { |c| optioner.provision_class c }
+  opts.on('-s', '--slave', 'Provision slave (default: false)')    { optioner.provision_slave true }
   opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
 end
 
 load_pool(o.spec || Binary.get_existing_spec_location)
 
-@provision_class = o.provision_class || "all"
-
 include Remote
 
 @clouds = o.cloudname ? {:cloud => cloud(o.cloudname.downcase.to_sym)} : clouds
 
 @clouds.each do |name, cloud|
   
-  with_cloud(cloud, {:testing => o.testing, :location => @location, :provision_class => @provision_class}) do
+  with_cloud(cloud, {:testing => o.testing, :location => @location, :provision_slave => o.provision_slave, :provision_master => true}) do
     
     provisioning_in_progress
     
-    if provision_class == "slave" || provision_class == "all"
-      Provisioner.provision_slaves(self, testing)
-    end
-    if provision_class == "master" || provision_class == "all"
-      Provisioner.provision_master(self, testing)
-    end
+    Provisioner.provision_master(self, testing) if provision_master
+    Provisioner.provision_slaves(self, testing) if provision_slave
+    # if provision_class == "master" || provision_class == "all"    
+    # end
     
     provisioning_complete
 

data/bin/server-build-messenger

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+
+root_dir = ::File.expand_path( ::File.join(::File.dirname(__FILE__), "..", "lib/erlang/messenger") )
+
+INCLUDE = "include"
+ERLC_FLAGS = "-I#{INCLUDE}"
+@version = "0.1"
+
+# erl -pa ./ebin/ -run pm_packager recompile_scripts #{@version} -run init stop -noshell
+cmd =<<-EOE
+  cd #{root_dir}
+  rm ebin/*.beam
+  erlc -pa ./ebin -o ebin ./src/*.erl
+  erl -pa ./ebin -s pm_packager start -s init stop
+EOE
+
+out = %x[#{cmd.runnable}]

data/bin/server-fire-cmd

@@ -11,6 +11,4 @@ end
 
 @command = o.command if o.command
 
-# TODO: Add a whitelist of commands the 
-# server can run for SECURITY    
 puts %x[#{@command}].chomp

data/bin/server-list-responding

@@ -0,0 +1,24 @@
+#!/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', '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")}"
+  end  
+  
+end

data/bin/server-start-master

@@ -13,19 +13,14 @@ load_pool(o.spec || Binary.get_existing_spec_location)
 include Remote
 
 @clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
-@hostname = o.hostname ? o.hostname : "master"
 
 @clouds.each do |name, cloud|
   
-  with_cloud(cloud, {:testing => o.testing, :hostname => @hostname }) do
-    # TODO: Change this to be app specfic
-    # SECURITY RISK
-    append_dir = ::File.join( ::File.dirname(__FILE__), "..", "lib/erlang/messenger" )
-    command_line_opts = "-pa #{append_dir}/ebin -sname #{hostname} -setcookie poolparty -detached -heart"
-    boot_file = "#{append_dir}/pm_master_rel-0.1"
-    
-    command = "erl -boot #{boot_file} #{command_line_opts}"
+  with_cloud(cloud, {:testing => o.testing }) do
     
+    boot_file = "#{Messenger.append_dir}/pm_master_rel-0.1"
+    command = Messenger.erl_command("master", "-boot #{boot_file} #{noshell ? "" : "-detached -heart"}")
+
     Kernel.system command
   end  
   

data/bin/server-start-node

@@ -6,6 +6,7 @@ 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)
@@ -13,18 +14,18 @@ load_pool(o.spec || Binary.get_existing_spec_location)
 include Remote
 
 @clouds = o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds
-@hostname = o.hostname ? o.hostname : "master"
+@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|
   
-  with_cloud(cloud, {:testing => o.testing, :hostname => @hostname }) do
+  with_cloud(cloud, {:testing => o.testing, :hostname => @hostname, :noshell => o.noshell }) do
     # TODO: Change this to be app specfic
     # SECURITY RISK
-    append_dir = ::File.join( ::File.dirname(__FILE__), "..", "lib/erlang/messenger" )
-    command_line_opts = "-pa #{append_dir}/ebin -sname #{hostname} -setcookie poolparty -detached -heart"
-    boot_file = "#{append_dir}/pm_node_rel-0.1"
     
-    command = "erl -boot #{boot_file} #{command_line_opts}"
+    boot_file = "#{Messenger.append_dir}/pm_node_rel-0.1"
+    command = Messenger.erl_command(hostname, "-boot #{boot_file} #{noshell ? "" : "-detached -heart"}")
     
     Kernel.system command
   end  

data/lib/erlang/messenger/Emakefile

@@ -0,0 +1 @@
+{"src/*", [debug_info, {outdir, "ebin"}, {i,"include"}]}.

data/lib/erlang/messenger/Rakefile

@@ -1,46 +1,29 @@
 require 'rake/clean'
 
 INCLUDE = "include"
-
 ERLC_FLAGS = "-I#{INCLUDE} +warn_unused_vars +warn_unused_import"
 
 SRC = FileList['src/*.erl']
 OBJ = SRC.pathmap("%{src,ebin}X.beam")
-
 CLEAN.include("ebin/*.beam")
 
 directory 'ebin'
 
-rule ".beam" => ["%{ebin,src}X.erl"] do |t|
-  sh "erlc -D EUNIT -pa ebin -W #{ERLC_FLAGS} -o ebin #{t.source}"
+rule ".beam" =>  ["%{ebin,src}X.erl"] do |t|
+  sh "erlc -pa ebin -W #{ERLC_FLAGS} -o ebin #{t.source}"
 end
 
-desc "Recompile the sources"
-task :recompile => [:clean, :compile]
-
-desc "Compile all the sources"
 task :compile => ['ebin'] + OBJ
-
-desc "Rebuild the boot scripts"
-task :build_boot_scripts => [:recompile] do
-  puts "Rebuilding boot scripts"
-  @version = "0.1"
-  cmd = "erl -pa ./ebin/ -run utils recompile_scripts #{@version} -run init stop -noshell"
-  Kernel.system cmd
-end
-
 task :default => :compile
 
-task :test => [:compile] do
+task :run_tests => [:compile] do
   puts "Modules under test:"
   OBJ.each do |obj|
     obj[%r{.*/(.*).beam}]
     mod = $1
-    puts "running #{mod}"
     test_output = `erl -pa ebin -run #{mod} test -run init stop`
 
     if /\*failed\*/ =~ test_output
-      puts test_output
       test_output[/(Failed.*Aborted.*Skipped.*Succeeded.*$)/]
     else
       test_output[/1>\s*(.*)\n/]
@@ -49,3 +32,29 @@ task :test => [:compile] do
     puts "#{mod}: #{$1}"
   end
 end
+
+desc "Recompile the sources"
+task :recompile => [:clean, :compile]
+
+desc "Compile all the sources"
+task :compile => ['ebin'] + OBJ
+
+desc "Rebuild the boot scripts"
+task :build_boot_scripts => [:recompile] do
+  puts "Rebuilding boot scripts"
+  @version = "0.1"
+  cmd = "erl -pa ./ebin/ -run pm_packager recompile_scripts #{@version} -run init stop -noshell"
+  Kernel.system cmd
+end
+
+desc "Rebuild and repackage"
+task :repackage => [:build_boot_scripts] do  
+  cmd = "erl -pa ./ebin -s pm_packager start -s init stop"
+  Kernel.system cmd
+end
+
+desc "Install messenger"
+task :install_messenger do
+  cmd = "erl -pa ./ebin/ -run pm_packager install_messenger #{@version} -run init stop -noshell"
+  Kernel.system cmd
+end

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

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

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

@@ -1,7 +1 @@
-{release, {"pm_master_rel", "0.1"},
-          {erts, "5.6.3"},
-          [{kernel, "2.12.2"},
-           {stdlib, "1.15.2"},
-           {sasl, "2.1.5.2"},
-           {master, "0.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"}]}.

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

@@ -1,7 +1 @@
-{release, {"pm_node_rel", "0.1"},
-          {erts, "5.6.3"},
-          [{kernel, "2.12.2"},
-           {stdlib, "1.15.2"},
-           {sasl, "2.1.5.2"},
-           {node, "0.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"}]}.

data/lib/erlang/messenger/lib/eunit/AUTHORS

@@ -0,0 +1,2 @@
+Richard Carlsson <richardc@it.uu.se>
+Micka�l R�mond <mickael.remond@process-one.net>

data/lib/erlang/messenger/lib/eunit/CHANGELOG

@@ -0,0 +1,14 @@
+2007-04-05 Richard Carlsson <richardc@it.uu.se>
+
+	* Preparing for Beta release of EUnit 2.0 (after months in alpha)
+
+2005-12-13 Micka�l R�mond <mickael.remond@process-one.net>
+
+	* doc/NOTES.txt, include/unit.hrl, src/unit.erl, src/test.erl: Added
+	Richard Carlsson unit test tool to prepare integration in eunit.
+	* AUTHORS: Update
+
+2005-11-26 Micka�l R�mond <mickael.remond@process-one.net>
+
+	* This version is a complete rewrite of eunit 1.0. Eunit 1.1 is
+	simpler and compliant with Aegis development tool.