vmc-ng/lib/vmc/cli/app.rb in vmc-0.4.0.beta.11 vs vmc-ng/lib/vmc/cli/app.rb in vmc-0.4.0.beta.12

@@ -203,11 +203,11 @@
       fail "No applications given." if names.empty?
 
       names.each do |name|
         app = client.app(name)
 
-        fail "Unknown application." unless app.exists?
+        fail "Unknown application '#{name}'" unless app.exists?
 
         app = filter(:start_app, app)
 
         switch_mode(app, input(:debug_mode))
 
@@ -244,11 +244,11 @@
         with_progress("Stopping #{c(name, :name)}") do |s|
           app = client.app(name)
 
           unless app.exists?
             s.fail do
-              err "Unknown application."
+              err "Unknown application '#{name}'"
             end
           end
 
           if app.stopped?
             s.skip do
@@ -307,12 +307,18 @@
         fail "No applications." if apps.empty?
 
         names = [input(:name, apps.collect(&:name).sort)]
       end
 
-      # TODO: handle invalid app name
-      to_delete = names.collect { |n| apps.find { |a| a.name == n } }
+      to_delete = names.collect do |n|
+        if app = apps.find { |a| a.name == n }
+          app
+        else
+          fail "Unknown application '#{n}'"
+        end
+      end
+
       orphaned = find_orphaned_services(to_delete)
 
       to_delete.each do |app|
         really = input(:really, app.name, :name)
 
@@ -407,11 +413,11 @@
     flag(:all, :default => false)
     def logs(name = nil)
       name ||= input(:name)
 
       app = client.app(name)
-      fail "Unknown application." unless app.exists?
+      fail "Unknown application '#{name}'" unless app.exists?
 
       instances =
         if input(:all)
           app.instances
         else
@@ -558,11 +564,11 @@
       group :apps, :info, :hidden => true
       def unmap(name, url)
         simple = url.sub(/^https?:\/\/(.*)\/?/i, '\1')
 
         app = client.app(name)
-        fail "Unknown application." unless app.exists?
+        fail "Unknown application '#{name}'" unless app.exists?
 
         with_progress("Updating #{c(name, :name)}") do |s|
           unless app.urls.delete(simple)
             s.fail do
               err "URL #{url} is not mapped to this application."
@@ -588,11 +594,11 @@
         unless name =~ VALID_NAME
           fail "Invalid variable name; must match #{VALID_NAME.inspect}"
         end
 
         app = client.app(appname)
-        fail "Unknown application." unless app.exists?
+        fail "Unknown application '#{appname}'" unless app.exists?
 
         with_progress("Updating #{c(app.name, :name)}") do
           app.update!("env" =>
                         app.env.reject { |v|
                           v.start_with?("#{name}=")
@@ -609,11 +615,11 @@
       desc "unset APP [NAME]", "Remove an environment variable"
       group :apps, :info, :hidden => true
       flag :restart, :default => true
       def unset(appname, name)
         app = client.app(appname)
-        fail "Unknown application." unless app.exists?
+        fail "Unknown application '#{appname}'" unless app.exists?
 
         with_progress("Updating #{c(app.name, :name)}") do
           app.update!("env" =>
                         app.env.reject { |v|
                           v.start_with?("#{name}=")
@@ -634,10 +640,10 @@
           with_progress("Getting variables") do |s|
             app = client.app(appname)
 
             unless app.exists?
               s.fail do
-                err "Unknown application."
+                err "Unknown application '#{appname}'"
                 return
               end
             end
 
             app.env