fairchild-poolparty 1.1.5 → 1.2.12

data/bin/cloud-run

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + "/../lib")
+require "poolparty"
+# require "poolpartycl"
+require 'git-style-binary/command'
+
+GitStyleBinary.command do  
+  version "PoolParty #{$0} command"  
+  banner <<-EOS
+Usage: #{$0} #{all_options_string} cmd
+
+  run a cmd in the cloud
+EOS
+
+  short_desc "run a cmd in the cloud"
+  opt :inst_num, "The number of the instance to ssh to, starts at 0.", :type => :int
+  
+  run do |command|    
+    @loaded_clouds.each do |cloud|
+      @cloud = cloud
+      nodes = @cloud.nodes(:status => "running")
+      
+      if !nodes.empty?
+        nodes.each_with_index do |node, i|
+          next unless i == command[:inst_num].to_i if command[:inst_num]
+          ip = nodes[i].ip || nodes[i].public_ip
+          cmd = ARGV.join(" ")
+          puts "%s %s: %s" % [cloud.cloud_name, ip, cmd]
+          @cloud.ssh_into(ip, :cmd => cmd) if @cloud
+        end
+      else
+        puts "No running instances can be found"
+      end
+    end
+    
+  end    
+end

data/bin/cloud-setup-dev

@@ -1,25 +1,36 @@
 #!/usr/bin/env ruby
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$:.unshift(File.dirname(__FILE__) + "/../lib")
 require "poolparty"
-require "poolpartycl"
+# require "poolpartycl"
+require 'git-style-binary/command'
 
-o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-n name', '--name name', 'Setup development environment for cloud named')    { |c| optioner.cloudname c }
-end
-  
-o.loaded_clouds.each do |cld|
-  
-  if cld.remote_instances_list.empty?
-    puts "Your cloud is not running"
-  else
-    str =<<-EOE
-    Host #{cld.name}-master
-      User        #{cld.user}
-      Hostname    #{cld.remote_instances_list.first.ip}
-      IdentityFile    #{cld.keypair}
-    EOE
-  
-    puts "Enter the following in your .ssh/config file"
-    puts str
+GitStyleBinary.command do  
+  version "PoolParty #{$0} command"  
+  banner <<-EOS
+Usage: #{$0} #{all_options_string} COMMAND [ARGS]
+
+  puts a helpful ssh config
+EOS
+
+  short_desc "puts a helpful ssh config"
+
+  run do |command|    
+    @loaded_clouds.each do |cld|
+      
+        if cld.nodes(:status => "running").empty?
+          puts "Your cloud is not running"
+        else
+          str =<<-EOE
+          Host #{cld.name}
+            User        #{cld.user}
+            Hostname    #{cld.nodes(:status => "running").first.ip}
+            IdentityFile    #{cld.keypair}
+          EOE
+        
+          puts "Enter the following in your .ssh/config file"
+          puts str
+        end
+      
+    end    
   end
 end

data/bin/cloud-show

@@ -1,28 +1,47 @@
 #!/usr/bin/env ruby
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$:.unshift(File.dirname(__FILE__) + "/../lib")
 require "poolparty"
+# require "poolpartycl"
+require 'git-style-binary/command'
 
-o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
-end
+GitStyleBinary.command do
+  @theme = :short
+  
+  version "PoolParty #{$0} command"  
+  banner <<-EOS
+Usage: #{$0} #{all_options_string}
 
-o.loaded_clouds.each do |cld|
-  puts "\nFrom #{$pool_specfile}\n"
-  print_with_nice_printer "Cloud: #{cld.name}", [
-    "instances #{cld.minimum_instances}..#{cld.maximum_instances}",
-    "keypair #{cld.keypair}",
-    "using #{cld.remote_base.class.to_s.top_level_class}"
-  ] do |printer|
-    if cld.nodes(:status => "running").size > 0
-      printer.empty
-      printer.center("Active instances")
-      printer << nodes(:status => "running").map{|a| a.ip.strip }.join("\n")
-    end
-    if cld.nodes(:status => "pending").size > 0
-      printer.empty
-      printer.center "Pending instances"
-      printer << cld.nodes(:status => "pending").map{|a| a.to_s}.join("\n")
+shows output about the clouds.rb
+
+EOS
+
+  short_desc "shows output about the clouds.rb"
+
+  run do |command|
+
+    @loaded_clouds.each do |cld|
+        
+        dputs "Showing #{cld.name}"
+        puts "\nFrom #{$pool_specfile}\n"
+        print_with_nice_printer "Cloud: #{cld.name}", [
+          "instances #{cld.minimum_instances}..#{cld.maximum_instances}",
+          "keypair #{cld.keypair}",
+          "using #{cld.remote_base.class.to_s.top_level_class}"
+        ] do |printer|
+          if cld.nodes(:status => "running").size > 0
+            printer.empty
+            printer.center("Active instances")
+            printer << cld.nodes(:status => "running").map{|a| a.ip.strip rescue nil }.compact.join("\n")
+          end
+          if cld.nodes(:status => "pending").size > 0
+            printer.empty
+            printer.center "Pending instances"
+            printer << cld.nodes(:status => "pending").map{|a| a.ip.strip rescue nil }.join("\n")
+          end
+          printer.empty
+        end
+      
     end
-    printer.empty
+    
   end
 end

data/bin/cloud-ssh

@@ -1,21 +1,30 @@
 #!/usr/bin/env ruby
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$:.unshift(File.dirname(__FILE__) + "/../lib")
 require "poolparty"
-require "poolpartycl"
+# require "poolpartycl"
+require 'git-style-binary/command'
 
-o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  optioner.options( :num => 0 )
-  opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
-  opts.on('-i num', '--id num', 'Instance num to ssh (default: 0)')    { |i| optioner.inst_num i.to_i }
-end
-load_pool(o.spec? ? o.spec : Binary.get_existing_spec_location)
+GitStyleBinary.command do  
+  version "PoolParty #{$0} command"  
+  banner <<-EOS
+Usage: #{$0} #{all_options_string}
 
-@cloud = o.loaded_clouds.first
-nodes = @cloud.nodes(:status => "running")
+  ssh into an instance of the cloud
+EOS
 
-if !nodes.empty?
-  n = o.inst_num? ? o.inst_num : 0
-  @cloud.ssh_into( nodes[n].ip ) if @cloud
-else
-  puts "No running instances can be found"
+  short_desc "ssh into an instance of the cloud"
+  opt :inst_num, "The number of the instance to ssh to, starts at 0.", :type => :int
+  
+  run do |command|    
+    @cloud = @loaded_clouds.first
+    nodes = @cloud.nodes(:status => "running")
+    
+    if !nodes.empty?
+      n = command[:inst_num] ? command[:inst_num].to_i : 0
+      @cloud.ssh_into( nodes[n].ip || nodes[n].public_ip ) if @cloud
+    else
+      puts "No running instances can be found"
+    end
+    
+  end    
 end

data/bin/cloud-start

@@ -1,30 +1,44 @@
 #!/usr/bin/env ruby
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$:.unshift(File.dirname(__FILE__) + "/../lib")
 require "poolparty"
+# require "poolpartycl"
+require 'git-style-binary/command'
 
-o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-n cloudname', '--name name', 'Start cloud by this name')    { |c| optioner.cloudname c }
-end
+GitStyleBinary.command do  
+  version "PoolParty #{$0} command"  
+  banner <<-EOS
+Usage: #{$0} #{all_options_string}
 
-o.loaded_clouds.each do |cld|
+  starts a single instance in your cloud.
+EOS
 
-  if cld.nodes(:status => "running").size.zero?
-    puts header("Starting cloud #{cld.name} (#{cld.keypair})")
-    puts "#{cld.nodes(:status => "running").size} running instances (#{cld.minimum_instances} - #{cld.maximum_instances})"
+  short_desc "starts a single instance in your cloud"
+
+  run do |command|    
     
-    cld.launch_instance!(cld.dsl_options) do |node|
+    @loaded_clouds.each do |cld|
+
+      if cld.nodes(:status => "running").size.zero?
+        puts "Starting cloud #{cld.name} (#{cld.keypair})"
+        puts "#{cld.nodes(:status => "running").size} running instances (#{cld.minimum_instances} - #{cld.maximum_instances})"
+        
+        cld.launch_instance!(:cloud_name => cld.name) do |node|
+          
+          ::PoolParty::Provision::BootStrapper.new(node.ip, :cloud => cld)
+          ::PoolParty::Provision::DrConfigure.new(node.ip,  :cloud => cld)
+          
+          puts <<-EOM
+            Your cloud has started. Your ip is #{node.ip}
+          EOM
+        end
       
-      ::PoolParty::Provision::BootStrapper.new(node.ip, :cloud => cld)
-      ::PoolParty::Provision::DrConfigure.new(node.ip,  :cloud => cld)
+      else
+        puts <<-EOE
+          Your cloud is already running.
+        EOE
+      end
       
-      puts <<-EOM
-        Your cloud has started. Your ip is #{node.ip}
-      EOM
     end
-  
-  else
-    puts <<-EOE
-      Your cloud is already running.
-    EOE
+    
   end
 end

data/bin/cloud-terminate

@@ -1,22 +1,41 @@
 #!/usr/bin/env ruby
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$:.unshift(File.dirname(__FILE__) + "/../lib")
 require "poolparty"
 require "poolpartycl"
+require 'git-style-binary/command'
 
-o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-n name', '--name name', 'Terminate the cloud of this name')    { |c| optioner.cloudname c }
-end
+GitStyleBinary.command do  
+  version "PoolParty #{$0} command"  
+  banner <<-EOS
+Usage: #{$0} #{all_options_string} COMMAND [ARGS]
 
-o.loaded_clouds.each do |cld|
-  cld.nodes(:status => "running").each do |inst|
-    msg = <<-EOM
-Shutting down #{inst.instance_id}
-Are you sure? (Y/N)
-    EOM
-    
-    if are_you_sure?(msg)
-      puts "Shutting down #{inst.instance_id}"
-      cld.terminate_instance!(:instance_id => inst.instance_id)
-    end
+  terminate the cloud
+EOS
+
+  short_desc "terminate the cloud"
+  
+  opt :yes, "Answer yes to the are you sure question", :type => :boolean, :default => false
+
+  run do |command|    
+    @loaded_clouds.each do |cld|
+      
+      cld.nodes(:status => "running").each do |inst|
+        msg = <<-EOM
+    Shutting down #{inst.instance_id}
+    Are you sure? (Y/N)
+        EOM
+        o = are_you_sure? msg || command[:yes]
+        if o
+          puts "Shutting down #{inst.instance_id}"
+          cld.terminate_instance!(:instance_id => inst.instance_id)
+        else
+          if are_you_sure?(msg)
+            puts "Shutting down #{inst.instance_id}"
+            cld.terminate_instance!(:instance_id => inst.instance_id)
+          end
+        end
+      end
+      
+    end    
   end
 end

data/bin/cloud-verify

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + "/../lib")
+require "poolparty"
+# require "poolpartycl"
+require 'git-style-binary/command'
+
+GitStyleBinary.command do  
+  version "PoolParty #{$0} command"  
+  banner <<-EOS
+Usage: #{$0} #{all_options_string}
+
+  Run the verifiers on your cloud 
+EOS
+
+  short_desc "Run the verifiers on your cloud"
+
+  run do |command|    
+    @loaded_clouds.each do |cld|
+      
+        begin
+          if cld.verifiers.size > 0
+            cld.passing?
+            vputs "Cloud passed verification"
+          else
+            raise "Your cloud doesn't have any verifiers!"
+            exit 2
+          end
+        rescue Exception => e
+           cld.vputs <<-EOM
+      
+            Verification failed: #{e}"
+              Please check your clouds.rb for any errors
+      
+            Exception: #{e.class}: #{e.message}\n\t#{e.backtrace.join("\n\t")}
+      
+            EOM
+        end
+      
+    end    
+  end
+end

data/bin/install-poolparty

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolpartycl"
+require "poolparty/installers/base_installer"
+require "highline/import"
+
+say("\nWhat remoter base would you like to use?")
+choose do |menu|
+  menu.prompt = "> "
+
+  PoolParty::Remote::RemoterBase.available_bases.each do |base|
+    menu.choice base.to_sym do 
+      
+      say "Great, we'll be using #{base}"
+      
+      klass = "::PoolParty::Installers::#{base.to_s.capitalize}".constantize
+      klass.send :new
+    end
+  end
+  
+end

data/bin/server-cloud-elections

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
-require "poolparty/lite"
 
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-n cloudname', '--name name', 'Start cloud by this name')    { |c| optioner.cloudname c }
@@ -10,28 +9,23 @@ 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)
+cld = ::PoolParty::Cloud::Cloud.load_from_json(ENV['CLOUDS_JSON_FILE'] || '/etc/poolparty/clouds.json')  #TODO: smarter option parser
 
-o.loaded_clouds.each do |cld|
-  cld.update_from_schema(schema)
-  
-  case vote_for
-  when "expand"
-    vputs "Launching new instance"
-    cld.send :launch_instance!, schema.options 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
-    
-  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)
-  else
-    puts "Unknown action: #{vote_for}"
-  end
+case vote_for
+when "expand"
+  puts "Launching new instance"
+  cld.launch_instance! 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  
 
+when "contract"
+  last_instance_id = %x[server-list-active instance_id].split("\t").last
+  cloud.terminate_instance!(:instance_id => last_instance_id)
+when 'none'
+  nil
+else
+  puts "Unknown action: #{vote_for}"
 end
+

data/bin/server-list-active

@@ -1,31 +1,32 @@
 #!/usr/bin/env ruby
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-require "poolparty/lite"
+# require "poolparty/lite"
+# require "poolparty/core/array"
+require 'poolparty'
 
 list_type = ARGV.shift || "ip"
 
-json_file = ARGV[0] || PoolParty::Default.properties_hash_file
+json_file = ARGV[0] || ENV['CLOUD_JSON_FILE'] || 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
+cld = Cloud.load_from_json(::File.read(json_file))
+conditions= {:status=>'running', :keypair=>cld.keypair_name}
+inst_array = cld.nodes(conditions)
+puts inst_array.collect{|n| n[list_type] || n[list_type.to_sym]}.join("\t")
 
-if !inst_array || inst_array.empty?
-  remoter_base = schema.options.remote_base
-  remote_base = remoter_base.top_level_class.constantize(PoolParty::Remote)
 
-  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 }
-else
-  inst_array
-end
-
-print print_array.compact.join("\t")
+# schema = PoolParty::Schema.new( ::File.read(json_file) )
+# 
+# inst_array = nil #PoolParty::Neighborhoods.load_default.instances
+# 
+# if !inst_array || inst_array.empty?
+#   remote_base = PoolParty::Remote.module_eval( schema.options.remoter_base.camelcase )
+#   instances = remote_base.send :describe_instances, schema.options.keypair_name
+#   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
+#   print inst_array.map {|inst| inst.send list_type.to_sym }.compact.join("\t")
+# end

data/bin/server-manage-election

@@ -1,38 +1,31 @@
 #!/usr/bin/env ruby
-# Call server-list-active and get the neighborhood ips back
-# then call each of those at the port of butterfly and retain the json
-# From there, mash it up together and call server-handle-election
-# to handle the election process
-
-# 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'
-require "poolparty/lite"
+#require "poolparty/lite"
+require 'poolparty'
 
 status = ARGV.shift || "running" # or pending or terminated
-schema = ::PoolParty.load_cloud_from_json(ARGV.shift)  #TODO: smarter option parser
+schema = ::PoolParty::Cloud::Cloud.load_from_json(ENV['CLOUDS_JSON_FILE'] || '/etc/poolparty/clouds.json')
 
 def get_json_stats_from(ip, port)
-  Net::HTTP.start(ip, port) {|http| http.get('/stats.json') }.body rescue "{}"
+  Net::HTTP.start(ip, port) {|http| http.get('/stats') }.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")
+ips = schema.describe_instances.select_with_hash(:status=>'running').collect{|n| n.ip} #TODO: needs to filter to only this cloud
 
-minimum_instances = schema.options.minimum_instances
-maximum_instances = schema.options.maximum_instances
+minimum_instances = schema.dsl_options.minimum_instances
+maximum_instances = schema.dsl_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[server-cloud-elections contract]
   exit(0)
 end
 
@@ -50,17 +43,15 @@ candidates.each do |action, ballots|
   end
 end
 
-puts total_json_hash.inspect
-puts candidates.inspect
-
 # Expand the cloud if 50+% of the votes are for expansion
 # Contract the cloud if 51+% of the votes are for contraction
 @elected_action = candidates[:elected_action] || "none"
+puts "checking nominations"
 if (candidates[:expand] - candidates[:contract])/total_json_hash.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])/total_json_hash.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      
 

data/bin/server-show-stats

@@ -10,7 +10,7 @@ end
 o.loaded_clouds.each do |cloud|
   
   with_cloud(cloud) do    
-    puts header("Stats")
+    puts "Stats"
     puts rules_values
   end  
   

data/config/jeweler.rb

@@ -12,18 +12,18 @@ end
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name = "poolparty"
+    s.description = "PoolParty: The easy, open-source, cross-cloud management solution"
     s.summary = <<-EOM      
       Self-healing, auto-scaling system administration, provisioning
       and maintaining tool that makes cloud computing fun and easy
     EOM
-    s.description = s.summary
     
     s.homepage = "http://poolpartyrb.com"
     s.email = "ari.lerner@citrusbyte.com"
     s.authors = ["Ari Lerner"]
     
     s.test_files = Dir["test/**/test_*.rb"]
-    excludes_regexp = ["vendor/gems", "lib/erlang"].one_of_regex
+    excludes_regexp = ["lib/erlang"].one_of_regex
 
     s.files = (%w(Rakefile History.txt README.txt PostInstall.txt License.txt VERSION.yml) + 
               Dir["{config,examples,lib,spec,test,tasks,script,generators,bin,vendor}/**/*"]).delete_if{|f| f =~ excludes_regexp}
@@ -36,14 +36,14 @@ end
         "--main", "README"
         ]
     
-    s.add_dependency 'activesupport'
+    # s.add_dependency 'activesupport'
     s.add_dependency 'logging'
-    s.add_dependency 'auser-dslify'
-    s.add_dependency 'auser-parenting'
+    # s.add_dependency 'auser-dslify'
+    # s.add_dependency 'auser-parenting'
     # s.add_dependency 'auser-suitcase'
     # s.add_dependency 'ruby2ruby'  #TODO: remove this after verifying removing doesnt break anything
     s.add_dependency 'grempe-amazon-ec2'
-    s.add_dependency 'rubigen', ">=1.5.2"
+    # s.add_dependency 'rubigen', ">=1.5.2"
     # Certainly there should be more here
     
   end