vmc 0.4.0.beta.25 → 0.4.0.beta.26

data/vmc-ng/lib/vmc.rb

@@ -6,3 +6,4 @@ require "vmc/cli/app"
 require "vmc/cli/service"
 require "vmc/cli/user"
 require "vmc/cli/space"
+require "vmc/cli/organization"

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

@@ -789,7 +789,7 @@ module VMC
         line "platform: #{b(a.framework.name)} on #{b(a.runtime.name)}"
 
         start_line "usage: #{b(human_size(a.memory * 1024 * 1024, 0))}"
-        print " #{c(IS_UTF8 ? "\xc3\x97" : "x", :dim)} #{b(a.total_instances)}"
+        print " #{d(IS_UTF8 ? "\xc3\x97" : "x")} #{b(a.total_instances)}"
         print " instance#{a.total_instances == 1 ? "" : "s"}"
 
         line

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

@@ -7,6 +7,7 @@ Mothership::Help.groups(
     [:info, "Information"]],
   [:services, "Services",
     [:manage, "Management"]],
+  [:organizations, "Organizations"],
   [:spaces, "Spaces"],
   [:admin, "Administration",
     [:user, "User Management"]])

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

@@ -46,7 +46,7 @@ module VMC
       print c("> ", :prompt)
 
       unless value.empty?
-        print "#{c(value, :default) + "\b" * value.size}"
+        print "#{d(value) + "\b" * value.size}"
       end
     end
 

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

@@ -0,0 +1,63 @@
+require "vmc/cli"
+
+module VMC
+  class Organization < CLI
+    def precondition
+      super
+      fail "This command is v2-only." unless v2?
+    end
+
+    def self.by_name(what, obj = what)
+      proc { |name, *_|
+        client.send(:"#{obj}_by_name", name) ||
+          fail("Unknown #{what} '#{name}'")
+      }
+    end
+
+    desc "Show organization information"
+    group :organizations
+    input(:organization, :aliases => ["--org", "-o"],
+          :argument => :optional, :from_given => by_name("organization"),
+          :desc => "Organization to show") {
+      client.current_organization
+    }
+    input :full, :type => :boolean,
+      :desc => "Show full information for appspaces"
+    def org(input)
+      org = input[:organization]
+
+      if quiet?
+        puts org.name
+        return
+      end
+
+      line "#{c(org.name, :name)}:"
+
+      indented do
+        line "domains: #{name_list(org.domains)}"
+
+        if input[:full]
+          line "spaces:"
+
+          spaced(org.spaces(2)) do |s|
+            indented do
+              invoke :space, :space => s
+            end
+          end
+        else
+          line "spaces: #{name_list(org.spaces)}"
+        end
+      end
+    end
+
+    private
+
+    def name_list(xs)
+      if xs.empty?
+        d("none")
+      else
+        xs.collect { |x| c(x.name, :name) }.join(", ")
+      end
+    end
+  end
+end

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

@@ -25,32 +25,40 @@ module VMC
     def space(input)
       space = input[:space]
 
-      line "name: #{c(space.name, :name)}"
-      line "organization: #{c(space.organization.name, :name)}"
+      if quiet?
+        puts space.name
+        return
+      end
+
+      line "#{c(space.name, :name)}:"
+
+      indented do
+        line "organization: #{c(space.organization.name, :name)}"
 
-      if input[:full]
-        line
-        line "apps:"
+        if input[:full]
+          line
+          line "apps:"
 
-        spaced(space.apps(2)) do |a|
-          indented do
-            invoke :app, :app => a
+          spaced(space.apps(2)) do |a|
+            indented do
+              invoke :app, :app => a
+            end
           end
+        else
+          line "apps: #{name_list(space.apps)}"
         end
-      else
-        line "apps: #{name_list(space.apps)}"
-      end
 
-      if input[:full]
-        line
-        line "services:"
-        spaced(space.service_instances(2)) do |i|
-          indented do
-            invoke :service, :instance => i
+        if input[:full]
+          line
+          line "services:"
+          spaced(space.service_instances(2)) do |i|
+            indented do
+              invoke :service, :instance => i
+            end
           end
+        else
+          line "services: #{name_list(space.service_instances)}"
         end
-      else
-        line "services: #{name_list(space.service_instances)}"
       end
     end
 
@@ -58,7 +66,7 @@ module VMC
 
     def name_list(xs)
       if xs.empty?
-        c("none", :dim)
+        d("none")
       else
         xs.collect { |x| c(x.name, :name) }.join(", ")
       end

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

@@ -87,7 +87,7 @@ module VMC
 
         indented do
           if runtimes.empty? && !quiet?
-            line "#{c("none", :dim)}"
+            line "#{d("none")}"
           else
             spaced(runtimes) do |r|
               display_runtime(r)
@@ -104,7 +104,7 @@ module VMC
 
         indented do
           if frameworks.empty? && !quiet?
-            line "#{c("none", :dim)}"
+            line "#{d("none")}"
           else
             spaced(frameworks) do |f|
               display_framework(f)
@@ -121,7 +121,7 @@ module VMC
 
         indented do
           if services.empty? && !quiet?
-            line "#{c("none", :dim)}"
+            line "#{d("none")}"
           else
             spaced(services) do |s|
               display_service(s)
@@ -373,7 +373,7 @@ module VMC
 
           # TODO: probably won't have this in final version
           apps = r.apps.collect { |a| c(a.name, :name) }
-          app_list = apps.empty? ? c("none", :dim) : apps.join(", ")
+          app_list = apps.empty? ? d("none") : apps.join(", ")
           line "apps: #{app_list}"
         end
       end
@@ -413,7 +413,7 @@ module VMC
 
           # 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? ? c("none", :dim) : apps.join(", ")}"
+          line "apps: #{apps.empty? ? d("none") : apps.join(", ")}"
         end
       end
     end

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.25"
+  VERSION = "0.4.0.beta.26"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 62196433
+  hash: 62196439
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 25
-  version: 0.4.0.beta.25
+  - 26
+  version: 0.4.0.beta.26
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-25 00:00:00 Z
+date: 2012-07-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -233,12 +233,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 0
         - 4
-        - 5
-        version: 0.4.5
+        - 6
+        version: 0.4.6
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -265,12 +265,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 7
         segments: 
         - 0
         - 0
-        - 11
-        version: 0.0.11
+        - 12
+        version: 0.0.12
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
@@ -373,6 +373,7 @@ files:
 - vmc-ng/lib/vmc/cli/app.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/service.rb
 - vmc-ng/lib/vmc/cli/space.rb
 - vmc-ng/lib/vmc/cli/start.rb