auser-poolparty 1.1.7 → 1.2.0

data/lib/poolparty/verification/verifiers/ping.rb

@@ -11,6 +11,11 @@ module PoolParty
       def passing?
         ping_port(host, port, 3)
       end
+
+      def to_s
+        "<#{self.class.to_s} host:#{host} port:#{port}>"
+      end
+
     end
     
   end

data/lib/poolparty/verification/verify.rb

@@ -20,9 +20,11 @@ module PoolParty
       end
       def passing?
         reset!
+        vputs "Starting cloud verification"
         verifiers.each do |v|          
           ip = nodes(:status => "running").first.ip rescue "127.0.0.1"
           v.host = ip
+          vputs "  checking #{v} on #{ip}"
           raise "Verification failed at #{v.class}" unless v.passing?
         end
         return true

data/spec/bin/fixtures/bin_cloud_for_test.rb

@@ -10,10 +10,4 @@ cloud :binary_testing_cloud do
     listen "8080"
     has_file :name => "/etc/apache2/apache2.conf"
   end
-  
-  case_of "hostname" do
-    when_is 'master' do            
-      has_package :name=>'haproxy'
-    end
-  end
 end

data/spec/poolparty/dependency_resolver/chef_resolver_spec.rb

@@ -81,12 +81,6 @@ describe "ChefResolver" do
           has_file :name => "/etc/apache2/apache2.conf", :template => "#{::File.dirname(__FILE__)}/../fixtures/test_template.erb", :friends => "bob"
           has_exec :command => "ls /etc/apache2"
         end
-        
-        case_of "hostname" do
-          when_is 'master' do            
-            has_package :name=>'haproxy'
-          end
-        end
       end
       @properties = @cloud.to_properties_hash
       

data/spec/poolparty/net/remoter_bases/ec2_remote_instance_spec.rb

@@ -105,20 +105,10 @@ describe "Remote Instance" do
       @ec2.stub!(:launching_time).and_return(30.minutes.ago)
       @ec2.elapsed_runtime.should be >= 1800
     end
-    it "should be say that it is the master if the name is master" do
-      @ec2.name.should == "master"
-      @ec2.master?.should == true
-    end
     it "should say that it is responding? if responding is not nil" do
       @ec2.running?.should == true
       @ec2.responding?.should == true
       # @ec2.responding.should_not be_nil
     end
-    it "should have the puppet_runner_command" do
-      @ec2.respond_to?(:puppet_runner_command).should == true
-    end
-    it "should return the puppet_runner_command with puppetd" do
-      @ec2.puppet_runner_command.should =~ /puppetrun/
-    end
   end
 end

data/spec/poolparty/spec_helper.rb

@@ -76,7 +76,6 @@ class TestBaseClass < PoolParty::PoolPartyBaseClass
 end
 
 def setup
-  PoolParty::Messenger.stub!(:messenger_send!).and_return false  
 end
 
 def new_test_cloud(force_new=false)

data/tasks/spec.rake

@@ -4,6 +4,8 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 
 task :default  => [:spec, :test]
+desc "Update vendor directory and run tests"
+task :ci => ["poolparty:vendor:update", :spec, :test]
 
 Spec::Rake::SpecTask.new(:spec) do |t|
   t.warning = t.rcov = false

data/test/poolparty/dependency_resolver/puppet_resolver_test.rb

@@ -72,12 +72,6 @@ class TestPuppetResolver < Test::Unit::TestCase
           has_file :name => "/etc/apache2/apache2.conf", :template => "#{::File.dirname(__FILE__)}/../../fixtures/test_template.erb", :friends => "bob"
           has_exec :command => "ls /etc/apache2"
         end
-
-        case_of "hostname" do
-          when_is 'master' do            
-            has_package :name=>'haproxy'
-          end
-        end
       end
       @properties = @cloud.to_properties_hash
 
