auser-poolparty 0.2.91 → 0.2.92

data/PostInstall.txt

@@ -1,4 +1,4 @@
-Get ready to jump in the pool, you just installed PoolParty! (Updated at 00:13 12/21/08)
+Get ready to jump in the pool, you just installed PoolParty! (Updated at 18:36 12/21/08)
 
 To get started, run the generator:
 

data/lib/poolparty/base_packages/poolparty.rb

@@ -63,6 +63,7 @@ module PoolParty
             requires get_gempackage("poolparty")
             command "/usr/bin/puppetrunner"
           end
+        has_exec(:command => "/usr/bin/puppetrunner")
         has_user(:name => user)
         # end
         
@@ -90,30 +91,12 @@ module PoolParty
         
         execute_on_master do
           has_exec(:name => "update_hosts", :command => ". /etc/profile && server-update-hosts -n #{cloud.name}")
-          
-          # has_cron(:name => "master puppetd runner", :user => Base.user, :minute => "*/15") do
-          #   requires get_gempackage("poolparty")
-          #   command(PoolParty::Remote::RemoteInstance.puppet_runner_command)
-          # end
-          has_cron(:name => "Load handler", :user => Base.user, :minute => "*/4") do
-            requires get_gempackage("poolparty")
-            command(". /etc/profile && cloud-handle-load -n #{cloud.name}")
-          end
-          has_cron(:name => "provisioning ensurer", :user => Base.user, :minute => "*/2") do
-            requires get_gempackage("poolparty")
-            command ". /etc/profile && cloud-ensure-provisioning -n #{cloud.name}"
-          end
-          # has_runit_service("client_server", "pm_client", File.join(File.dirname(__FILE__), "..", "templates/messenger/client/"))
-          # has_runit_service("master_server", "pm_master", File.join(File.dirname(__FILE__), "..", "templates/messenger/master/"))
-          # TODO: Update this so it only runs when needed          
-          # has_customservice(:name => "start master server", :pattern => "/pm_master/", :bin => ". /etc/profile && server-start-master")
-          # has_customservice(:name => "start client server", :pattern => "/client_service/", :bin => ". /etc/profile && server-start-client")                    
+          has_exec(:command => ". /etc/profile && cloud-handle-load -n #{cloud.name}")
+          has_exec(:command => ". /etc/profile && cloud-ensure-provisioning -n #{cloud.name}")            
           has_exec(:name => "start master messenger", :command => ". /etc/profile && server-start-master") #, :ifnot => "/bin/ps aux | /bin/grep -q pm_master"
           has_exec(:name => "start client server", :command => ". /etc/profile && server-start-client") #, :ifnot => "/bin/ps aux | /bin/grep -q client_server"
-          
-          has_cron({:name => "maintain script", :command => ". /etc/profile && cloud-maintain -n #{cloud.name}", :minute => "*/3", :requires => [get_gempackage("poolparty"), get_cron("puppetd runner"), get_cron("Load handler"), get_service("haproxy")]})
-          
-          has_cron(:name => "ensure puppetmaster is running", :command => ". /etc/profile && puppetmasterd --verbose", :hour => "0")
+          has_exec(:command => ". /etc/profile && cloud-maintain -n #{cloud.name}")          
+          has_cron(:name => "ensure puppetmaster is running", :command => ". /etc/profile && puppetmasterd --verbose", :hour => "1")
           
         end        
         # has_host(:name => "puppet", :ip => (self.respond_to?(:master) ? self : parent).master.ip)

data/lib/poolparty/provisioners/capistrano/recipies/master.rb

@@ -43,7 +43,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     def download_base_gems
       run(returning(Array.new) do |arr|
         base_gems.each do |name, url|
-          arr << "wget #{url} -O #{Base.remote_storage_path}/#{name}.gem 2>&1"
+          arr << "wget #{url} -O #{Base.remote_storage_path}/#{name}.gem 2>&1; echo 'downloaded #{name}'" if url
         end
       end.join(" && "))
     end
@@ -51,11 +51,8 @@ Capistrano::Configuration.instance(:must_exist).load do
     def install_base_gems
       run(returning(Array.new) do |arr|
         base_gems.each do |name, url|
-          if url.empty?
-            arr << "/usr/bin/gem install --ignore-dependencies --no-ri --no-rdoc #{name}"
-          else
-            arr << "/usr/bin/gem install --ignore-dependencies --no-ri --no-rdoc #{Base.remote_storage_path}/#{name}.gem"
-          end          
+          str = url.empty? ? "#{name}" : "#{Base.remote_storage_path}/#{name}.gem"
+          arr << "/usr/bin/gem install --ignore-dependencies --no-ri --no-rdoc #{str}"
         end
       end.join(" && "))
     end

