auser-poolparty 1.3.4 → 1.3.5

data/VERSION.yml

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

data/bin/cloud-bootstrap

@@ -21,6 +21,7 @@ EOS
     @loaded_clouds.each do |cld|
       
       cld.nodes.each do |node|
+        node.cloud = cld # needed for bootstrap
         node.bootstrap!(:force=>command[:force])
       end
       

data/bin/cloud-configure

@@ -26,6 +26,7 @@ EOS
       end
       
       cld.nodes.each do |node|
+        node.cloud = cld # ?
         node.configure!(:cloud => cld)
       end
       

data/bin/cloud-contract

@@ -17,6 +17,7 @@ EOS
     @loaded_clouds.each do |cld|
       
       node_to_terminate = cld.nodes.last
+      node_to_terminate.cloud = cld
       
       msg = [
         "Contracting cloud #{cld.name} (#{cld.keypair}) by 1",

data/bin/poolparty-setup

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolparty/installer"
+
+require 'git-style-binary/command'
+
+GitStyleBinary.command do
+  banner <<-EOS
+Usage: #{$0} #{all_options_string}
+
+  Sets up a basic clouds.rb file and carries through the steps to bootstrap a new cloud
+EOS
+
+  short_desc "Setup a new clouds.rb file"
+  
+  providers = {}
+  PoolParty::Installer.all.each_with_index do |installer,idx|
+    providers.merge!(idx+1 => installer)
+  end
+  
+  str = ["The cloud_provider you'd like to set your clouds.rb for. The available clouds include:"]
+  PoolParty::Installer.all.each do |provider|
+    str << "\t\t\t\t\t\t\t\t#{provider.name} - #{provider.description}"
+  end
+  opt :type, str.join("\n"), :type => :string, :default => "ec2"
+
+  run do |command|
+    
+    klass = PoolParty::Installer.find_by_name(command[:type])
+    puts "Great, we'll be using #{klass}"
+    inst = klass.send :new
+    inst.run
+    
+  end
+end

data/examples/vmware.rb

@@ -0,0 +1,18 @@
+require "poolparty"
+require 'poolparty-extensions'
+
+pool "poolparty" do
+  instances 1
+  
+  cloud "vmware" do
+    keypair "id_rsa"
+    using :vmware do
+      image_id  "/Users/nmurray/Documents/VMware/Ubuntu-jaunty.vmwarevm/Ubuntu-jaunty.vmx"
+      public_ip "192.168.133.128"
+    end
+    has_file "/etc/motd", :content => "welcome to your instance"
+
+    has_convenience_helpers
+  end
+
+end

data/lib/cloud_providers/cloud_provider_instance.rb

@@ -222,7 +222,7 @@ module CloudProviders
       end
             
       def on_all_callbacks(call_time, *args, &block)
-        cloud.callback call_time
+        cloud.callback call_time if cloud
         super
       end
       

data/lib/core/object.rb

@@ -71,10 +71,10 @@ class Object
     puts "[INFO] -- #{m}" if verbose?
   end
   def dputs(m="")
-    puts "[DEBUG] -- #{m.inspect}" if debugging?
+    puts "[DEBUG] -- #{m.is_a?(String) ? m : m.inspect}" if debugging?
   end
   def ddputs(m="")
-    puts "[VERY DEBUG] -- #{m.inspect}" if very_debugging?
+    puts "[VERY DEBUG] -- #{m.is_a?(String) ? m : m.inspect}" if very_debugging?
   end
   def verbose?
     $TESTING ||= false

data/lib/dependency_resolvers/chef.rb

@@ -26,7 +26,7 @@ module DependencyResolvers
       end
       
       def compile_command
-        "/usr/bin/chef-solo -c /etc/chef/solo.rb -j /etc/chef/dna.json"
+        "/usr/bin/chef-solo -c /etc/chef/solo.rb -j /etc/chef/dna.json#{ " -l debug" if very_debugging?}"
       end
          
       # compile the resources
@@ -57,7 +57,7 @@ module DependencyResolvers
           super
         end
         
-        apply_meta_functions(res, o) if res.is_a?(PoolParty::Resource)
+        apply_meta_functions(res, o) if res.is_a?(PoolParty::Resource) && res.print_to_chef != :no_print
       end
       
       default_attr_reader :variables, []

data/lib/mixins/askable.rb

@@ -15,6 +15,7 @@ module Askable
         colored_say e.inspect
         exit 0
       end
+      answer
     end
 
     def ask_with_help(opts={}, &block)
@@ -56,13 +57,9 @@ module Askable
     
     def choose(str, choices={}, opts={}, &block)
       colored_say(str)
-      choices.each do |k,v|
-        colored_say("#{k}) #{v}")
-      end
-      colored_print((opts[:prompt] || "> "))
-      pick = gets.chomp.to_i
-      yield choices[pick] if block
-      choices[pick]
+      answer = ask(choices)
+      yield answer if block
+      answer
     end
     
     def wait
@@ -130,6 +127,8 @@ module Askable
       case @question
       when String
         ask_string
+      when Hash
+        ask_hash
       when Array
         ask_array
       end
@@ -150,5 +149,15 @@ module Askable
       num = (@input.gets).to_i rescue colored_say("<red>Invalid input, must be a number between 1 and #{@question.size + 1}")
       @answer = @question[num-1]
     end
+    
+    def ask_hash
+      @question.sort.each do |k,v|
+        colored_say("#{k}) #{v}")
+      end
+      colored_print((@opts[:prompt] || "> "))
+      pick = @input.gets.to_i
+      @answer = @question[pick]
+    end
+    
   end
 end

data/lib/poolparty/base.rb

@@ -37,6 +37,8 @@ module PoolParty
     # - stack
     def run_in_context(o={}, &block)
       proc = Proc.new do
+        # Name MUST be set first
+        set_vars_from_options(:name => o[:name]) if o.has_key?(:name)
         set_vars_from_options(o)
         instance_eval &block if block
       end
@@ -127,12 +129,12 @@ module PoolParty
     # to create edges on the graph
     def resources_graph(force=false)
       return @resources_graph if @resources_graph && !force
-      result = Digraph.new
-      
-      add_ordered_resources_to_result(resources, result)
+      result = Digraph.new      
       
       create_graph(resources, nil, result)
       
+      add_ordered_resources_to_result(resources, result)
+      
       @resources_graph = result
     end
     
@@ -141,7 +143,7 @@ module PoolParty
       arr_of_resources = resources.zip_offset(1)
       
       arr_of_resources.each do |first, second|
-        result.add_edge!(first, second)
+        result.add_edge!(first, second) unless result.edge?(first, second) or result.edge?(second, first)
         add_ordered_resources_to_result(first.resources, result)
       end
     end
@@ -200,9 +202,9 @@ module PoolParty
     
     # The clouds.rb file
     def clouds_dot_rb_file(n=nil); self.class.clouds_dot_rb_file(n); end
-    def self.clouds_dot_rb_file(n=nil)
-        Pool.clouds_dot_rb_file(n)
-    end
+    def self.clouds_dot_rb_file(n=nil);Pool.clouds_dot_rb_file(n);end
+    def clouds_dot_rb_dir(n=nil); self.class.clouds_dot_rb_dir(n);end
+    def self.clouds_dot_rb_dir(n=nil); Pool.clouds_dot_rb_dir(n);end
     
     # If the method is missing from ourself, check the Default
     # class for the corresponding method.

data/lib/poolparty/cloud.rb

@@ -26,6 +26,10 @@ module PoolParty
     callback_block do |cld, callback|
     end
     
+    def before_compile
+      validate_all_resources
+    end
+    
     # Freeze the cloud_name so we can't modify it at all, set the plugin_directory
     # call and run instance_eval on the block and then call the after_create callback
     def initialize(n, o={}, &block)
@@ -176,9 +180,15 @@ module PoolParty
     # Take the cloud's resources and compile them down using 
     # the defined (or the default dependency_resolver, chef)
     def compile(caller=nil)
+      callback :before_compile
       FileUtils.mkdir_p tmp_path unless File.directory?(tmp_path)
-      ddputs("Compiling cloud #{self.name} to #{tmp_path/"etc"/"#{dependency_resolver_name}"}")
-      dependency_resolver.compile_to(ordered_resources, tmp_path/"etc"/"#{dependency_resolver_name}", caller)
+      ddputs <<-EOE
+Compiling cloud #{self.name} to #{tmp_path/"etc"/"#{dependency_resolver_name}"} 
+  number of resources: #{ordered_resources.size}
+      EOE
+      out = dependency_resolver.compile_to(ordered_resources, tmp_path/"etc"/"#{dependency_resolver_name}", caller)
+      callback :after_compile
+      out
     end
     
     # Get the os of the first node if it was not explicity defined, we'll assume they are
@@ -242,5 +252,50 @@ module PoolParty
       end
     end
     
+    def validate_all_resources
+      ddputs("Validating all the resources")
+      [:ensure_not_cyclic, :ensure_meta_fun_are_resources].each do |meth|
+        self.send meth
+      end
+    end
+    
+    def ensure_not_cyclic
+      if resources_graph.cyclic?
+        cycles = []
+        
+        resources_graph.edges.each do |edge|
+          if resources_graph.adjacent?(edge.source, edge.target) && resources_graph.adjacent?(edge.target, edge.source) && !cycles.include?(edge.source)
+            cycles << "#{edge.source.class}(#{edge.source.name}) depends on #{edge.target.class}(#{edge.target.name})"
+          end
+        end
+        msg =<<-EOE
+      
+        Your resource graph is cyclic. Two resources depend on each other, Cannot decide which resource
+        to go first. Dying instead. Correct this and then try again.
+      
+          #{cycles.join("\n          ")}
+      
+        Hint: You can see the resource graph by generating it with:
+          cloud compile -g name
+        
+        EOE
+        raise PoolPartyError.create("CyclicResourceGraphError", msg)
+      end
+    end
+    
+    def ensure_meta_fun_are_resources
+      resources.each do |res|
+        
+        if res.meta_notifies
+          res.meta_notifies.each do |ty, arr|
+            arr.each do |nm, action|
+              raise PoolPartyError.create("ResourceNotFound", "A resource required for #{ty}(#{nm}) was not found: #{ty}(#{nm}). Please make sure you've specified this in your configuration.") unless get_resource(ty, nm)
+            end
+          end
+        end
+        
+      end
+    end    
+    
   end
 end

data/lib/poolparty/installer.rb

@@ -15,7 +15,7 @@ module PoolParty
         steps.each {|c| self.__send__ c.to_sym }
         self.__send__ :closing_message
       rescue Exception => e
-        # colored_say e.inspect
+        colored_say e.inspect
         colored_say exit_msg
       ensure
         Colors.reset!
@@ -35,7 +35,7 @@ First, we'll setup your environment so using PoolParty will be a <blue>breeze</b
 <yellow>Cancelled PoolParty installation</yellow>
 
 You can always restart this by typing:
-<blue>install-poolparty</blue>
+<blue>cloud setup</blue>
 
 <line>
 EOE
@@ -97,8 +97,12 @@ irc.freenode.net / #poolpartyrb
     def self.all
       @all ||= []
     end
-
-
+    
+    def self.find_by_name(nm)
+      all.detect do |i|
+        i.name =~ /#{nm}/i
+      end
+    end
   end
 end
 

data/lib/poolparty/installers/ec2.rb

@@ -4,7 +4,8 @@ module PoolParty
       
       def steps
         [
-          :todo
+          :find_ec2_directory, :ask_for_access_key, :ask_for_private_access_key,
+          :show_env_setup
         ]
       end
       
@@ -16,15 +17,84 @@ module PoolParty
         "Ec2 installer"
       end
       
-      def todo
+      def find_ec2_directory
+        msg = "We found the following vmware files in the default vmware directory.\nChoose one of these to use as your vmrun file or select other\n<line>"
+        
+        directories = {}
+        default_ec2_directories.each_with_index do |file,idx|
+          directories.merge!(idx+1 => file)
+        end
+        
+        base = choose(msg, directories)
+        @ec2_directory = base == :other ? ask_for_ec2_directory : base
+      end
+      
+      def ask_for_access_key
+        access_key_help =<<-EOV
+EC2 uses an access key to identify you and allows you to start and stop instances.
+        EOV
+
+        access_key = <<-EOE
+What is your access key?
+        EOE
+        ask_with_help :message => access_key, :help => access_key_help do |k|
+          @access_key = k
+        end
+      end
+      
+      def ask_for_private_access_key
+        private_access_key_help =<<-EOV
+EC2 uses a private access key to identify you and allows you to start and stop instances.
+        EOV
+
+        private_access_key = <<-EOE
+What is your private access key?
+        EOE
+        ask_with_help :message => private_access_key, :help => private_access_key_help do |k|
+          @secret_access_key = k
+        end
+      end
+      
+      
+      def ask_for_ec2_directory
+        ec2_directory_help =<<-EOV
+Ec2 needs to know where you store your certificates and private keys. Amazon expects these to be in the ~/.ec2 directory. We suggest a subdirectory of the ~/.ec2 directory so you can separate ec2 accounts. 
+        EOV
+
+        ec2_directory_msg = <<-EOE
+What's path to your ec2 directory with your cert and pk files?
+        EOE
+        ask_with_help :message => ec2_directory_msg, :help => ec2_directory_help
+      end
+
+      
+      def show_env_setup
         colored_say <<-EOE
-          <line>
-          <red>Not implemented yet</red>
-          <line>
+<line>
+  
+  Setup your environment:
+  
+  export EC2_ACCESS_KEY=#{@access_key}
+  export EC2_SECRET_KEY=#{@secret_access_key}
+
+  export EC2_PRIVATE_KEY=$(ls #{@ec2_directory}/pk-*.pem)
+  export EC2_CERT=$(ls #{@ec2_directory}/cert-*.pem)
+  
+<line>
         EOE
         exit 0
       end
       
+      private
+      
+      def default_ec2_directories
+        @default_ec2_directories ||= find_default_ec2_directories rescue nil
+      end
+      
+      def find_default_ec2_directories
+        Dir["#{::File.expand_path("~")}/.ec2/*"].reject {|f| File.file?(f) }
+      end
+      
     end
   end
 end

data/lib/poolparty/installers/vmware.rb

@@ -59,9 +59,14 @@ Awesome. What's the path to your vmwarevm file?
         ip_help =<<-EOV
 Right now, vmrun, the remoter base needs an explicitly set ip. Log into your vm and type ifconfig. Copy and paste that here.
         EOV
-        @ip = ask_with_help :message => "Now, what's the ip of your vm?", :help => ip_help
+        @ip = ask_with_help :message => "what's the ip of your vm?", :help => ip_help
         
-        puts @ip
+        if @ip =~ /\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b/
+          @ip
+        else
+          colored_say "<red>You must enter a valid ip</red>"
+          get_vm_ip
+        end
       end
       
       def get_key
@@ -70,9 +75,16 @@ Finally, we'll set somethings up here shortly, but first we'll need to know wher
 at ~/.ssh/id_rsa.pub. If this is true, then just press enter. Otherwise, enter the path of your public key.        
         EOV
         
-        ask_with_help :message => "What keypair would you like to use? (default: ~/.ssh/id_rsa.pub)",
-                      :help => key_help do |k|
-          @key = k.empty? ? ::File.expand_path("~/.ssh/id_rsa.pub") : k
+        ask_with_help :message => "What keypair would you like to use? (default: ~/.ssh/id_rsa.pub)", :help => key_help do |responded_key|
+          responded_key = "~/.ssh/id_rsa.pub" if responded_key.empty?
+
+          @key = File.expand_path(responded_key)
+          if File.file?(@key)
+            @key
+          else
+            colored_say "<red>You must enter a valid path to a keyfile</red>"
+            get_key
+          end
         end
       end
       

data/lib/poolparty/plugins/apache.rb

@@ -1,4 +1,5 @@
 module PoolParty
+  
   module Resources
     
     class Apache < Resource
@@ -49,12 +50,12 @@ module PoolParty
           passenger_configs
           
           has_exec "install_passenger_script" do
-            command 'echo -en \"\\\\n\\\\n\\\\n\\\\n\" | passenger-install-apache2-module'
+            command "passenger-install-apache2-module -auto"
             notifies get_exec("restart-apache2"), :run
             requires get_exec("restart-apache2")
             requires get_package("apache2")
             requires get_gem_package("passenger")
-            not_if "test -f /etc/apache2/mods-available/passenger.conf && test -s /etc/apache2/mods-available/passenger.conf"
+            not_if "test -f /etc/apache2/mods-available/passenger.conf && test -s /etc/apache2/mods-available/passenger.conf "
             creates lambda { "@node[:apache][:passenger_module_path]" }
             end
           

data/lib/poolparty/plugins/apache2/base.conf.erb

@@ -162,10 +162,10 @@ LogFormat "%h %l %u %t \"%r\" %>s %b" common
 LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
 
-DocumentRoot /var/www
+#DocumentRoot /var/www
 
 # Listen <%= @node[:apache][:port] %>
-NameVirtualHost *:<%= @node[:apache][:port] %>
+#NameVirtualHost *:<%= @node[:apache][:port] %>
 
 
 # NEW CONFIG FILE

data/lib/poolparty/plugins/apache2/browser_fixes.conf.erb

@@ -23,4 +23,4 @@
     BrowserMatch "^gnome-vfs/1.0" redirect-carefully
     BrowserMatch "^XML Spy" redirect-carefully
     BrowserMatch "^Dreamweaver-WebDAV-SCM1" redirect-carefully
-</IfModule>
+</IfModule>

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

@@ -32,9 +32,9 @@ module PoolParty
           if !File.exists?("#{dir}/#{name}/current")
           
           # setup an initial symlink so apache will start even if there have not been any deploys yet
-            has_site_directory "releases/initial/public"
+            #has_site_directory "releases/initial/public"
             #FIXME  the following line is chef specific.  It will fail with puppet
-            # has_symlink(:target_file => "#{dir}/#{name}/current", :to => "#{dir}/#{name}/releases/initial")
+            has_link(:target_file => "#{dir}/#{name}/current", :to => "#{dir}/#{name}/releases/initial")
           end
           log_dir = "#{site_directory}/shared/log"
           appended_path "current"

data/lib/poolparty/pool.rb

@@ -78,7 +78,7 @@ module PoolParty
       end
     end
     
-    def self.clouds_dot_rb_dir
+    def self.clouds_dot_rb_dir(n=nil)
       File.dirname(self.clouds_dot_rb_file) if self.clouds_dot_rb_file
     end
     
@@ -133,7 +133,14 @@ module PoolParty
     #   + sets up the log
     def self.before_file_load(filepath)
       $:.unshift(::File.dirname(filepath))
-      Dir["#{::File.dirname(filepath)}/plugins/*"].each { |plugin_path| $:.unshift(plugin_path) }
+      Dir["#{ ::File.dirname(filepath)}/plugins/*"].each do |plugin_path| 
+        if File.directory?(plugin_path)
+          $:.unshift(plugin_path)
+          require "#{plugin_path}/#{File.basename(plugin_path)}"
+        elsif File.file?(plugin_path) && plugin_path.match(/.rb$/)
+          require plugin_path
+        end
+      end
     end
     
     # Call init to the resource methods and init the log

data/lib/poolparty/resource.rb

@@ -2,7 +2,7 @@ module PoolParty
   class Resource < Base
     
     attr_reader :exists
-    attr_reader :meta_notifies, :meta_not_if, :meta_only_if, :meta_subscribes
+    attr_accessor :meta_notifies, :meta_not_if, :meta_only_if, :meta_subscribes
     attr_accessor :graph_index
     
     default_options(
@@ -44,7 +44,9 @@ module PoolParty
       other_resources_hash.each do |k,v|
         notifies_array = (@meta_notifies[k] ||= [])
         notifies_array << [v, action_to_take] unless notifies_array.include?([v, action_to_take])
-      end      
+        # Implicitly add a require
+        # requires(k => v)
+      end
     end
     
     def subscribes(other_resources_hash, action_to_take=:reload, at_time=:delayed)
@@ -56,12 +58,19 @@ module PoolParty
     end
     
     # Requires
-    def requires(other_resources_hsh)
-      other_resources_hsh.each do |k,v|
-        current_deps = (dependencies[k] ||= [])
-        current_deps << v unless current_deps.include?(v)
+    def requires(other_resources_obj)
+      case other_resources_obj
+      when Hash
+        other_resources_obj.each do |k,v|
+          dependencies[k] ||= []
+          dependencies[k] << v unless dependencies[k].include?(v)
+        end
+      when Array
+        other_resources_obj.each do |obj|
+          requires(obj)
+        end
       end
-    end    
+    end
     
     # Not if
     # If a block is given with the not_if, we assume it is
@@ -102,6 +111,10 @@ module PoolParty
     def after_compile
     end
     
+    def after_loaded
+      requires parent if parent && !parent.is_a?(PoolParty::Cloud) && !parent.is_a?(PoolParty::Pool)
+    end
+    
     # Singleton methods
     # has_name
     # The has_ and does_not_have methods names

data/lib/poolparty/resources/directory.rb

@@ -31,6 +31,10 @@ module PoolParty
         :group      => "root",
         :recursive  => true
       )
+
+      def after_loaded
+        requires get_user(owner) if owner && owner != "root"
+      end
       
       def print_to_chef
         <<-EOE
@@ -47,4 +51,4 @@ end
     end
     
   end
-end
+end

data/lib/poolparty/resources/exec.rb

@@ -43,7 +43,7 @@ module PoolParty
 str = 'execute "<%= name %>" do
   command <%= print_variable(command || name) %>
   path <%= print_variable(path) %>
-  action :<%= action ? action : (exists ? :run : :nothing) %>
+  action <%= print_variable(action ? action : (exists ? :run : :nothing)) %>
 '
       str << "  creates <%= print_variable(creates) %>\n" if creates
       str << "  cwd <%= print_variable(cwd) %>\n" if cwd
@@ -58,4 +58,4 @@ str = 'execute "<%= name %>" do
     end
     
   end
-end
+end

data/lib/poolparty/resources/file.rb

@@ -38,7 +38,11 @@ module PoolParty
         :backup   => 5,
         :owner    => "root"
       )
-      
+
+      def after_loaded
+        requires get_user(owner) if owner && owner != "root"
+      end
+            
       def self.has_method_name
         "file"
       end
@@ -62,6 +66,8 @@ end
           file = arg.first
           @template = if File.file?(b = File.expand_path(file))
             b
+          elsif File.file?(c = File.expand_path(File.join(clouds_dot_rb_dir, file)))
+            c
           elsif f = search_in_known_locations(file)
             f
           else
@@ -78,4 +84,4 @@ end
     end
     
   end
-end
+end