vmc 0.4.0.beta.16 → 0.4.0.beta.17

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

@@ -226,6 +226,10 @@ module VMC
       save_targets(ts)
     end
 
+    def no_v2
+      fail "Not implemented for v2." if v2?
+    end
+
     def v2?
       client.is_a?(CFoundry::V2::Client)
     end

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

@@ -33,6 +33,14 @@ module VMC
     }
 
 
+    def self.find_by_name(what)
+      proc { |name, choices|
+        choices.find { |c| c.name == name } ||
+          fail("Unknown #{what} '#{name}'")
+      }
+    end
+
+
     desc "List your applications"
     group :apps
     input :name, :desc => "Filter by name regexp"
@@ -86,14 +94,29 @@ module VMC
           :desc => "Number of instances to run") {
       ask("Instances", :default => 1)
     }
-    input(:framework, :desc => "Framework to use") { |choices, default|
-      opts = {:choices => choices}
+    input(:framework, :desc => "Framework to use",
+          :from_given => find_by_name("framework")) { |choices, default, other|
+      choices = choices.sort_by(&:name)
+      choices << other if other
+
+      opts = {
+        :choices => choices,
+        :display => proc { |f|
+          if f == other
+            "other"
+          else
+            f.name
+          end
+        }
+      }
+
       opts[:default] = default if default
 
       ask("Framework", opts)
     }
-    input(:runtime, :desc => "Runtime to run it with") { |choices|
-      ask("Runtime", :choices => choices)
+    input(:runtime, :desc => "Runtime to run it with",
+          :from_given => find_by_name("runtime")) { |choices|
+      ask("Runtime", :choices => choices, :display => proc(&:name))
     }
     input(:command, :desc => "Startup command for standalone app") {
       ask("Startup command")
@@ -115,14 +138,7 @@ module VMC
 
       name = input[:name] if input[:name]
 
-      exists =
-        if v2?
-          client.current_space.apps.find { |a| a.name == name }
-        elsif client.app(name).exists?
-          client.app(name)
-        end
-
-      if exists
+      if exists = client.app_by_name(name)
         upload_app(exists, path)
         invoke :restart, :name => exists.name if input[:restart]
         return
@@ -137,28 +153,22 @@ module VMC
       app.space = client.current_space if v2?
       app.total_instances = input[:instances]
 
-      framework_names = frameworks.collect(&:name).sort
       if detected.empty?
-        framework_name = input[:framework, framework_names, nil]
+        framework = input[:framework, frameworks, nil, false]
       else
         detected_names = detected.collect(&:name).sort
-        framework_name =
-          input[:framework, detected_names + ["other"], default && default.name]
+        framework = input[:framework, detected, default, true]
 
-        if framework_name == "other"
+        if framework == :other
           input.forget(:framework)
-          framework_name = input[:framework, framework_names, nil]
+          framework = input[:framework, frameworks, nil, false]
         end
       end
 
-      framework = frameworks.find { |f| f.name == framework_name }
-
       runtimes = v2? ? client.runtimes : framework.runtimes
-      runtime_name = input[:runtime, runtimes.collect(&:name).sort]
-      runtime = runtimes.find { |r| r.name == runtime_name }
+      runtime = input[:runtime, runtimes]
 
       fail "Invalid framework '#{input[:framework]}'" unless framework
-
       fail "Invalid runtime '#{input[:runtime]}'" unless runtime
 
       app.framework = framework
@@ -237,10 +247,12 @@ module VMC
       names = input[:names]
       fail "No applications given." if names.empty?
 
+      apps = client.apps
+
       names.each do |name|
-        app = client.app(name)
+        app = apps.find { |a| a.name == name }
 
-        fail "Unknown application '#{name}'" unless app.exists?
+        fail "Unknown application '#{name}'" unless app
 
         app = filter(:start_app, app)
 
@@ -256,6 +268,9 @@ module VMC
           app.start!
         end
 
+        # TODO: reenable for v2
+        next if v2?
+
         check_application(app)
 
         if app.debug_mode && !quiet?
@@ -274,16 +289,14 @@ module VMC
       names = input[:names]
       fail "No applications given." if names.empty?
 
+      apps = client.apps
+
       names.each do |name|
-        with_progress("Stopping #{c(name, :name)}") do |s|
-          app = client.app(name)
+        app = apps.find { |a| a.name == name }
 
-          unless app.exists?
-            s.fail do
-              err "Unknown application '#{name}'"
-            end
-          end
+        fail "Unknown application '#{name}'" unless app
 
+        with_progress("Stopping #{c(name, :name)}") do |s|
           if app.stopped?
             s.skip do
               err "Application is not running."
@@ -311,12 +324,14 @@ module VMC
 
     desc "Delete an application"
     group :apps, :manage
-    input(:really, :type => :boolean) { |name, color|
+    input(:really, :type => :boolean, :forget => true) { |name, color|
       force? || ask("Really delete #{c(name, color)}?", :default => false)
     }
-    input(:names, :argument => :splat, :singular => :name,
-          :desc => "Applications to delete") { |names|
-      [ask("Delete which application?", :choices => names)]
+    input(:apps, :argument => :splat, :singular => :app,
+          :desc => "Applications to delete",
+          :from_given => find_by_name("application")) { |apps|
+      [ask("Delete which application?", :choices => apps.sort_by(&:name),
+           :display => proc(&:name))]
     }
     input :orphaned, :aliases => "-o", :type => :boolean,
       :desc => "Delete orphaned instances"
@@ -344,15 +359,7 @@ module VMC
       apps = client.apps
       fail "No applications." if apps.empty?
 
-      names = input[:names, apps.collect(&:name).sort]
-
-      to_delete = names.collect do |n|
-        if app = apps.find { |a| a.name == n }
-          app
-        else
-          fail "Unknown application '#{n}'"
-        end
-      end
+      to_delete = input[:apps, apps]
 
       deleted = []
       to_delete.each do |app|
@@ -379,13 +386,15 @@ module VMC
     input :names, :argument => :splat, :singular => :name,
       :desc => "Applications to list instances of"
     def instances(input)
+      no_v2
+
       names = input[:names]
       fail "No applications given." if names.empty?
 
       names.each do |name|
         instances =
           with_progress("Getting instances for #{c(name, :name)}") do
-            client.app(name).instances
+            client.app_by_name(name).instances
           end
 
         instances.each do |i|
@@ -415,7 +424,7 @@ module VMC
       :desc => "Restart app after updating?"
     def scale(input)
       name = input[:name]
-      app = client.app(name)
+      app = client.app_by_name(name)
 
       instances = input.given(:instances)
       memory = input.given(:memory)
@@ -453,9 +462,11 @@ module VMC
     input :all, :default => false,
       :desc => "Get logs for every instance"
     def logs(input)
+      no_v2
+
       name = input[:name]
 
-      app = client.app(name)
+      app = client.app_by_name(name)
       fail "Unknown application '#{name}'" unless app.exists?
 
       instances =
@@ -504,6 +515,8 @@ module VMC
     input :path, :argument => true, :default => "/",
       :desc => "Path of file to read"
     def file(input)
+      no_v2
+
       file =
         with_progress("Getting file contents") do
           client.app(input[:name]).file(*input[:path].split("/"))
@@ -521,6 +534,8 @@ module VMC
     input :path, :argument => true, :default => "/",
       :desc => "Path of directory to list"
     def files(input)
+      no_v2
+
       files =
         with_progress("Getting file listing") do
           client.app(input[:name]).files(*input[:path].split("/"))
@@ -538,10 +553,12 @@ module VMC
     input :names, :argument => :splat, :singular => :name,
       :desc => "Application to check the status of"
     def health(input)
+      # TODO: get all apps and filter
+
       apps =
         with_progress("Getting application health") do
           input[:names].collect do |n|
-            [n, app_status(client.app(n))]
+            [n, app_status(client.app_by_name(n))]
           end
         end
 
@@ -561,9 +578,11 @@ module VMC
     input :name, :argument => true,
       :desc => "Application to get the stats for"
     def stats(input)
+      no_v2
+
       stats =
         with_progress("Getting stats for #{c(input[:name], :name)}") do
-          client.app(input[:name]).stats
+          client.app_by_name(input[:name]).stats
         end
 
       stats.sort_by { |k, _| k }.each do |idx, info|
@@ -592,11 +611,13 @@ module VMC
     input :url, :argument => true,
       :desc => "URL to route"
     def map(input)
+      no_v2
+
       name = input[:name]
       simple = input[:url].sub(/^https?:\/\/(.*)\/?/i, '\1')
 
       with_progress("Updating #{c(name, :name)}") do
-        app = client.app(name)
+        app = client.app_by_name(name)
         app.urls << simple
         app.update!
       end
@@ -611,8 +632,10 @@ module VMC
       ask("Which URL?", :choices => choices)
     }
     def unmap(input)
+      no_v2
+
       name = input[:name]
-      app = client.app(name)
+      app = client.app_by_name(name)
 
       url = input[:url, app.urls]
 
@@ -642,7 +665,7 @@ module VMC
 
       vars =
         with_progress("Getting env for #{c(input[:name], :name)}") do |s|
-          app = client.app(appname)
+          app = client.app_by_name(appname)
 
           unless app.exists?
             s.fail do
@@ -689,7 +712,7 @@ module VMC
         fail "Invalid variable name; must match #{VALID_ENV_VAR.inspect}"
       end
 
-      app = client.app(appname)
+      app = client.app_by_name(appname)
       fail "Unknown application '#{appname}'" unless app.exists?
 
       with_progress("Updating #{c(app.name, :name)}") do
@@ -721,7 +744,7 @@ module VMC
       appname = input[:name]
       name = input[:var]
 
-      app = client.app(appname)
+      app = client.app_by_name(appname)
       fail "Unknown application '#{appname}'" unless app.exists?
 
       with_progress("Updating #{c(app.name, :name)}") do
@@ -752,11 +775,11 @@ module VMC
       end
 
       if runtime = options[:runtime]
-        return false if a.runtime !~ /#{runtime}/
+        return false if a.runtime.name !~ /#{runtime}/
       end
 
       if framework = options[:framework]
-        return false if a.framework !~ /#{framework}/
+        return false if a.framework.name !~ /#{framework}/
       end
 
       if url = options[:url]

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

@@ -12,9 +12,9 @@ module VMC
       end
     end
 
-    def list_choices(choices, options)
+    def list_choices(choices, options = {})
       choices.each_with_index do |o, i|
-        puts "#{c(i + 1, :number)}: #{o}"
+        puts "#{c(i + 1, :number)}: #{show_choice(o, options)}"
       end
     end
 

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

@@ -6,69 +6,87 @@ module VMC
     group :services
     input :name, :desc => "Filter by name regexp"
     input :app, :desc => "Filter by bound application regexp"
+    input :service, :desc => "Filter by service regexp"
+    # TODO: not in v2
     input :type, :desc => "Filter by service type regexp"
-    input :vendor, :desc => "Filter by service vendor regexp"
     input :tier, :desc => "Filter by service tier regexp"
     def services(input)
-      services =
+      instances =
         with_progress("Getting service instances") do
-          client.service_instances
+          client.service_instances(2)
         end
 
-      puts "" unless quiet?
-
-      if services.empty? and !quiet?
+      if instances.empty? and !quiet?
+        puts ""
         puts "No services."
       end
 
-      if app = input[:app]
-        apps = client.apps
-        services.reject! do |s|
-          apps.none? { |a| a.services.include? s.name }
-        end
-      end
-
-      services.each do |s|
-        display_service(s) if service_matches(s, input)
+      instances.each.with_index do |i, n|
+        display_instance(i) if instance_matches(i, input)
       end
     end
 
+    services_from_label = proc { |label, services|
+      services.select { |s| s.label == label }
+    }
+
+    plan_from_name = proc { |name, plans|
+      plans.find { |p| p.name == name }
+    }
 
     desc "Create a service"
     group :services, :manage
     input(:service, :argument => true,
-          :desc => "What kind of service (e.g. redis, mysql)") { |choices|
-      ask "What kind?", :choices => choices
+          :desc => "What kind of service (e.g. redis, mysql)",
+          :from_given => services_from_label) { |services|
+      [ask("What kind?", :choices => services.sort_by(&:label),
+           :display => proc { |s| "#{c(s.label, :name)} v#{s.version}" },
+           :complete => proc { |s| "#{s.label} v#{s.version}" })]
     }
     input(:name, :argument => true,
-          :desc => "Local name for the service") { |service|
+          :desc => "Name for your instance") { |service|
       random = sprintf("%x", rand(1000000))
       ask "Name?", :default => "#{service.label}-#{random}"
     }
-    input(:version, :desc => "Version of the service") { |choices|
-      ask "Which version?", :choices => choices
+    input(:version, :desc => "Version of the service") { |services|
+      ask "Which version?", :choices => services,
+        :display => proc(&:version)
+    }
+    input(:plan, :desc => "Service plan",
+          :from_given => plan_from_name) { |plans|
+      ask "Which plan?", :choices => plans.sort_by(&:name),
+        :display => proc { |p| "#{p.name}: #{p.description}" },
+        :complete => proc(&:name)
     }
     input :bind, :alias => "--app",
       :desc => "Application to immediately bind to"
     def create_service(input)
       services = client.services
 
-      service_label = input[:service, services.collect(&:label).sort]
-      services = services.select { |s| s.label == service_label }
+      services = input[:service, services]
 
       if services.size == 1
         service = services.first
       else
-        version = input[:version, services.collect(&:version).sort]
-        service = services.find { |s| s.version == version }
+        service = input[:version, services]
       end
 
+      plans = service.service_plans
+      plan = plans.find { |p| p.name == "D100" } || input[:plan, plans]
+
       instance = client.service_instance
       instance.name = input[:name, service]
-      instance.type = service.type
-      instance.vendor = service.label
-      instance.version = service.version
-      instance.tier = "free"
+
+      if v2?
+        instance.service_plan = plan
+        instance.space = client.current_space
+        instance.credentials = {} # TODO: ?
+      else
+        instance.type = service.type
+        instance.vendor = service.label
+        instance.version = service.version
+        instance.tier = "free"
+      end
 
       with_progress("Creating service #{c(instance.name, :name)}") do
         instance.create!
@@ -97,7 +115,7 @@ module VMC
       appname = input[:app, client.apps.collect(&:name)]
 
       with_progress("Binding #{c(name, :name)} to #{c(appname, :name)}") do
-        client.app(appname).bind(name)
+        client.app_by_name(appname).bind(name)
       end
     end
 
@@ -115,7 +133,7 @@ module VMC
     def unbind_service(input)
       appname = input[:app, client.apps.collect(&:name)]
 
-      app = client.app(appname)
+      app = client.app_by_name(appname)
       name = input[:name, app.services]
 
       with_progress("Unbinding #{c(name, :name)} from #{c(appname, :name)}") do
@@ -130,7 +148,7 @@ module VMC
           :desc => "Service to delete") { |choices|
       ask "Delete which service?", :choices => choices
     }
-    input(:really, :type => :boolean) { |name, color|
+    input(:really, :type => :boolean, :forget => true) { |name, color|
       force? || ask("Really delete #{c(name, color)}?", :default => false)
     }
     input :all, :default => false, :desc => "Delete all services"
@@ -160,31 +178,44 @@ module VMC
 
     private
 
-    def service_matches(s, options)
+    def instance_matches(i, options)
+      if app = options[:app]
+        return false if i.service_bindings.none? { |b|
+          b.app.name == app
+        }
+      end
+
       if name = options[:name]
-        return false if s.name !~ /#{name}/
+        return false if i.name !~ /#{name}/
       end
 
-      if type = options[:type]
-        return false if s.type !~ /#{type}/
+      if service = options[:service]
+        return false if i.service_plan.service.label !~ /#{service}/
       end
 
-      if vendor = options[:vendor]
-        return false if s.vendor !~ /#{vendor}/
+      if !v2? && type = options[:type]
+        return false if i.type !~ /#{type}/
       end
 
-      if tier = options[:tier]
-        return false if s.tier !~ /#{tier}/
+      if !v2? && tier = options[:tier]
+        return false if i.tier !~ /#{tier}/
       end
 
       true
     end
 
-    def display_service(s)
+    def display_instance(i)
       if quiet?
-        puts s.name
+        puts i.name
       else
-        puts "#{c(s.name, :name)}: #{s.vendor} v#{s.version}"
+        plan = i.service_plan
+        service = plan.service
+
+        puts ""
+        puts "#{c(i.name, :name)}: #{service.label} v#{service.version}"
+        puts "  description: #{service.description}"
+        puts "  plan: #{c(plan.name, :name)}"
+        puts "    description: #{plan.description}"
       end
     end
   end

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

@@ -46,7 +46,7 @@ module VMC
     desc "Delete a user"
     group :admin, :user, :hidden => true
     input :email, :argument => true, :desc => "User to delete"
-    input(:really, :type => :boolean) { |email|
+    input(:really, :type => :boolean, :forget => true) { |email|
       force? || ask("Really delete user #{c(email, :name)}?", :default => false)
     }
     def delete_user(input)

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.16"
+  VERSION = "0.4.0.beta.17"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 62196419
+  hash: 62196417
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 16
-  version: 0.4.0.beta.16
+  - 17
+  version: 0.4.0.beta.17
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-13 00:00:00 Z
+date: 2012-07-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -233,12 +233,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 7
         segments: 
         - 0
         - 4
-        - 1
-        version: 0.4.1
+        - 4
+        version: 0.4.4
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -249,12 +249,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 0
         - 3
-        - 2
-        version: 0.3.2
+        - 3
+        version: 0.3.3
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
@@ -265,12 +265,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 21
         segments: 
         - 0
         - 0
-        - 1
-        version: 0.0.1
+        - 5
+        version: 0.0.5
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency