auser-poolparty 0.2.71 → 0.2.72

data/History.txt

@@ -1,3 +1,6 @@
+== 0.2.72 
+  * Added specs to spec cloud
+  
 == 0.2.6 2008-10-14
   * Maintaining the cloud
   

data/Manifest.txt

@@ -53,51 +53,42 @@ 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
 lib/erlang/messenger/control
 lib/erlang/messenger/ebin/client.app
+lib/erlang/messenger/ebin/client_app.beam
+lib/erlang/messenger/ebin/client_server.beam
+lib/erlang/messenger/ebin/erl_crash.dump
 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_client_old.beam
 lib/erlang/messenger/ebin/pm_client_rel-0.1.rel
+lib/erlang/messenger/ebin/pm_client_supervisor.beam
+lib/erlang/messenger/ebin/pm_cluster.beam
+lib/erlang/messenger/ebin/pm_event_manager.beam
+lib/erlang/messenger/ebin/pm_master.beam
+lib/erlang/messenger/ebin/pm_master_event_handler.beam
 lib/erlang/messenger/ebin/pm_master_rel-0.1.rel
+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/pm_strings.beam
+lib/erlang/messenger/ebin/utils.beam
 lib/erlang/messenger/include/defines.hrl
-lib/erlang/messenger/lib/eunit/.svn/all-wcprops
-lib/erlang/messenger/lib/eunit/.svn/entries
-lib/erlang/messenger/lib/eunit/.svn/format
-lib/erlang/messenger/lib/eunit/.svn/prop-base/NOTES.svn-base
-lib/erlang/messenger/lib/eunit/.svn/text-base/AUTHORS.svn-base
-lib/erlang/messenger/lib/eunit/.svn/text-base/CHANGELOG.svn-base
-lib/erlang/messenger/lib/eunit/.svn/text-base/COPYING.svn-base
-lib/erlang/messenger/lib/eunit/.svn/text-base/NOTES.svn-base
-lib/erlang/messenger/lib/eunit/.svn/text-base/README.svn-base
-lib/erlang/messenger/lib/eunit/.svn/text-base/sys.config.svn-base
-lib/erlang/messenger/lib/eunit/.svn/text-base/vsn.mk.svn-base
 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/.svn/all-wcprops
-lib/erlang/messenger/lib/eunit/doc/.svn/entries
-lib/erlang/messenger/lib/eunit/doc/.svn/format
-lib/erlang/messenger/lib/eunit/doc/.svn/prop-base/erlang.png.svn-base
-lib/erlang/messenger/lib/eunit/doc/.svn/prop-base/eunit.html.svn-base
-lib/erlang/messenger/lib/eunit/doc/.svn/prop-base/index.html.svn-base
-lib/erlang/messenger/lib/eunit/doc/.svn/prop-base/modules-frame.html.svn-base
-lib/erlang/messenger/lib/eunit/doc/.svn/prop-base/overview-summary.html.svn-base
-lib/erlang/messenger/lib/eunit/doc/.svn/prop-base/packages-frame.html.svn-base
-lib/erlang/messenger/lib/eunit/doc/.svn/text-base/edoc-info.svn-base
-lib/erlang/messenger/lib/eunit/doc/.svn/text-base/erlang.png.svn-base
-lib/erlang/messenger/lib/eunit/doc/.svn/text-base/eunit.html.svn-base
-lib/erlang/messenger/lib/eunit/doc/.svn/text-base/index.html.svn-base
-lib/erlang/messenger/lib/eunit/doc/.svn/text-base/modules-frame.html.svn-base
-lib/erlang/messenger/lib/eunit/doc/.svn/text-base/overview-summary.html.svn-base
-lib/erlang/messenger/lib/eunit/doc/.svn/text-base/overview.edoc.svn-base
-lib/erlang/messenger/lib/eunit/doc/.svn/text-base/packages-frame.html.svn-base
-lib/erlang/messenger/lib/eunit/doc/.svn/text-base/stylesheet.css.svn-base
 lib/erlang/messenger/lib/eunit/doc/edoc-info
 lib/erlang/messenger/lib/eunit/doc/erlang.png
 lib/erlang/messenger/lib/eunit/doc/eunit.html
@@ -107,64 +98,27 @@ 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/.svn/all-wcprops
-lib/erlang/messenger/lib/eunit/ebin/.svn/dir-prop-base
-lib/erlang/messenger/lib/eunit/ebin/.svn/entries
-lib/erlang/messenger/lib/eunit/ebin/.svn/format
+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/examples/.svn/all-wcprops
-lib/erlang/messenger/lib/eunit/examples/.svn/entries
-lib/erlang/messenger/lib/eunit/examples/.svn/format
-lib/erlang/messenger/lib/eunit/examples/.svn/prop-base/eunit_examples.erl.svn-base
-lib/erlang/messenger/lib/eunit/examples/.svn/prop-base/fib.erl.svn-base
-lib/erlang/messenger/lib/eunit/examples/.svn/text-base/eunit_examples.erl.svn-base
-lib/erlang/messenger/lib/eunit/examples/.svn/text-base/fib.erl.svn-base
-lib/erlang/messenger/lib/eunit/examples/.svn/text-base/tests.txt.svn-base
+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/.svn/all-wcprops
-lib/erlang/messenger/lib/eunit/include/.svn/entries
-lib/erlang/messenger/lib/eunit/include/.svn/format
-lib/erlang/messenger/lib/eunit/include/.svn/prop-base/eunit.hrl.svn-base
-lib/erlang/messenger/lib/eunit/include/.svn/text-base/eunit.hrl.svn-base
 lib/erlang/messenger/lib/eunit/include/eunit.hrl
-lib/erlang/messenger/lib/eunit/src/.svn/all-wcprops
-lib/erlang/messenger/lib/eunit/src/.svn/entries
-lib/erlang/messenger/lib/eunit/src/.svn/format
-lib/erlang/messenger/lib/eunit/src/.svn/prop-base/autoload.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/prop-base/code_monitor.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/prop-base/eunit.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/prop-base/eunit_autoexport.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/prop-base/eunit_data.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/prop-base/eunit_internal.hrl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/prop-base/eunit_lib.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/prop-base/eunit_proc.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/prop-base/eunit_serial.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/prop-base/eunit_server.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/prop-base/eunit_striptests.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/prop-base/eunit_test.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/prop-base/eunit_tests.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/prop-base/eunit_tty.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/prop-base/file_monitor.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/text-base/autoload.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/text-base/code_monitor.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/text-base/eunit.app.src.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/text-base/eunit.appup.src.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/text-base/eunit.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/text-base/eunit_autoexport.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/text-base/eunit_data.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/text-base/eunit_internal.hrl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/text-base/eunit_lib.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/text-base/eunit_proc.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/text-base/eunit_serial.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/text-base/eunit_server.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/text-base/eunit_striptests.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/text-base/eunit_test.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/text-base/eunit_tests.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/text-base/eunit_tty.erl.svn-base
-lib/erlang/messenger/lib/eunit/src/.svn/text-base/file_monitor.erl.svn-base
+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
@@ -184,6 +138,7 @@ 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/log/pool.logs
 lib/erlang/messenger/pm_client_rel-0.1.boot
 lib/erlang/messenger/pm_client_rel-0.1.script
 lib/erlang/messenger/pm_master_rel-0.1.boot
@@ -346,6 +301,7 @@ lib/poolparty/templates/yaws.conf
 lib/poolparty/version.rb
 lib/poolpartycl.rb
 lib/poolpartyspec.rb
+log/pool.log
 log/pool.logs
 poolparty.gemspec
 script/destroy
@@ -419,6 +375,7 @@ spec/poolparty/pool/test_plugins/sshkey_test
 spec/poolparty/pool/test_plugins/virtual_host_template.erb
 spec/poolparty/pool/test_plugins/webserver.rb
 spec/poolparty/poolparty_spec.rb
+spec/poolparty/spec/core/string_spec.rb
 spec/poolparty/spec_helper.rb
 tasks/cloud.rake
 tasks/deployment.rake

data/PostInstall.txt

@@ -1,4 +1,4 @@
-Get ready to jump in the pool, you just installed PoolParty! (Updated at 17:10 11/26/08)
+Get ready to jump in the pool, you just installed PoolParty! (Updated at 19:03 11/28/08)
 
 To get started, run the generator:
 

data/README.txt

@@ -44,6 +44,7 @@ sudo gem install auser-poolparty
 * Add become master for the nodes
 * Add soft-stop to haproxy while reconfiguring
 * Replace services with Runit
+* Add more granular spec helpers
 * Refactor provisioning to use erlang
 * Add queuing of tasks on the messenger
 * Add list of latest loads to the messenger

data/lib/erlang/messenger/Makefile

@@ -0,0 +1,15 @@
+all: code
+
+code: clean
+	rake compile
+
+clean:
+	rake clean
+
+package-debian: code
+	mkdir -p project_name/usr/lib/erlang/lib/project_name/ebin/ && cp source_file_name.beam project_name/usr/lib/erlang/lib/project_name/ebin/source_file_name.beam
+	mkdir -p project_name/DEBIAN/ && cp control project_name/DEBIAN/control
+	dpkg -b project_name project_name.deb
+
+install-debian: package-debian
+	dpkg -i project_name.deb

data/lib/erlang/messenger/lib/eunit/Makefile

@@ -0,0 +1,28 @@
+
+APPNAME=eunit
+
+SUB_DIRECTORIES = src
+
+include vsn.mk
+
+DOC_OPTS={def,{version,\"$(EUNIT_VSN)\"}}
+
+
+all: subdirs
+
+subdirs:
+	@for d in $(SUB_DIRECTORIES); do \
+	  	(cd $$d; $(MAKE)); \
+	done
+
+clean:
+	@for d in $(SUB_DIRECTORIES); do \
+	  	(cd $$d; $(MAKE) clean); \
+	done
+
+docs:
+	erl -noshell -eval "edoc:application($(APPNAME), \".\", [$(DOC_OPTS)])" -s init stop
+
+test: subdirs
+	@echo Testing...
+	@erl -noshell -pa ebin -s eunit test -s init stop

data/lib/erlang/messenger/lib/eunit/src/Makefile

@@ -0,0 +1,46 @@
+
+include ../vsn.mk
+
+EMULATOR=beam
+EBIN=../ebin
+INCLUDE=../include
+
+APP_TARGET=$(EBIN)/eunit.app
+APPUP_TARGET=$(EBIN)/eunit.appup
+
+ERL_COMPILE_FLAGS += -I$(INCLUDE) +warn_unused_vars +nowarn_shadow_vars +warn_unused_import
+
+SOURCES= \
+	eunit_autoexport.erl \
+	eunit_striptests.erl \
+	eunit.erl \
+	eunit_tests.erl \
+	eunit_server.erl \
+	eunit_proc.erl \
+	eunit_serial.erl \
+	eunit_test.erl \
+	eunit_lib.erl \
+	eunit_data.erl \
+	eunit_tty.erl \
+	code_monitor.erl \
+	file_monitor.erl \
+	autoload.erl
+
+OBJECTS=$(SOURCES:%.erl=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
+
+all: $(OBJECTS)
+
+$(OBJECTS): eunit_internal.hrl \
+	$(INCLUDE)/eunit.hrl 
+
+clean:
+	rm -f $(OBJECTS)
+
+$(EBIN)/%.$(EMULATOR):%.erl
+	erlc -pa $(EBIN) -W $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
+
+$(APP_TARGET): eunit.app.src ../vsn.mk
+	sed -e 's;%VSN%;$(EUNIT_VSN);' $< > $@
+
+$(APPUP_TARGET): eunit.appup.src ../vsn.mk
+	sed -e 's;%VSN%;$(EUNIT_VSN);' $< > $@

data/lib/poolparty/dependency_resolutions/puppet.rb

@@ -39,6 +39,7 @@ module PoolParty
       
       def resources_string_from_resources(res, pre="\t")
         @variables = res.extract! {|name,resource| name == :variable}
+        
         returning Array.new do |str|
           unless @variables.empty?
             str << "\n# Variables"

data/lib/poolparty/modules/resourcing_dsl.rb

@@ -10,12 +10,12 @@ module PoolParty
       str ? options.append!(:require => send_if_method(str)) : options[:require]
     end 
     def ensures(str="running")
-      if %w(absent running).map {|a| self.send a.to_sym}.include?(str)
+      # if %w(absent running).map {|a| self.send a.to_sym}.include?(str)
         str == "absent" ? is_absent : is_present
-      else
-        options.append!(:ensure => str)
-      end
-      str
+      # else
+        # options.append!(:ensure => str)
+      # end
+      # str
     end
     # Allows us to send an ensure to ensure the presence of a resource
     def is_present(*args)

data/lib/poolparty/plugins/deploydirectory.rb

@@ -20,7 +20,7 @@ module PoolParty
         path = ::File.join( Base.tmp_path, "#{::File.basename(from_dir)}.tar.gz" )
         archive_name = "#{name.dir_safe}.tar.gz"
         cmd = "cd #{::File.expand_path(from_dir)} && tar -czf #{archive_name} . && mv #{archive_name} #{Base.tmp_path}"
-        `#{cmd}` unless testing
+        Kernel.system(cmd) unless testing
       end
       
       def unpack_directory

data/lib/poolparty/pool/resource.rb

@@ -103,7 +103,7 @@ module PoolParty
             def #{lowercase_class_name}(opts={}, parent=self, &blk)
               add_resource(:#{lowercase_class_name}, opts, parent, &blk)
             end
-            def get_#{lowercase_class_name}(name)              
+            def get_#{lowercase_class_name}(name, opts={}, parent=self, &block)
               res = in_a_resource_store?(:#{lowercase_class_name}, name) ?
                 get_resource(:#{lowercase_class_name}, name) :
                 self.class.resource_string_name(ty, key)
@@ -276,13 +276,22 @@ module PoolParty
     def self.add_has_and_does_not_have_methods_for(type=:file)
       module_eval <<-EOE
         def has_#{type}(opts={}, parent=self, &block)
-          #{type}(#{type == :exec ? "opts" : "{:is_present => ''}.merge(opts)"}, parent, &block)
+          #{type}(handle_option_values(opts).merge(:ensures => "present"), parent, &block)
         end
         def does_not_have_#{type}(opts={}, parent=self, &block)
-          #{type}(#{type == :exec ? "opts" : "{:is_absent => ''}.merge(opts)"}, parent, &block)
+          #{type}(handle_option_values(opts).merge(:ensures => "absent"), parent, &block)
         end
       EOE
     end
     
+    def handle_option_values(o)
+      case o.class.to_s
+      when "String"
+        {:name => o}
+      else
+        o
+      end
+    end
+    
   end
 end

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

@@ -1,10 +1,16 @@
 class String
   def grab_entry_for(type, name)
     begin
-      allowed = /[ \$\._\-\[\]\n\t\\\/&,\(\)"':=>0-9a-zA-Z]/
-      matches = self.match(/#{type}(.*)\{(.*)#{name}\":(.*)(#{allowed})*\}/)[0]
+      allowed = /[ \$\._\-\[\]\n\t\\\/&,\(\)"',|:=\>\<0-9a-zA-Z]/
+      matches = self.match(/#{type}(.*)\{(.*)"#{name}":(.*)(#{allowed})*\}/)[0]
     rescue
       ""
     end
   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(/,/, '')
+  end
 end

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

@@ -1,6 +1,8 @@
 module Spec
   module Matchers
     module SpecExtensions
+      # Mainly extensions, these methods are inherent in all of the matchers
+      # and are intended for helping parse the final manifest for spec'ing purposes.
       class SpecExtensionsBase
         def ensured_as(ensured="present")
           str = "ensure => '#{ensured}'"
@@ -16,7 +18,7 @@ module Spec
           "file"
         end
         def is_valid_resource?
-          grab_entry.split(/\n/).select {|l| l.match(/(.*)=>([ \t]*),$/) }.empty?
+          grab_entry.split(/\n/).select {|l| l.match(/(.*)=>(\W+),$/) }.empty?
         end
       end
     end

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

@@ -1,15 +1,15 @@
 module PoolParty
   class SpecCore
-    dynamic_matcher_for(:deploydirectory) do
-      it "should have the directory" do
-        @manifest.should have_directory(@to)
-      end
-      it "should have the rsyncmirror" do
-        @manifest.should have_rsyncmirror("deploydirectory-#{@to}")
-      end
-      it "should have the exec to unpack the archive" do
-        @manifest.should have_exec("deploy-directory-#{@to}")
-      end
-    end
+    # dynamic_matcher_for(:deploydirectory) do
+    #   it "should have the directory" do
+    #     @manifest.should have_directory(@to)
+    #   end
+    #   it "should have the rsyncmirror" do
+    #     @manifest.should have_rsyncmirror("deploydirectory-#{@to}")
+    #   end
+    #   it "should have the exec to unpack the archive" do
+    #     @manifest.should have_exec("deploy-directory-#{@to}")
+    #   end
+    # end
   end
 end

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

@@ -17,7 +17,7 @@ module Spec
           "expected #{@target.inspect} not to have gempackage #{@expected}"
         end
         def type
-          "gempackage"
+          "exec"
         end
       end
     end

data/lib/poolparty/version.rb

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

data/lib/poolpartyspec.rb

@@ -1,5 +1,3 @@
-require "rubygems"
-require "spec"
 ["core", "spec"].each do |dir|
   Dir[File.join(File.dirname(__FILE__), "poolparty", "spec", dir, "*.rb")].each {|f| require f}
 end
@@ -7,7 +5,7 @@ end
 class TestCloudClass < PoolParty::Cloud::Cloud  
   def build_test_manifest
     reset_resources!
-    realize_plugins!(true)
+    realize_plugins!
     
     returning Array.new do |arr|