vmc 0.4.0.beta.26 → 0.4.0.beta.27

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

@@ -50,6 +50,22 @@ module VMC
       end
     end
 
+
+    desc "List available organizations"
+    group :organizations
+    def orgs(input)
+      orgs =
+        with_progress("Getting organizations") do
+          client.organizations
+        end
+
+      line unless quiet?
+
+      orgs.each do |o|
+        line c(o.name, :name)
+      end
+    end
+
     private
 
     def name_list(xs)

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

@@ -28,6 +28,9 @@ module VMC
     input :name, :desc => "Filter by name regexp"
     input :app, :desc => "Filter by bound application regexp"
     input :service, :desc => "Filter by service regexp"
+    input :plan, :desc => "Filter by service plan"
+    input :provider, :desc => "Filter by service provider"
+    input :version, :desc => "Filter by service version"
     # TODO: not in v2
     input :type, :desc => "Filter by service type regexp"
     input :tier, :desc => "Filter by service tier regexp"
@@ -43,8 +46,12 @@ module VMC
         line "No services."
       end
 
+      instances.reject! do |i|
+        !instance_matches(i, input)
+      end
+
       spaced(instances) do |i|
-        display_service_instance(i) if instance_matches(i, input)
+        display_service_instance(i)
       end
     end
 
@@ -285,13 +292,25 @@ module VMC
         return false if i.tier !~ /#{tier}/
       end
 
+      if v2? && plan = options[:plan]
+        return false if i.service_plan.name !~ /#{plan}/i
+      end
+
+      if v2? && provider = options[:provider]
+        return false if i.service_plan.service.provider !~ /#{provider}/
+      end
+
+      if v2? && version = options[:version]
+        return false if i.service_plan.service.version !~ /#{version}/
+      end
+
       true
     end
 
     def display_service_instance(i)
       if quiet?
         line i.name
-      else
+      elsif v2?
         plan = i.service_plan
         service = plan.service
 
@@ -299,12 +318,15 @@ module VMC
 
         indented do
           line "description: #{service.description}"
+          line "provider: #{c(service.provider, :name)}"
           line "plan: #{c(plan.name, :name)}"
 
           indented do
             line "description: #{plan.description}"
           end
         end
+      else
+        line "#{c(i.name, :name)}: #{i.vendor} #{i.version}"
       end
     end
 

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

@@ -14,16 +14,29 @@ module VMC
       }
     end
 
+    def self.space_by_name
+      proc { |name, org, *_|
+        org.spaces(1, :name => name).first ||
+          fail("Unknown space '#{name}'")
+      }
+    end
+
     desc "Show space information"
     group :spaces
