vmc 0.4.0.beta.58 → 0.4.0.beta.59

data/vmc-ng/lib/vmc/cli/app.rb

@@ -7,8 +7,10 @@ module VMC
   class App < CLI
     desc "List your applications"
     group :apps
-    input :space, :desc => "Show apps in given space",
-      :from_given => by_name("space")
+    input(:space, :desc => "Show apps in given space",
+          :from_given => by_name("space")) {
+      client.current_space
+    }
     input :name, :desc => "Filter by name regexp"
     input :runtime, :desc => "Filter by runtime regexp"
     input :framework, :desc => "Filter by framework regexp"
@@ -16,18 +18,17 @@ module VMC
     input :one_line, :alias => "-l", :type => :boolean, :default => false,
       :desc => "Single-line tabular format"
     def apps
-      if space = input[:space] || client.current_space
-        apps =
-          with_progress("Getting applications in #{c(space.name, :name)}") do
-            # depth of 2 for service binding instance names
-            space.apps(2)
-          end
-      else
-        apps =
-          with_progress("Getting applications") do
-            client.apps
-          end
-      end
+      msg =
+        if space = input[:space]
+          "Getting applications in #{c(space.name, :name)}"
+        else
+          "Getting applications"
+        end
+
+      apps =
+        with_progress(msg) do
+          client.apps(2)
+        end
 
       if apps.empty? and !quiet?
         line
@@ -53,7 +54,13 @@ module VMC
               "#{a.total_instances} x #{human_mb(a.memory)}",
               v2? && (a.production ? "prod" : "dev"),
               a.runtime.name,
-              a.urls.size == 1 ? a.url : "#{a.url}, ..."
+              if a.urls.empty?
+                d("none")
+              elsif a.urls.size == 1
+                a.url
+              else
+                "#{a.url}, ..."
+              end
             ]
           })
       else
@@ -93,12 +100,12 @@ module VMC
       ask("Instances", :default => 1)
     }
     input(:framework, :from_given => find_by_name("framework"),
-          :desc => "Framework to use") { |choices, default, all, other|
-      ask_with_other("Framework", choices, default, all, other)
+          :desc => "Framework to use") { |all, choices, default, other|
+      ask_with_other("Framework", all, choices, default, other)
     }
     input(:runtime, :from_given => find_by_name("runtime"),
-          :desc => "Runtime to use") { |choices, default, all, other|
-      ask_with_other("Runtime", choices, default, all, other)
+          :desc => "Runtime to use") { |all, choices, default, other|
+      ask_with_other("Runtime", all, choices, default, other)
     }
     input(:command, :desc => "Startup command for standalone app") {
       ask("Startup command")
@@ -850,9 +857,9 @@ module VMC
       if detected_framework = detector.detect_framework
         framework = input[
           :framework,
+          all_frameworks,
           [detected_framework],
           detected_framework,
-          all_frameworks,
           :other
         ]
       else
@@ -875,9 +882,9 @@ module VMC
       else
         runtime = input[
           :runtime,
+          all_runtimes,
           detected_runtimes,
           default_runtime,
-          all_runtimes,
           :other
         ]
       end
@@ -1080,7 +1087,7 @@ module VMC
       end
     end
 
-    def ask_with_other(message, choices, default, all, other)
+    def ask_with_other(message, all, choices, default, other)
       choices = choices.sort_by(&:name)
       choices << other if other
 

data/vmc-ng/lib/vmc/cli/service.rb

@@ -4,6 +4,10 @@ module VMC
   class Service < CLI
     desc "List your service instances"
     group :services
+    input(:space, :desc => "Show services in given space",
+          :from_given => by_name("space")) {
+      client.current_space
+    }
     input :name, :desc => "Filter by name"
     input :service, :desc => "Filter by service type"
     input :plan, :desc => "Filter by service plan"
@@ -14,8 +18,15 @@ module VMC
     input :one_line, :alias => "-l", :type => :boolean, :default => false,
       :desc => "Single-line tabular format"
     def services
+      msg =
+        if space = input[:space]
+          "Getting services in #{c(space.name, :name)}"
+        else
+          "Getting services"
+        end
+
       instances =
-        with_progress("Getting service instances") do
+        with_progress(msg) do
           client.service_instances(2)
         end
 

data/vmc-ng/lib/vmc/cli/space.rb

@@ -106,7 +106,7 @@ module VMC
             ]
           })
       else
-        spaces.each do |s|
+        spaced(spaces) do |s|
           invoke :space, :space => s, :full => input[:full]
         end
       end

data/vmc-ng/lib/vmc/version.rb

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.58"
+  VERSION = "0.4.0.beta.59"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 1605859511
+  hash: 1905859163
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 58
-  version: 0.4.0.beta.58
+  - 59
+  version: 0.4.0.beta.59
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-27 00:00:00 Z
+date: 2012-10-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -265,12 +265,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 91
+        hash: 89
         segments: 
         - 0
         - 3
-        - 36
-        version: 0.3.36
+        - 37
+        version: 0.3.37
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency