engineyard 0.8.1 → 0.8.2

data/lib/engineyard/cli/api.rb

@@ -13,7 +13,7 @@ module EY
         begin
           super
         rescue EY::API::InvalidCredentials
-          EY.ui.warn "Credentials rejected, please authenticate again"
+          EY.ui.warn "Credentials rejected; please authenticate again."
           refresh
           retry
         end
@@ -24,15 +24,13 @@ module EY
       end
 
       def self.fetch_token
-        EY.ui.warn("The engineyard gem is prerelease software. Please do not use")
-        EY.ui.warn("this tool to deploy to mission-critical environments, yet.")
-        EY.ui.info("We need to fetch your API token, please login")
+        EY.ui.info("We need to fetch your API token; please log in.")
         begin
           email    = EY.ui.ask("Email: ")
           password = EY.ui.ask("Password: ", true)
           super(email, password)
         rescue EY::API::InvalidCredentials
-          EY.ui.warn "Invalid username or password, please try again"
+          EY.ui.warn "Invalid username or password; please try again."
           retry
         end
       end

data/lib/engineyard/model/instance.rb

@@ -3,7 +3,7 @@ require 'escape'
 module EY
   module Model
     class Instance < ApiStruct.new(:id, :role, :name, :status, :amazon_id, :public_hostname, :environment)
-      EYSD_VERSION = ENV["EY_DEPLOY_VERSION"] || "0.8.1"
+      EYSD_VERSION = ENV["EY_DEPLOY_VERSION"] || "0.8.2"
       EXIT_STATUS = Hash.new { |h,k| raise EY::Error, "ey-deploy version checker exited with unknown status code #{k}" }
       EXIT_STATUS.merge!({
         255 => :ssh_failed,
@@ -119,7 +119,7 @@ module EY
 
         framework_arg = ['--framework-env', environment.framework_env]
 
-        verbose_arg = verbose ? ['--verbose'] : []
+        verbose_arg = (verbose || ENV['DEBUG']) ? ['--verbose'] : []
 
         cmd = Escape.shell_command(start + deploy_args + framework_arg + instance_args + verbose_arg)
         puts cmd if verbose

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '0.8.1'
+  VERSION = '0.8.2'
 end

data/spec/ey/deploy_spec.rb

@@ -15,7 +15,7 @@ describe "ey deploy without an eyrc file" do
       input.puts("test")
     end
 
-    @out.should include("We need to fetch your API token, please login")
+    @out.should include("We need to fetch your API token; please log in.")
     @out.should include("Email:")
     @out.should include("Password:")
     @ssh_commands.should_not be_empty

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -18,6 +18,8 @@ date: 2010-06-30 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: termios
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
@@ -25,11 +27,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: termios
-  prerelease: false
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: highline
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
@@ -39,11 +41,11 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  name: highline
-  prerelease: false
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: thor
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
@@ -53,11 +55,11 @@ dependencies:
         - 13
         - 6
         version: 0.13.6
-  name: thor
-  prerelease: false
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: escape
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
@@ -67,11 +69,11 @@ dependencies:
         - 0
         - 4
         version: 0.0.4
-  name: escape
-  prerelease: false
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rest-client
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
@@ -80,11 +82,11 @@ dependencies:
         - 1
         - 4
         version: "1.4"
-  name: rest-client
-  prerelease: false
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: json
   requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
@@ -94,8 +96,6 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
-  name: json
-  prerelease: false
   type: :runtime
   version_requirements: *id006
 description: This gem allows you to deploy your rails application to the Engine Yard cloud directly from the command line.