adds addresses and sugar

TODO.md

@@ -1,3 +1,2 @@
-* rake servers:chef[meal_name]: confirm before proceeding (add force option to bypass)
 * security groups:  More thought required
 * EBS snapshots: More thought required

boucher.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "boucher"
-  s.version     = "0.1.8"
+  s.version     = "0.2.0"
   s.authors     = ["'Micah Micah'"]
   s.email       = ["'micah@8thlight.com'"]
   s.homepage    = "http://github.com/8thlight/boucher"

lib/boucher/env.rb

@@ -5,7 +5,7 @@ module Boucher
   } unless defined?(Boucher::Config)
 
   def self.env_name
-    ENV["BENV"] ? ENV["BENV"] : :dev
+    Boucher::Config[:env] || ENV["BENV"] || :dev
   end
 
   env_dir = File.expand_path("config/env")

lib/boucher/servers.rb

@@ -7,7 +7,7 @@ module Boucher
   def self.print_server_table_header
     puts
     printf SERVER_TABLE_FORMAT, "ID", "Environment", "Meal", "Creator", "State", "Public IP", "Private IP", "Inst. Size"
-    puts ("-" * 120)
+    puts ("-" * 107)
   end
 
   def self.print_server(server)
@@ -134,4 +134,16 @@ def self.change_servers_state(servers, command, new_state)
     puts
     puts "The servers have been #{command}-ed."
   end
+
+  def self.resolve_servers(id_or_meal)
+    if id_or_meal[0..1] == "i-"
+      puts "Retrieving server with id #{id_or_meal}..."
+      [Boucher::Servers.with_id(id_or_meal)]
+    else
+      puts "Searching for running #{id_or_meal} servers in #{Boucher.env_name} environment..."
+      servers = Boucher::Servers.search(:meal => id_or_meal, :env => Boucher.env_name, :state => "!terminated")
+      Boucher::print_servers(servers)
+      servers
+    end
+  end
 end

lib/boucher/util.rb

@@ -6,16 +6,4 @@ def self.current_user
     "unknown"
   end
 
-  def resolve_servers(id_or_meal)
-    if id_or_meal[0..1] == "i-"
-      puts "Retrieving server with id #{id_or_meal}..."
-      [Boucher::Servers.with_id(id_or_meal)]
-    else
-      puts "Searching for running #{id_or_meal} servers in #{Boucher.env_name} environment..."
-      servers = Boucher::Servers.search(:meal => id_or_meal, :env => Boucher.env_name, :state => "!terminated")
-      Boucher::print_servers[servers]
-      servers
-    end
-  end
-
 end