poolparty 0.2.84 → 1.2.2

data/History.txt

@@ -1,3 +1,10 @@
+== 1.1 2009-03-03
+  * Release 1.1 with new stable core
+
+== 1.0.0 2009-1-20
+	* Released 1.0 at CitrusByte
+	* Party
+	
 == 0.2.77 2008-12-5
   * Added heartbeat failover
 

data/License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2008 Ari Lerner
+Copyright (c) 2009 Ari Lerner
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/PostInstall.txt

@@ -1,4 +1,4 @@
-Get ready to jump in the pool, you just installed PoolParty! (Updated at 19:18 12/13/08)
+Get ready to jump in the pool, you just installed PoolParty! (Updated at 19:34 03/02/09)
 
 To get started, run the generator:
 

data/README.txt

@@ -9,19 +9,10 @@ with language such as:
 
 pool :cloud do
  cloud :app do
-  apache do
-   has_virtualhost(:name => "/var/www/sites/poolpartyrb.com")
-  end
+   instances 2..10
  end
 end
 
-== FEATURES/PROBLEMS:
-
-* Written in Ruby and Erlang
-* Written from the ground up to be extensible with plugins
-* Easy git-style commands to communicate with your clouds
-* Much much more
-
 == SYNOPSIS:
 
 PoolParty is written with the intention of being as application-agnostic as possible. It installs only the basic 
@@ -30,25 +21,25 @@ required software to glue the cloud together on the instances as listed below.
 PoolParty is easily configuration. In fact, it makes little assumptions about your development environment and allows 
 several options on how to begin configuring the cloud.
 
+== WHAT NEXT:
+* PoolParty::Resources - learn how to use resources in your <tt>clouds.rb</tt>
+
+== FEATURES/PROBLEMS:
+
+* Written in Ruby and Erlang
+* Written from the ground up to be extensible with plugins
+* Easy git-style commands to communicate with your clouds
+* Much much more
+
 == REQUIREMENTS:
 
-COMING SOON
+Ruby
+Erlang
 
 == INSTALL:
 
 sudo gem install auser-poolparty
 
-== TODO:
-* Rewrite the disallowed_options to whitelist allowed_options on resources
-* Add pingback for nodes to master when failure occurs
-* Add become master for the nodes
-* Add soft-stop to haproxy while reconfiguring
-* Replace services with Runit
-* Add more granular spec helpers
-* Refactor provisioning to use erlang
-* Add queuing of tasks on the messenger
-* Add list of latest loads to the messenger
-
 == LICENSE:
 
 (The MIT License)

data/Rakefile

@@ -1,15 +1,24 @@
 require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
+
+begin
+  require 'hanna/rdoctask'
+rescue Exception => e
+  require "rake/rdoctask"
+end
+
+require 'config/jeweler' # setup gem configuration
 
 Dir['tasks/**/*.rake'].each { |rake| load rake }
 
 desc "Clean tmp directory"
 task :clean_tmp do |t|
-  %x[rm #{File.dirname(__FILE__)}/Manifest.txt; touch #{File.dirname(__FILE__)}/Manifest.txt]
+  FileUtils.rm_rf("#{File.dirname(__FILE__)}/Manifest.txt") if ::File.exists?("#{File.dirname(__FILE__)}/Manifest.txt") 
+  FileUtils.touch("#{File.dirname(__FILE__)}/Manifest.txt")
   %w(logs tmp).each do |dir|
     FileUtils.rm_rf("#{File.dirname(__FILE__)}/#{dir}") if ::File.exists?("#{File.dirname(__FILE__)}/#{dir}")
   end
 end
+
 desc "Remove the pkg directory"
 task :clean_pkg do |t|
   %w(pkg).each do |dir|
@@ -17,9 +26,6 @@ task :clean_pkg do |t|
   end
 end
 
-desc "Generate a new manifest and a new gem"
-task :build_local_gem => [:clean_tmp, :spec, :clean_pkg, :"manifest:refresh", :package]
-
 desc "Packge with timestamp"
 task :update_timestamp do
   data = open("PostInstall.txt").read
@@ -33,37 +39,22 @@ task :update_timestamp do
   ::File.open("PostInstall.txt", "w+") {|f| f << data }
 end
 
-desc "Release to github"
-task :github_release => [:clean_tmp, :spec, :clean_pkg, :"manifest:refresh", :update_timestamp, :package] do
-  res = %x[rake debug_gem]
-  res = res.split("\n")[1..-1].join("\n")
-  ::File.open("#{GEM_NAME.downcase}.gemspec", "w+") do |f|
-    f << res
-  end
-  `mv #{::File.expand_path(::File.dirname(__FILE__))}/pkg/*.gem #{::File.expand_path(::File.dirname(__FILE__))}/pkg/poolparty.gem`
-end
-
-desc "Generate gemspec"
-task :gemspec  => [:spec, :clean_tmp, :"manifest:refresh", :build_local_gem] do |t|
-  res = %x[rake debug_gem]
-  res = res.split("\n")[1..-1].join("\n")
-  ::File.open("#{GEM_NAME.downcase}.gemspec", "w+") do |f|
-    f << res
-  end
+namespace :gem do
+  task(:build).prerequisites.unshift :gemspec # Prepend the gemspec generation
+  
+  desc "Build the gem only if the specs pass"
+  task :test_then_build => [:spec, :build]
+  
+  desc "Build and install the gem only if the specs pass"
+  task :test_then_install => [:spec, :install]
 end
 
-desc "Generate gemspec for github"
-task :gh => [:github_release] do
-  filepath = ::File.join(::File.dirname(__FILE__), "poolparty.gemspec")
-  data = open(filepath).read
-  spec = eval("$SAFE = 3\n#{data}")
-  yml = YAML.dump spec
-  File.open(filepath, "w+") do |f|
-    f << yml
-  end
-end
+task :release => [:update_timestamp]
 
-desc "Generate github gemspec and latest gem"
-task :ghgem => [:gh] do
-  %x[sudo gem install pkg/poolparty.gem]
+# Generate documentation
+Rake::RDocTask.new do |rd|
+  rd.main = "Readme.txt"
+  rd.rdoc_files.include("Readme.txt", "lib/**/*.rb")
+  rd.rdoc_dir = "rdoc"
+  # rd.template = "hanaa"
 end

data/VERSION.yml

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

data/bin/cloud

@@ -3,7 +3,8 @@ $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
 require "poolpartycl"
 
-name = ARGV.select {|arg| arg if Binary.available_binaries_for("cloud").include?(arg) }.first
+# name = ARGV.select {|arg| arg if Binary.available_binaries_for("cloud").include?(arg) }.first
+name = ARGV.shift if Binary.available_binaries_for("cloud").include?(ARGV.first)
 # If the options include -h and they don't include a valid command, then we can just pass the 
 # original options back, but if they do contain a binary, we don't want -h getting through to 
 # these options, so we'll strip it if it's included
@@ -14,7 +15,27 @@ new_args = new_args.reject {|arg| Binary.available_binaries_for("cloud").include
 # Let's make sure if no command is passed in that we show the help message
 new_args.push("-h") unless name
 
-o = PoolParty::Optioner.new(new_args, {:extra_help => "\nCloud actions\n#{Binary.list_binaries_for("cloud")}\n\n", :abstract => true}) do |opts, optioner|  
+# Binary.list_binaries_for("cloud")
+extra_help_string = <<-EOE
+
+  Cloud commands
+    cloud start       starts a single instance in your cloud.
+    cloud bootstrap   bootstraps an instance or multiple instances
+    cloud configure   configures an instance or multiple instances
+    cloud provision   combines bootstrap and configures an instance or multiple instances
+    cloud expand      expands the cloud by a single instance
+    cloud contract    contracts the cloud by a single instance
+    cloud describe    show the configuration of the current clouds.rb configuration file
+    cloud list        show a list of the current instances on the cloud
+    cloud show        shows output about the clouds.rb
+    cloud ssh         ssh into an instance of the cloud
+    cloud terminate   terminate the cloud
+    
+EOE
+
+o = PoolParty::Optioner.new(new_args, {
+  :extra_help => extra_help_string,
+  :abstract => true}) do |opts, optioner|  
   opts.on('-n cloudname', '--name name', 'Address this cloud')    { |c| optioner.cloudname c }
 end
 
@@ -25,7 +46,7 @@ command_line = "#{program_location}"
 
 # Run it from the command-line first
 if Binary.available_binaries_for("cloud").include?(name)
-  system command_line, *ARGV
+  system command_line, *new_args
 else
   puts "Unknown poolparty binary: #{name}"
 end

data/bin/cloud-bootstrap

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+require "poolparty/provision/boot_strapper"
+
+
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-n cloudname', '--name name', 'Start cloud by this name')    { |c| optioner.cloudname c }
+  opts.on('-i num', '--num i', 'Instance number')    { |i| optioner.inst_num i.to_i }
+end
+
+o.loaded_clouds.each do |cld|
+  # If an IP or DNS name is given, bootstrap that node, otherwise, bootstrap all running nodes.
+  # ::FileUtils.rm_rf "#{Default.tmp_path}/" unless o.testing?
+  
+  nodes = !o.unflagged_args.empty? ?  o.unflagged_args : cld.nodes(:status => "running").collect {|i| i.ip }.sort.compact
+  if nodes.empty?
+    puts "No nodes to bootstrap"
+  else
+    if o.inst_num?
+      vputs "\nBootStrapping: #{nodes[o.inst_num]}\n--------------------"
+      ::PoolParty::Provision::BootStrapper.new nodes[o.inst_num], :cloud => cld
+    else
+      nodes.each do |address|
+        vputs "\nBootStrapping: #{address}\n--------------------"      
+        ::PoolParty::Provision::BootStrapper.new address, :cloud => cld
+      end
+    end
+  end
+end
+

data/bin/cloud-configure

@@ -1,27 +1,43 @@
 #!/usr/bin/env ruby
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
-require "poolpartycl"
 
-o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  optioner.cloudnames
-  # optioner.daemonizeable
-end
+extra_help_string = <<-EOE
 
-o.loaded_clouds.each do |cloud|
+  Cloud configure
   
-  with_cloud(cloud) do
+    Cloud configure will repackage the deployment and send it off to a 
+    remote instance from within the cloud. It then will reconfigure
+    itself and alert the rest of the cloud
     
-    # hide_output do
-      # if provision_class == "master" || provision_class == "all"
-      @cl = self
-      # daemon ? daemonize {Provisioner.configure_master(@cl, testing)} : Provisioner.configure_master(self, testing)
-      verbose ? provisioner_for(master).configure(testing) : hide_output { provisioner_for(master).configure(testing) }
-      # end
-      # if provision_class == "slave" || provision_class == "all"
-      #   Provisioner.configure_slaves(self, testing)
-      # end
-    # end    
-    clear_base_directory unless testing
-  end    
-end
+EOE
+
+o = PoolParty::Optioner.new(ARGV, {:extra_help => extra_help_string}) do |opts, optioner|
+  opts.on('-n cloudname', '--name name', 'Start cloud by this name')    { |c| optioner.cloudname c }
+  opts.on('-i num', '--num i', 'Instance number')    { |i| optioner.inst_num i.to_i }
+end
+
+o.loaded_clouds.each do |cld|
+  # If an IP or DNS name is given, bootstrap that node, otherwise, bootstrap all running nodes.
+  # ::FileUtils.rm_rf "#{Default.tmp_path}/" unless o.testing?
+  
+  if cld.nodes(:status => "running").size < 1
+    puts header("No instances running")
+  else
+    nodes = !o.unflagged_args.empty? ?  o.unflagged_args : cld.nodes(:status => "running").collect {|i| i.ip }.sort.compact
+    if nodes.empty?
+      puts "No nodes to configure"
+    else
+      if o.inst_num?
+        vputs "Configuring #{nodes[o.inst_num]}"
+        ::PoolParty::Provision::DrConfigure.new( nodes[o.inst_num], :cloud => cld )
+      else
+        nodes.each do |address|
+          puts "Configuring: #{address}"
+          ::PoolParty::Provision::DrConfigure.new( address, :cloud => cld )
+        end
+      end
+    end
+  end
+end
+

data/bin/cloud-contract

@@ -7,11 +7,11 @@ o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
 end
 
-o.loaded_clouds.each do |cl|
-  with_cloud(cl) do
-    puts header("Contracting cloud #{name}")
-    puts "#{list_of_running_instances.size} running instances (#{minimum_instances} minimum instances)"
-    puts testing ? "Not contracting (test mode)" : "Contracting the cloud if possible"
-    contract_cloud_if_necessary( !testing )
-  end
+o.loaded_clouds.each do |cld|  
+  puts header("Contracting cloud #{cld.name}")
+  puts "#{cld.nodes(:status => "running").size} running instances (#{cld.minimum_instances} minimum instances)"
+  puts testing ? "Not contracting (test mode)" : "Contracting the cloud if possible"
+
+  last_instance_id = cld.nodes(:status => "running").last[:instance_id]
+  cld.remote_base.terminate_instance! cld.options.merge(:instance_id => last_instance_id)
 end

data/bin/cloud-describe

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
+end
+
+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}",
+    "remoter #{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 }.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")
+    end
+    printer.empty
+  end
+end

data/bin/cloud-expand

@@ -7,13 +7,20 @@ o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-n name', '--name name', 'Expand the cloud on this name')    { |c| optioner.cloudname c }
 end
 
-o.loaded_clouds.each do |cloud|
+o.loaded_clouds.each do |cld|
 
-  with_cloud(cloud) do
-    vputs header("Expanding cloud #{name}")
-    vputs "#{list_of_running_instances.size} running instances of #{maximum_instances} possible instances"
-    vputs testing ? "Not expanding (test mode)" : "Expanding the cloud"
-    expand_cloud_if_necessary( !testing )
+  vputs header("Expanding cloud #{cld.name}")
+  vputs "#{cld.nodes(:status => "running").size} running instances of #{cld.maximum_instances} possible instances"
+  vputs testing ? "Not expanding (test mode)" : "Expanding the cloud"
+  
+  cld.launch_instance! do |node|
+    ::PoolParty::Provision::BootStrapper.new(node.ip, :cloud => cld)
+    ::PoolParty::Provision::DrConfigure.new(node.ip,  :cloud => cld)
+    
+    puts <<-EOM
+      Your cloud has expanded. The new ip is #{node.ip}
+    EOM
   end
   
+  
 end

data/bin/cloud-handle-load

@@ -11,13 +11,13 @@ o.loaded_clouds.each do |cloud|
 
   with_cloud(cloud) do
     vputs header("Load handling cloud #{name}")
-    vputs "should_expand_cloud: #{should_contract_cloud?}"
-    if should_expand_cloud?
+    vputs "can_expand_cloud: #{can_contract_cloud?}"
+    if can_expand_cloud?
       vputs "Expanding cloud based on load"
       log.debug "Expanding cloud based on load"
       log.debug rules_values
       expand_cloud_if_necessary
-    elsif should_contract_cloud?
+    elsif can_contract_cloud?
       vputs "Contracting cloud based on load"
       log.debug rules_values
       contract_cloud_if_necessary

data/bin/cloud-list

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
-require "poolpartycl"
 
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-f [remote|local]', '--from [remote|local]', 'Remote or local (default: local)')    { |o| optioner.location o }
@@ -10,17 +9,13 @@ o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
 end
 
-o.loaded_clouds.each do |cloud|
-  
-  with_cloud(cloud) do
-    puts header("Listing cloud #{name}")
-    puts subheader("Active instances")
-    puts list_of_running_instances.map{|a| a.to_s}.join("\n")
-    puts ""
-    if list_of_pending_instances.size > 0
-      puts subheader("Pending instances")
-      puts list_of_pending_instances.map{|a| a.to_s}.join("\n")
-    end
-  end  
-  
+o.loaded_clouds.each do |cld|
+  puts header("Listing cloud #{cld.name}")
+  puts subheader("Active instances")
+  puts cld.nodes(:status => "running").map{|a| "#{a[:instance_id]}\t#{a[:ip]}" }.join("\n")
+    
+  if cld.nodes(:status => "pending").size > 0
+    puts subheader("Pending instances")
+    puts cld.nodes(:status => "pending").map{|a| "#{a[:instance_id]}\t#{a[:ip]}" }.join("\n")
+  end
 end

data/bin/cloud-osxcopy

@@ -4,13 +4,14 @@ require "poolparty"
 require "poolpartycl"
 
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
-  opts.on('-n name', '--name name', 'Copy the master ip for this cloud')    { |c| optioner.cloudname c }
+  opts.on('-n name', '--name name', 'Copy an ip from this cloud to the clipboard')    { |c| optioner.cloudname c }
 end
 
-o.loaded_clouds.each do |cloud|
+o.loaded_clouds.each do |cld|
   
-  with_cloud(cloud, {:location => @location}) do
-    Kernel.system "echo #{master.ip.chomp} | pbcopy"
-  end
+  node = cld.nodes(:status => "running").first
+  ip = node.ip
+  puts "ip: #{ip}"
+  Kernel.system "echo #{ip} | pbcopy"
   
 end

data/bin/cloud-provision

@@ -1,35 +1,30 @@
 #!/usr/bin/env ruby
 $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "poolparty"
-require "poolpartycl"
+require "poolparty/provision/boot_strapper"
 
 o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
   opts.on('-n cloudname', '--name name', 'Start cloud by this name')    { |c| optioner.cloudname c }
-  opts.on('-p', '--slave', 'Provision slave (default: false)')    { optioner.provision_slave true }
-  opts.on('-i num', '--id num', 'Instance num to provision')    { |i| optioner.instance_number i }
+  opts.on('-i num', '--num i', 'Instance number')    { |i| optioner.inst_num i.to_i }
 end
 
-o.loaded_clouds.each do |cloud|
-
-  with_cloud(cloud) do
-    setup_dev
-    instance_num = instance_number.to_i if instance_number
-    
-    if instance_num
-      @instance = get_instance_by_number( instance_num )
-      instance_num == 0 ? provisioner_for(master).install(testing) : provisioner_for(@instance).install(testing)
-      # Provisioner.process_clean_reconfigure_for!(@instance, self, testing)
+o.loaded_clouds.each do |cld|
+  # If an IP or DNS name is given, bootstrap that node, otherwise, bootstrap all running nodes.
+  nodes = !o.unflagged_args.empty? ?  o.unflagged_args : cld.nodes(:status => "running").collect {|i|i.ip }.compact
+  if nodes.empty?
+    puts "No nodes to bootstrap"
+  else
+    if o.inst_num?
+      ::PoolParty::Provision::BootStrapper.new( nodes[o.inst_num], :full_keypair_path => cld.keypair.full_filepath, :cloud => cld )
+      ::PoolParty::Provision::DrConfigure.new( nodes[o.inst_num], :full_keypair_path => cld.keypair.full_filepath,  :cloud => cld )
     else
-      if provision_slave
-        vputs "Provisioning slaves"
-        verbose ? provisioner_for(nil).install(testing) : hide_output { provisioner_for(nil).install(testing) }
-      else
-        vputs "Provisioning master"
-        verbose ? provisioner_for(master).install(testing) : hide_output { provisioner_for(master).install(testing) }
+      nodes.each do |address|
+        puts "bootstrapping: #{address}"
+        ::PoolParty::Provision::BootStrapper.new( address, :full_keypair_path => cld.keypair.full_filepath, :cloud => cld )
+        ::PoolParty::Provision::DrConfigure.new( address, :full_keypair_path => cld.keypair.full_filepath, 
+                                                          :cloud => cld )
       end
     end
-    
-    clear_base_directory unless testing
   end
+end
 
-end

data/bin/cloud-setup-dev

@@ -7,19 +7,19 @@ 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 |cloud|  
-  with_cloud(cloud) do
-    
-    setup_dev
-    
+o.loaded_clouds.each do |cld|
+  
+  if cld.remote_instances_list.empty?
+    puts "Your cloud is not running"
+  else
     str =<<-EOE
-    Host #{name}-master
-      User        #{user}
-      Hostname    #{master.ip}
-      IdentityFile    #{full_keypair_path}
+    Host #{cld.name}
+      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
-  end  
+  end
 end

data/bin/cloud-show

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "poolparty"
+
+o = PoolParty::Optioner.new(ARGV) do |opts, optioner|
+  opts.on('-n name', '--name name', 'Listing for cloud name')    { |c| optioner.cloudname c }
+end
+
+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")
+    end
+    printer.empty
+  end
+end

data/bin/cloud-spec

@@ -29,8 +29,8 @@ o.loaded_clouds.each do |cloud|
       case testtype
       when "launch"
       when nil
-        print_with_nice_printer("Starting live specing cloud #{name}")      
-        # hide_output {launch_and_configure_master!}
+        print_with_nice_printer("Starting live specing cloud #{name}")
+        puts "TODO:  this isn't implented yet."
         print_with_nice_printer("Waiting for cloud to provision")
         
       end

data/bin/cloud-ssh

@@ -4,11 +4,18 @@ require "poolparty"
 require "poolpartycl"
 
 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.num i }
+  opts.on('-i num', '--id num', 'Instance num to ssh (default: 0)')    { |i| optioner.inst_num i.to_i }
 end
-load_pool(o.spec || Binary.get_existing_spec_location)
+load_pool(o.spec? ? o.spec : Binary.get_existing_spec_location)
 
 @cloud = o.loaded_clouds.first
+nodes = @cloud.nodes(:status => "running")
 
-@cloud.ssh_into_instance_number( o.num.to_i || 0 ) if @cloud
+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"
+end