auser-poolparty 1.2.2 → 1.2.3

data/lib/poolparty/base_packages/haproxy.rb

@@ -1,23 +1,33 @@
+=begin rdoc
+  Enables haproxy for a cloud
+=end
 module PoolParty
   class Base
     plugin :haproxy do
       
+      default_options(
+        :port => 80,
+        :forwarding_port => 8080,
+        :proxy_mode => "http"
+      )
+      
       def before_configure
       end
       
-      def enable
-        # has_chef_recipe "apache2"
-        # include_chef_recipe "#{::File.dirname(__FILE__)}/../../../vendor/chef/apache2"
-
+      def loaded(o={}, &block)
+        set_vars_from_options(cloud.dsl_options.reject{|k,v| [:enabled, :disabled].include?(v) }) if cloud
         # Restart sysklogd after we update the haproxy.log
         has_service(:name => "sysklogd")    
+
+        has_package "haproxy"
+
         # Template variables
-        has_variable("haproxy_name", :value => "#{cloud.name}")
+        has_variable("haproxy_name", :value => "#{(cloud ? cloud.name : name)}")
         has_variable("listen_ports", :value => [ "8080" ], :namespace => "apache")
         
-        has_variable("ports_haproxy", :value => ([(self.respond_to?(:port) ? port : Default.port)].flatten))        
-        has_variable("forwarding_port", :value => (respond_to?(:forwarding_port) ? forwarding_port : Default.forwarding_port))
-        has_variable("proxy_mode", :value => (respond_to?(:proxy_mode) ? proxy_mode : Default.proxy_mode))
+        has_variable("ports_haproxy", :value => ([(port || Default.port)].flatten))        
+        has_variable("forwarding_port", :value => (forwarding_port || Default.forwarding_port))
+        has_variable("proxy_mode", :value => (proxy_mode || Default.proxy_mode))
     
         # Startup haproxy and enable it
         has_line_in_file(:line => "ENABLED=1", :file => "/etc/default/haproxy")
@@ -27,14 +37,7 @@ module PoolParty
           content ''
         end
         
-        has_directory "/var/run/haproxy"
-        # has_package "apache2"
-        # has_service "apache2"
-        
-        has_package "haproxy" do
-          # stops get_service("apache2"), :immediately
-          # starts get_service("apache2")
-        end
+        has_directory "/var/run/haproxy"        
 
         has_exec "reloadhaproxy", 
           :command => "/etc/init.d/haproxy reload", 
@@ -49,8 +52,6 @@ module PoolParty
         # Service is required
         has_service("haproxy") do
           action [:start, :enable]
-          # stops get_service("apache2"), :immediately
-          # starts get_service("apache2")
         end
         
       end

data/lib/poolparty/base_packages/poolparty.rb

@@ -4,7 +4,7 @@ module PoolParty
       
       def enable        
         has_cron "/usr/bin/server-manage-election" do
-          minute "0,5,10,15,20,25,30,35,40,45,50,55"
+          minute "*"
           command "/usr/bin/server-manage-election"
         end
       end

data/lib/poolparty/core/hash.rb

@@ -2,6 +2,22 @@
   Hash extentions
 =end
 class Hash
+  
+  # alias_method :_old_reader, :[]
+  # # Treat string and symbols the same
+  # def [](key)
+  #   if o = _old_reader(key) || has_key?(key)
+  #     return o 
+  #   elsif key.is_a? Symbol
+  #     _old_reader(key.to_s)
+  #   elsif key.is_a? String
+  #     _old_reader(key.to_sym) rescue _old_reader(key)
+  #   else
+  #     _old_reader(key)
+  #   end
+  # end
+  
+  # Return a hash of all the elements where the block evaluates to true
   def choose(&block)
     Hash[*self.select(&block).inject([]){|res,(k,v)| res << k << v}]
   end
@@ -66,6 +82,36 @@ class Hash
     keys.sort[idx - 1]
   end
   
+  def stringify_keys
+    dup.stringify_keys!
+  end
+  
+  # Converts all of the keys to strings
+  def stringify_keys!
+    keys.each{|k| 
+      v = delete(k)
+      self[k.to_s] = v
+      v.stringify_keys! if v.is_a?(Hash)
+      v.each{|p| p.stringify_keys! if p.is_a?(Hash)} if v.is_a?(Array)
+    }
+    self
+  end
+  
+  def symbolize_keys
+    dup.stringify_keys!
+  end
+  
+  # Converts all of the keys to strings
+  def symbolize_keys!
+    keys.each{|k| 
+      v = delete(k)
+      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)
+    }
+    self
+  end
+  
   def method_missing(sym, *args, &block)
     if has_key?(sym)
       fetch(sym)

data/lib/poolparty/core/object.rb

@@ -16,11 +16,7 @@ class Object
     original = self.method(original_id).to_proc
     define_method(new_id){|*args| original.call(*args)}
   end
-  def with_options(opts={}, par=nil, &block)
-    @p = par.clone
-    @p.options.merge!(opts)
-    @p.instance_eval &block if block
-  end  
+
   def returning(receiver)
     yield receiver
     receiver
@@ -29,14 +25,24 @@ class Object
     block.in_context(self).call
     self
   end
-  def send_if_method(v, *args)
-    if (v.nil? || v.to_s.empty? || v.is_a?(Array) || v.is_a?(Integer))# && !v.is_a?(Symbol))#)v.is_a?(String)
-      v
-    else
-      vs = v.to_s.to_sym
-      respond_to?(vs) ? self.send(vs, *args) : v rescue v  #NOTE MF: maybe we should not rescue all errors?
-    end
-  end
+  
+  # Procs that have been run already in the run_once blocks
+  # This is just a container array of procs
+  def run_procs
+    @run_procs ||= []
+  end
+  
+  # Do once.
+  # Takes a block. IF this block has already been run (from the run_procs array),
+  # then run it and store the block unique id in the run_procs array so
+  # it never gets run again
+  def do_once(&block)
+    unless run_procs.include?(block.to_s)      
+      instance_eval &block if block
+      run_procs << block.to_s
+    end    
+  end
+
   def respec_string
     case self.class
     when String
@@ -85,7 +91,7 @@ class Object
     print "#{m}" if debugging?(o) || verbose?(o) rescue ""
   end
   def verbose?(o=self)
-    o.respond_to?(:verbose) ? o.verbose : ($TESTING ||= false)
+    o.respond_to?(:verbose) ? o.verbose : (debugging? || $TESTING ||= false)
   end
   def debugging?(o=self)
     o.respond_to?(:debug) ? o.debug : ($DEBUGGING ||= false)
@@ -100,4 +106,4 @@ class Object
   def unix_hide_string
     "2>&1 > /dev/null"
   end
-end
+end

data/lib/poolparty/core/string.rb

@@ -1,3 +1,7 @@
+require 'rubygems'
+require 'json'
+require 'json/add/core'
+
 class String
   def hasherize(format=[])
     hash = {}
@@ -46,6 +50,9 @@ class String
     self.gsub(/['"]/, '\\\"')
     # self.gsub(/["']/, "\\\"")
   end
+  def path_quote
+    self.safe_quote.gsub(/[ ]/, '\ ')
+  end
   def nice_runnable(quite=true)
     self.split(/ && /).join("\n")
   end
@@ -188,4 +195,13 @@ class String
     File.join(self, o.to_s)
   end
   
+  # Parse json string to a ruby object
+  def json_parse
+    return nil if self == "null" || self.empty?
+    result = JSON.parse self
+    if result.respond_to? :keys
+      result.symbolize_keys!
+    end
+  end
+  
 end

data/lib/poolparty/dependency_resolver/chef_resolver.rb

@@ -26,7 +26,6 @@ module PoolParty
     def compile(props=@properties_hash, tabs=0, default_namespace="poolparty")
       base_dir(default_namespace)
       build_base_recipe_directory( default_namespace )
-      
       # ::Suitcase::Zipper.add( base_dir, "chef/cookbooks")
       
       _compile(props, tabs, default_namespace)
@@ -46,7 +45,6 @@ module PoolParty
     end
     
     def build_base_recipe_directory(nm)
-      dputs "Making new #{base_dir}"
       ::FileUtils.mkdir_p "#{base_dir}"
       
       [ "recipes", "templates", "attributes" ].each do |bdir|
@@ -61,7 +59,11 @@ module PoolParty
     end
     
     def base_dir(nm="poolparty")
-      @base_dir ||= "#{Default.tmp_path}/dr_configure/chef/cookbooks/#{nm}"
+      @base_dir ||= "#{tmp_path}/dr_configure/chef/cookbooks/#{nm}"
+    end
+    
+    def tmp_path
+      the_cloud ? the_cloud.tmp_path : "#{Default.tmp_path}/pool/cloud"
     end
     
     def options_to_string(opts,tabs=0)
@@ -159,7 +161,8 @@ module PoolParty
         hsh.merge!({:source => "#{nm}.erb"})
       end
       # 
-      hsh.delete(:require) if hsh.has_key?(:require)
+      hsh.delete(:require)
+      hsh.delete(:requires)
       hsh.delete(:name) # we don't need the names in the methods
       hsh
     end
@@ -211,9 +214,23 @@ module PoolParty
       when PoolParty::Resources::Resource
         "resources(:#{handle_chef_types(obj.class.to_s.top_level_class.downcase.to_sym)} => \"#{obj.name}\")"
       when Fixnum
-        "#{obj.to_i}"
+        case obj
+        when /^\d{3}$/
+          "0#{obj.to_i}"
+        else
+          "#{obj.to_i}"
+        end        
       when String
-        "\"#{obj}\""
+        case obj
+        when /^\d{4}$/
+          "#{obj}"
+        when /^\d{3}$/
+          "0#{obj}"
+        else
+          "\"#{obj}\""
+        end
+      when Proc
+        obj.call # eh
       when Array
         # If we are sending a notifies with a second argument
         if obj[1] && [:immediately, :delayed].include?(obj[1])

data/lib/poolparty/dependency_resolver/dependency_resolver.rb

@@ -10,7 +10,7 @@ module PoolParty
     
     attr_reader :properties_hash, :the_cloud
     
-    def initialize(hsh, contxt=nil)
+    def initialize(hsh, contxt={:tmp_path => "/tmp/poolparty/testpool/testcloud"})
       raise DependencyResolverException.new('must pass a hash') if hsh.nil? || !(hsh.instance_of?(OrderedHash) || hsh.instance_of?(Hash))
       @properties_hash = hsh
       @the_cloud = contxt

data/lib/poolparty/dependency_resolver/dependency_resolver_cloud_extensions.rb

@@ -7,7 +7,7 @@ module PoolParty
   module DependencyResolverCloudExtensions    
     def to_properties_hash
       oh = {}
-      oh[:options] = options.merge(:cloud_name => name)
+      oh[:options] = dsl_options.merge(:cloud_name => name)
       oh[:resources] = ordered_resources.map {|a| a.to_properties_hash }
       # oh[:resources] = resources.keys.inject(OrderedHash.new) do |sum,k|
       #   sum.merge(k.to_sym => resources[k].map {|a| a.to_properties_hash } )
@@ -23,7 +23,7 @@ module PoolParty
   # Adds the to_properties_hash method on top of resources, the lowest level
   module DependencyResolverResourceExtensions
     def to_properties_hash
-      {:pp_type => self.class.to_s.top_level_class}.merge!(options)
+        {:pp_type => self.class.to_s.top_level_class}.merge!(dsl_options)
     end
   end
 end

data/lib/poolparty/dependency_resolver/puppet_resolver.rb

@@ -5,12 +5,6 @@ module PoolParty
   
   class PuppetResolver< DependencyResolver
     
-    permitted_resource_options({
-      :global => [:require, :name],
-      :file => [:content, :mode, :user],
-      :exec => [:command, :path, :refreshonly]
-    })
-    
     def initialize(hsh=nil)
       super(hsh)
     end
@@ -71,11 +65,6 @@ module PoolParty
     
     def permitted_option?(ty, key)
       true
-      # if permitted_resource_options.has_key?(ty)
-      #   permitted_resource_options[ty].include?(key) || true #permitted_resource_options[:global].include?(key)
-      # else
-      #   true
-      # end
     end
     
     def hash_flush_out(hash, pre="", post="")
@@ -97,6 +86,10 @@ module PoolParty
           "present"
         end
       end
+
+      if hsh.has_key?(:requires)
+        hsh[:require] = hsh.delete(:requires)
+      end
       new_hsh ={}
       hsh.each do |k,v|
         new_hsh.merge!({k => to_option_string(v)})
@@ -126,26 +119,11 @@ module PoolParty
     end
     
     def handle_print_service(klassname, plugin, tabs)
-      case klassname.to_s
-      when "conditional"
-        # "#{tf(tabs)}case $#{klasshash[:options][:variable]} {#{klasshash[:services][:control_statements].map do |k,v|"\n#{tf(tabs+1)}#{k} : {#{compile(v.to_properties_hash, tabs+2)}#{tf(tabs+1)}\n#{tf(tabs)}}" end}}"
-        # 
-        # str = ""        
-        # plugin.each do |klasshash|
-        #   # str << "\n#{tf(tabs+1)}#{compile(hsh,tabs+1)}"
-        #   str << "#{tf(tabs)}case $#{klasshash[:options][:variable]} {"
-        #   str << "#{klasshash[:services][:control_statements].map do |k,v|"\n#{tf(tabs+1)}#{k} : {#{compile(v.to_properties_hash, tabs+2)}#{tf(tabs+1)}\n#{tf(tabs)}}" end}"
-        # end        
-        # str << "#{tf(tabs)}}"
-        # deprecated conditional
-        
-      else
-        kname = klassname.to_s.gsub(/pool_party_/, '').gsub(/_class/, '')
-        str = "\n#{tf(tabs)}# #{kname}\n"
-        str << "#{tf(tabs)}class #{kname} {"
-        str << "\n#{tf(tabs+1)}#{compile(plugin,tabs+1)}"
-        str << "#{tf(tabs)}} include #{kname}"        
-      end
+      kname = klassname.to_s.gsub(/pool_party_/, '').gsub(/_class/, '')
+      str = "\n#{tf(tabs)}# #{kname}\n"
+      str << "#{tf(tabs)}class #{kname} {"
+      str << "\n#{tf(tabs+1)}#{compile(plugin,tabs+1)}"
+      str << "#{tf(tabs)}} include #{kname}"        
     end
     
     def handle_print_variable(name, value, tabs)
@@ -185,4 +163,4 @@ module PoolParty
     
   end
 
-end
+end

data/lib/poolparty/helpers/optioner.rb

@@ -9,10 +9,15 @@ module PoolParty
   class Optioner
     include Dslify
     
+    attr_accessor :loaded_pool, :loaded_clouds, :loaded_pools
+    
+    dsl_methods :spec,
+                :num,
+                :cloudname,
+                :poolname
+                
     default_options( :verbose => false, 
-                     :quiet => false, 
-                     :cloudname => false, 
-                     :poolname => false)
+                     :quiet => false)
     
     def initialize(args=[], opts={}, &block)
       boolean_args << opts[:boolean_args] if opts.has_key?(:boolean_args)
@@ -75,8 +80,8 @@ module PoolParty
     end
     
     def parse_options(&blk)
-      self.spec = nil
-      self.num = nil
+      self.spec nil
+      self.num nil
       
       progname = $0.include?("-") ? "#{::File.basename($0[/(\w+)-/, 1])} #{::File.basename($0[/-(.*)/, 1])}" : ::File.basename($0)
       @opts = OptionParser.new
@@ -106,20 +111,20 @@ module PoolParty
       @opts.parse(@arguments.dup)
       
       process_options
-      output_options if verbose
+      output_options if verbose? && verbose
       
       if @load_pools
-        self.loaded_pool load_pool( spec? ? spec : Binary.get_existing_spec_location)
-        self.loaded_clouds extract_cloud_from_options(self)
-        self.loaded_pools extract_pool_from_options(self)
+        @loaded_pool = load_pool( spec? ? spec : Binary.get_existing_spec_location)
+        @loaded_clouds = extract_cloud_from_options(self)
+        @loaded_pools = extract_pool_from_options(self)
 
         reject_junk_options!
         raise CloudNotFoundException.new("Please specify your cloud with -s, move it to ./clouds.rb or in your POOL_SPEC environment variable") unless loaded_clouds && !loaded_clouds.empty?
         loaded_pools.each do |pl|
-          pl.options(self.options)
+          pl.dsl_options.merge!(self.options)
         end
         loaded_clouds.each do |cl|
-          cl.options(self.options)
+          cl.dsl_options.merge!(self.options)
         end
       end
     end
@@ -147,10 +152,10 @@ module PoolParty
   end
   
   def extract_cloud_from_options(o)
-    o.cloudname ? [cloud(o.cloudname.downcase.to_sym)] : clouds.collect {|n,cl| cl}
+    o.cloudname? ? [cloud(o.cloudname.downcase.to_sym)] : clouds.collect {|n,cl| cl}
   end
   
   def extract_pool_from_options(o)
-    o.poolname ? [pool(o.poolname.downcase.to_sym)] : pools.collect {|n,pl| pl}
+    o.poolname? ? [pool(o.poolname.downcase.to_sym)] : pools.collect {|n,pl| pl}
   end
-end
+end

data/lib/poolparty/installers/base_installer.rb

@@ -0,0 +1,113 @@
+module PoolParty
+  module Installers
+    class BaseInstaller
+
+      include ::PoolParty::Remote
+      include ::PoolParty::Pinger
+      
+      def initialize
+        self.__send__ :welcome_message
+        commands.each {|c| self.__send__ c.to_sym }
+        self.__send__ :closing_message
+      end
+      
+      def welcome_message
+        welcome_msg = <<-EOE
+We are going to take you through the installation process of PoolParty.
+
+First, we'll setup your environment so using PoolParty will be a breeze
+        EOE
+                
+        colored_say "Welcome to PoolParty!", :help
+        say welcome_msg
+        begin
+          t = colored_ask "Press enter to continue or Ctrl+C to exit"
+        rescue Exception => e
+          say <<-EOE
+
+Cancelled PoolParty installation
+
+You can always restart this by typing:
+  install-poolparty
+EOE
+          exit 0
+        end
+        
+      end
+      
+      def closing_message
+closing_message = <<-EOE
+You are now set to ride the waves with PoolParty! You'll notice there is a clouds.rb file in your current directory. You can start your new cloud
+by typing:
+
+cloud start
+
+You can start your clouds.rb. More samples are available here: 
+  http://github.com/auser/poolparty-examples/tree/master
+EOE
+        say closing_message
+      end
+      
+      def commands
+        @commands ||= []
+      end
+      
+      protected
+      
+      def ask_with_help(opts={}, &block)
+        help_str = opts[:help]
+        message = opts[:message]
+
+        o = ask("#{message} (h for help)") do |q|    
+          q.validate = opts[:validate] if opts.has_key?(:validate)
+        end
+
+        if %w(h H).include?(o)
+          colored_say help_str, :help
+          ask_with_help(opts, &block)
+        else
+          block.call(o)
+        end
+        o
+      end
+
+      def rescued_ask(m, r)
+        begin
+          t = colored_ask m
+        rescue Exception => e
+          say r
+        end
+      end
+
+      def colored_ask(str, color = :notice)
+        setup_colors
+        ask("<%= color(\"#{str}\", :#{color}) %>")
+      end
+
+      def colored_say(str, color = :headline)
+        setup_colors
+        say("<%= color(\"#{str}\", :#{color}) %>") 
+      end
+
+      def setup_colors
+          unless @setup_colors
+          ft = HighLine::ColorScheme.new do |cs|
+            cs[:headline]         = [ :bold, :yellow, :on_black ]
+            cs[:horizontal_line]  = [ :bold, :white, :on_blue]
+            cs[:critical]         = [ :yellow, :on_red  ]
+            cs[:error]            = [ :bold, :red  ]
+            cs[:help]             = [ :bold, :white, :on_blue]
+            cs[:notice]           = [ :blue, :on_white]
+          end
+
+          HighLine.color_scheme = ft
+          @setup_colors = true
+        end
+      end
+      
+
+    end
+  end
+end
+
+Dir["#{::File.dirname(__FILE__)}/*.rb"].each {|lib| require lib }