engineyard 2.0.0.pre4 → 2.0.0.pre5.1

data/lib/engineyard/cli/api.rb

@@ -25,12 +25,21 @@ module EY
         @ui = ui
         EY::CloudClient.endpoint = endpoint
 
-        @token = token # specified on command line
-        @token ||= ENV['ENGINEYARD_API_TOKEN'] if ENV['ENGINEYARD_API_TOKEN']
-        @token ||= EY::EYRC.load.api_token
-        @token ||= self.class.authenticate(ui)
-
-        unless @token
+        # If the token is specified, we don't ask for authentication when
+        # the token is reject, we just exit.
+        if @token = token
+          @specified = true
+          @source = 'token from --api-token'
+        elsif @token = ENV['ENGINEYARD_API_TOKEN']
+          @specified = true
+          @source = 'token from $ENGINEYARD_API_TOKEN'
+        elsif @token = EY::EYRC.load.api_token
+          @specified = false
+          @source = "api_token in #{EY::EYRC.load.path}"
+        elsif @token = self.class.authenticate(ui)
+          @specified = false
+          @source = 'credentials'
+        else
           raise EY::Error, "Sorry, we couldn't get your API token."
         end
 
@@ -50,10 +59,15 @@ module EY
           super
         end
       rescue EY::CloudClient::InvalidCredentials
-        ui.warn "Authentication failed."
-        @token = self.class.authenticate(@ui)
-        @api = EY::CloudClient.new(@token, @ui)
-        retry
+        if @specified
+          ui.error "Authentication failed: Invalid #{@source}."
+          exit(255)
+        else
+          ui.warn "Authentication failed: Invalid #{@source}. Retrying..."
+          @token = self.class.authenticate(@ui)
+          @api = EY::CloudClient.new(@token, @ui)
+          retry
+        end
       end
 
     end

data/lib/engineyard/serverside_runner.rb

@@ -23,12 +23,12 @@ module EY
     end
 
     def put_up_maintenance_page(&block)
-      @command = @adapter.enable_maintenance_page(&block)
+      @command = @adapter.enable_maintenance(&block)
       self
     end
 
     def take_down_maintenance_page(&block)
-      @command = @adapter.disable_maintenance_page(&block)
+      @command = @adapter.disable_maintenance(&block)
       self
     end
 

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '2.0.0.pre4'
+  VERSION = '2.0.0.pre5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre4
+  version: 2.0.0.pre5.1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre4
+        version: 2.0.0.pre5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre4
+        version: 2.0.0.pre5
 - !ruby/object:Gem::Dependency
   name: engineyard-cloud-client
   requirement: !ruby/object:Gem::Requirement