auser-poolparty 1.1.4 → 1.1.5

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 4
+:patch: 5
 :major: 1
 :minor: 1

data/bin/cloud-configure

@@ -9,6 +9,8 @@ end
 
 o.loaded_clouds.each do |cld|
   # If an IP or DNS name is given, bootstrap that node, otherwise, bootstrap all running nodes.
+  # ::FileUtils.rm_rf "#{Default.tmp_path}/" unless o.testing?
+  
   nodes = !o.unflagged_args.empty? ?  o.unflagged_args : cld.remote_instances_list.collect {|inst| inst.ip if inst.running? }.compact
   if nodes.empty?
     puts "No nodes to configure"

data/bin/cloud-start

@@ -12,8 +12,8 @@ o.loaded_clouds.each do |cld|
     puts "#{cld.list_of_running_instances.size} running instances (#{cld.minimum_instances} - #{cld.maximum_instances})"
     
     cld.launch_instance! do |node|
-      ::PoolParty::Provision::BootStrapper.new(node.ip, :full_keypair_path => cld.keypair.full_filepath, :cloud => cld)
-      ::PoolParty::Provision::DrConfigure.new(node.ip,  :full_keypair_path => cld.keypair.full_filepath, :cloud => cld)
+      ::PoolParty::Provision::BootStrapper.new(node.ip, :cloud => cld)
+      ::PoolParty::Provision::DrConfigure.new(node.ip,  :cloud => cld)
       
       puts <<-EOM
         Your cloud has started. Your ip is #{node.ip}

data/bin/server-cloud-elections

@@ -1,26 +1,34 @@
 #!/usr/bin/env ruby
-require "rubygems"
-require 'net/http'
-require 'json'
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
 require "poolparty/lite"
 
-vote_for = ARGV.shift || "none" # or pending or terminated
-schema = ::PoolParty.load_cloud_from_json(ARGV.shift)  #TODO: smarter option parser
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-n cloudname', '--name name', 'Start cloud by this name')    { |c| optioner.cloudname c }
+  opts.on('-i num', '--num i', 'Instance number')    { |i| optioner.inst_num i.to_i }
+end
+
+vote_for = o.unflagged_args.shift || "none"
+
+schema = ::PoolParty.load_cloud_from_json(o.unflagged_args.shift)  #TODO: smarter option parser
 remote_base_name = schema.options.remote_base.split('::')[-1].camelcase
 remoter_base = PoolParty::Remote.module_eval(remote_base_name)
-require 'rubygems'; require 'ruby-debug'; debugger
 
-case vote_for
-when "expand"
-  # PoolParty.log << "Launching new instance"
-  remoter_base.send :launch_new_instance!, schema.options do |node|
-    ::PoolParty::Provision::BootStrapper.new( node[:ip], :full_keypair_path => cld.keypair.full_filepath, :cloud => schema.options )
-    ::PoolParty::Provision::DrConfigure.new( node[:ip], :full_keypair_path => cld.keypair.full_filepath, :cloud => schema.options )
+o.loaded_clouds.each do |cld|
+  cld.update_from_schema(schema)
+  
+  case vote_for
+  when "expand"
+    # PoolParty.log << "Launching new instance"
+    cld.send :launch_instance!, schema.options do |node|
+      ::PoolParty::Provision::BootStrapper.new( node[:ip], :cloud => cld )
+      ::PoolParty::Provision::DrConfigure.new( node[:ip], :cloud => cld )
+    end
+  when "contract"
+    last_instance_id = %x[/usr/bin/server-list-active instance_id].split("\t").last
+    remoter_base.terminate_instance! schema.options.merge(:instance_id => last_instance_id)
+  else
+    puts "Unknown action: #{vote_for}"
   end
-when "contract"
-  last_instance_id = %x[/usr/bin/server-list-active instance_id].split("\t").last
-  remoter_base.terminate_instance! schema.options.merge(:instance_id => last_instance_id)
-else
-  puts "Unknown action: #{vote_for}"
+
 end
-  

data/bin/server-ensure-provisioning

@@ -1,38 +1,33 @@
 #!/usr/bin/env ruby
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
-require "poolpartycl"
+require "poolparty/lite"
 
-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}
+  opts.on('-n cloudname', '--name name', 'Start cloud by this name')    { |c| optioner.cloudname c }
+  opts.on('-i num', '--num i', 'Instance number')    { |i| optioner.inst_num i.to_i }
 end
 
-o.loaded_clouds.each do |cloud|
-  
-  with_cloud(cloud) do
+schema = ::PoolParty.load_cloud_from_json
+
+o.loaded_clouds.each do |cld|
+  cld.update_from_schema(schema)
     
