auser-poolparty 1.2.8 → 1.2.9

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 2
-:patch: 8
+:patch: 9
 :major: 1

data/bin/cloud-list

@@ -17,21 +17,21 @@ EOS
 
   short_desc "show a list of the current instances on the clouds"
 
-  run do |command|    
+  run do |command|
     @loaded_clouds.each do |cld|
       if command[:instance_id]
         require 'pp'
-        pp result = cld.describe_instance(:instance_id=>command[:instance_id])
+        pp result = cld.nodes(:instance_id=>command[:instance_id])
       else
         puts "Listing cloud #{cld.name}"
         puts "Active instances"
         puts cld.nodes(:status => "running").map{|a| "#{a[:instance_id] || a[:id]}\t#{a[:ip] ||a[:public_ip] }" }.join("\n")
-
+        
         if cld.nodes(:status => "pending").size > 0
           puts "Pending instances"
           puts cld.nodes(:status => "pending").map{|a| "#{a[:instance_id] || a[:id]}\t#{a[:ip] ||a[:public_ip] }" }.join("\n")
         end
       end
-    end    
+    end
   end
 end

data/bin/cloud-provision

@@ -26,11 +26,13 @@ EOS
           address = cld.nodes[ command[:inst_num] ]
           ::PoolParty::Provision::BootStrapper.new( address[:ip], :cloud => cld )
           ::PoolParty::Provision::DrConfigure.new( address[:ip], :cloud => cld )
+          cld.call_after_provision_callbacks
         else
           cld.nodes(:status => "running").each do |address|
             cld.vputs "\nConfiguring: #{address[:ip]}\n--------------------"      
             ::PoolParty::Provision::BootStrapper.new( address[:ip], :cloud => cld )
             ::PoolParty::Provision::DrConfigure.new( address[:ip], :cloud => cld )
+            cld.call_after_provision_callbacks
           end
         end
       end

data/bin/cloud-ssh

@@ -21,7 +21,7 @@ EOS
     
     if !nodes.empty?
       n = command[:inst_num] ? command[:inst_num].to_i : 0
-      @cloud.ssh_into( nodes[n].ip ) if @cloud
+      @cloud.ssh_into( nodes[n].ip || nodes[n].public_ip ) if @cloud
     else
       puts "No running instances can be found"
     end

data/bin/install-poolparty

@@ -9,7 +9,7 @@ say("\nWhat remoter base would you like to use?")
 choose do |menu|
   menu.prompt = "> "
 
-  available_bases.each do |base|
+  PoolParty::Remote::RemoterBase.available_bases.each do |base|
     menu.choice base.to_sym do 
       
       say "Great, we'll be using #{base}"

data/examples/fairchild.rb

@@ -1,27 +1,36 @@
+require 'rubygems'
+$:.unshift "#{File.dirname(__FILE__)}/../lib"
+require "poolparty"
+
 # Basic pool spec
 # Shows global settings for the clouds
-pool :application do
+pool :party do
   instances 1..3
-  ami 'ami-7cfd1a15'  
+  image_id 'ami-7cfd1a15'
+  debugging true
   
-  cloud :example_one do
-    keypair 'front'
-    has_directory "/var/www"
-    
-    has_file "/etc/motd", 
-      :content => "Welcome to LARubyConf"
-    has_file :name => "/var/www/index.html" do
-      content "<h1>Welcome to your new poolparty instance</h1>"
-      mode 0644
-      owner "www-data"
+  access_key "XXXXXX"
+  secret_access_key "XXXXXXX"
+  
+  cloud :app do
+    keypair 'app'
+    using :ec2 do
+      image_id 'ami-7cfd1a15'
+      availability_zone 'us-east-1c'
     end
     
-    has_git_repo "paparazzi" do
-      source "git://github.com/auser/paparazzi.git"
-      at "/var/www"
-    end
+    has_file "/etc/motd", :content => "Welcome to LARubyConf"
+    # has_directory "/var/www"
+    # has_file :name => "/var/www/index.html" do
+    # content "<h1>Welcome to your new poolparty instance</h1>"
+    # mode 0644
+    # owner "www-data"
+    # end
     