data/lib/poolparty/provisioners/provisioner_base.rb

@@ -168,7 +168,7 @@ module PoolParty
           "net-scp" => "http://rubyforge.org/frs/download.php/37664/net-scp-1.0.1.gem",
           "net-ssh-gateway" => "http://rubyforge.org/frs/download.php/36389/net-ssh-gateway-1.0.0.gem",
           :highline => "http://rubyforge.org/frs/download.php/46328/highline-1.5.0.gem",
-          :capistrano => "http://rubyforge.org/frs/download.php/48031/capistrano-2.5.3.gem",
+          :capistrano => "",
           :poolparty => "http://github.com/auser/poolparty/tree/master%2Fpkg%2Fpoolparty.gem?raw=true",
           "ec2" => "http://rubyforge.org/frs/download.php/43666/amazon-ec2-0.3.1.gem"
         }

data/lib/poolparty/spec/core/string.rb

@@ -1,16 +1,18 @@
 class String
   def grab_entry_for(type, name)
-    begin
-      allowed = /[ \$\._\-\[\]\n\t\\\/&,\(\)"',|:=\>\<0-9a-zA-Z]/
-      matches = self.match(/#{type}(.*)\{(.*)"#{name}":(.*)(#{allowed})*\}/)[0]
+    begin      
+      matches = self.match(/#{type}(.*)\{(.*)"#{name}":(.*)(#{_allowed})*\}/)[0]
     rescue
       ""
     end
   end
+  def _allowed
+    /[ \$\._\*\-\[\]\n\t\\\/&,\(\)"',|:=\>\<A-Za-z0-9]/
+  end
   def _grab_key_value_for(type, name, key)
     grab_entry_for(type, name).scan(/#{key}[ =>]*(.*)[,?]?$/).flatten.first rescue ""
   end
   def grab_key_value_for(ty, name, key)
-    _grab_key_value_for(ty,name,key).gsub(/,/, '')
+    _grab_key_value_for(ty,name,key).gsub(/,/, '') rescue ""
   end
 end

data/lib/poolparty/spec/matchers/a_spec_extensions_base.rb

@@ -18,7 +18,7 @@ module Spec
           "file"
         end
         def is_valid_resource?
-          grab_entry.split(/\n/).select {|l| l.match(/(.*)=>(\W+),$/) }.empty?
+          grab_entry.split(/\n/).select {|l| nil unless l.match(/(.*)=>([\n\t ]*),$/) }.empty?
         end
       end
     end

data/lib/poolparty/version.rb

@@ -2,7 +2,7 @@ module PoolParty
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 91
+    TINY  = 92
 
     STRING = [MAJOR, MINOR, TINY].join('.')    
   end

data/poolparty.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.91
+  version: 0.2.92
 platform: ruby
 authors: 
 - Ari Lerner
@@ -535,7 +535,7 @@ files:
 has_rdoc: true
 homepage: http://poolparty.rubyforge.org
 post_install_message: |-
-  Get ready to jump in the pool, you just installed PoolParty! (Updated at 00:13 12/21/08)
+  Get ready to jump in the pool, you just installed PoolParty! (Updated at 18:36 12/21/08)
   
   To get started, run the generator:
   

data/website/index.html

@@ -34,7 +34,7 @@
     <h1>PoolParty</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/poolparty"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.91</a>
+      <a href="http://rubyforge.org/projects/poolparty" class="numbers">0.2.92</a>
     </div>
     <h1>&#8216;Easy cloud computing&#8217;</h1>
 <h2>What</h2>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 0.2.91
+  version: 0.2.92
 platform: ruby
 authors: 
 - Ari Lerner
@@ -535,7 +535,7 @@ files:
 has_rdoc: true
 homepage: http://poolparty.rubyforge.org
 post_install_message: |-
-  Get ready to jump in the pool, you just installed PoolParty! (Updated at 00:13 12/21/08)
+  Get ready to jump in the pool, you just installed PoolParty! (Updated at 18:36 12/21/08)
   
   To get started, run the generator: