auser-poolparty 1.2.4 → 1.2.7

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 2
-:patch: 4
+:patch: 7
 :major: 1

data/bin/cloud

@@ -36,6 +36,13 @@ EOS
   end
   
   run do |command|
-    puts "Primary Options: #{command.opts.inspect}"
+    subcommands = GitStyleBinary.list_subcommands
+    
+    puts "Usage: cloud COMMAND [ARGS]
+    
+    The cloud subcommands commands are:
+      #{subcommands}
+
+    See 'cloud help COMMAND' for more information on a specific command."
   end
 end

data/bin/cloud-contract

@@ -23,7 +23,7 @@ EOS
       
       if cld.minimum_instances < cld.nodes(:status => "running").size
         last_instance_id = cld.nodes(:status => "running").last[:instance_id]
-        cld.remote_base.terminate_instance! cld.options.merge(:instance_id => last_instance_id)
+        cld.remote_base.terminate_instance! cld.dsl_options.merge(:instance_id => last_instance_id)
       else
         puts "The cloud #{cld.name} is running minimum instances (#{cld.nodes(:status => "running").size})"
       end

data/bin/cloud-provision

@@ -31,7 +31,6 @@ EOS
             cld.vputs "\nConfiguring: #{address[:ip]}\n--------------------"      
             ::PoolParty::Provision::BootStrapper.new( address[:ip], :cloud => cld )
             ::PoolParty::Provision::DrConfigure.new( address[:ip], :cloud => cld )
-            
           end
         end
       end

data/bin/server-cloud-elections

@@ -11,27 +11,27 @@ end
 vote_for = o.unflagged_args.shift || "none"
 
 schema = ::PoolParty.load_cloud_from_json(o.unflagged_args.shift)  #TODO: smarter option parser
-remote_base_name = schema.options.remote_base.split('::')[-1].camelcase
-remoter_base = PoolParty::Remote.module_eval(remote_base_name)
+remote_base = PoolParty::Remote.module_eval( schema.options.remoter_base.camelcase )
 
 o.loaded_clouds.each do |cld|
   cld.update_from_schema(schema)
-  
   case vote_for
   when "expand"
-    vputs "Launching new instance"
+    puts "Launching new instance"
+    `rm /etc/poolparty/neighborhood.json`
     cld.send :launch_instance!, schema.options.merge(:cloud_name => cld.name) do |node|
       dputs "Started node at #{node[:ip]}"
-      
       ::PoolParty::Provision::BootStrapper.new( node[:ip], :cloud => cld )
       ::PoolParty::Provision::DrConfigure.new( node[:ip], :cloud => cld )
-    end
-    
+    end  
+  
   when "contract"
-    last_instance_id = %x[/usr/bin/server-list-active instance_id].split("\t").last
-    remoter_base.terminate_instance! schema.options.merge(:instance_id => last_instance_id)
+    `rm /etc/poolparty/neighborhood.json`
+    last_instance_id = %x[server-list-active instance_id].split("\t").last
+    remote_base.terminate_instance! schema.options.merge(:instance_id => last_instance_id)    
   else
     puts "Unknown action: #{vote_for}"
+    remote_base.describe_instances
   end
 
 end

data/bin/server-list-active

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty/lite"
+require "poolparty/core/array"
 
 list_type = ARGV.shift || "ip"
 
@@ -8,24 +9,16 @@ json_file = ARGV[0] || PoolParty::Default.properties_hash_file
 raise "ERROR: no json_file given" if !json_file
 schema = PoolParty::Schema.new( ::File.read(json_file) )
 
-inst_array = PoolParty::Neighborhoods.load_default.instances.instances
+inst_array = PoolParty::Neighborhoods.load_default.instances
 
 if !inst_array || inst_array.empty?
-  remoter_base = schema.options.remote_base
-  remote_base = remoter_base.top_level_class.constantize(PoolParty::Remote)
-
+  remote_base = PoolParty::Remote.module_eval( schema.options.remoter_base.camelcase )
   instances = remote_base.send :describe_instances, schema.options
-  inst_array = instances.map {|inst| inst.send list_type.to_sym }  
-end
-
-print_array = 
-case list_type
-when "ip"
-  inst_array.compact.map {|i| i.ip }
-when "internal_ip"
-  inst_array.compact.map {|i| i.internal_ip || i.ip }
+  inst_array = instances.map {|inst| inst.send list_type.to_sym }.compact
+  if ['ip', 'public_id', 'internal_ip'].include? list_type
+    inst_array.delete_if{|n| !n.match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/) }
+  end
+  print inst_array.compact.join("\t")
 else
-  inst_array
-end
-
-print print_array.compact.join("\t")
+  print inst_array.map {|inst| inst.send list_type.to_sym }.compact.join("\t")
+end

data/bin/server-manage-election

@@ -7,6 +7,7 @@
 # Error codes
 # 1 -> clouds.json was not loaded
 # 2 -> server-list-active didn't run
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "rubygems"
 require 'net/http'
 require 'json'
@@ -19,20 +20,18 @@ def get_json_stats_from(ip, port)
   Net::HTTP.start(ip, port) {|http| http.get('/stats.json') }.body rescue "{}"
 end
  
-ips = %x[/usr/bin/server-list-active internal_ip].split("\t")
-
-exit(2) unless ips
+ips = %x[server-list-active internal_ip].split("\t")
 
 minimum_instances = schema.options.minimum_instances
 maximum_instances = schema.options.maximum_instances
 
 if ips.size < minimum_instances
-  %x[/usr/bin/server-cloud-elections expand]
   puts "Cloud is too small, need to expand"
+ %x[server-cloud-elections expand]
   exit(0)
 elsif ips.size > maximum_instances
-  %x[/usr/bin/server-cloud-elections contract]
   puts "Cloud is too big, need to contract"
+ %x[n/server-cloud-elections contract]
   exit(0)
 end
 

data/examples/basic.rb

@@ -1,19 +1,20 @@
 # Basic pool spec
 # Shows global settings for the clouds
 pool :application do
-  instances 3..50  
+  instances 1..5
   
   cloud :basic_app do
-    minimum_instances 12
+    minimum_instances 3
+    keypair 'front'
     image_id "ami-abc123"
     has_file :name => "/etc/motd", :content => "Welcome to your PoolParty instance"
   end
   
   cloud :basic_db do
     using :vmrun do
-      vmx_hash "file" => "192.168.248.122"
+      vmx_hash "/path/to/vmx_file" => "192.168.248.122"
     end
-    minimum_instances 19
+    minimum_instances 1
     image_id "ami-1234bc"
   end
 

data/examples/fairchild.rb

@@ -5,7 +5,7 @@ pool :application do
   ami 'ami-7cfd1a15'  
   
   cloud :example_one do
-    
+    keypair 'front'
     has_directory "/var/www"
     
     has_file "/etc/motd", 

data/lib/poolparty.rb

@@ -64,12 +64,12 @@ $_poolparty_load_directories = [
   "dependencies.rb",
   "modules/searchable_paths.rb",
   "modules/pinger.rb",
+  "modules",
   "poolparty/key.rb",
   "dependency_resolver/dependency_resolver_cloud_extensions.rb",
   "dependency_resolver/dependency_resolver.rb",
   "poolparty/poolparty_base_class.rb",
   "poolparty/default.rb",
-  "modules",
   "exceptions",
   'poolparty/key.rb',
   "dependency_resolver",

data/lib/poolparty/core/hash.rb

@@ -112,13 +112,21 @@ class Hash
     self
   end
   
+  def to_cloud
+    $:.unshift("#{::File.dirname(__FILE__)}/../../poolparty")
+    require "poolparty"
+    cld = Cloud.new((fetch(:name) rescue "hashed_cloud"))
+    cld.set_vars_from_options(self)
+    cld
+  end
+  
   def method_missing(sym, *args, &block)
-    if has_key?(sym)
+    if has_key?(sym.to_sym)
       fetch(sym)
     elsif has_key?(sym.to_s)
       fetch(sym.to_s)
     else
       super
     end
-  end
+  end  
 end

data/lib/poolparty/helpers/optioner.rb

@@ -114,17 +114,17 @@ module PoolParty
       output_options if verbose? && verbose
       
       if @load_pools
-        @loaded_pool = load_pool( spec? ? spec : Binary.get_existing_spec_location)
+        @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.dsl_options.merge!(self.options)
+          pl.dsl_options.merge!(self.dsl_options)
         end
         loaded_clouds.each do |cl|
-          cl.dsl_options.merge!(self.options)
+          cl.dsl_options.merge!(self.dsl_options)
         end
       end
     end
@@ -152,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

data/lib/poolparty/lite.rb

@@ -5,12 +5,15 @@ begin
 rescue Exception => e
   require "dslify"
 end
+require "#{::File.dirname(__FILE__)}/core/string"
+require "#{::File.dirname(__FILE__)}/core/hash"
+require "#{::File.dirname(__FILE__)}/core/object"
 require "#{::File.dirname(__FILE__)}/poolparty/default"
 require "#{::File.dirname(__FILE__)}/modules/user_helpers"
+require "#{::File.dirname(__FILE__)}/modules/cloud_resourcer"
+require "#{::File.dirname(__FILE__)}/modules/pinger"
 require "#{::File.dirname(__FILE__)}/schema"
-require "#{::File.dirname(__FILE__)}/core/string"
 require "#{::File.dirname(__FILE__)}/net/init"
-require "#{::File.dirname(__FILE__)}/core/hash"
 require "#{::File.dirname(__FILE__)}/poolparty/neighborhoods"
 require "#{::File.dirname(__FILE__)}/exceptions/RemoteException.rb"
 

data/lib/poolparty/modules/cloud_resourcer.rb

@@ -74,11 +74,18 @@ module PoolParty
     end
     
     def update_from_schema(schema)
-      keypairs = schema.options.delete(:keypairs).map {|a| PoolParty::Key.new(a.basename) }
-      options.merge! schema.options
-      dsl_options[:keypairs] = keypairs
-
-      dsl_options[:dependency_resolver] = schema.options.dependency_resolver.split("::")[-1].gsub(/Resolver/, '').preserved_class_constant("Resolver") rescue PoolParty::Chef
+      self.dsl_options.merge! schema.options.to_hash
+      self.dependency_resolver = schema.options.dependency_resolver.split("::")[-1].gsub(/Resolver/, '').preserved_class_constant("Resolver") rescue PoolParty::Chef
+      keypair schema.options.keypair_name
+      remote_base_class = PoolParty::Remote.module_eval( schema.options.remoter_base.camelcase )
+      self.remote_base = remote_base_class.new  schema.options.remote_base.to_hash
+      
+      # self.keypair = PoolParty::Key.new schema.options.keypair.basename
+      # keypair = schema.options.delete(:keypairs).map {|a| PoolParty::Key.new(a.basename) }
+      # options.merge! schema.options.to_hash
+      # dsl_options[:keypairs] = keypairs
+      # 
+      # dsl_options[:dependency_resolver] = schema.options.dependency_resolver.split("::")[-1].gsub(/Resolver/, '').preserved_class_constant("Resolver") rescue PoolParty::Chef
       
     end
     

data/lib/poolparty/modules/pretty_printer.rb

@@ -26,7 +26,7 @@ module PoolParty
     def pretty_options(pre, o)
       return "" unless o.respond_to?(:options)
       print_options = (o.respond_to?(:parent) && o.parent && o.parent.respond_to?(:options)) ? 
-        (o.dsl_options.delete_if {|k,v| o.parent.dsl_options.has_key?(k) && o.parent.options[k] == o.options[k] && !o.options[k].nil? } ) : 
+        (o.dsl_options.delete_if {|k,v| o.parent.dsl_options.has_key?(k) && o.parent.dsl_options[k] == o.dsl_options[k] && !o.dsl_options[k].nil? } ) : 
         o.options
       print_options = print_options.map {|k,v| [k, o.send(k.to_sym).to_s] }.inject({}) { |r,e| r[e[0]] = e[1] unless o.class.default_options[e[0]] == e[1] || e[1].nil? || e[1].empty?; r }
       print_options.flush_out("#{pre}\t")

data/lib/poolparty/monitors/monitor_rack.rb

@@ -61,6 +61,7 @@ module Monitors
     
     private
     def instance
+      return nil if path_map.nil?
       @instance ||= constantize( path_map.first ).new(env)
     end
     
@@ -95,7 +96,7 @@ module Monitors
         when 1 # example: /stats
           instance.send(verb.to_sym, @data)
         when 2 # example: /stats/load
-          instance.send("#{verb}_#{path[1]}".to_sym, @data)
+          instance.send("#{verb}_#{path[1]}".to_sym, @data) rescue instance.send("#{path[1]}".to_sym, @data)
         else # example: /stats/load/average/5/minutes
           instance.send("#{verb}_#{path[1]}".to_sym, env['rack.input'].read, *path[2..-1])
         end
@@ -119,5 +120,4 @@ module Monitors
   
   end
   
-
 end

data/lib/poolparty/monitors/monitors/{time_monitor.rb → clock_monitor.rb}

@@ -1,8 +1,8 @@
 # An example monitor
-# access it at /monitor_time/ or /monitor_time/now
+# access it at /monitor_clock/ or /monitor_clock/now
 module Monitors
   
-  class Time < BaseMonitor
+  class Clock < BaseMonitor
     def get(data=nil)
       Time.now
     end

data/lib/poolparty/monitors/monitors/neighborhood_monitor.rb

@@ -8,7 +8,8 @@ module Monitors
   class Neighborhood < BaseMonitor
     
     def get(data=nil)
-      neighborhood
+      reset!
+      neighborhood      
     end
     
     def put(data, from=nil)
@@ -66,12 +67,14 @@ module Monitors
     end
     
     # HELPERS
-    def instances
-      @instances ||= ::PoolParty::Neighborhoods.load_default.instances.to_hash[:instances]
+    def instances(_n=nil)
+      @instances ||= ::PoolParty::Neighborhoods.load_default.instances #.to_hash #[:instances]
     end
-    def stats
+    def stats(_n=nil)
       @stats ||= ::PoolParty::Neighborhoods.load_default.stats rescue Stats.new(@env).get
     end
-    
+    def reset!
+      @neighborhood = @stats = nil
+    end
   end
 end

data/lib/poolparty/monitors/monitors/stats_monitor.rb

@@ -16,26 +16,19 @@ module Monitors
       
       begin
         @cloud = JSON.parse( open('/etc/poolparty/clouds.json' ).read )
+        # @cloud = ::PoolParty::Cloud::Cloud.load_from_json(open('/etc/poolparty/clouds.json' ).read)
       rescue 
-        @cloud = ::PoolParty::Default.options.merge({"options" =>
+        @cloud = ::PoolParty::Default.dsl_options.merge({"options" =>
           {"rules" => {"expand"   => PoolParty::Default.expand_when,
                        "contract" => PoolParty::Default.contract_when
                       }
           }
-        })
+        })        
       end
-      # Our cloud.options.rules looks like
-      #  {"expand_when" => "load > 0.9", "contract_when" => "load < 0.4"}
-      # We set these as rules on ourselves so we can use aska to parse the rules.
-      # Later, we can call vote_rules on ourself and we'll get back Aska::Rule(s)
-      # which we'll call valid_rule? for each Rule and return the result
-      @cloud["options"]["rules"].each do |name, rul|
-        r = Aska::Rule.new(rul)
-        rule(name) << r
-      end
-      # log << "#{::Time.now.strftime("%Y-%m-%d-%H-%M")}, #{stats.to_json}\n"
+      make_aska_rules(@cloud["options"]["rules"])
+      log << "#{::Time.now.strftime("%Y-%m-%d-%H-%M")}, #{stats.to_json}\n"
     end
-    
+        
     def get(data=nil)
       begin
         if !request.params || request.params.empty?
@@ -43,10 +36,11 @@ module Monitors
         else
           stats[request.params[0].to_sym] ||= self.send(request.params[0])
           stats[request.params[0].to_sym]
+          log << "#{::Time.now.strftime("%Y-%m-%d-%H-%M")}, #{stats.to_json}\n"
           stats.to_json
         end
       rescue Exception => e
-        "Error: #{e}"
+        "Error: #{e}".to_json
       end
     end
     
@@ -86,11 +80,12 @@ module Monitors
       # TODO: Move?
       # Expand the cloud if 50+% of the votes are for expansion
       # Contract the cloud if 51+% of the votes are for contraction
+      # Check to make sure an elected action is not already in progress
       if (candidates[:expand] - candidates[:contract])/stats.keys.size > 0.5
-        %x[/usr/bin/server-cloud-elections expand] unless elected_action == "expand"
+        %x[server-cloud-elections expand] unless elected_action == "expand"
         @elected_action = "expand"
       elsif (candidates[:contract] - candidates[:expand])/stats.keys.size > 0.5
-        %x[/usr/bin/server-cloud-elections contract] unless elected_action == "contract"
+        %x[server-cloud-elections contract] unless elected_action == "contract"
         @elected_action = "contract"
       end      
 
@@ -100,12 +95,11 @@ module Monitors
       stats.to_json
     end
 
-
-    def elected_action
+    def elected_action(_n=nil)
       @elected_action ||= nil
     end
 
-    def rules
+    def rules(_n=nil)
       @rules ||= {}
     end
 
@@ -120,37 +114,38 @@ module Monitors
       stats
     end
 
-    def stats
+    def stats(_n=nil)
       @stats ||= {my_ip  => {}}
     end
 
-    def load
+    def load(_n=nil)
       %x{"uptime"}.split[-3].to_f
     end
 
-    def instances
+    def instances(_n=nil)
       # res = PoolParty::Neighborhoods.load_default.instances
-      res ||= %x[/usr/bin/server-list-active internal_ip].split("\t")
+      res ||= %x[server-list-active internal_ip].split("\t")
       res
     end
 
-    def can_expand?
+    def can_expand?(_n=nil)
       instances.size < max_instances
     end
 
-    def can_contract?
+    def can_contract?(_n=nil)
       instances.size > min_instances
     end
 
-    def min_instances
+    def min_instances(_n=nil)
       (@cloud["options"]["minimum_instances"] || PoolParty::Default.minimum_instances).to_i
     end
 
-    def max_instances
+    def max_instances(_n=nil)
       (@cloud["options"]["maximum_instances"] || PoolParty::Default.maximum_instances).to_i
     end
 
-    def nominations
+    def nominations(_n=nil)
+      # return ['expand'] if instances.size<min_instances
       load = stats[my_ip]["load"] ||= self.send(:load)
       stats[my_ip]["nominations"] ||= rules.collect do |k,cld_rules|
         t = cld_rules.collect do |r|
@@ -170,17 +165,38 @@ module Monitors
       end.flatten.compact
     end
 
+    #alias to allow access thru http route GET /stats/nominations
+    def get_nominations(_nodes=[])
+      nominations.to_json
+    end
+    
+    def get_hello(_n=nil)
+      'hi there'
+    end
+    
     def my_ip
       @my_ip ||= ohai["ipaddress"]
     end
 
-    def ohai
+    def ohai(_n=nil)
       @ohai ||= JSON.parse(%x[ohai])
     end
 
     def reload_data!
       @stats[my_ip] = {}
       instances.each {|inst| @stats[inst] = {} }
+    end
+    
+    # Our cloud.dsl_options.rules looks like
+    #  {"expand_when" => "load > 0.9", "contract_when" => "load < 0.4"}
+    # We set these as rules on ourselves so we can use aska to parse the rules.
+    # Later, we can call vote_rules on ourself and we'll get back Aska::Rule(s)
+    # which we'll call valid_rule? for each Rule and return the result
+    def make_aska_rules(rules)
+      rules.each do |name, rul|
+        r = Aska::Rule.new(rul)
+        rule(name) << r
+      end
     end    
     
   end