-    apache
+    # has_git "paparazzi" do
+    #   source "git://github.com/auser/paparazzi.git"
+    #   dir "/var/www"
+    # end
     
   end
 

data/examples/metavirt_cloud.rb

@@ -5,17 +5,15 @@ require "poolparty"
 pool :multiverse do
   
   cloud :vv do
-    keypair "front"
     instances 2
     has_file "/etc/motd", :content => "Welcome to your poolparty instance!"
     using :metavirt do
-      server_config({:host=>"172.16.68.1", :port=>3000})
+      server_config({:host=>"192.168.248.1", :port=>3000})
       authorized_keys 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCTppECfx7Tb0zoviRfqFaePyAek6+ZktKkHiTHu/jkhG1s4q1oHEe89no21xLxuReyJrDlNe8rLxxZzoYCaAWRdhcqMR3BNqb2w2jpF4pH+bFj0557KrwWP6HSNpRRkyYhxLqZbuH/2t3TzkPevZbcfSYa09jIzqnmTruh9l1s+n5E3cNr/RDdDn7tv3Ok7mKN7GEjkK7F83Pt9xviHevg22xqzm99nS+hg6Kl/fQUTO6pOmC5x+9V47RJz1+9WdhGJ7M83zijX9rMnAwrR5LFoL6aZyyU0G71SpoIL5e8XD/jt1WNKFJOfG8YMLb3i03UABm/Q5Q30+R7UoRxSWRX'
       using :vmrun do
         # vmx_files Dir[::File.expand_path("~/Documents/Virtual Machines.localized/metavirts/*/*.vmx")]
         vmx_files [
-          "/Users/mfairchild/Documents/Virtual\ Machines.localized/Ubuntu-jaunty.vmwarevm/Ubuntu-jaunty.vmx",
-          "/Users/mfairchild/Documents/Virtual\ Machines.localized/metavirts/Ubuntu32bitVM copy.vmwarevm/Ubuntu32bitVM.vmx"
+          "/Users/alerner/Documents/vm/Ubuntu32bitVM.vmwarevm/Ubuntu32bitVM.vmx"
           ]
       end
     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 digest/sha2 json pp).each do |lib|
+%w(rubygems fileutils resolv digest/sha2 json pp).each do |lib|
   begin
     require lib
   rescue Exception => e
@@ -75,7 +75,7 @@ $_poolparty_load_directories = [
   "dependency_resolver",
   "aska.rb",
   "config",
-  "monitors/monitor_rack",
+  "monitors/monitor_rack.rb",
   "capistrano.rb",
   'provisioners/provisioner_base.rb',
   'provisioners/capistrano/capistrano.rb',
@@ -132,14 +132,9 @@ class Object
   include PoolParty
   include PoolParty::Pool
   include PoolParty::Cloud
-  
   include PoolParty::DefinableResource
 end
 
-class Class
-  include PoolParty::PluginModel
-end
-
 ## Load PoolParty Plugins and package
 module PoolParty
   %w(plugins base_packages).each do |dir|

data/lib/poolparty/core/array.rb

@@ -34,7 +34,7 @@ class Array
   def select_with_hash(conditions={})
     return self if conditions.empty?
     select do |node|
-      conditions.any? do |k,v| 
+      conditions.any? do |k,v|
         ( node.has_key?(k) && node[k]==v ) or ( node.respond_to?(k) && node.send(k)==v )
       end
     end

data/lib/poolparty/core/exception.rb

@@ -2,7 +2,7 @@
   Exception overloads
 =end
 class Exception
-  alias nice_message to_str
+  alias :nice_message :to_s
   # Gives us a nice_message for exceptions
   def nice_message(padding="")
     "#{padding}#{message}\n#{padding}"# + backtrace.join("\n#{padding}")

data/lib/poolparty/core/hash.rb

@@ -97,17 +97,24 @@ class Hash
     self
   end
   
-  def symbolize_keys
-    dup.stringify_keys!
+  def symbolize_keys(key_modifier=nil)
+    dup.symbolize_keys!(key_modifier)
   end
   
   # Converts all of the keys to strings
-  def symbolize_keys!
+  # can pass in a :key_modifier that will be sent to each key, before being symbolized.
+  # This can be usefull if you want to downcase, or snake_case each key.
+  # >> {'Placement' => {'AvailabilityZone'=>"us-east-1a"} }.symbolize_keys(:snake_case)
+  # => {:placement=>{:availability_zone=>"us-east-1a"}}  
+  def symbolize_keys!(key_modifier=nil) 
     keys.each{|k| 
       v = delete(k)
+      if key_modifier && k.respond_to?(key_modifier)
+        k = k.send(key_modifier)
+      end
       self[k.to_sym] = v
-      v.symbolize_keys! if v.is_a?(Hash)
-      v.each{|p| p.symbolize_keys! if p.is_a?(Hash)} if v.is_a?(Array)
+      v.symbolize_keys!(key_modifier) if v.is_a?(Hash)
+      v.each{|p| p.symbolize_keys!(key_modifier) if p.is_a?(Hash)} if v.is_a?(Array)
     }
     self
   end

data/lib/poolparty/core/integer.rb

@@ -0,0 +1,11 @@
+class Integer
+  def months
+    PoolParty::Duration.new(self * 30.days, [[:months, self]])
+  end
+  alias :month :months
+
+  def years
+    PoolParty::Duration.new(self * 365.25.days, [[:years, self]])
+  end
+  alias :year :years
+end

data/lib/poolparty/core/object.rb

@@ -106,4 +106,18 @@ class Object
   def unix_hide_string
     "2>&1 > /dev/null"
   end
+
+  # Get object's meta (ghost, eigenclass, singleton) class
+  # from activesupport
+  def metaclass
+    class << self
+      self
+    end
+  end
+
+  # If class_eval is called on an object, add those methods to its metaclass
+  # from activesupport
+  def class_eval(*args, &block)
+    metaclass.class_eval(*args, &block)
+  end
 end

data/lib/poolparty/core/string.rb

@@ -60,7 +60,7 @@ class String
   # Refactor this guy to get the class if the class is defined, and not always create a new one
   # although, it doesn't really matter as ruby will just reopen the class
   def class_constant(superclass=nil, opts={}, &block)
-    symc = ((opts && opts[:preserve]) ? ("#{self.camelcase}Class") : "PoolParty#{self.camelcase}Class").classify
+    symc = ((opts && opts[:preserve]) ? ("#{self.camelcase}") : "PoolParty#{self.camelcase}").classify
 
     kla=<<-EOE
       class #{symc} #{"< #{superclass}" if superclass}
@@ -203,5 +203,10 @@ class String
       result.symbolize_keys!
     end
   end
+
+  # dumb and ugly pluralize
+  def pluralize(count=2)
+    count > 1 ? self + "s" : self 
+  end
   
 end

data/lib/poolparty/core/time.rb

@@ -53,4 +53,10 @@ class Numeric
     in_units = (seconds / 1.send(unit))
     "#{in_units.to_i} #{in_units != 1 ? unit.to_s.pluralize : unit} ago" 
   end
+end
+
+class Time
+  def to_time
+    self
+  end
 end

data/lib/poolparty/extra/duration.rb

@@ -0,0 +1,96 @@
+module PoolParty
+  # Provides accurate date and time measurements using Date#advance and 
+  # Time#advance, respectively. It mainly supports the methods on Numeric,
+  # such as in this example:
+  #
+  #   1.month.ago       # equivalent to Time.now.advance(:months => -1)
+  class Duration
+    attr_accessor :value, :parts
+
+    def initialize(value, parts) #:nodoc:
+      @value, @parts = value, parts
+    end
+
+    # Adds another Duration or a Numeric to this Duration. Numeric values
+    # are treated as seconds.
+    def +(other)
+      if Duration === other
+        Duration.new(value + other.value, @parts + other.parts)
+      else
+        Duration.new(value + other, @parts + [[:seconds, other]])
+      end
+    end
+
+    # Subtracts another Duration or a Numeric from this Duration. Numeric
+    # values are treated as seconds.
+    def -(other)
+      self + (-other)
+    end
+
+    def -@ #:nodoc:
+      Duration.new(-value, parts.map { |type,number| [type, -number] })
+    end
+
+    def is_a?(klass) #:nodoc:
+      klass == Duration || super
+    end
+
+    # Returns true if <tt>other</tt> is also a Duration instance with the
+    # same <tt>value</tt>, or if <tt>other == value</tt>.
+    def ==(other)
+      if Duration === other
+        other.value == value
+      else
+        other == value
+      end
+    end
+
+    def self.===(other) #:nodoc:
+      other.is_a?(Duration) rescue super
+    end
+
+    # Calculates a new Time or Date that is as far in the future
+    # as this Duration represents.
+    def since(time = ::Time.current)
+      sum(1, time)
+    end
+    alias :from_now :since
+
+    # Calculates a new Time or Date that is as far in the past
+    # as this Duration represents.
+    def ago(time = ::Time.current)
+      sum(-1, time)
+    end
+    alias :until :ago
+
+    def inspect #:nodoc:
+      consolidated = parts.inject(::Hash.new(0)) { |h,part| h[part.first] += part.last; h }
+      [:years, :months, :days, :minutes, :seconds].map do |length|
+        n = consolidated[length]
+        "#{n} #{n == 1 ? length.to_s.singularize : length.to_s}" if n.nonzero?
+      end.compact.to_sentence
+    end
+
+    protected
+
+      def sum(sign, time = ::Time.current) #:nodoc:
+        parts.inject(time) do |t,(type,number)|
+          if t.acts_like?(:time) || t.acts_like?(:date)
+            if type == :seconds
+              t.since(sign * number)
+            else
+              t.advance(type => sign * number)
+            end
+          else
+            raise ::ArgumentError, "expected a time or date, got #{time.inspect}"
+          end
+        end
+      end
+
+    private
+
+      def method_missing(method, *args, &block) #:nodoc:
+        value.send(method, *args)
+      end
+  end
+end

data/lib/poolparty/helpers/binary.rb

@@ -1,4 +1,4 @@
-require "ftools"
+require "fileutils"
 module PoolParty
   
   # Load a file that contains a pool into memory

data/lib/poolparty/modules/cloud_resourcer.rb

@@ -6,7 +6,7 @@
     
   method is stored, for instance. It's also where the key convenience methods are written
 =end
-require "ftools"
+require "fileutils"
 
 module PoolParty
   module CloudResourcer

data/lib/poolparty/modules/definable_resource.rb

@@ -19,6 +19,9 @@ module PoolParty
       name.to_s.new_resource_class &block
     end
     
+    # DEPRICATED
+    # use plugin instead
+    #
     # Allow us to create virtual resources
     # Generally, in plugins
     # This sets a virtual resource against the Resource class
@@ -41,13 +44,8 @@ module PoolParty
     # 
     # An example is included in the poolparty-apache-plugin
     def virtual_resource(name=:virtual_resource, opts={}, &block)
-      symc = "#{name}".top_level_class.camelcase
-      klass = symc.class_constant(PoolParty::Plugin::Plugin, {:preserve => true}, &block)
-      
-      PoolParty::Service.add_has_and_does_not_have_methods_for(symc)
-      
-      klass.module_eval &block if block
-      klass
+      $stderr.puts "virtual_resource (#{name}) is depricated"
+      plugin(name, &block)
     end
     
   end

data/lib/poolparty/modules/output.rb

@@ -6,8 +6,8 @@ module PoolParty
         args.each do |line|
           (output ||= []) << line
         end
-      end        
-    end      
+      end
+    end
 
   end
 end

data/lib/poolparty/monitors/base_monitor.rb

@@ -5,12 +5,28 @@
   monitors
 =end
 module Monitors
+  
+  @available_monitors =[]
+  def self.available
+    @available_monitors
+  end
+  
   class BaseMonitor
     
+    def self.inherited(subclass)
+      unless Monitors.available.include?(subclass)
+        Monitors.available << subclass
+      end
+    end
+    
     def initialize(env=nil)
       @env=env
     end
     
+    def env(env=@env)
+      @env=env
+    end
+    
     %w(close).each do |event|
       %w(before after).each do |time|
         module_eval <<-EOE
@@ -28,5 +44,6 @@ module Monitors
     def after_close_callbacks
       @after_close_callbacks ||= []
     end
+    
   end
 end