ey-pro-cli 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdcb5d58754c356a886b61cfb4c76b206e2e2c37
-  data.tar.gz: c46cd11202f0ece0718cf2c7e7a758c8bdf8e311
+  metadata.gz: defe6750674ddd946f92182eee60783585e8e50d
+  data.tar.gz: 968dab5bdcc881322578fc950f3dfe47769af676
 SHA512:
-  metadata.gz: 7506c5287842faaf5bf52709799224c430879653302f78b77ea6898bca5011a28e7e30c18db31b88502f2a7ff77350bab2169b4945f5e909f2183ae69eec1283
-  data.tar.gz: 71780323f597b33b4576fe2e09c0af720119cbf6184203bb075ae8ad69a959a4821fa6f5d7169394f7d4d1def975078856f4a2d7faea24f62dac6f739105e32d
+  metadata.gz: 400884f9613419bccb16c1c03296eaaee46817a1ef9971af11af12d288bb4999661bfc8322841b17cb54ec898e604d713ab9e30d52fbe5498b67945a25276c5a
+  data.tar.gz: e456158c4115f0f56ac3ec2a98956e0ac852b9967c21d737fd7f69e736a84c62158c62eafb9def4af1a5bb0bb0e21f1c56025c4569378051bd624eaaadde46ec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ey-pro-cli (0.0.9)
+    ey-pro-cli (0.0.10)
       addressable (~> 2.2)
       cistern (~> 0.11, >= 0.11.1)
       colorize

data/lib/ey_pro_cli.rb

@@ -12,8 +12,6 @@ require File.expand_path(File.dirname(__FILE__) + '/ey_pro_cli/version')
 require File.expand_path(File.dirname(__FILE__) + '/vendor/core/ey-core')
 
 class EyProCli < Thor
-  class InvalidEnvironment < RuntimeError; end
-
   class << self
     attr_accessor :core_file
 
@@ -80,8 +78,18 @@ class EyProCli < Thor
 
   def deploy
     check_for_updates unless options["no-update-check"]
-    unless environment = core_environment_for(options)
-      abort "Unable to locate environment #{options[:environment]} in #{options[:account]}".red
+    operator, environment = core_operator_and_environment_for(options)
+    unless operator.is_a?(Ey::Core::Client)
+      abort <<-EOF
+Found account #{operator.name} but requested account #{options[:account]}.
+Use the ID of the account instead of the name.
+This can be retrieved by running "ey-pro accounts".
+      EOF
+      .red unless operator.name == options[:account] || operator.id == options[:account]
+    end
+
+    unless environment
+      abort "Unable to locate environment #{options[:environment]} in #{operator.name}".red
     end
     app = core_application_for(options)
 
@@ -167,8 +175,8 @@ Current Version:   #{current_version}
     options[:account] ? core_account_for(options) : core_client
   end
 
-  def core_environment_for(options={})
-    operator(options).environments.first(name: options[:environment])
+  def core_operator_and_environment_for(options={})
+    [operator(options), operator(options).environments.first(name: options[:environment])]
   end
 
   def core_application_for(options={})

data/lib/ey_pro_cli/version.rb

@@ -1,3 +1,3 @@
 module EyProCliVersion
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ey-pro-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Engine Yard Cloud Team