-    @nonprovisioned_nodes = list_of_running_instances.map {|a| a.name } - cloud.get_current_nodes
-    # @tp = ThreadPool.new(10)
-    @nonprovisioned_nodes.each do |node|
-      vputs "Provisioning #{node}"
-      next if node == "master"
-      # @tp.process do
-      str = returning Array.new do |s|
-        s << cloud.dependency_resolver_command
-      end.join(";")
-  
-      node_id = node.gsub(/node/, '')
-      
-      cmd = ". /etc/profile && #{str};server-provision -n #{cloud.name} -i #{node_id};#{str}"
-      running_cmd = "ps aux | grep -v grep | grep \"server-provision -n #{cloud.name} -i #{node_id};\""
-      
-      vputs "Executing #{cmd}"
-      running = %x[#{running_cmd}]
-      `#{cmd}` if running.chomp.empty?
+  # If an IP or DNS name is given, bootstrap that node, otherwise, bootstrap all running nodes.
+  nodes = !o.unflagged_args.empty? ?  o.unflagged_args : cld.remote_instances_list.collect {|inst| inst.ip if inst.running? }.compact
+  if nodes.empty?
+    puts "No nodes to bootstrap"
+  else
+    if o.inst_num?
+      ::PoolParty::Provision::BootStrapper.new( nodes[o.inst_num], :cloud => cld )
+      ::PoolParty::Provision::DrConfigure.new( nodes[o.inst_num], :cloud => cld )
+    else
+      nodes.each do |address|
+        puts "bootstrapping: #{address}"
+        ::PoolParty::Provision::BootStrapper.new( address, :cloud => cld )
+        ::PoolParty::Provision::DrConfigure.new( address, :cloud => cld )
+      end
     end
-    # @tp.join
-  end  
-  
-end
+  end
+end
+

data/bin/server-list-active

@@ -10,6 +10,7 @@ schema = PoolParty::Schema.new( ::File.read(json_file) )
 
 remoter_base = schema.options.remote_base
 
+# TODO: WTF? Change this
 instances = PoolParty::Remote::Ec2.describe_instances(schema.options)
 inst_array = instances.map {|inst| inst.send list_type.to_sym }
 

data/lib/poolparty/base_packages/haproxy.rb

@@ -2,9 +2,13 @@ module PoolParty
   class Base
     plugin :poolparty_base_haproxy do
       
-      def enable
+      def before_configure
         # We need the haproxy package
-        ::Suitcase::Zipper.add("#{::File.dirname(__FILE__)}/../../../vendor/chef/apache2", "chef/recipes")
+        ::Suitcase::Zipper.add("#{::File.dirname(__FILE__)}/../../../vendor/chef/apache2", "chef/cookbooks")
+      end
+      
+      def enable
+        has_chef_recipe 'apache2'
         has_service "apache2"
         
         has_package({:name => "haproxy"}) do

data/lib/poolparty/base_packages/poolparty.rb

@@ -3,7 +3,7 @@ module PoolParty
     plugin :poolparty_base_packages do
       
       def enable
-        has_package "git"
+        has_package "git-core"
         
         has_cron "/usr/bin/server-manage-election" do
           minute "0,5,10,15,20,25,30,35,40,45,50,55"

data/lib/poolparty/core/string.rb

@@ -67,6 +67,20 @@ class String
     klass
   end
   
+  def new_resource_class(superclass=nil, opts={}, &block)
+    symc = "::PoolParty::Resources::#{self.camelcase}"
+    kla=<<-EOE
+      class #{symc} < ::PoolParty::Resources::Resource
+      end
+    EOE
+    
+    Kernel.module_eval kla
+    klass = symc.constantize
+    klass.module_eval &block if block
+
+    klass
+  end
+  
   def camelcase
     gsub(/(^|_|-)(.)/) { $2.upcase }
   end

data/lib/poolparty/dependency_resolver/chef_resolver.rb

@@ -1,8 +1,33 @@
+=begin rdoc
+  ChefResolver
+  
+  This takes the internal structure
+  {
+    :options => {},
+    :services => [{}],
+    :resources => {}
+  }
+  
+  and creates a chef recipe to reflect.
+  
+  /cookbooks/
+    namespace/
+      recipes/
+      templates/
+      attributes/
+=end
 module PoolParty
   
   class ChefResolver< DependencyResolver
     
-    def compile(props=@properties_hash, tabs=0, default_namespace="poolparty")
+    # Compile and add to the zipper
+    def compile(props=@properties_hash, tabs=0, default_namespace="poolparty")      
+      o = _compile(props, tabs, default_namespace)
+      ::Suitcase::Zipper.add(build_base_recipe_directory( default_namespace ), "chef/cookbooks")
+      o
+    end
+    
+    def _compile(props=@properties_hash, tabs=0, default_namespace="poolparty")
       cld_name = default_namespace
       comp(cld_name, props, tabs)
     end
@@ -16,8 +41,8 @@ module PoolParty
         resources_to_string(props[:resources],tabs),
         services_to_string(props[:services],tabs)
       ].join("\n")
-      ::File.open("#{basedir}/recipes/default.rb", "w+") {|f| f << default_recipe }        
-      ::Suitcase::Zipper.add(basedir, "chef/recipes/cookbooks")
+      ::File.open("#{basedir}/recipes/default.rb", "w+") {|f| f << default_recipe }      
+      
       default_recipe
     end
     
@@ -29,7 +54,7 @@ module PoolParty
     end
     
     def base_dir(nm=nil)
-      @base_dir ||= "#{Default.tmp_path}/dr_configure/chef/recipes/#{nm}"
+      @base_dir ||= "#{Default.tmp_path}/trash/chef/cookbooks/#{nm}"
     end
     
     def options_to_string(opts,tabs=0)
@@ -45,6 +70,12 @@ module PoolParty
           handle_print_variables(vars)
         end
         
+        if opts[:chef_recipe]
+          opts.delete(:chef_recipe).each do |rcp|
+            out << "include_recipe #{to_option_string(rcp.name)}"
+          end          
+        end
+        
         if opts.has_key?(:line_in_file)
           lines = opts.delete(:line_in_file).inject([]) do |sum, l|
             sum << PoolParty::Resources::Exec.new(:name => l[:name], :command => PoolParty::Resources::LineInFile.command(l[:line], l[:file]) ).to_properties_hash
@@ -129,7 +160,7 @@ module PoolParty
         str = "\n#{tf(tabs)}# #{kname}\n"
         str << "#{tf(tabs+1)}"
         klassarray.each do |hsh|
-          str << compile(hsh,tabs+1, klassname)
+          str << _compile(hsh,tabs+1, klassname)
         end        
         str << "#{tf(tabs)}"
       end
@@ -183,9 +214,9 @@ module PoolParty
         nil
       when :if_not
         "not_if"
-      when :notif
+      when :not_if
         "not_if"
-      when :onlyif
+      when :only_if
         "only_if"
       else
         "#{key}"        

data/lib/poolparty/lite.rb

@@ -1,16 +1,18 @@
 require "rubygems"
 require "json"
-require("#{::File.dirname(__FILE__)}/../../vendor/gems/dslify/lib/dslify")
+require("#{::File.dirname(__FILE__)}/../../vendor/gems/dslify/lib/dslify") rescue( require 'dslify')
 require "#{::File.dirname(__FILE__)}/poolparty/default"
 require "#{::File.dirname(__FILE__)}/schema"
 require "#{::File.dirname(__FILE__)}/net/init"
 require "#{::File.dirname(__FILE__)}/exceptions/RemoteException.rb"
 
 module PoolParty
+  extend ::PoolParty::Remote
+  
   def self.load_cloud_from_json(json_file_path=nil)
     json_file = json_file_path || PoolParty::Default.properties_hash_file
     PoolParty::Schema.new( ::File.read(json_file) ) rescue exit 1
-  end
+  end  
 end
 
 class String

data/lib/poolparty/modules/cloud_resourcer.rb

@@ -85,9 +85,9 @@ module PoolParty
     # Use the keypair path
     def keypair(*args)
       if args && !args.empty?
-        args.each {|arg| _keypairs.unshift Key.new(arg) }
+        args.each {|arg| _keypairs.unshift Key.new(arg) unless arg.nil? || arg.empty? }
       else
-        _keypairs.select {|key| key.exists? }.first
+        @keypair ||= _keypairs.select {|key| key.exists? }.first
       end
     end
     
@@ -97,10 +97,19 @@ module PoolParty
       dsl_options[:keypairs] ||= [Key.new]
     end
     
-    def full_keypair_path      
+    def full_keypair_path
       @full_keypair_path ||= keypair.full_filepath
     end
     
+    def update_from_schema(schema)
+      keypairs = schema.options.delete(:keypairs).map {|a| PoolParty::Key.new(a.basename) }
+      options.merge! schema.options
+      dsl_options[:keypairs] = keypairs
+
+      dsl_options[:dependency_resolver] = schema.options.dependency_resolver.split("::")[-1].gsub(/Resolver/, '').preserved_class_constant("Resolver") rescue PoolParty::Chef
+      
+    end
+        
     # TODO: deprecate
     def number_of_resources
       arr = resources.map do |n, r|

data/lib/poolparty/modules/definable_resource.rb

@@ -16,10 +16,7 @@ module PoolParty
     # 
     # For example usage, see lib/poolparty/plugins/line.rb
     def define_resource(name, &block)
-      symc = "#{name}".camelcase
-      klass = symc.class_constant(PoolParty::Resources::CustomResource, {:preserve => true}, &block)
-      PoolParty::Resources.module_eval &block
-      klass
+      name.to_s.new_resource_class(PoolParty::Resources::Resource, &block)
     end
     
     # Allow us to create virtual resources

data/lib/poolparty/net/remoter/cloud_control.rb

@@ -3,36 +3,6 @@ require "ping"
 module PoolParty
   module Remote
     
-    # TODO: Rename and modularize the @inst.status =~ /pending/ so that it works on all 
-    # remoter_bases
-    def launch_instance!(o={}, &block)
-      @inst = launch_new_instance!( o )
-      wait "2.seconds"
-      500.times do |i|
-        if @inst.status =~ /pending/
-          sleep(2)
-          @inst = describe_instance(@inst)          
-        end
-      end
-      when_instance_is_responding @inst do
-        block.call(@inst) if block
-        after_launch_instance(@inst)
-      end
-      @inst
-    end
-    
-    # Called after an instance is launched
-    def after_launch_instance(instance=nil)      
-    end
-    
-    def when_instance_is_responding(inst, &block)
-      if ping_port(inst.ip, 22)
-        block.call if block
-      else
-        raise "Instance not responding at #{inst.ip}"
-      end
-    end
-    
     # A convenience method for waiting until there are no more
     # pending instances and then running the block
     def when_no_pending_instances(&block)

data/lib/poolparty/net/remoter/connections.rb

@@ -27,7 +27,7 @@ module PoolParty
     end
     
     def ssh_options(opts={})
-      o = {"-i" => full_keypair_path,
+      o = {"-i" => keypair.full_filepath,
            "-l" => user,
            "-o" =>"StrictHostKeyChecking=no"
            }.merge(opts)
@@ -55,23 +55,24 @@ module PoolParty
         :host=>target_host, :user=>'root')
       # commands.each {|c| run_remote(c, target_host) }
     end    
-
-    def ping_port(host, port=22, retry_times=400)
+    
+    def self.ping_port(host, port=22, retry_times=400)
       connected = false
       retry_times.times do |i|
         begin
-          break if connected = TCPSocket.new(host, port).is_a?(TCPSocket)      
+          break if connected = TCPSocket.new(host, port).is_a?(TCPSocket)
         rescue Exception => e
           sleep(2)
         end
       end
       connected
     end
+    def ping_port(ip, port, retry_times=500);self.class.ping_port(ip, port, retry_times);end
     
     def netssh(cmds=[], opts={})
       user = opts.delete(:user) || user #rescue 'root'
       host = opts.delete(:host) || target_host
-      ssh_options_hash = {:keys => [full_keypair_path],
+      ssh_options_hash = {:keys => [keypair.full_filepath],
                           :auth_methods => 'publickey',
                           :paranoid => false
                            }.merge(opts)
@@ -79,7 +80,7 @@ module PoolParty
       # Start the connection
       Net::SSH.start(host, user, ssh_options_hash) do |ssh|  
         cmds.each do |command|
-          ssh.exec!(command) do |ch, stream, data| 
+          ssh.exec!(command) do |ch, stream, data|
             if stream == :stdout
              print data
             else

data/lib/poolparty/net/remoter_base.rb

@@ -23,7 +23,7 @@ module PoolParty
     # This class is the base class for all remote types, such as ec2
     # Everything remoting-wise is derived from this class
     class RemoterBase
-      include  Remote
+      include  ::PoolParty::Remote
       
       def initialize(prnt = nil)
         @parent = prnt
@@ -77,6 +77,50 @@ module PoolParty
         self.class.describe_instances(o ? options.merge(o) : options)
       end
       
+      # TODO: Rename and modularize the @inst.status =~ /pending/ so that it works on all 
+      # remoter_bases
+      def self.launch_instance!(o={}, &block)
+        @inst = launch_new_instance!( o )
+        sleep(2)
+        500.times do |i|
+          if @inst.status =~ /pending/
+            sleep(2)
+            @inst = describe_instance(@inst)          
+          end
+        end
+        when_instance_is_responding @inst do
+          block.call(@inst) if block
+          after_launch_instance(@inst)
+        end
+        @inst
+      end
+      def launch_instance!(o={}, &block); self.class.launch_instance!(self.options.merge(o), &block);end
+
+      # Called after an instance is launched
+      def self.after_launch_instance(instance=nil);end
+
+      def self.when_instance_is_responding(inst, &block)
+        if ping_port(inst.ip, 22)
+          block.call if block
+        else
+          raise "Instance not responding at #{inst.ip}"
+        end
+      end
+      def when_instance_is_responding(inst, &block);self.class.when_instance_is_responding;end
+      
+      # TODO: BAD FORM, already defined in connections.rb. Fix this, ASAP
+      def self.ping_port(host, port=22, retry_times=400)
+        connected = false
+        retry_times.times do |i|
+          begin
+            break if connected = TCPSocket.new(host, port).is_a?(TCPSocket)
+          rescue Exception => e
+            sleep(2)
+          end
+        end
+        connected
+      end
+      
       # After launch callback
       # This is called after a new instance is launched
       def after_launched(force=false)        

data/lib/poolparty/plugins/chef.rb

@@ -1,16 +1,15 @@
 require "tempfile"
+# BIG TODO: Slim the place where the content is gathered from
 module PoolParty
   class ChefRecipe
     include Dslify
   end
   class Chef
+    define_resource :chef_recipe do
+    end
     
     plugin :chef do
-      def before_load(o, &block)        
-        bootstrap_gems "chef", "ohai"
-        bootstrap_commands [
-          "mkdir -p /etc/chef/cookbooks /etc/chef/cache"
-        ]
+      def before_load(o, &block)
       end
       
       def loaded o={}, &block
@@ -21,25 +20,29 @@ module PoolParty
       end
       
       def basedir
-        @basedir ||= "#{Default.tmp_path}/dr_configure/chef/recipes/main"
+        @basedir ||= "#{Default.tmp_path}/dr_configure/chef/cookbooks/main"
       end
       
       def recipe file=nil, o={}, &block        
         if file
+          file = ::File.expand_path(file)
           ::FileUtils.mkdir_p "#{basedir}/recipes" unless ::File.directory? basedir
-          
+                    
           unless ::File.file?(file)
             tfile = Tempfile.new("main-poolparty-recipe")
             tfile << file # copy the string into the temp file
             file = tfile.path
           end
-          
+                    
+          ::FileUtils.rm "#{basedir}/recipes/default.rb" if ::File.file?("#{basedir}/recipes/default.rb")
           ::File.cp file, "#{basedir}/recipes/default.rb"
           
           templates o[:templates] if o[:templates]
           
-          recipe_files << basedir
+          # recipe_files << basedir
+          # ::Suitcase::Zipper.add(basedir, "chef/cookbooks")
         # TODO: Enable neat syntax from within poolparty
+        
         else
           raise <<-EOR
             PoolParty currently only supports passing recipes as files. Please specify a file in your chef block and try again"
@@ -51,10 +54,11 @@ module PoolParty
         if templates
           ::FileUtils.mkdir_p "#{basedir}/templates/default/"
           templates.each do |f|
+            f = ::File.expand_path(f)
             if ::File.file?(f)
               ::File.cp f, "#{basedir}/templates/default/#{::File.basename(f)}"
             elsif ::File.directory?(f)
-              Dir["#{f}/*"].each {|f| ::File.cp f, "#{basedir}/templates/default/#{::File.basename(f)}" }
+              Dir["#{f}/**"].each {|f| ::File.cp f, "#{basedir}/templates/default/#{::File.basename(f)}" }
             else
               tfile = Tempfile.new("main-poolparty-recipe")
               tfile << f # copy the string into the temp file
@@ -65,28 +69,25 @@ module PoolParty
       end
       
       def json file=nil, &block
-        if @json_file
-          @json_file
-        else
-          if file
-            if ::File.file? file
-              ::File.cp file, "#{Default.tmp_path}/dr_configure/dna.json"
-            elsif file.is_a?(String)
-              ::File.open("#{Default.tmp_path}/dr_configure/dna.json", "w+"){|tf| tf << file } # is really a string
-            else
-              raise <<-EOM
-                Your json must either point to a file that exists or a string. Please check your configuration and try again
-              EOM
-            end
-            @json_file = "#{Default.tmp_path}/dr_configure/dna.json"
+        if file
+          if ::File.file? file
+            ::Suitcase::Zipper.add_content_as(open(file).read, "dna.json", "chef")
+          elsif file.is_a?(String)
+            ::Suitcase::Zipper.add_content_as(file, "dna.json", "chef")
           else
-            unless @recipe
-              @recipe = ChefRecipe.new
-              @recipe.instance_eval &block if block
-              @recipe.recipes(recipe_files.empty? ? ["poolparty"] : ["poolparty", "main"])
-              ::File.open("#{Default.tmp_path}/dr_configure/dna.json", "w+") {|f| f << @recipe.options.to_json }
-              @json_file = "#{Default.tmp_path}/dr_configure/dna.json"
-            end
+            raise <<-EOM
+              Your json must either point to a file that exists or a string. Please check your configuration and try again
+            EOM
+          end
+        else
+          unless @recipe
+            @recipe = ChefRecipe.new
+            @recipe.instance_eval &block if block
+            @recipe.recipes(recipe_files.empty? ? ["poolparty"] : ["poolparty", "main"])
+            # ::File.open("#{Default.tmp_path}/dr_configure/dna.json", "w+") {|f| f << @recipe.options.to_json }
+            ::Suitcase::Zipper.add_content_as(@recipe.options.to_json, "dna.json", "chef")
+            
+            configure_commands ["cp -f /var/poolparty/dr_configure/chef/dna.json /etc/chef/dna.json"]
           end
         end
       end
@@ -94,37 +95,35 @@ module PoolParty
       def include_recipes *recps
         unless recps.empty?
           recps.each do |rcp|
-            Dir[::File.expand_path(rcp)].each do |f|              
-              added_recipes << f
+            Dir[::File.expand_path(rcp)].each do |f|
+              ::Suitcase::Zipper.add(f, "chef/cookbooks")
             end            
           end
         end
       end
       
       def config file=""
-        if @config_file
-          @config_file
+        if ::File.file? file
+          ::Suitcase::Zipper.add_content_as(open(file).read, "solo.rb", "chef")
         else
-          if ::File.file? file
-            @config_file = file
-          else
-            conf_string = if file.empty?
+          conf_string = if file.empty?
 # default config
-            <<-EOE
+          <<-EOE
 cookbook_path     "/etc/chef/cookbooks"
 node_path         "/etc/chef/nodes"
 log_level         :info
 file_store_path  "/etc/chef"
 file_cache_path  "/etc/chef"
-            EOE
-            else
-              open(file).read
-            end
-            ::File.open("#{Default.tmp_path}/dr_configure/chef_config.rb", "w+") do |tf|
-              tf << conf_string
-            end
-            @config_file = "#{Default.tmp_path}/dr_configure/chef_config.rb"
+          EOE
+          else
+            open(file).read
           end
+          # ::FileUtils.mkdir_p "#{Default.tmp_path}/trash" unless ::File.directory? "#{Default.tmp_path}/trash"
+          # ::File.open("#{Default.tmp_path}/trash/solo.rb", "w+") do |tf|
+          #   tf << conf_string
+          # end
+          ::Suitcase::Zipper.add_content_as(conf_string, "solo.rb", "chef")
+          # ::Suitcase::Zipper.add("#{Default.tmp_path}/trash/solo.rb", "chef")
         end
       end
       
@@ -132,34 +131,24 @@ file_cache_path  "/etc/chef"
         @added_recipes ||= []
       end
       
-      def after_create
-        before_configure
+      def before_bootstrap
+        puts "Called before_bootstrap in chef"
+        bootstrap_gems "chef", "ohai"
+        bootstrap_commands [
+          "mkdir -p /etc/chef/cookbooks /etc/chef/cache"
+        ]
       end
-      
       def before_configure
+        puts "Calling before_configure in Chef (dir: #{::File.directory?("/etc/chef")})"
         config
         json
         
         if ::File.directory?("/etc/chef")
-          ::Suitcase::Zipper.add("/etc/chef/cookbooks/*", "chef/recipes")
+          ::Suitcase::Zipper.add("/etc/chef/cookbooks/*", "chef/cookbooks")
           ::Suitcase::Zipper.add("/etc/chef/dna.json", "chef/json")
           ::Suitcase::Zipper.add("/etc/chef/solo.rb", "chef/")
         end
         
-        ::Suitcase::Zipper.add(@config_file, "chef")
-        added_recipes.each do |rcp|
-          # ::FileUtils.cp_r rcp, "/tmp/poolparty/dr_configure/recipes/"
-          ::Suitcase::Zipper.add(rcp, "chef/recipes")
-        end
-        
-        ::Suitcase::Zipper.add(@json_file, "chef/json")
-        configure_commands ["cp -f /var/poolparty/dr_configure/chef/json/dna.json /etc/chef/dna.json"]
-
-        recipe_files.each do |rf|
-          ::FileUtils.mkdir_p "/tmp/poolparty/dr_configure/recipes/#{::File.basename(rf)}"
-          ::FileUtils.cp_r rf, "/tmp/poolparty/dr_configure/recipes/#{::File.basename(rf)}"
-          # ::Suitcase::Zipper.add(rf, "chef/recipes") 
-        end
       end
       
     end

data/lib/poolparty/plugins/{deploydirectory.rb → deploy_directory.rb}

@@ -14,7 +14,7 @@ module PoolParty
     
     virtual_resource(:deploy_directory) do
       
-      def loaded(opts={}, &block)        
+      def loaded(opts={}, &block)
         package_deploy_directory
         add_unpack_directory
       end
@@ -30,6 +30,13 @@ module PoolParty
           not_if "test -f #{to}"
           command "cp -R /var/poolparty/dr_configure/user_directory/#{name}/* #{to}"
         end
+        
+        if owner?
+          has_exec(:name => "chown-#{name}") do
+            command "chown #{owner} -R #{to}"
+          end
+        end
+        
       end
       
     end

data/lib/poolparty/plugins/gem_package.rb

@@ -0,0 +1,31 @@
+module PoolParty    
+  class GempackageResource
+    
+    virtual_resource(:gem_package) do
+      
+      def loaded(opts={}, &block)
+        if download_url?
+          has_exec(
+            :name => "download-#{name}", 
+            :cwd => Default.remote_storage_path, 
+            :command => "wget #{download_url} -O #{name}.gem", 
+            :if_not => "test -f #{Default.remote_storage_path}/#{name}.gem"
+          )
+          has_exec(
+            :name => "install-#{name}-gem",
+            :command => "gem install --no-ri --no-rdoc  #{Default.remote_storage_path}/#{name}.gem",
+            :if_not => "gem list --local #{name} | grep #{name} #{"| grep #{version}" if version?}",
+            :requires => "download-#{name}"
+          )
+        else
+          has_exec(
+            :name => "#{name}",
+            :command  => "gem install --no-ri --no-rdoc #{"--version #{version}" if version?} #{"--source #{source}" if source?} #{name}",
+            :if_not => "gem list --local #{name} | grep #{name} #{"| grep #{version}" if version?}"
+          )
+        end
+      end
+      
+    end
+  end
+end

data/lib/poolparty/poolparty/key.rb

@@ -6,8 +6,8 @@ module PoolParty
     attr_accessor :filepath
     
     # Create a new key that defaults to id_rsa as the name. 
-    def initialize(filepath=nil)
-      @filepath = (filepath.nil? || filepath.empty?) ? "id_rsa" : filepath
+    def initialize(fpath=nil)
+      @filepath = (fpath.nil? || fpath.empty?) ? "id_rsa" : fpath
     end
     
     # If the full_filepath is nil, then the key doesn't exist
@@ -42,20 +42,23 @@ module PoolParty
     # then it returns nil and assumes we it doesn't exist
     def search_in_known_locations
       self.class.keypair_paths.each do |path|
-        full_path = ::File.join( ::File.expand_path(path), filepath)
+        full_path = ::File.join( ::File.expand_path(path), ::File.basename(filepath))
         return full_path if ::File.exists?(full_path)
       end
+      # raise Exception.new("We cannot continue without a keypair. Please define a keypair in your clouds.rb")
+      # TODO: Add raise for keypair
       nil
     end
     
     # Default locations to search for the key
     def self.keypair_paths
-      [ "#{ENV["HOME"]}/.ssh",
+      [ 
+        "#{ENV["HOME"]}/.ssh",
         "#{Default.poolparty_home_path}/keys",
-        Default.base_keypair_path,
-        Default.base_config_directory,
-        Default.base_ssh_path,
-        Default.remote_storage_path,        
+        PoolParty::Default.base_keypair_path,
+        PoolParty::Default.base_config_directory,
+        PoolParty::Default.base_ssh_path,
+        PoolParty::Default.remote_storage_path,        
         Dir.pwd
       ]
     end

data/lib/poolparty/poolparty/plugin.rb

@@ -59,7 +59,7 @@ module PoolParty
       end
       
       def self.inherited(subclass)
-        method_name = subclass.to_s.top_level_class.gsub(/pool_party_/, '').gsub(/_class/, '').downcase.to_sym        
+        method_name = subclass.to_s.top_level_class.gsub(/pool_party_/, '').gsub(/_class/, '').downcase.to_sym
         add_has_and_does_not_have_methods_for(method_name)
       end
       

data/lib/poolparty/poolparty/plugin_model.rb

@@ -4,7 +4,7 @@ module PoolParty
   module PluginModel
     
     def plugin(name=:plugin, cloud=nil, &block)
-      plugins.has_key?(name) ? plugins[name] : (plugins[name] = PluginModel.new(name, &block))
+      plugins[name] ||= PluginModel.new(name, &block)
     end
     alias_method :register_plugin, :plugin
     
@@ -15,8 +15,8 @@ module PoolParty
     class PluginModel
       attr_accessor :klass
       
-      def initialize(name,&block)
-        symc = "#{name}".top_level_class.camelcase        
+      def initialize(name,&block)        
+        symc = "#{name}".top_level_class.camelcase
         klass = symc.class_constant(PoolParty::Plugin::Plugin, {:preserve => true}, &block)
         
         lowercase_class_name = symc.downcase
@@ -28,9 +28,9 @@ module PoolParty
             i = plugin_store.select {|i| i if i.class == #{lowercase_class_name.camelcase}Class }.first if plugin_store
             if i
               i
-            else
+            else              
               inst = #{lowercase_class_name.camelcase}Class.new(opts, parent, &block)
-              this_context.plugin_store << inst if this_context
+              plugin_store << inst if plugin_store
               inst
             end
           end

data/lib/poolparty/poolparty/service.rb

@@ -18,7 +18,7 @@ module PoolParty
       
       meth = <<-EOM
         def __#{lowercase_class_name}(opts={}, &block)
-          PoolParty::#{lowercase_class_name.camelcase}Class.new(opts, &block)
+          plugin_store << PoolParty::#{lowercase_class_name.camelcase}Class.new(opts, &block)
         end
         alias :#{lowercase_class_name} :__#{lowercase_class_name}
       EOM

data/lib/poolparty/provision/boot_strapper.rb

@@ -29,6 +29,7 @@ module PoolParty
                           activesupport
                           grempe-amazon-ec2
                           RubyInline
+                          ohai
                           chef
                           auser-dslify
                           auser-butterfly
@@ -45,7 +46,19 @@ module PoolParty
       })
       class <<self; attr_reader :defaults; end
       
-      def initialize(host, opts={}, &block)
+      # In case the method is being called on ourself, let's check the 
+      # defaults hash to see if it's available there
+      def method_missing(m,*a,&block)
+        if self.class.defaults.has_key?(m) 
+          self.class.defaults[m]
+        elsif @cloud
+          @cloud.send m, *a, &block
+        else
+          super
+        end
+      end
+      
+      def initialize(host, opts={}, &block)        
         self.class.defaults.merge(opts).to_instance_variables(self)
         @target_host = host
         @cloud = opts[:cloud]
@@ -66,7 +79,7 @@ module PoolParty
         
       def pack_the_dependencies
         # Add the keypair to the instance... shudder
-        ::Suitcase::Zipper.add(@cloud.keypair, "keys")
+        ::Suitcase::Zipper.add(keypair, "keys")
         
         # Use the locally built poolparty gem if it is availabl
         if edge_pp_gem = Dir["#{Default.vendor_path}/../pkg/*poolparty*gem"].pop
@@ -90,6 +103,7 @@ module PoolParty
         
         ::Suitcase::Zipper.add("#{::File.join(File.dirname(__FILE__), '..', 'templates', 'gemrc' )}", "etc/poolparty")
         ::Suitcase::Zipper.build_dir!("#{Default.tmp_path}/dependencies")
+        ::Suitcase::Zipper.flush!
         
         # ::FileUtils.rm_rf "#{Default.tmp_path}/trash"
       end

data/lib/poolparty/provision/configurations/chef.rb

@@ -5,15 +5,18 @@ module PoolParty
       def self.commands
         [
           "mkdir -p /etc/chef/cookbooks /etc/chef/cache",
-          "cp -R /var/poolparty/dr_configure/chef/recipes/* /etc/chef/cookbooks",
-          "cp /var/poolparty/dr_configure/chef_config.rb /etc/chef/solo.rb",
+          "cp -R /var/poolparty/dr_configure/chef/cookbooks/* /etc/chef/cookbooks",
+          "cp /var/poolparty/dr_configure/chef/solo.rb /etc/chef/solo.rb",
+          "cp /var/poolparty/dr_configure/chef/dna.json /etc/chef/dna.json",
           "/usr/bin/chef-solo -c /etc/chef/solo.rb -j /etc/chef/dna.json"
         ]
       end
       def self.files_to_upload
         [ 
-          "#{Default.tmp_path}/chef_config.rb",
-          "#{Default.tmp_path}/dna.json"
+          "#{Default.tmp_path}/dr_configure/chef/solo.rb",
+          "#{Default.tmp_path}/dr_configure/chef/dna.json",
+          "#{Default.base_config_directory}/chef/solo.rb",
+          "#{Default.base_config_directory}/chef/dna.json"
         ]
       end
     end

data/lib/poolparty/provision/dr_configure.rb

@@ -17,13 +17,27 @@ module PoolParty
          :dependency_resolver => 'chef'
        })
      end
-          
-     attr_accessor :full_keypair_path
+     
+     # In case the method is being called on ourself, let's check the 
+     # defaults hash to see if it's available there
+     def method_missing(m,*a,&block)
+       if self.class.defaults.has_key?(m) 
+         self.class.defaults[m]
+       elsif @cloud
+         @cloud.send m, *a, &block
+       else
+         super
+       end
+     end
+    
+     attr_reader :cloud, :keypair
+     
      def initialize(host, opts={}, &block)
        self.class.defaults.merge(opts).to_instance_variables(self)
        @target_host = host
        @configurator = "::PoolParty::Provision::#{dependency_resolver.capitalize}".constantize
        @cloud = opts[:cloud]
+       @keypair = @cloud.keypair
        
        @cloud.call_before_configure_callbacks if @cloud
        prescribe_configuration
@@ -31,11 +45,12 @@ module PoolParty
      end
      
      def prescribe_configuration
+       ::FileUtils.mkdir_p "#{Default.tmp_path}/dr_configure" unless ::File.directory?("#{Default.tmp_path}/dr_configure")
       ::File.cp $pool_specfile, "#{Default.tmp_path}/dr_configure/clouds.rb"
       ::File.open "#{Default.tmp_path}/dr_configure/clouds.json", "w" do |f|
         f << cloud.to_properties_hash.to_json
       end
-            
+      
       setup_configurator
       write_erlang_cookie
       @configurator.files_to_upload.each {|f| ::FileUtils.cp f, "#{Default.tmp_path}/dr_configure/#{::File.basename(f)}" if ::File.file?(f) }
@@ -47,13 +62,13 @@ module PoolParty
         'chmod 600 /var/poolparty/dr_configure/clouds.rb',
         'cp -f /var/poolparty/dr_configure/clouds.json /etc/poolparty',
         'cp /var/poolparty/dr_configure/clouds.rb /etc/poolparty',
-        'cp /var/poolparty/dr_configure/erlang.cookie /root/.erlang.cookie',        
+        'cp /var/poolparty/dr_configure/erlang.cookie /root/.erlang.cookie',
         'ruby /var/poolparty/dr_configure/erlang_cookie_maker',
         "touch /var/poolparty/POOLPARTY.PROGRESS",
         'echo "configure" >> /var/poolparty/POOLPARTY.PROGRESS'
         ]
       commands << self.class.class_commands unless self.class.class_commands.empty?
-      commands << @configurator.commands      
+      commands << @configurator.commands
      end
      
      def pack_up_and_ship_off_suitcase
@@ -65,7 +80,6 @@ module PoolParty
      def setup_configurator
        # @cloud.write_properties_hash("#{Default.tmp_path}/properties_hash.rb")
        #TODO: move to puppet class
-       puts "writting new config file"
        @cloud.build_and_store_new_config_file("#{Default.tmp_path}/dr_configure/poolparty.pp") 
        # Neighborhoods.clump(@cloud.remote_instances_list, "#{Default.tmp_path}/neighborhood.json")
      end

data/lib/poolparty/schema.rb

@@ -40,6 +40,23 @@ module PoolParty
         @hsh.send(sym, *args, &block)
       end
     end
+    
+    def to_cloud(node={})
+      require "ostruct"
+      
+      $pool_specfile = "/etc/poolparty/clouds.rb"
+      
+      remoter_base = PoolParty::Remote.module_eval(options.remote_base.split('::')[-1].camelcase)
+      # TODO: Seriously, make this sexier
+      
+      cld = OpenStruct.new(options)
+      cld.keypair = ::PoolParty::Key.new("/etc/poolparty/#{node[:keypair]}")
+      cld.remoter_base = remoter_base
+      cld.build_and_store_new_config_file = "/etc/poolparty/clouds.json"
+      cld.dependency_resolver = PoolParty.module_eval(options.dependency_resolver.split("::")[-1].camelcase).send(:new)
+      
+      cld
+    end
   end
 end
 # class Hash

data/lib/poolparty/templates/haproxy.conf

@@ -31,6 +31,6 @@ listen <%= @node[:poolparty][:haproxy_name] %>
     mode              <%= @node[:poolparty][:proxy_mode] %>
     bind 0.0.0.0:<%= @node[:poolparty][:ports_haproxy].join(",0.0.0.0:") %>
     cookie POOLPARTYPARTY
-    <% %x[/usr/bin/server-list-active ip].split("\t").each_with_index do |ip, index| %>
+    <% %x[/usr/bin/server-list-active internal_ip].split("\t").each_with_index do |ip, index| %>
     server <%= index == 0 ? "master" : "node#{index}" %> <%= ip %>:<%= @node[:poolparty][:forwarding_port] %> weight 1 check cookie
     <% end %>

data/vendor/gems/suitcase/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 4
+:patch: 5

data/vendor/gems/suitcase/lib/suitcase/zipper.rb

@@ -30,15 +30,15 @@ module Suitcase
     def self.build_dir!(dirpath)
       ::FileUtils.mkdir_p dirpath unless ::File.directory? dirpath
       items.each do |name, path|
-        if name == :string
+        if name.to_s =~ /string/
           fpath = "#{dirpath}/#{path[:namespace]}/#{path[:name]}"
           ensure_location_exists(::File.dirname(fpath))
           ::File.open(fpath, "w+") do |tf|
             tf << path[:content]
           end
-        else
+        else          
           end_path = "#{dirpath}/#{name}"
-          ::FileUtils.mkdir_p ::File.dirname(end_path) unless ::File.directory? ::File.dirname(end_path) unless name == ::File.basename(name)
+          ::FileUtils.mkdir_p ::File.dirname(end_path) unless ::File.directory? ::File.dirname(end_path) unless name == ::File.basename(name)          
           ::FileUtils.cp path, end_path
         end
       end
@@ -112,7 +112,7 @@ module Suitcase
     end
     
     def self.add_content_as(content="", filename="", namespace="files")
-      items.merge!({:string => {:name => ::File.basename(filename), :content => content, :namespace => namespace}})
+      items.merge!({"string_#{filename}_#{namespace}".to_sym => {:name => ::File.basename(filename), :content => content, :namespace => namespace}})
     end
 
   end

data/vendor/gems/suitcase/suitcase.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{suitcase}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ari Lerner"]
-  s.date = %q{2009-04-14}
+  s.date = %q{2009-04-16}
   s.email = %q{arilerner@mac.com}
   s.extra_rdoc_files = ["README.rdoc", "LICENSE"]
   s.files = ["README.rdoc", "VERSION.yml", "lib/suitcase", "lib/suitcase/unzipper.rb", "lib/suitcase/zipper.rb", "lib/suitcase.rb", "test/suitcase_test.rb", "test/test_dir", "test/test_dir/box.rb", "test/test_dir/test.txt", "test/test_helper.rb", "LICENSE"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auser-poolparty
 version: !ruby/object:Gem::Version 
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors: 
 - Ari Lerner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-15 00:00:00 -07:00
+date: 2009-04-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -369,7 +369,8 @@ files:
 - lib/poolparty/net/remoter_bases/ec2/ec2_response_object.rb
 - lib/poolparty/plugins
 - lib/poolparty/plugins/chef.rb
-- lib/poolparty/plugins/deploydirectory.rb
+- lib/poolparty/plugins/deploy_directory.rb
+- lib/poolparty/plugins/gem_package.rb
 - lib/poolparty/plugins/git.rb
 - lib/poolparty/plugins/line_in_file.rb
 - lib/poolparty/plugins/rsyncmirror.rb
@@ -414,7 +415,6 @@ files:
 - lib/poolparty/schema.rb
 - lib/poolparty/services
 - lib/poolparty/services/conditional.rb
-- lib/poolparty/services/gem_package.rb
 - lib/poolparty/spec
 - lib/poolparty/spec/core
 - lib/poolparty/spec/core/string.rb

data/lib/poolparty/services/gem_package.rb

@@ -1,52 +0,0 @@
-module PoolParty    
-  # module Resources
-        
-    class Gempackage < Service
-      
-      # When we call gempackage, we want the exec to run on the directory we suggest
-      # we also only want it to run if there is NOT a local gem already installed with
-      # the package details (version and name)
-      # 
-      # TODO: Add it so that it tries to pull the gem off the master fileserver first...
-      def loaded(opts={})
-        if download_url
-                    
-          case_of "hostname"
-          when_is "master" do
-            has_exec(:name => "download-#{name}", :cwd => Default.remote_storage_path, :command => "wget #{download_url} -O #{name}.gem", :ifnot => "test -f #{Default.remote_storage_path}/#{name}.gem")
-          end
-          end_of
-          
-          has_file({
-            :name => "#{Default.remote_storage_path}/#{name}.gem", 
-            :source => "#{Base.fileserver_base}/#{name}.gem",
-            :requires => get_host("master")
-          })
-                    
-          has_exec(opts.merge({:name => "#{name}", :cwd =>"#{Default.remote_storage_path}"})) do
-            command "gem install --no-ri --no-rdoc #{Default.remote_storage_path}/#{name}.gem"
-            ifnot "gem list --local #{name} | grep #{name} #{"| grep #{version}" if version}"
-            requires get_file("#{Default.remote_storage_path}/#{name}.gem")
-          end
-          
-        else
-          has_exec(opts.merge({:name => "#{name}", :cwd => "/tmp", :path => "/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/var/lib/gems/1.8/bin"})) do
-            command "gem install --no-ri --no-rdoc #{"--version #{version}" if version} #{"--source #{source}" if source} #{name}"
-            ifnot "gem list --local #{name} | grep #{name} #{"| grep #{version}" if version}"
-          end
-        end
-      end
-      def virtual_resource?
-        true
-      end
-      def printable?
-        true
-      end
-      def class_type_name
-        "Exec"
-      end
-      
-    end
-    
-  # end
-end