vmc 0.4.0.beta.66 → 0.4.0.beta.67

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

@@ -47,6 +47,10 @@ module VMC
         spaced(apps) do |a|
           display_app(a)
         end
+      elsif quiet?
+        apps.each do |a|
+          line a.name
+        end
       else
         table(
           ["name", "status", "usage", v2? && "plan", "runtime", "url"],
@@ -769,11 +773,6 @@ module VMC
     IS_UTF8 = !!(ENV["LC_ALL"] || ENV["LC_CTYPE"] || ENV["LANG"])["UTF-8"]
 
     def display_app(a)
-      if quiet?
-        line a.name
-        return
-      end
-
       status = app_status(a)
 
       line "#{c(a.name, :name)}: #{status}"

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

@@ -78,63 +78,68 @@ module VMC
       end
 
       if runtimes
-        unless quiet?
-          line
-          line "runtimes:"
-        end
+        line unless quiet?
 
-        indented do
-          if runtimes.empty? && !quiet?
-            line "#{d("none")}"
-          else
-            spaced(runtimes) do |r|
-              display_runtime(r)
-            end
+        if runtimes.empty? && !quiet?
+          line "#{d("none")}"
+        elsif input[:quiet]
+          runtimes.each do |r|
+            line r.name
           end
+        else
+          table(
+            %w{runtime description},
+            runtimes.sort_by(&:name).collect { |r|
+              [c(r.name, :name), r.description]
+            })
         end
       end
 
       if frameworks
-        unless quiet?
-          line
-          line "frameworks:"
-        end
+        line unless quiet?
 
-        indented do
-          if frameworks.empty? && !quiet?
-            line "#{d("none")}"
-          else
-            spaced(frameworks) do |f|
-              display_framework(f)
-            end
+        if frameworks.empty? && !quiet?
+          line "#{d("none")}"
+        elsif input[:quiet]
+          frameworks.each do |f|
+            line f.name
           end
+        else
+          table(
+            %w{framework description},
+            frameworks.sort_by(&:name).collect { |f|
+              [c(f.name, :name), f.description]
+            })
         end
       end
 
       if services
-        unless quiet?
-          line
-          line "services:"
-        end
+        line unless quiet?
 
-        indented do
-          if services.empty? && !quiet?
-            line "#{d("none")}"
-          else
-            spaced(services) do |s|
-              display_service(s)
-            end
+        if services.empty? && !quiet?
+          line "#{d("none")}"
+        elsif input[:quiet]
+          services.each do |s|
+            line s.label
           end
+        else
+          table(
+            ["service", "version", "provider", v2? && "plans", "description"],
+            services.sort_by(&:label).collect { |s|
+              [ c(s.label, :name),
+                s.version,
+                s.provider,
+                v2? && s.service_plans.collect(&:name).join(", "),
+                s.description
+              ]
+            })
         end
       end
     end
 
     desc "Set or display the target cloud, organization, and space"
     group :start
-    input :url, :argument => :optional,
-      :desc => "Target URL to switch to"
-    input :interactive, :alias => "-i", :type => :boolean,
-      :desc => "Interactively select organization/space"
+    input :url, :argument => :optional, :desc => "Target URL to switch to"
     input(:organization, :aliases => ["--org", "-o"],
           :from_given => find_by_name("organization"),
           :desc => "Organization") { |orgs|
@@ -146,8 +151,7 @@ module VMC
       ask("Space", :choices => spaces, :display => proc(&:name))
     }
     def target
-      if !input[:interactive] && !input.given?(:url) &&
-          !input.given?(:organization) && !input.given?(:space)
+      if !input.given?(:url) && !input.given?(:organization) && !input.given?(:space)
         display_target
         display_org_and_space unless quiet?
         return
@@ -163,8 +167,7 @@ module VMC
 
       return unless v2? && client.logged_in?
 
-      if input[:interactive] || input.given?(:organization) ||
-          input.given?(:space)
+      if input.given?(:organization) || input.given?(:space)
         info = target_info
 
         select_org_and_space(input, info)
@@ -197,8 +200,6 @@ module VMC
     input :username, :alias => "--email", :argument => :optional,
       :desc => "Account email"
     input :password, :desc => "Account password"
-    input :interactive, :alias => "-i", :type => :boolean,
-      :desc => "Interactively select organization/space"
     input(:organization, :aliases => ["--org", "-o"],
           :from_given => find_by_name("organization"),
           :desc => "Organization") { |orgs|
@@ -255,7 +256,7 @@ module VMC
       invalidate_client
 
       if v2?
-        line if input[:interactive]
+        line if input.interactive?(:organization) || input.interactive?(:space)
         select_org_and_space(input, info)
         save_target_info(info)
       end
@@ -364,60 +365,6 @@ module VMC
     rescue CFoundry::APIError
     end
 
-    def display_runtime(r)
-      if quiet?
-        line r.name
-      else
-        line "#{c(r.name, :name)}:"
-
-        indented do
-          line "description: #{b(r.description)}" if r.description
-
-          # TODO: probably won't have this in final version
-          line "apps: #{name_list(r.apps)}"
-        end
-      end
-    end
-
-    def display_service(s)
-      if quiet?
-        line s.label
-      else
-        line "#{c(s.label, :name)}:"
-
-        indented do
-          line "description: #{s.description}"
-          line "version: #{s.version}"
-          line "provider: #{s.provider}"
-
-          if v2?
-            line "plans:"
-            indented do
-              s.service_plans.sort_by(&:name).each do |p|
-                line "#{c(p.name, :name)}: #{p.description}"
-              end
-            end
-          end
-        end
-      end
-    end
-
-    def display_framework(f)
-      if quiet?
-        line f.name
-      else
-        line "#{c(f.name, :name)}:"
-
-        indented do
-          line "description: #{b(f.description)}" if f.description
-
-          # TODO: probably won't show this in final version; just for show
-          apps = f.apps.collect { |a| c(a.name, :name) }
-          line "apps: #{apps.empty? ? d("none") : apps.join(", ")}"
-        end
-      end
-    end
-
     def org_valid?(guid, user = client.current_user)
       return false unless guid
       client.organization(guid).users.include? user
@@ -435,12 +382,11 @@ module VMC
     def select_org_and_space(input, info)
       changed_org = false
 
-      if input[:interactive] || input.given?(:organization) || \
-          !org_valid?(info[:organization])
+      if input.given?(:organization) || !org_valid?(info[:organization])
         orgs = client.organizations
         fail "No organizations!" if orgs.empty?
 
-        if !input[:interactive] && orgs.size == 1 && !input.given?(:organization)
+        if orgs.size == 1 && !input.given?(:organization)
           org = orgs.first
         else
           org = input[:organization, orgs.sort_by(&:name)]
@@ -455,16 +401,15 @@ module VMC
       end
 
       # switching org means switching space
-      if input[:interactive] || changed_org || input.given?(:space) || \
-          !space_valid?(info[:space])
+      if changed_org || input.given?(:space) || !space_valid?(info[:space])
         spaces = org.spaces
 
         fail "No spaces!" if spaces.empty?
 
-        if !input[:interactive] && spaces.size == 1 && !input.given?(:space)
+        if spaces.size == 1 && !input.given?(:space)
           space = spaces.first
         else
-          line if input[:interactive] && changed_org
+          line if changed_org && input.interactive?(:organization)
           space = input[:space, spaces.sort_by(&:name)]
         end
 

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

@@ -38,25 +38,21 @@ module VMC
     option :verbose, :alias => "-V", :type => :boolean,
       :desc => "Print extra information"
 
-    option(:force, :alias => "-f", :type => :boolean,
-           :desc => "Skip interaction when possible") {
-      input[:script]
-    }
-
-    option(:quiet, :alias => "-q", :type => :boolean,
-           :desc => "Simplify output format") {
-      input[:script]
-    }
-
-    option(:script, :type => :boolean,
-           :desc => "Shortcut for --quiet and --force") {
-      !$stdout.tty?
-    }
-
-    option(:color, :type => :boolean, :default => true,
-           :desc => "Use colorful output") {
-      !input[:quiet]
-    }
+    option :force, :alias => "-f", :type => :boolean,
+      :default => proc { input[:script] },
+      :desc => "Skip interaction when possible"
+
+    option :quiet, :alias => "-q", :type => :boolean,
+      :default => proc { input[:script] },
+      :desc => "Simplify output format"
+
+    option :script, :type => :boolean,
+      :default => proc { !$stdout.tty? },
+      :desc => "Shortcut for --quiet and --force"
+
+    option :color, :type => :boolean,
+      :default => proc { !input[:quiet] },
+      :desc => "Use colorful output"
 
     option :trace, :alias => "-t", :type => :boolean,
       :desc => "Show API requests and responses"

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

@@ -17,7 +17,7 @@ module VMC
     end
 
     def start_line(msg)
-      print "  " * @@indentation
+      print "  " * @@indentation unless quiet?
       print msg
     end
 

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.66"
+  VERSION = "0.4.0.beta.67"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: -614476860
+  hash: 1620813125
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 66
-  version: 0.4.0.beta.66
+  - 67
+  version: 0.4.0.beta.67
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-15 00:00:00 Z
+date: 2012-10-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -265,12 +265,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 71
+        hash: 69
         segments: 
         - 0
         - 3
-        - 42
-        version: 0.3.42
+        - 43
+        version: 0.3.43
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
@@ -297,12 +297,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 17
         segments: 
         - 0
         - 2
-        - 1
-        version: 0.2.1
+        - 3
+        version: 0.2.3
   type: :runtime
   version_requirements: *id017
 - !ruby/object:Gem::Dependency