auser-poolparty 0.2.60 → 0.2.61

data/lib/poolparty/modules/method_missing_sugar.rb

@@ -16,7 +16,7 @@ module PoolParty
     # See get_from_options for more information
     def method_missing(m, *args, &block)
       if block_given?
-        (args[0].class == self.class) ? args[0].instance_eval(&block) : super
+        (args[0].class == self.class) ? args[0].run_in_context(&block) : super
       else        
         get_from_options(m, *args, &block)
       end

data/lib/poolparty/net/remote.rb

@@ -7,9 +7,11 @@ module PoolParty
     include PoolParty::Remote::Remoter
     
     def using(t)
+      @cloud = self
       if available_bases.include?(t.to_sym)
         unless using_remoter? || t.nil?
           self.class.send :attr_reader, :remote_base
+          self.class.send :attr_reader, :parent_cloud
           mod = "#{t}".preserved_module_constant
           
           # mod.send :include, PoolParty::Remote::RemoterBase
@@ -17,6 +19,7 @@ module PoolParty
           self.extend mod
           
           @remote_base = "#{t}".preserved_module_constant
+          @parent_cloud = @cloud
         end
       else
         puts "Unknown remote base" 

data/lib/poolparty/net/remote_bases/ec2.rb

@@ -11,6 +11,8 @@ begin
   end
   module PoolParty
     module Ec2
+      include PoolParty::Remote::RemoterBase
+      
       def launch_new_instance!(num=1)
         instance = ec2.run_instances(
           :image_id => (ami || Base.ami),
@@ -40,13 +42,13 @@ begin
         @id = 0
         get_instances_description.each_with_index do |h,i|
           if h[:status] == "running"
-            @name = @id == 0 ? "master" : "node#{@id}"
+            inst_name = @id == 0 ? "master" : "node#{@id}"
             @id += 1
           else
-            @name = "#{h[:status]}_node#{i}"
+            inst_name = "#{h[:status]}_node#{i}"
           end
           h.merge!({
-            :name => @name,
+            :name => inst_name,
             :hostname => h[:ip],
             :ip => h[:ip].convert_from_ec2_to_ip,
             :index => i,
@@ -160,6 +162,7 @@ begin
           :ip => resp.dnsName || "not-assigned",
           :status => resp.instanceState.name,
           :launching_time => resp.launchTime.parse_datetime,
+          :internal_ip => resp.privateDnsName,
           :keypair => resp.keyName
         }        
       rescue Exception => e

data/lib/poolparty/net/remote_instance.rb

@@ -7,11 +7,13 @@ module PoolParty
       include Remote
       include Configurable
       include CloudResourcer
-            
-      def initialize(opts, parent=self)
-        @parent = parent
+      
+      def initialize(opts, parent=nil)        
+        run_setup(parent)
+                
         set_vars_from_options(parent.options) if parent && parent.respond_to?(:options)
         set_vars_from_options(opts) unless opts.nil? || opts.empty?
+        
         on_init
       end
       
@@ -77,6 +79,10 @@ module PoolParty
       def self.puppet_rerun_commad
         puppet_runner_command
       end
+      def hosts_file_listing_for(cl)
+        string = (cl.name == parent.name) ? "#{name}.#{parent.name}\t#{name}" : "#{name}.#{parent.name}"
+        "#{internal_ip}\t#{string}"
+      end
     end
     
   end  

data/lib/poolparty/net/remoter.rb

@@ -40,30 +40,6 @@ module PoolParty
       def remote_rsync_command
         "rsync -azP --exclude cache -e '#{remote_ssh_string}'"
       end
-      # Open the cached local copy of the instances list and 
-      # create a new RemoteInstance from each line
-      def list_from_local
-        list_file = get_working_listing_file
-        if list_file
-          out = returning Array.new do |instances|
-            open(list_file).read.split("\n").each do |line|
-              instances << RemoteInstance.new(line)
-            end
-          end
-        else
-          out = list_from_remote(:cache => true)
-        end
-        return out
-      end      
-      # List the instances that are known from the remoter_base
-      # Create a RemoteInstance for each of the instances from the hash
-      # returned by the list of instances, write them to the cached file
-      # and then return the array of instances
-      def list_from_remote(options={})
-        out_array = get_remote_nodes
-        write_to_file( local_instances_list_file_locations.first, out_array.map{|a| a.to_s }.join("\n")) if options[:cache]
-        out_array
-      end
       # Get the names of the nodes. Mainly used for puppet templating
       def list_of_node_names(options={})
         list_of_running_instances.collect {|ri| ri.name }
@@ -72,13 +48,7 @@ module PoolParty
       def list_of_node_ips(options={})
         list_of_running_instances.collect {|ri| ri.ip }
       end
-      def get_remote_nodes
-        returning Array.new do |instances|
-          list_of_instances(respond_to?(:keypair) ? keypair : nil).each do |h|
-            instances << PoolParty::Remote::RemoteInstance.new(h)
-          end
-        end
-      end
+
       # Get the instance first instance file that exists on the system from the expected places
       # denoted in the local_instances_list_file_locations
       def get_working_listing_file
@@ -210,15 +180,16 @@ module PoolParty
         logger.debug "Launching master"
         request_launch_master_instance if list_of_pending_instances.size.zero? && can_start_a_new_instance? && !is_master_running?
         reset!
-        
+        vputs ""
         vputs "Waiting for there to be no pending instances..."
         when_no_pending_instances do
           wait "20.seconds"
           vputs ""
           vputs "Provisioning master..."
-          hide_output { Provisioner.provision_master(self, testing) }
-          PoolParty::Provisioner.clear_master_ssl_certs(self)
-          PoolParty::Provisioner.reconfigure_master(self, testing)
+          
+          verbose ? Provisioner.provision_master(self, testing) : hide_output { Provisioner.provision_master(self, testing) }
+          verbose ? Provisioner.clear_master_ssl_certs(self, testing) : hide_output { Provisioner.clear_master_ssl_certs(self, testing) }
+          
           after_launched
         end        
       end
@@ -258,7 +229,7 @@ module PoolParty
       def contract_cloud_if_necessary(force=false)
         if can_shutdown_an_instance?          
           if should_contract_cloud?(force)
-            logger.debug "Shrinking the cloud by 1"
+            vputs "Shrinking the cloud by 1"
             before_shutdown
             request_termination_of_non_master_instance
           end
@@ -279,9 +250,7 @@ module PoolParty
       
       # Rsync command to the instance
       def rsync_storage_files_to(instance=nil)
-        hide_output do
-          Kernel.system "#{rsync_storage_files_to_command(instance)}" if instance
-        end
+        hide_output {Kernel.system "#{rsync_storage_files_to_command(instance)}" if instance}
       end
       # Take the rsync command and execute it on the system
       # if there is an instance given

data/lib/poolparty/net/remoter_base.rb

@@ -71,7 +71,9 @@ module PoolParty
         list.select {|i| i.name == name }.first
       end
       def remote_instances_list
-        list_of_instances.map {|i| PoolParty::Remote::RemoteInstance.new(i, self) }
+        # puts "> #{@containing_cloud.name} - #{@containing_cloud.class}"
+        @containing_cloud = self
+        @remote_instances_list ||= list_of_instances(keypair).collect {|h| PoolParty::Remote::RemoteInstance.new(h, @containing_cloud) }
       end
       # List the instances for the current key pair, regardless of their states
       # If no keypair is passed, select them all
@@ -79,7 +81,7 @@ module PoolParty
         key = keyp ? keyp : keypair
         unless @describe_instances
           tmpInstanceList = describe_instances.select {|a| key ? a[:keypair] == key : true }
-          has_master = !tmpInstanceList.select {|a| a[:name] == "master" }.empty?
+          has_master = !tmpInstanceList.select {|a| a[:name] == "master" }.empty?          
           if has_master
             @describe_instances = tmpInstanceList
           else
@@ -103,13 +105,6 @@ module PoolParty
       def select_from_instances_on_status(status=/running/, list=[])
         list.select {|a| a[:status] =~ status}
       end
-      # Instances
-      # Get the master from the cloud
-      def master
-        # remote_instances_list.select {|a| a.master }.first
-        @list = list_from_remote
-        @list.reject {|a| a unless a.name =~ /master/ }.first if @list.class != String
-      end
       # Helpers
       def create_keypair
       end

data/lib/poolparty/pool/base.rb

@@ -10,7 +10,6 @@ module PoolParty
     extend MethodMissingSugar
     
     default_options({
-      :environment => "production",
       :user => "root", # This should change here
       :base_keypair_path => "#{ENV["HOME"]}/.ec2",
       :tmp_path => "/tmp/poolparty",
@@ -25,9 +24,11 @@ module PoolParty
       :default_project_specfile_name => "spec/pool.spec",
       :port => "80",
       :forwarding_port => "8080",
-      :proxy_mode => "http",      
+      :proxy_mode => "http",
       # EC2 Options
-      :ami => "ami-1cd73375" 
+      :ami => "ami-1cd73375",
+      # Options that should not be touched pretty much ever
+      :manifest_path => "/etc/puppet/manifests"
     })
         
     # Class methods

data/lib/poolparty/pool/cloud.rb

@@ -3,8 +3,8 @@ require File.dirname(__FILE__) + "/resource"
 
 module PoolParty    
   module Cloud
-    def cloud(name=:app, &block)
-      clouds.has_key?(name) ? clouds[name] : (clouds[name] = Cloud.new(name, self, &block))
+    def cloud(name=:app, parent=self, &block)
+      clouds.has_key?(name) ? clouds[name] : (clouds[name] = Cloud.new(name, parent, &block))
     end
 
     def clouds
@@ -14,7 +14,7 @@ module PoolParty
     def with_cloud(cl, opts={}, &block)
       raise CloudNotFoundException.new("Cloud not found") unless cl
       cl.options.merge!(opts) if opts
-      cl.instance_eval &block if block
+      cl.run_in_context &block if block
     end
     
     class Cloud
@@ -25,8 +25,7 @@ module PoolParty
       include Configurable
       include CloudResourcer
       # extend CloudResourcer
-      # Net methods
-      include PoolParty::Remote::RemoterBase
+      # Net methods      
       include Remote
       include PoolParty::CloudDsl
       
@@ -43,15 +42,17 @@ module PoolParty
         :polling_time => "30.seconds"
       })
       
-      def initialize(name, parent, &block)
-        @name = name
+      def initialize(name, parent=self, &block)
+        @cloud_name = @name = name
         
+        setup_defaults
         plugin_directory "#{::Dir.pwd}/plugins"
         
-        set_parent(parent) if parent
-        self.instance_eval &block if block
+        p = parent if parent.is_a?(PoolParty::Pool::Pool)        
+        run_setup(p, &block)
         
-        setup_defaults
+        # set_parent(parent) if parent && !@parent
+        # self.run_in_context parent, &block if block        
       end
       
       def setup_defaults
@@ -126,7 +127,6 @@ module PoolParty
         @build_manifest ||= build_from_existing_file
         unless @build_manifest
           
-          # reset_resources!
           add_poolparty_base_requirements
           
           @build_manifest = "class poolparty {\n #{build_short_manifest}\n}"
@@ -177,23 +177,19 @@ module PoolParty
       # Also note that there is no block associated. This is because we have written
       # all that is necessary in a method called enable
       # which is called when there is no block
-      def add_poolparty_base_requirements
+      def add_poolparty_base_requirements        
         heartbeat
         haproxy
         ruby
-        poolparty
-      end
-      
-      def provisioning?
-        @provisioning_in_progress == true
+        poolparty_base_packages
       end
       
-      def provisioning_in_progress
-        @provisioning_in_progress = true
-      end
-      
-      def provisioning_complete
-        @provisioning_in_progress = false
+      def other_clouds
+        returning Array.new do |arr|
+          clouds.each do |name, cl|
+            arr << cl if name != self.name
+          end
+        end
       end
       
       def reset!

data/lib/poolparty/pool/plugin.rb

@@ -7,43 +7,19 @@ module PoolParty
       include CloudResourcer
       include Resources
       
-      attr_accessor :parent
       class_inheritable_accessor :name
       
       default_options({})
       
-      def initialize(parent=self, opts={}, &block)
-        set_parent(parent)
-        block ? instance_eval(&block) : enable
+      def initialize(p=self, opts={}, &block)        
+        run_setup(p, &block)
+        enable unless block
       end
       
       # Overwrite this method
       def enable
       end
       
-      # Call the cloud from within the plugin
-      def cloud
-        @p = parent
-        while !@p.is_a?(PoolParty::Cloud)
-          @p = @p.parent
-        end
-        @p
-      end
-            
-      # def method_missing(m, *args, &block)
-      #   if block_given?
-      #     (args[0].class == self.class) ? args[0].instance_eval(&block) : super
-      #   elsif parent && parent.respond_to?(m)
-      #     parent.send m, *args, &block
-      #   else
-      #     get_from_options(m, *args)
-      #   end
-      # end
-      # 
-      # def get_from_options(m, *args)
-      #   args.empty? ? options[m] : options[m] = args[0]
-      # end
-      
     end
     
   end

data/lib/poolparty/pool/plugin_model.rb

@@ -14,28 +14,26 @@ module PoolParty
     
     class PluginModel      
       attr_accessor :name, :klass
-      attr_reader :parent
       include MethodMissingSugar
       include Configurable
       include PrettyPrinter      
       
       def initialize(name,cld,&block)
         @name = name
-        @parent = cld
+        # @parent = cld
         class_string_name = "#{name}"
         
         # Create the class to evaluate the plugin on the implemented call
         klass = class_string_name.class_constant(PoolParty::Plugin::Plugin)
-        klass.extend PoolParty::Resources
-        klass.send :include, PoolParty::Resources
-
-        # Create the block inside the instantiated plugin
-        klass.module_eval &block if block
+        mod = class_string_name.module_constant(&block)
+        
+        # klass.extend PoolParty::Resources
+        klass.send :include, mod
         
         # Store the name of the class for pretty printing later
         klass.name = name
         # Add the plugin definition to the cloud as an instance method
-        Cloud::Cloud.module_eval <<-EOE
+        Cloud::Cloud.class_eval <<-EOE
           def #{name}(parent=self, &block)
             @#{class_string_name.downcase} ||= #{class_string_name.class_constant}.new(parent, &block)
           end

data/lib/poolparty/pool/pool.rb

@@ -9,9 +9,10 @@ module PoolParty
       $pools ||= {}
     end
     
-    def with_pool(pool, opts={}, &block)
-      pool.options.merge!(opts)
-      pool.instance_eval &block if block
+    def with_pool(pl, opts={}, &block)
+      raise CloudNotFoundException.new("Pool not found") unless pl
+      pl.options.merge!(opts) if pl.options
+      pl.run_in_context &block if block
     end
         
     def reset!
@@ -37,7 +38,8 @@ module PoolParty
         setup_defaults
         
         @name = name
-        instance_eval &block if block
+        # run_in_context &block if block
+        run_setup(self, &block)
       end
       
       def setup_defaults
@@ -47,6 +49,15 @@ module PoolParty
       # This is where the entire process starts
       def inflate
       end
+      
+      def pool_clouds
+        @pool_clouds ||= returning Array.new do |arr|
+          clouds.each do |name, cl|
+            arr << cl if cl.parent.name == self.name
+          end
+        end
+      end
+      
     end
     
     # Helpers