vmc-ng/lib/vmc/cli/app.rb in vmc-0.4.0.beta.53 vs vmc-ng/lib/vmc/cli/app.rb in vmc-0.4.0.beta.54

@@ -80,11 +80,20 @@
             a.runtime.name,
             a.url
           ]
         }
 
-        tabular(*rows)
+        tabular(
+          !quiet? && [
+            b("name"),
+            b("status"),
+            b("usage"),
+            v2? && b("plan"),
+            b("runtime"),
+            b("url")
+          ],
+          *rows)
       else
         spaced(apps) do |a|
           display_app(a)
         end
       end
@@ -155,10 +164,11 @@
       :desc => "Start app after pushing?"
     input :restart, :type => :boolean, :default => true,
       :desc => "Restart app after updating?"
     input(:create_services, :type => :boolean,
           :desc => "Interactively create services?") {
+      line unless quiet?
       ask "Create services for application?", :default => false
     }
     input(:bind_services, :type => :boolean,
           :desc => "Interactively bind services?") {
       ask "Bind other services to application?", :default => false
@@ -356,12 +366,14 @@
       unless instances || memory || plan_name
         instances = input[:instances, app.total_instances]
         memory = input[:memory, app.memory]
       end
 
-      instances = instances.to_i
-      instances_changed = instances && instances != app.total_instances
+      if instances
+        instances = instances.to_i
+        instances_changed = instances != app.total_instances
+      end
 
       if memory
         memory = megabytes(memory)
         memory_changed = memory != app.memory
       end
@@ -469,11 +481,11 @@
     desc "Examine an app's files"
     group :apps, :info, :hidden => true
     input :app, :argument => true,
       :desc => "Application to inspect the files of",
       :from_given => by_name("app")
-    input :path, :argument => true, :default => "/",
+    input :path, :argument => :optional, :default => "/",
       :desc => "Path of directory to list"
     def files
       app = input[:app]
       path = input[:path]
 
@@ -1071,10 +1083,10 @@
     end
 
     def delete_orphaned_services(instances, orphaned)
       return if instances.empty?
 
-      line unless quiet?
+      line unless quiet? || force?
 
       instances.select { |i|
         orphaned ||
           ask("Delete orphaned service instance #{c(i.name, :name)}?",
               :default => false)