-    input(:space, :argument => :optional, :from_given => by_name("space"),
+    input(:organization, :aliases => ["--org", "-o"],
+          :from_given => by_name("organization"),
+          :desc => "Space's organization") {
+      client.current_organization
+    }
+    input(:space, :argument => :optional, :from_given => space_by_name,
           :desc => "Space to show") {
       client.current_space
     }
     input :full, :type => :boolean,
       :desc => "Show full information for apps, service instances, etc."
     def space(input)
-      space = input[:space]
+      org = input[:org]
+      space = input[:space, org]
 
       if quiet?
         puts space.name
@@ -62,6 +75,139 @@ module VMC
       end
     end
 
+
+    desc "List spaces in an organization"
+    group :spaces
+    input(:organization, :aliases => ["--org", "-o"],
+          :argument => :optional, :from_given => by_name("organization"),
+          :desc => "Organization to list spaces from") {
+      client.current_organization
+    }
+    def spaces(input)
+      org = input[:organization]
+      spaces =
+        with_progress("Getting spaces in #{c(org.name, :name)}") do
+          org.spaces
+        end
+
+      line unless quiet?
+
+      spaces.each do |s|
+        line c(s.name, :name)
+      end
+    end
+
+
+    desc "Create a space in an organization"
+    group :spaces
+    input(:name, :argument => :optional, :desc => "Space name") {
+      ask("Name")
+    }
+    input(:organization, :aliases => ["--org", "-o"],
+          :argument => :optional, :from_given => by_name("organization"),
+          :desc => "Parent organization") {
+      client.current_organization
+    }
+    input :manager, :type => :boolean, :default => true,
+      :desc => "Add current user as manager"
+    input :developer, :type => :boolean, :default => true,
+      :desc => "Add current user as developer"
+    input :auditor, :type => :boolean, :default => false,
+      :desc => "Add current user as auditor"
+    def create_space(input)
+      space = client.space
+      space.organization = input[:organization]
+      space.name = input[:name]
+
+      with_progress("Creating space #{c(space.name, :name)}") do
+        space.create!
+      end
+
+      if input[:manager]
+        with_progress("Adding you as a manager") do
+          space.add_manager client.current_user
+        end
+      end
+
+      if input[:developer]
+        with_progress("Adding you as a developer") do
+          space.add_developer client.current_user
+        end
+      end
+
+      if input[:auditor]
+        with_progress("Adding you as an auditor") do
+          space.add_auditor client.current_user
+        end
+      end
+    end
+
+
+    desc "Delete a space and its contents"
+    group :spaces
+    input(:space, :argument => :optional, :from_given => space_by_name,
+          :desc => "Space to delete") { |org|
+      spaces = org.spaces
+      fail "No spaces." if spaces.empty?
+
+      ask "Which space in #{c(org.name, :name)}?", :choices => spaces,
+        :display => proc(&:name)
+    }
+    input(:organization, :aliases => ["--org", "-o"],
+          :from_given => by_name("organization"),
+          :desc => "Space's organization") {
+      client.current_organization
+    }
+    input(:really, :type => :boolean, :forget => true) { |space|
+      force? || ask("Really delete #{c(space.name, :name)}?", :default => false)
+    }
+    input(:recursive, :alias => "-r", :type => :boolean, :forget => true) {
+      ask "Delete #{c("EVERYTHING", :bad)}?", :default => false
+    }
+    def delete_space(input)
+      org = input[:organization]
+      space = input[:space, org]
+      return unless input[:really, space]
+
+      apps = space.apps
+      instances = space.service_instances
+
+      unless force? || apps.empty? && instances.empty?
+        line "This space is not empty!"
+        line
+        line "apps: #{name_list(apps)}"
+        line "service instances: #{name_list(instances)}"
+        line
+
+        return unless input[:recursive]
+
+        apps.each do |a|
+          invoke :delete, :app => a, :really => true
+        end
+
+        instances.each do |i|
+          invoke :delete_service, :instance => i, :really => true
+        end
+      end
+
+      is_current = space == client.current_space
+
+      with_progress("Deleting space #{c(space.name, :name)}") do
+        space.delete!
+      end
+
+      org.invalidate!
+
+      if org.spaces.empty?
+        line
+        line c("There are no longer any spaces in #{b(org.name)}.", :warning)
+        line "You may want to create one with #{c("create-space", :good)}."
+      elsif is_current
+        invalidate_client
+        invoke :target, :organization => client.current_organization
+      end
+    end
+
     private
 
     def name_list(xs)

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

@@ -1,5 +1,3 @@
-require "base64"
-
 require "vmc/cli"
 
 module VMC
@@ -75,7 +73,7 @@ module VMC
 
         if user = client.current_user
           line
-          line "user: #{b(user.email || token_data[:email] || user.guid)}"
+          line "user: #{b(user.email || user.guid)}"
         end
       end
 
@@ -157,8 +155,7 @@ module VMC
 
       if input.given?(:url)
         target = sane_target_url(input[:url])
-        display = c(target.sub(/https?:\/\//, ""), :name)
-        with_progress("Setting target to #{display}") do
+        with_progress("Setting target to #{c(target, :name)}") do
           set_target(target)
         end
       end
@@ -176,6 +173,8 @@ module VMC
 
       return if quiet?
 
+      invalidate_client
+
       line
       display_target
       display_org_and_space
@@ -473,21 +472,5 @@ module VMC
         end
       end
     end
-
-    # grab the metadata from a token that looks like:
-    #
-    # bearer (base64 ...)
-    def token_data
-      return @token_data if @token_data
-
-      tok = Base64.decode64(client.base.token.sub(/^bearer\s+/, ""))
-      tok.sub!(/\{.+?\}/, "") # clear algo
-      @token_data = JSON.parse(tok[/\{.+?\}/], :symbolize_names => true)
-
-    # normally i don't catch'em all, but can't expect all tokens to be the
-    # proper format, so just silently fail as this is not critical
-    rescue
-      {}
-    end
   end
 end

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

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 62196439
+  hash: 62196437
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 26
-  version: 0.4.0.beta.26
+  - 27
+  version: 0.4.0.beta.27
 platform: ruby
 authors: 
 - VMware
@@ -249,12 +249,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 0
         - 3
-        - 12
-        version: 0.3.12
+        - 13
+        version: 0.3.13
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency