engineyard 1.3.19 → 1.3.20

data/lib/engineyard/cli.rb

@@ -297,7 +297,7 @@ module EY
         EY.ui.say
 
         EY.ui.say "Deploy commands:"
-        deploy_cmds = %w(deploy environments logs rebuild rollback)
+        deploy_cmds = %w(deploy environments logs rebuild rollback status)
         deploy_cmds.map! do |name|
           list.find{|task| task[0] =~ /^#{base} #{name}/ }
         end

data/lib/engineyard/cli/ui.rb

@@ -117,7 +117,7 @@ module EY
         output << ["Finished at",     dep.finished_at]
 
         output.each do |att, val|
-          puts "#    %-15s %s" % ["#{att}:", val.to_s]
+          puts "#\t%-15s %s" % ["#{att}:", val.to_s]
         end
         puts "#"
 

data/lib/engineyard/model/environment.rb

@@ -1,6 +1,6 @@
 module EY
   module Model
-    class Environment < ApiStruct.new(:id, :account, :name, :framework_env, :instances, :instances_count, :apps, :app_master, :username, :stack_name, :api)
+    class Environment < ApiStruct.new(:id, :account, :name, :framework_env, :instances, :instances_count, :apps, :app_master, :username, :app_server_stack_name, :load_balancer_ip_address, :api)
 
       attr_accessor :ignore_bad_master
 

data/lib/engineyard/model/instance.rb

@@ -13,7 +13,7 @@ module EY
           args.repo          = app.repository_uri
           args.instances     = instances_data
           args.verbose       = verbose || ENV['DEBUG']
-          args.stack         = environment.stack_name
+          args.stack         = environment.app_server_stack_name
           args.framework_env = environment.framework_env
         end
       end

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.3.19'
+  VERSION = '1.3.20'
 end

data/spec/support/scenarios.rb

@@ -82,7 +82,8 @@ module Scenario
           "instances" => _instances,
           "name" => "giblets",
           "instances_count" => 4,
-          "stack_name" => "nginx_mongrel",
+          "app_server_stack_name" => "nginx_mongrel",
+          "load_balancer_ip_address" => '127.0.0.0',
           "framework_env" => "production"}]
     end
 
@@ -140,8 +141,9 @@ module Scenario
               "public_hostname" => "ec2-174-129-198-124.compute-1.amazonaws.com"}],
           "name" => "giblets",
           "instances_count" => 1,
-          "stack_name" => "nginx_mongrel",
           "id" => 200,
+          "app_server_stack_name" => "nginx_mongrel",
+          "load_balancer_ip_address" => '127.0.0.0',
           "framework_env" => "production"}]
     end
   end # UnlinkedApp
@@ -160,8 +162,9 @@ module Scenario
           "instances" => [],
           "name" => "giblets",
           "instances_count" => 0,
-          "stack_name" => "nginx_mongrel",
           "id" => 200,
+          "app_server_stack_name" => "nginx_mongrel",
+          "load_balancer_ip_address" => '127.0.0.0',
           "framework_env" => "production"}]
     end
 
@@ -204,22 +207,25 @@ module Scenario
               "public_hostname" => "app_master_hostname.compute-1.amazonaws.com"}],
           "name" => "giblets",
           "instances_count" => 1,
-          "stack_name" => "nginx_mongrel",
           "id" => 200,
+          "app_server_stack_name" => "nginx_mongrel",
+          "load_balancer_ip_address" => '127.0.0.0',
           "framework_env" => "production",
         }, {
           "ssh_username" => "ham",
           "instances" => [],
           "name" => "bakon",
           "instances_count" => 0,
-          "stack_name" => "nginx_passenger",
+          "app_server_stack_name" => "nginx_passenger",
+          "load_balancer_ip_address" => '127.0.0.0',
           "id" => 202,
         }, {
           "ssh_username" => "hamburger",
           "instances" => [],
           "name" => "beef",
           "instances_count" => 0,
-          "stack_name" => "nginx_passenger",
+          "app_server_stack_name" => "nginx_passenger",
+          "load_balancer_ip_address" => '127.0.0.0',
           "id" => 206,
         }]
     end
@@ -276,14 +282,16 @@ module Scenario
           "ssh_username" => "turkey",
           "instances_count" => 1,
           "instances" => [railsapp_master],
-          "stack_name" => "nginx_unicorn",
+          "app_server_stack_name" => "nginx_unicorn",
+          "load_balancer_ip_address" => '127.0.0.0',
         }, {
           "id" => 439,
           "framework_env" => "production",
           "name" => "keycollector_production",
           "ssh_username" => "deploy",
-          "stack_name" => "nginx_mongrel",
           "instances_count" => 1,
+          "load_balancer_ip_address" => '127.0.0.0',
+          "app_server_stack_name" => "nginx_mongrel",
           "instances" => [keycollector_master],
         }]
     end
@@ -319,7 +327,8 @@ module Scenario
               "public_hostname" => "app_master_hostname.compute-1.amazonaws.com"}],
           "name" => "railsapp_production",
           "instances_count" => 1,
-          "stack_name" => "nginx_mongrel",
+          "load_balancer_ip_address" => '127.0.0.0',
+          "app_server_stack_name" => "nginx_mongrel",
           "framework_env" => "production",
         }, {
           "id" => 202,
@@ -332,7 +341,8 @@ module Scenario
             }],
           "name" => "railsapp_staging",
           "instances_count" => 1,
-          "stack_name" => "nginx_passenger",
+          "load_balancer_ip_address" => '127.3.2.1',
+          "app_server_stack_name" => "nginx_passenger",
           "framework_env" => "production",
         }, {
           "ssh_username" => "ham",
@@ -344,8 +354,9 @@ module Scenario
             }],
           "name" => "railsapp_staging_2",
           "instances_count" => 1,
-          "stack_name" => "nginx_passenger",
+          "app_server_stack_name" => "nginx_passenger",
           "id" => 204,
+          "load_balancer_ip_address" => '127.0.0.2',
           "framework_env" => "production",
         }]
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: engineyard
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: 
   segments: 
   - 1
   - 3
-  - 19
-  version: 1.3.19
+  - 20
+  version: 1.3.20
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 -07:00
+date: 2011-05-27 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency