vmc 0.4.0.beta.84 → 0.4.0.beta.85

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

@@ -17,17 +17,19 @@ module VMC
     input :full, :type => :boolean, :default => false,
       :desc => "Verbose output format"
     def apps
-      msg =
-        if space = input[:space]
-          "Getting applications in #{c(space.name, :name)}"
-        else
-          "Getting applications"
-        end
+      if space = input[:space]
+        space.summarize!
 
-      apps =
-        with_progress(msg) do
-          (space || client).apps(2)
-        end
+        apps =
+          with_progress("Getting applications in #{c(space.name, :name)}") do
+            space.apps
+          end
+      else
+        apps =
+          with_progress("Getting applications") do
+            client.apps(2)
+          end
+      end
 
       if apps.empty? and !quiet?
         line
@@ -1090,7 +1092,7 @@ module VMC
     end
 
     def app_status(a)
-      health = v2? ? a.state : a.health
+      health = a.health
 
       if a.debug_mode == "suspend" && health == "0%"
         c("suspended", :neutral)

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

@@ -10,15 +10,24 @@ module VMC
 
     desc "List domains in a space"
     group :domains
-    input :organization, :argument => :optional, :aliases => ["--org", "-o"],
-      :from_given => by_name("organization"),
-      :desc => "Organization to delete the domain from"
+    input :space, :argument => :optional,
+      :default => proc { client.current_space },
+      :from_given => by_name("space"),
+      :desc => "Space to list the domains from"
+    input :all, :type => :boolean, :default => false,
+      :desc => "List all domains"
     def domains
-      target = input[:organization] || client
+      space = input[:space]
 
       domains =
-        with_progress("Getting domains") do
-          target.domains
+        if input[:all]
+          with_progress("Getting all domains") do
+            client.domains
+          end
+        else
+          with_progress("Getting domains in #{c(space.name, :name)}") do
+            space.domains
+          end
         end
 
       line unless quiet?

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

@@ -11,6 +11,7 @@ module VMC
     desc "List routes in a space"
     group :routes
     def routes
+      # TODO: scope to space once space.routes is possible
       routes =
         with_progress("Getting routes") do
           client.routes

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

@@ -83,14 +83,25 @@ module VMC
         if runtimes.empty? && !quiet?
           line "#{d("none")}"
         elsif input[:quiet]
-          runtimes.each do |r|
+          sorted_runtimes(runtimes).each do |r|
             line r.name
           end
         else
+          status_colors = {
+            "current" => :good,
+            "next" => :name,
+            "deprecated" => :bad
+          }
+
           table(
-            %w{runtime description},
-            runtimes.sort_by(&:name).collect { |r|
-              [c(r.name, :name), r.description]
+            %w{runtime version info},
+            sorted_runtimes(runtimes).collect { |r|
+              if r.status
+                info = r.deprecated? ? "End of Life: #{r.status[:eol_date]}" : nil
+                [c(r.name, status_colors[r.status[:name]]), r.version, info]
+              else
+                [c(r.name, :name), r.version, nil]
+              end
             })
         end
       end
@@ -426,5 +437,39 @@ module VMC
         end
       end
     end
+
+    def sorted_runtimes(runtimes)
+      return runtimes if runtimes.empty?
+
+      # Sort by name if V2 or other server that doesn't yet have category, status, series
+      if v2? || !(runtimes[0].category && runtimes[0].status &&
+                  runtimes[0].series)
+        return runtimes.sort_by(&:name)
+      end
+
+      # Sort by category (i.e java, ruby, node, etc)
+      by_category = runtimes.group_by(&:category)
+
+      # Sort by status (current, next, deprecated)
+      sorted = []
+      by_category.sort.each do |category, runtimes|
+        by_status = {}
+        runtimes.each do |runtime|
+          by_status[runtime.status[:name]] ||= []
+          by_status[runtime.status[:name]] << runtime
+        end
+
+        %w(current next deprecated).each do |status|
+          next unless by_status[status]
+
+          # Sort by series descending (ruby19, ruby18, etc)
+          by_status[status].sort_by(&:series).reverse_each do |r|
+            sorted << r
+          end
+        end
+      end
+
+      sorted
+    end
   end
 end

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.84"
+  VERSION = "0.4.0.beta.85"
 end

data/vmc-ng/spec/start/info_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path("../../helpers", __FILE__)
+
+describe "Start#info" do
+  it "orders runtimes by category, status, and series" do
+    running(:info, :runtimes => true) do
+      does("Getting runtimes")
+      known_runtimes = %w(java7 java node08 node06 node ruby19 ruby18)
+
+      expected_order = known_runtimes.dup
+
+      client.runtimes.size.times do
+        with_output do |str|
+          if known_runtimes.include? str
+            expected_order.first.should == str
+            expected_order.shift
+          end
+        end
+      end
+
+      expected_order.size.should == 0
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 2921369787
+  hash: 2616878885
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 84
-  version: 0.4.0.beta.84
+  - 85
+  version: 0.4.0.beta.85
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-08 00:00:00 Z
+date: 2012-11-10 00:00:00 -08:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -265,12 +266,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 127
+        hash: 125
         segments: 
         - 0
         - 3
-        - 54
-        version: 0.3.54
+        - 55
+        version: 0.3.55
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
@@ -416,77 +417,79 @@ files:
 - vmc/Rakefile
 - vmc/config/clients.yml
 - vmc/config/micro/offline.conf
-- vmc/config/micro/paths.yml
 - vmc/config/micro/refresh_ip.rb
-- vmc/lib/cli/commands/admin.rb
-- vmc/lib/cli/commands/apps.rb
-- vmc/lib/cli/commands/base.rb
-- vmc/lib/cli/commands/manifest.rb
-- vmc/lib/cli/commands/micro.rb
-- vmc/lib/cli/commands/misc.rb
-- vmc/lib/cli/commands/services.rb
-- vmc/lib/cli/commands/user.rb
-- vmc/lib/cli/config.rb
-- vmc/lib/cli/console_helper.rb
-- vmc/lib/cli/core_ext.rb
-- vmc/lib/cli/errors.rb
-- vmc/lib/cli/frameworks.rb
-- vmc/lib/cli/manifest_helper.rb
-- vmc/lib/cli/runner.rb
-- vmc/lib/cli/services_helper.rb
-- vmc/lib/cli/tunnel_helper.rb
-- vmc/lib/cli/usage.rb
-- vmc/lib/cli/version.rb
-- vmc/lib/cli/zip_util.rb
-- vmc/lib/cli.rb
+- vmc/config/micro/paths.yml
 - vmc/lib/vmc/client.rb
+- vmc/lib/vmc/micro.rb
 - vmc/lib/vmc/const.rb
+- vmc/lib/vmc/micro/switcher/dummy.rb
+- vmc/lib/vmc/micro/switcher/windows.rb
 - vmc/lib/vmc/micro/switcher/base.rb
 - vmc/lib/vmc/micro/switcher/darwin.rb
-- vmc/lib/vmc/micro/switcher/dummy.rb
 - vmc/lib/vmc/micro/switcher/linux.rb
-- vmc/lib/vmc/micro/switcher/windows.rb
 - vmc/lib/vmc/micro/vmrun.rb
-- vmc/lib/vmc/micro.rb
 - vmc/lib/vmc.rb
+- vmc/lib/cli.rb
+- vmc/lib/cli/frameworks.rb
+- vmc/lib/cli/version.rb
+- vmc/lib/cli/manifest_helper.rb
+- vmc/lib/cli/errors.rb
+- vmc/lib/cli/config.rb
+- vmc/lib/cli/console_helper.rb
+- vmc/lib/cli/core_ext.rb
+- vmc/lib/cli/tunnel_helper.rb
+- vmc/lib/cli/commands/micro.rb
+- vmc/lib/cli/commands/user.rb
+- vmc/lib/cli/commands/admin.rb
+- vmc/lib/cli/commands/misc.rb
+- vmc/lib/cli/commands/manifest.rb
+- vmc/lib/cli/commands/services.rb
+- vmc/lib/cli/commands/base.rb
+- vmc/lib/cli/commands/apps.rb
+- vmc/lib/cli/usage.rb
+- vmc/lib/cli/zip_util.rb
+- vmc/lib/cli/runner.rb
+- vmc/lib/cli/services_helper.rb
+- vmc/caldecott_helper/server.rb
 - vmc/caldecott_helper/Gemfile
 - vmc/caldecott_helper/Gemfile.lock
-- vmc/caldecott_helper/server.rb
 - vmc/bin/vmc
 - vmc-ng/LICENSE
 - vmc-ng/Rakefile
+- vmc-ng/lib/vmc/spec_helpers.rb
+- vmc-ng/lib/vmc/version.rb
+- vmc-ng/lib/vmc/spec_helpers/eventlog.rb
+- vmc-ng/lib/vmc/spec_helpers/patches.rb
+- vmc-ng/lib/vmc/detect.rb
+- vmc-ng/lib/vmc/errors.rb
+- vmc-ng/lib/vmc/spacing.rb
+- vmc-ng/lib/vmc/plugin.rb
+- vmc-ng/lib/vmc/constants.rb
+- vmc-ng/lib/vmc/cli.rb
+- vmc-ng/lib/vmc/cli/service.rb
+- vmc-ng/lib/vmc/cli/user.rb
+- vmc-ng/lib/vmc/cli/interactive.rb
+- vmc-ng/lib/vmc/cli/space.rb
+- vmc-ng/lib/vmc/cli/start.rb
 - vmc-ng/lib/vmc/cli/app.rb
-- vmc-ng/lib/vmc/cli/domain.rb
 - vmc-ng/lib/vmc/cli/help.rb
-- vmc-ng/lib/vmc/cli/interactive.rb
 - vmc-ng/lib/vmc/cli/organization.rb
 - vmc-ng/lib/vmc/cli/route.rb
-- vmc-ng/lib/vmc/cli/service.rb
-- vmc-ng/lib/vmc/cli/space.rb
-- vmc-ng/lib/vmc/cli/start.rb
-- vmc-ng/lib/vmc/cli/user.rb
-- vmc-ng/lib/vmc/cli.rb
-- vmc-ng/lib/vmc/constants.rb
-- vmc-ng/lib/vmc/detect.rb
-- vmc-ng/lib/vmc/errors.rb
-- vmc-ng/lib/vmc/plugin.rb
-- vmc-ng/lib/vmc/spacing.rb
-- vmc-ng/lib/vmc/spec_helpers/eventlog.rb
-- vmc-ng/lib/vmc/spec_helpers/patches.rb
-- vmc-ng/lib/vmc/spec_helpers.rb
-- vmc-ng/lib/vmc/version.rb
+- vmc-ng/lib/vmc/cli/domain.rb
 - vmc-ng/lib/vmc.rb
+- vmc-ng/spec/helpers.rb
+- vmc-ng/spec/start/info_spec.rb
+- vmc-ng/spec/start/target_spec.rb
+- vmc-ng/spec/app/push_spec.rb
 - vmc-ng/spec/app/app_spec.rb
 - vmc-ng/spec/app/apps_spec.rb
-- vmc-ng/spec/app/push_spec.rb
+- vmc-ng/spec/assets/hello-sinatra/manifest.yml
 - vmc-ng/spec/assets/hello-sinatra/Gemfile
 - vmc-ng/spec/assets/hello-sinatra/main.rb
-- vmc-ng/spec/assets/hello-sinatra/manifest.yml
-- vmc-ng/spec/helpers.rb
 - vmc-ng/spec/Rakefile
-- vmc-ng/spec/start/target_spec.rb
 - vmc-ng/bin/vmc
 - bin/vmc
+has_rdoc: true
 homepage: http://vmware.com
 licenses: []
 
@@ -518,7 +521,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Client library and CLI that provides access to the VMware Cloud Application Platform.