auser-poolparty 1.2.7 → 1.2.8

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

@@ -51,8 +51,13 @@ module PoolParty
         :keypair_name =>nil
         })
         
-      def ami
-        image_id
+      # alias to image_id
+      def ami(n=nil)
+        if n.nil?
+          image_id
+        else
+          image_id n
+        end
       end
       
       # Requires a hash of options

data/lib/poolparty/net/remoter_bases/ec2/ec2_remote_instance.rb

@@ -1,3 +1,4 @@
+require "#{::File.dirname(__FILE__)}/ec2"
 module PoolParty  
   module Remote
     class Ec2RemoteInstance < RemoteInstance

data/lib/poolparty/net/remoter_bases/ec2/ec2_response_object.rb

@@ -1,7 +1,7 @@
 # Convenience class to convert standard amazon-ec2 responses from their camel cased style to a hash using underscore style.
 # For example: instanceId to instance_id
 class EC2ResponseObject
-  def self.get_descriptions(resp)      
+  def self.get_descriptions(resp)          
     rs = get_instance_from_response(resp)
     group = get_group_from_response(resp)
     
@@ -58,7 +58,7 @@ class EC2ResponseObject
         :ip => resp.dnsName || "not-assigned",
         :internal_ip => resp.privateDnsName,
         :launching_time => resp.launchTime.parse_datetime,
-        :keypair => resp.keyName,
+        :keypair => (resp.keyName rescue ""),
         :security_group => group
       }        
   end

data/lib/poolparty/net/remoter_bases/metavirt/metavirt.rb

@@ -20,19 +20,22 @@ module PoolParty
         :keypair_path    => nil,
         :authorized_keys => nil,
         :remoter_base    => :vmrun,
-        :remote_base     => nil,
         :server_config   => {}
         )
-        
-      def initialize(opts={}, &block)
+      
+      def initialize(o={}, &block)
+        using o[:remoter_base], o.delete(:remote_base) if o.has_key?(:remoter_base)
         super
-        # self.keypair_name = keypair.basename
-        # # try and generate the public_key if needed
-        # if self.authorized_keys.nil?
-        #  self.authorized_keys = keypair.public_key  rescue nil
-        # end
       end
       
+      def remote_base(n=nil)
+        if n.nil?
+          @remote_base
+        else
+          @remote_base = n
+        end
+      end
+        
       def server
         if @server
           @server
@@ -46,21 +49,13 @@ module PoolParty
         end
       end
       
-      def remoter_base_options
-        dsl_options[:remoter_base_options] = remote_base.dsl_options.choose do |k,v|
-          v && (v.respond_to?(:empty) ? !v.empty?: true)
-        end
-      end
-      
       def self.launch_new_instance!(o={})
         new_instance(o).launch_new_instance!
       end
       def launch_new_instance!(o={})
-        opts =dsl_options.merge(:remoter_base_options=>remoter_base_options)
+        opts = to_hash.merge(o)
         result = JSON.parse(server['/run-instance'].put(opts.to_json)).symbolize_keys!
-        p result
         @id = result[:instance_id]
-        puts "\nid = #{@id}\n---"
         result
       end
       # Terminate an instance by id
@@ -68,27 +63,33 @@ module PoolParty
         new(nil, o).terminate_instance!
       end
       def terminate_instance!(o={})
-        puts "ID= #{id(o)}"
+        opts = to_hash.merge(o)
         raise "id or instance_id must be set before calling describe_instace" if !id(o)
         server["/instance/#{id(o)}"].delete
       end
 
       # Describe an instance's status, must pass :vmx_file in the options
       def self.describe_instance(o={})
-        new_instance(o).describe_instance
+        new(o).describe_instance
       end
       def describe_instance(o={})
+        opts = to_hash.merge(o)
         raise "id or instance_id must be set before calling describe_instace" if !id(o)
         server["/instance/#{id(o)}"].get.json_parse
       end
 
       def self.describe_instances(o={})
-        new_instance(o).describe_instances
+        new(o).describe_instances
       end
       def describe_instances(o={})
+        opts = to_hash.merge(o)
         JSON.parse( server["/instances/"].get ).collect{|i| i.symbolize_keys!}
       end
       
+      def to_hash
+        dsl_options.merge(:remote_base => remote_base.to_hash)
+      end
+      
       private
       def id(o={})
        @id = ( o[:id] || o[:instance_id] || @id || dsl_options[:id] || dsl_options[:instance_id] )

data/lib/poolparty/plugins/apache2/apache.rb

@@ -278,17 +278,37 @@ eof
 
     def loaded(opts={}, prnt=nil)
       enable_passenger
-      
       port "80" unless self.port
       
-      appended_path "current" if opts[:with_deployment_directories]
+      has_directory(:name => dir,                   :owner => www_user, :mode => '0744')
+      has_directory(:name => "#{site_directory}",      :owner => www_user, :mode => '0744')
+      has_directory(:name => "#{site_directory}/logs", :owner => www_user, :mode => '0744')
+      if opts[:with_deployment_directories]
+        has_directory(:name => "#{site_directory}/shared", :owner => www_user, :mode=>'0744')
+        has_directory(:name => "#{site_directory}/shared/public", :owner => www_user, :mode=>'0744')
+        has_directory(:name => "#{site_directory}/shared/config", :owner => www_user, :mode=>'0744')
+        has_directory(:name => "#{site_directory}/shared/log", :owner => www_user, :mode=>'0744')
+        has_directory(:name => "#{site_directory}/releases", :owner => www_user, :mode=>'0744')
+        do_once do |variable|
+          # setup an initial symlink so apache will start even if there have not been any deploys yet
+          has_directory(:name => "#{site_directory}/releases/initial/public", :owner => www_user, :mode=>'0744')
+          #FIXME  the following line is chef specific.  It will fail with puppet
+          
+          # has_symlink(:target_file => "#{dir}/#{name}/current", :to => "#{dir}/#{name}/releases/initial")
+        end        
+        log_dir = "#{site_directory}/shared/log"
+        appended_path "current"
+      else
+        log_dir = "#{site_directory}/log"
+      end
+      
       passenger_entry <<-EOE
 <VirtualHost *:#{port}>
     ServerName #{name}
     DocumentRoot #{site_directory}/public
     RailsEnv #{enviornment}
-    ErrorLog #{site_directory}/log/error_log
-    CustomLog #{site_directory}/log/access_log common
+    ErrorLog #{log_dir}/error_log
+    CustomLog #{log_dir}/access_log common
 </VirtualHost>
       EOE
       

data/lib/poolparty/plugins/authorized_key.rb

@@ -0,0 +1,29 @@
+=begin rdoc
+  Authorized key
+  
+  Usage:
+    has_authorized_key  :for_user         => "username",
+                        :public_key_file  => "/Users/alerner/.ssh/id_rsa.pub"
+=end
+module PoolParty
+  class Base
+    plugin :authorized_key do
+      
+      default_options(
+        :for_user => "root",
+        :public_key_file => nil
+      )
+      
+      def loaded(o={}, &block)
+        has_directory "~#{for_user}/.ssh", :owner => for_user
+        has_file      "~#{for_user}/.ssh/authorized_keys", :content => ""
+        has_line_in_file(:line => public_key_content, :file => "~#{for_user}/.ssh/authorized_keys")
+      end
+      
+      def public_key_content
+        open(public_key_file).read
+      end
+      
+    end
+  end
+end

data/lib/poolparty/plugins/chef.rb

@@ -37,8 +37,8 @@ module PoolParty
       
       def recipe(file=nil, o={}, &block)
         if file
-          file = ::File.expand_path(file)
-          raise RecipeNotFoundError.new(file) unless ::File.file?(file)
+          file = search_in_known_locations(file)
+          raise RecipeNotFoundError.new(file) unless file
           
           ::FileUtils.mkdir_p "#{basedir}/recipes" unless ::File.directory?("#{basedir}/recipes")          
           ::FileUtils.rm "#{basedir}/recipes/default.rb" if ::File.file?("#{basedir}/recipes/default.rb")

data/lib/poolparty/plugins/deploy_directory.rb

@@ -32,14 +32,14 @@ This will place the contents of ~/path/to/my/site from your machine to /mnt/bob
       end
       
       def package_deploy_directory
-        ::Suitcase::Zipper.add("#{::File.expand_path(from)}", "user_directory/")
+        ::Suitcase::Zipper.add("#{from}", "user_directory/")
       end
       
       def add_unpack_directory
         has_directory(to)
         has_exec("unpack-#{::File.basename(to)}-deploy-directory",
           :requires => get_directory(to),
-          :command => "cp -R /var/poolparty/dr_configure/user_directory/#{name}/* #{to}")
+          :command => "cp -R /var/poolparty/dr_configure/user_directory/#{dir_name}/* #{to}")
         if owner
           has_exec(:name => "chown-#{name}", :command => "chown #{owner} -R #{to}")
         end     
@@ -53,6 +53,11 @@ This will place the contents of ~/path/to/my/site from your machine to /mnt/bob
         `cd #{from} && git pull`
       end
       
+      private
+      def dir_name
+        ::File.basename(from)
+      end
+      
     end
   end
 end

data/lib/poolparty/poolparty/cloud.rb

@@ -33,8 +33,7 @@ module PoolParty
         :maximum_instances    => 5,
         :ec2_dir              => ENV["EC2_HOME"],
         :minimum_runtime      => Default.minimum_runtime,
-        :dependency_resolver  => ChefResolver,
-        :remote_base          => nil,
+        # :dependency_resolver  => ChefResolver,
         :remoter_base         => Default.remoter_base,
         :keypair              => nil,
         :keypair_path         => nil,
@@ -128,6 +127,25 @@ module PoolParty
         setup_defaults
       end
       
+      # CALLBACKS
+      # To hook into the chain of processes that PoolParty uses
+      # when launching, bootstrapping, configuring tasks, call
+      # these methods in your clouds.rb.
+      # Example:
+      # 
+      #   after :bootstrap do
+      #     stuff
+      #   end
+      # 
+      # These store the blocks into the after/before_blocks on self
+      # and are called as appropriate at the runtime
+      def after time, &block 
+        (after_blocks[time.to_sym] ||= []) << block
+      end      
+      def before time, &block
+        (before_blocks[time.to_sym] ||= []) << block
+      end
+      
       # setup defaults for the cloud
       def setup_defaults
         set_vars_from_options(:keypair_name => key.basename, :keypair_path => key.full_filepath) rescue nil
@@ -135,8 +153,8 @@ module PoolParty
         dsl_options[:rules] = {:expand   => "#{dsl_options[:expand_when]}", 
                                :contract => dsl_options[:contract_when]}        
         
-        set_dependency_resolver 'chef'
-        using Default.remoter_base unless remote_base
+        dependency_resolver 'chef'
+        using Default.remoter_base unless @remote_base
       end
       
       def after_launch_instance(inst=nil)
@@ -256,30 +274,104 @@ module PoolParty
         true
       end
       
-      def to_json
-        to_properties_hash.reject{|k,v| k == :remote_base }.to_json
+      def to_hash
+        hsh = to_properties_hash
+        hsh[:options].merge!({:remote_base => remote_base.to_hash})  
+        # hsh.reject{|k,v| k == :remote_base || k == :cloud}
+        hsh
+      end
+      
+      def to_h
+        to_hash
       end
       
       # TODO: test
       # ruby -rrubygems -e 'require "poolparty";puts Cloud.load_from_json(open("/etc/poolparty/clouds.json").read).minimum_instances'      
-      def self.load_from_json(str)
-        parsed = JSON.parse(str).each {|k,v| dsl_options[k.to_sym] = v}
-        opts= parsed.options
+      def self.load_from_json(str, o={})
+        if ::File.file?(str)
+          str = open(str).read
+        end
+        parsed = JSON.parse(str).symbolize_keys!
+        opts = parsed.options
         opts["keypair"] = opts["keypair_path"] = opts["keypair_name"]
-        # cld.remoter_base = PoolParty::Remote.module_eval( schema.options.remoter_base.camelcase )
-        # opts.remoter_base_class = PoolParty::Remote.module_eval( opts.remoter_base.camelcase )
-        # opts.remoter_base_class.new opts.remote_base
-        opts["dependency_resolver"] = options.dependency_resolver.send(:new, opts)
+
         cld = Cloud.new opts.cloud_name.to_sym
-        cld.dsl_options.merge opts
-        cld.using opts.remoter_base.to_sym
-        cld.dsl_options.symbolize_keys!
+        cld.dsl_options.merge! opts
+        cld.using opts.remoter_base.to_sym, opts.remote_base
+        cld.dependency_resolver opts[:dependency_resolver]
+        
+        #TODO: will never run
+        unless true || o[:full_stack]
+          context_stack.push cld
+          cld.ordered_resources = parsed.resources.map do |r|
+            case typ = r.delete(:pp_type)
+            when "plugin"
+              # This may become a problem on the server where the plugins
+              # cannot be found. TODO: Fix?!? How? Uh... fake plugin maybe?            
+              cld.send(r[:name].gsub(/_class/, '').to_sym) do              
+                set_vars_from_options(r)
+              end            
+            else
+              cld.send("has_#{typ}".to_sym, r)
+            end
+            context_stack.pop
+          end
+        else
+          cld.ordered_resources = parsed.resources
+        end
         cld
       end
       
+      def remote_base(n=nil)
+        if n.nil?
+          @remote_base
+        else
+          @remote_base = n
+        end
+      end
+      
       def tmp_path
         Default.tmp_path / pool.name / name
       end
+            
+      # Reset the entire cloud
+      def reset!
+        reset_remoter_base!
+        @build_manifest = @describe_instances = @remote_instances_list = nil
+      end
+      
+      # Call before and after configure callbacks
+      # on the cloud.
+      # These are called from the dynamically defined callback method
+      #   call_before/after_configure/bootstrap_callbacks
+      # from within callbacks.rb
+      # If there is a callback block defined for the specific runtime
+      # method being called, then the appropriate callback blocks
+      # will be accessed and called from within the before/after_ callback
+      def before_bootstrap
+        before_blocks[:bootstrap].each {|b| b.call(self) } if before_blocks.has_key?(:bootstrap)
+      end
+      def after_bootstrap
+        after_blocks[:bootstrap].each {|b| b.call(self) } if after_blocks.has_key?(:bootstrap)
+      end
+      def before_configure
+        before_blocks[:configure].each {|b| b.call(self) } if before_blocks.has_key?(:configure)
+      end
+      def after_configure
+        after_blocks[:configure].each {|b| b.call(self) } if after_blocks.has_key?(:configure)
+      end
+      
+      private
+      
+      # Storage for the after and before callback blocks
+      # when calling the callbacks in the cloud. They are stored as hashes with
+      # and are filled with arrays of blocks during load-time
+      def after_blocks
+        @after_blocks ||= {}
+      end
+      def before_blocks
+        @before_blocks ||= {}
+      end
       
       def pool
         parent && parent.is_a?(Pool) ? parent : self
@@ -294,14 +386,9 @@ module PoolParty
       def add_poolparty_base_requirements
         # poolparty_base_heartbeat
         poolparty_base_ruby
-        poolparty_base_packages        
+        poolparty_base_packages
       end
-      
-      # Reset the entire cloud
-      def reset!
-        reset_remoter_base!
-        @build_manifest = @describe_instances = @remote_instances_list = nil
-      end            
+                
     end
   end 
 end

data/lib/poolparty/poolparty/plugin_model.rb

@@ -37,6 +37,7 @@ module PoolParty
         EOM
 
         PoolParty::Cloud::Cloud.class_eval meth
+        PoolParty::Service.add_has_and_does_not_have_methods_for(lowercase_class_name.to_sym)
       end
       
     end

data/lib/poolparty/poolparty/poolparty_base_class.rb

@@ -13,13 +13,17 @@ module PoolParty
     $context_stack ||= []
   end
   
-  class PoolPartyBaseClass
+  class PoolPartyBaseClass          
     attr_reader :init_opts
     
     include Parenting, Dslify
     
     include PoolParty::DependencyResolverCloudExtensions
-    # attr_accessor :depth    
+    include PoolParty::SearchablePaths
+    
+    # attr_accessor :depth
+    has_searchable_paths
+    
     default_options Default.dsl_options
 
     def initialize(opts={}, extra_opts={}, &block)
@@ -49,6 +53,10 @@ module PoolParty
         loaded(o, &block)
       end
     end
+
+    def search_in_known_locations(filepath, additional_search_paths=[])
+      find_file(filepath, [::File.dirname(pool_specfile)])
+    end    
     
     # Add the parent's options to my own and add myself as a service if I am not a resource
     def add_to_parent_if_parent_exists_and_is_a_service      
@@ -73,7 +81,20 @@ module PoolParty
       # services.merge!({lowercase_class_name.to_sym => serv})
     end
     # Container for the services
+
+    def inspect
+      to_properties_hash.inspect
+    end
     
+    def to_hash
+      to_properties_hash
+    end
+          
+    def to_json
+      to_hash.to_json
+      # JSON.generate(to_hash)
+    end
+
     def resources
       @resources ||= OrderedHash.new
     end
@@ -141,7 +162,8 @@ module PoolParty
     
     def ordered_resources
       @ordered_resources ||= []
-    end
+    end    
+    attr_writer :ordered_resources
     
     def is_plugin?
       false

data/lib/poolparty/poolparty/resource.rb

@@ -8,18 +8,13 @@
 =end
 module PoolParty
   module Resources
-
     
     def custom_file(path, str)
       write_to_file_in_storage_directory(path, str)
     end
     
     class Resource < PoolParty::PoolPartyBaseClass
-      include JSON
-      attr_accessor :prestring, :poststring
-      
-      # include CloudResourcer
-      
+            
       # For the time being, we'll make puppet the only available dependency resolution
       # base, but in the future, we can rip this out and make it an option
       # include PoolParty::DependencyResolutions::Puppet

data/lib/poolparty/provision/boot_strapper.rb

@@ -23,6 +23,9 @@ module PoolParty
                           net-scp
                           net-ssh-gateway
                           highline
+                          flexmock
+                          lockfile
+                          rubigen
                           json
                           activesupport
                           grempe-amazon-ec2
@@ -34,6 +37,7 @@ module PoolParty
                           thin
                           logging
                           ruby2ruby
+                          extlib
                         )
       end
 
@@ -127,7 +131,7 @@ module PoolParty
       def default_commands
         pack_the_dependencies
         ::FileUtils.rm_rf "#{cloud.tmp_path}/dependencies/gems/cache"
-        rsync "#{cloud.tmp_path}/dependencies", '/var/poolparty'
+        rsync "#{cloud.tmp_path}/dependencies", '/var/poolparty', ['-v', '-a', '--delete']
         
         commands << [
           "mkdir -p /etc/poolparty",

data/lib/poolparty/resources/directory.rb

@@ -30,7 +30,7 @@ The above example will place the contents of '/local/path' at '/path/on/server/n
       
       default_options({
         :recursive => true,
-        :mode => 0644
+        :mode => "0644"
       })
       
       def present

data/lib/poolparty/resources/symlink.rb

@@ -9,7 +9,7 @@ The symlink resource sets a symlink
 
 == Usage
 
-  has_symlink(:key => '...') do
+  has_symlink(:name => 'target', :source=>'/where/to' ) do
     # More options. 
     # This block is optional
   end
@@ -21,11 +21,18 @@ The symlink resource sets a symlink
 
 == Examples
 
+puppet style:
   has_symlink(:name => "/var/www/poolpartyrb.com/public", :source => "/var/www/poolpartyrb.com/poolparty-website/site")
+chef style:
+  has_symlink(:to => "/var/www/poolpartyrb.com/public", :target_file => "/var/www/poolpartyrb.com/poolparty-website/site")
 =end
     class Symlink < Resource
       
-      dsl_methods :source
+      dsl_methods :source,
+                  :to,
+                  :target_file
+                  
+      default_options :link_type => :symbolic
       
       def present
         :create

data/lib/poolparty/resources/user.rb

@@ -5,13 +5,28 @@ module PoolParty
       
       dsl_methods :name,        # Name of the user
                   :password,    # Password for the user
-                  :home         # Home directory
+                  :home,         # Home directory
+                  :authorized_keys
                   
                   
       default_options({
         :shell => "/bin/sh"
       })
       
+      def after_create
+        if authorized_keys
+          cloud.has_file :name=>"/home/#{name}/.ssh/authorized_keys", :content => authorized_keys
+        end
+      end
+      
+      def present
+        :create
+      end
+
+      def absent
+        :remove
+      end
+      
     end
     
   end

data/lib/poolparty/schema.rb

@@ -17,7 +17,6 @@ module PoolParty
         JSON.parse(h).each {|k,v| self[k.to_sym] = v}
       end
     end
-    
 
     def [](k)
       hsh[k]
@@ -28,7 +27,7 @@ module PoolParty
         hsh[k.to_sym] = self.class.new(v)
       else
         hsh[k.to_sym] = v
-      end      
+      end
     end
 
     def to_hash
@@ -51,14 +50,14 @@ module PoolParty
     
     def to_cloud(node={})
       require "ostruct"
-      
+
       $pool_specfile = "/etc/poolparty/clouds.rb"
       
       # TODO: Seriously, make this sexier      
       cld = OpenStruct.new(options)
       cld.keypair = ::PoolParty::Key.new("/etc/poolparty/#{node[:keypair]}")
       # cld.remoter_base = PoolParty::Remote.module_eval( schema.options.remoter_base.camelcase )
-      cld.remote_base = PoolParty::Remote.module_eval( schema.options.remoter_base.camelcase )
+      cld.remote_base = PoolParty::Remote.module_eval( self.options.remoter_base.camelcase )
       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)
 

data/lib/poolparty/templates/haproxy.conf

@@ -34,5 +34,5 @@ listen PoolParty-site-<%= @node[:poolparty][:haproxy_name] %>
   bind          0.0.0.0:<%= @node[:poolparty][:ports_haproxy].join(",0.0.0.0:") %>
   cookie        POOLPARTY
 <% %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
+  server        <%= index == 0 ? "master" : "node#{index}" %> <% ip %>:<% @node[:poolparty][:forwarding_port] %> weight 1 check cookie
 <% end %>

data/lib/poolparty.rb

@@ -2,7 +2,7 @@ $LOAD_PATH<< File.dirname(__FILE__)
 # Load required gems
 #TODO: remove activesupport
 @required_software = Array.new
-%w(rubygems activesupport ftools logging resolv ruby2ruby digest/sha2 json pp).each do |lib|
+%w(rubygems activesupport ftools logging resolv digest/sha2 json pp).each do |lib|
   begin
     require lib
   rescue Exception => e