@@ -92,10 +86,6 @@ class TestPuppetResolver < Test::Unit::TestCase
     should "should include apache class" do
       @compiled.should =~ /class apache \{/
     end
-    should "should include the case statement" do
-      @compiled.should =~ /case \$hostname \{/
-      @compiled.should =~ /master : \{/
-    end
     should "should require the file to have the directory (written as file)" do
       @compiled.should =~ /require => File\[\"\/var\/www\"\]/
     end

data/test/poolparty/verification/verify_test.rb

@@ -2,7 +2,7 @@ require "#{::File.dirname(__FILE__)}/../../test_helper"
 
 module PoolParty
   module Verifiers
-    class Ping < VerifierBase
+    class Ding < VerifierBase
       attr_accessor :port, :checked
       def initialize(port=80)
         @port = port
@@ -29,12 +29,12 @@ class TestVerification < Test::Unit::TestCase
     setup do
       @vc = TestVerificationClass.new do
         verify do
-          ping 80
+          ding 830
         end
       end
     end
     should "have a the ping verifier as a verifiers in the class" do
-      @vc.verifiers.first.class.should == PoolParty::Verifiers::Ping
+      @vc.verifiers.first.class.should == PoolParty::Verifiers::Ding
     end
     should "not explode when calling verify on the verifier" do
       @vc.verifiers.first.checked = true

data/vendor/chef/apache2/attributes/apache.rb

@@ -47,7 +47,7 @@ end
 ###
 
 # General settings
-apache[:listen_ports] = [ "8080" ]     unless apache.has_key?(:listen_ports)
+apache[:listen_ports] = [ "80" ]     unless apache.has_key?(:listen_ports)
 apache[:contact] = "ops@example.com" unless apache.has_key?(:contact)
 apache[:timeout] = 300               unless apache.has_key?(:timeout)
 apache[:keepalive] = "On"            unless apache.has_key?(:keepalive)

data/vendor/gems/parenting/Manifest.txt

@@ -4,10 +4,11 @@ PostInstall.txt
 README.rdoc
 Rakefile
 lib/parenting.rb
-lib/parenting/base.rb
+lib/parenting/parenting.rb
 parenting.gemspec
 script/console
 script/destroy
 script/generate
+test/file_to_eval.rb
 test/test_helper.rb
 test/test_parenting.rb

data/vendor/gems/parenting/lib/parenting.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Parenting
-  VERSION = '0.0.3' unless const_defined?(:VERSION)
+  VERSION = '0.0.4' unless const_defined?(:VERSION)
 end
 
 # Dir["parenting/core/*.rb"].each {|lib| require lib }

data/vendor/gems/parenting/parenting.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parenting}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Lerner"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.description = %q{Easily add parents to classes}
   s.email = ["arilerner@mac.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc"]
-  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "lib/parenting.rb", "lib/parenting/base.rb", "parenting.gemspec", "script/console", "script/destroy", "script/generate", "test/test_helper.rb", "test/test_parenting.rb"]
+  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "lib/parenting.rb", "lib/parenting/parenting.rb", "parenting.gemspec", "script/console", "script/destroy", "script/generate", "test/file_to_eval.rb", "test/test_helper.rb", "test/test_parenting.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://poolpartyrb.com}
   s.post_install_message = %q{PostInstall.txt}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.1.7
+  version: 1.2.0
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-30 00:00:00 -07:00
+date: 2009-05-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,11 +73,8 @@ executables:
 - cloud-ssh
 - cloud-start
 - cloud-terminate
-- messenger-get-current-nodes
-- server-become-master
-- server-build-messenger
+- cloud-verify
 - server-butterfly
-- server-clean-cert-for
 - server-cloud-elections
 - server-ensure-provisioning
 - server-fire-cmd
@@ -85,19 +82,10 @@ executables:
 - server-list-active
 - server-manage-election
 - server-monitor.ru
-- server-provision
 - server-query-agent
 - server-rerun
 - server-send-command
 - server-show-stats
-- server-start-agent
-- server-start-client
-- server-start-master
-- server-start-node
-- server-stop-client
-- server-stop-master
-- server-stop-node
-- server-update-hosts
 - server-write-new-nodes
 extensions: []
 
@@ -118,6 +106,7 @@ files:
 - examples/deploy.rb
 - examples/fairchild.rb
 - examples/fairchild_chef.rb
+- examples/maize.rb
 - examples/paparazzi.conf.erb
 - examples/plugin_without_plugin_directory.rb
 - examples/poolparty.rb
@@ -130,11 +119,6 @@ files:
 - lib/poolparty/base_packages/poolparty.rb
 - lib/poolparty/base_packages/ruby.rb
 - lib/poolparty/base_packages/runit.rb
-- lib/poolparty/capistrano
-- lib/poolparty/capistrano/cloud_tasks.rb
-- lib/poolparty/capistrano.rb
-- lib/poolparty/config
-- lib/poolparty/config/postlaunchmessage.txt
 - lib/poolparty/core
 - lib/poolparty/core/array.rb
 - lib/poolparty/core/class.rb
@@ -211,7 +195,6 @@ files:
 - lib/poolparty/monitors/monitors/time_monitor.rb
 - lib/poolparty/net
 - lib/poolparty/net/init.rb
-- lib/poolparty/net/messenger.rb
 - lib/poolparty/net/remote_bases.rb
 - lib/poolparty/net/remote_instance.rb
 - lib/poolparty/net/remoter
@@ -232,6 +215,7 @@ files:
 - lib/poolparty/net/remoter_bases/vmrun/vmrun.rb
 - lib/poolparty/net/remoter_bases/vmrun/vmrun_instance.rb
 - lib/poolparty/plugins
+- lib/poolparty/plugins/apache2.rb
 - lib/poolparty/plugins/bind.rb
 - lib/poolparty/plugins/chef.rb
 - lib/poolparty/plugins/chef_deploy.rb
@@ -241,7 +225,6 @@ files:
 - lib/poolparty/plugins/git.rb
 - lib/poolparty/plugins/line_in_file.rb
 - lib/poolparty/plugins/nanite.rb
-- lib/poolparty/plugins/rsyncmirror.rb
 - lib/poolparty/plugins/runit.rb
 - lib/poolparty/plugins/svn.rb
 - lib/poolparty/plugins/tokyo_tyrant.rb
@@ -279,36 +262,8 @@ files:
 - lib/poolparty/resources/symlink.rb
 - lib/poolparty/resources/user.rb
 - lib/poolparty/resources/variable.rb
+- lib/poolparty/resources.rb
 - lib/poolparty/schema.rb
-- lib/poolparty/services
-- lib/poolparty/services/conditional.rb
-- lib/poolparty/spec
-- lib/poolparty/spec/core
-- lib/poolparty/spec/core/string.rb
-- lib/poolparty/spec/matchers
-- lib/poolparty/spec/matchers/a_spec_extensions_base.rb
-- lib/poolparty/spec/matchers/have_cron.rb
-- lib/poolparty/spec/matchers/have_deploydirectory.rb
-- lib/poolparty/spec/matchers/have_directory.rb
-- lib/poolparty/spec/matchers/have_exec.rb
-- lib/poolparty/spec/matchers/have_file.rb
-- lib/poolparty/spec/matchers/have_gempackage.rb
-- lib/poolparty/spec/matchers/have_git.rb
-- lib/poolparty/spec/matchers/have_host.rb
-- lib/poolparty/spec/matchers/have_mount.rb
-- lib/poolparty/spec/matchers/have_package.rb
-- lib/poolparty/spec/matchers/have_remotefile.rb
-- lib/poolparty/spec/matchers/have_rsyncmirror.rb
-- lib/poolparty/spec/matchers/have_service.rb
-- lib/poolparty/spec/matchers/have_sshkey.rb
-- lib/poolparty/spec/matchers/have_symlink.rb
-- lib/poolparty/spec/matchers/have_variable.rb
-- lib/poolparty/spec/spec
-- lib/poolparty/spec/spec/dynamic_matchers.rb
-- lib/poolparty/spec/spec/ensure_matchers_exist.rb
-- lib/poolparty/spec/templates
-- lib/poolparty/spec/templates/have_base.rb
-- lib/poolparty/spec.rb
 - lib/poolparty/templates
 - lib/poolparty/templates/authkeys
 - lib/poolparty/templates/chef
@@ -332,6 +287,7 @@ files:
 - lib/poolparty/templates/messenger/node/run.erb
 - lib/poolparty/templates/monitor.ru
 - lib/poolparty/templates/namespaceauth.conf
+- lib/poolparty/templates/php.ini.erb
 - lib/poolparty/templates/poolparty.monitor
 - lib/poolparty/templates/puppet
 - lib/poolparty/templates/puppet/add_puppet_to_hosts
@@ -398,7 +354,6 @@ files:
 - spec/poolparty/monitors/monitors/cpu_monitor_spec.rb
 - spec/poolparty/monitors/monitors/memory_monitor_spec.rb
 - spec/poolparty/net
-- spec/poolparty/net/messenger_spec.rb
 - spec/poolparty/net/remote_instance_spec.rb
 - spec/poolparty/net/remote_spec.rb
 - spec/poolparty/net/remoter_base_spec.rb
@@ -451,11 +406,6 @@ files:
 - spec/poolparty/resources/user_spec.rb
 - spec/poolparty/resources/variable_spec.rb
 - spec/poolparty/schema_spec.rb
-- spec/poolparty/services
-- spec/poolparty/services/conditional_spec.rb
-- spec/poolparty/spec
-- spec/poolparty/spec/core
-- spec/poolparty/spec/core/string_spec.rb
 - spec/poolparty/spec_helper.rb
 - spec/poolparty/test_spec_helper.rb
 - test/fixtures
@@ -521,11 +471,8 @@ files:
 - bin/cloud-ssh
 - bin/cloud-start
 - bin/cloud-terminate
-- bin/messenger-get-current-nodes
-- bin/server-become-master
-- bin/server-build-messenger
+- bin/cloud-verify
 - bin/server-butterfly
-- bin/server-clean-cert-for
 - bin/server-cloud-elections
 - bin/server-ensure-provisioning
 - bin/server-fire-cmd
@@ -533,19 +480,10 @@ files:
 - bin/server-list-active
 - bin/server-manage-election
 - bin/server-monitor.ru
-- bin/server-provision
 - bin/server-query-agent
 - bin/server-rerun
 - bin/server-send-command
 - bin/server-show-stats
-- bin/server-start-agent
-- bin/server-start-client
-- bin/server-start-master
-- bin/server-start-node
-- bin/server-stop-client
-- bin/server-stop-master
-- bin/server-stop-node
-- bin/server-update-hosts
 - bin/server-write-new-nodes
 - vendor/chef
 - vendor/chef/apache2

data/bin/messenger-get-current-nodes

@@ -1,14 +0,0 @@
-#!/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', 'Stats for cloud name')    { |c| optioner.cloudname c }
-end
-
-o.loaded_clouds.each do |cloud|
-  # @nodes = cloud.messenger_send!("get_current_nodes")
-  # @nodes = @nodes.split(" ").map {|a| a.split(/@/)[-1] }
-  puts cloud.get_current_nodes.join(" ")
-end

data/bin/server-become-master

@@ -1,24 +0,0 @@
-#!/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', 'Listing for cloud name')    { |c| optioner.cloudname c }
-end
-
-load_pool(o.spec || Binary.get_existing_spec_location)
-
-include Remote
-
-@clouds = extract_cloud_from_options o
-
-@clouds.each do |cl|
-  
-  with_cloud(cl, {:testing => o.testing}) do
-    cmd = "hostname master && #{PoolParty::Remote::RemoteInstance.dependency_resolver_comand}"
-    %x[#{cmd}] unless testing
-    after_launch_master
-  end  
-  
-end

data/bin/server-build-messenger

@@ -1,28 +0,0 @@
-#!/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/ebin") )
-
-o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-end
-
-INCLUDE = "include"
-ERLC_FLAGS = "-I#{INCLUDE}"
-@version = "0.1"
-
-# erl -pa ./ebin/ -run pm_packager recompile_scripts #{@version} -run init stop -noshell
-# erlc -pa ./ebin -o ebin ./src/*.erl
-# erl -pa ./ebin -s pm_packager start -s init stop
-cmd =<<-EOE
-  cd #{root_dir}
-  rake recompile
-  rake build_boot_scripts
-EOE
-
-vputs "** Building messenger **", o
-vputs "Running command #{cmd.runnable}", o
-
-beams_not_running = %x[ps aux | grep beam | grep master | grep -v grep].empty?
-out = %x[#{cmd.runnable}] if beams_not_running