vmc 0.4.0.beta.14 → 0.4.0.beta.15

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

@@ -181,40 +181,19 @@ module VMC
 
       bindings = []
       if !v2? && input[:create_services] && !force?
-        services = client.system_services
+        services = client.services
 
         while true
-          vendor = ask "What kind?", :choices => services.keys.sort
-          meta = services[vendor]
+          instance = invoke :create_service
 
-          if meta[:versions].size == 1
-            version = meta[:versions].first
-          else
-            version = ask "Which version?",
-              :choices => meta[:versions].sort.reverse
-          end
-
-          random = sprintf("%x", rand(1000000))
-          service_name = ask "Service name?", :default => "#{vendor}-#{random}"
-
-          service = client.service(service_name)
-          service.type = meta[:type]
-          service.vendor = meta[:vendor]
-          service.version = version
-          service.tier = "free"
-
-          with_progress("Creating service #{c(service_name, :name)}") do
-            service.create!
-          end
-
-          bindings << service_name
+          bindings << instance.name
 
           break unless ask "Create another service?", :default => false
         end
       end
 
       if !v2? && input[:bind_services] && !force?
-        services = client.services.collect(&:name)
+        services = client.service_instances.collect(&:name)
 
         while true
           choices = services - bindings
@@ -844,8 +823,9 @@ module VMC
       end
 
       with_progress("Switching mode to #{c(mode, :name)}") do |s|
-        runtimes = client.system_runtimes
-        modes = runtimes[app.runtime]["debug_modes"] || []
+        runtime = client.runtimes.find { |r| r.name == app.runtime.name }
+        modes = runtime.debug_modes
+
         if modes.include?(mode)
           app.debug_mode = mode
           app.stop! if app.started?
@@ -945,10 +925,9 @@ module VMC
       names.select { |s|
         orphaned ||
           ask("Delete orphaned service #{c(s, :name)}?", :default => false)
-      }.each do |s|
-        with_progress("Deleting service #{c(s, :name)}") do
-          client.service(s).delete!
-        end
+      }.each do |name|
+        # TODO: splat
+        invoke :delete_service, :name => name, :really => true
       end
     end
 

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

@@ -11,8 +11,8 @@ module VMC
     input :tier, :desc => "Filter by service tier regexp"
     def services(input)
       services =
-        with_progress("Getting services") do
-          client.services
+        with_progress("Getting service instances") do
+          client.service_instances
         end
 
       puts "" unless quiet?
@@ -36,14 +36,14 @@ module VMC
 
     desc "Create a service"
     group :services, :manage
-    input(:vendor, :argument => true,
+    input(:service, :argument => true,
           :desc => "What kind of service (e.g. redis, mysql)") { |choices|
       ask "What kind?", :choices => choices
     }
     input(:name, :argument => true,
-          :desc => "Local name for the service") { |vendor|
+          :desc => "Local name for the service") { |service|
       random = sprintf("%x", rand(1000000))
-      ask "Name?", :default => "#{vendor}-#{random}"
+      ask "Name?", :default => "#{service.label}-#{random}"
     }
     input(:version, :desc => "Version of the service") { |choices|
       ask "Which version?", :choices => choices
@@ -51,30 +51,34 @@ module VMC
     input :bind, :alias => "--app",
       :desc => "Application to immediately bind to"
     def create_service(input)
-      services = client.system_services
+      services = client.services
 
-      vendor = input[:vendor, services.keys.sort]
-      meta = services[vendor]
+      service_label = input[:service, services.collect(&:label).sort]
+      services = services.select { |s| s.label == service_label }
 
-      if meta[:versions].size == 1
-        version = meta[:versions].first
+      if services.size == 1
+        service = services.first
       else
-        version = input[:version, meta[:versions]]
+        version = input[:version, services.collect(&:version).sort]
+        service = services.find { |s| s.version == version }
       end
 
-      service = client.service(input[:name, meta[:vendor]])
-      service.type = meta[:type]
-      service.vendor = meta[:vendor]
-      service.version = version
-      service.tier = "free"
+      instance = client.service_instance
+      instance.name = input[:name, service]
+      instance.type = service.type
+      instance.vendor = service.label
+      instance.version = service.version
+      instance.tier = "free"
 
-      with_progress("Creating service #{c(service.name, :name)}") do
-        service.create!
+      with_progress("Creating service #{c(instance.name, :name)}") do
+        instance.create!
       end
 
       if app = input[:bind]
-        invoke :bind_service, :name => service.name, :app => app
+        invoke :bind_service, :name => instance.name, :app => app
       end
+
+      instance
     end
 
 
@@ -89,7 +93,7 @@ module VMC
       ask "Which application?", :choices => choices
     }
     def bind_service(input)
-      name = input[:name, client.services.collect(&:name)]
+      name = input[:name, client.service_instances.collect(&:name)]
       appname = input[:app, client.apps.collect(&:name)]
 
       with_progress("Binding #{c(name, :name)} to #{c(appname, :name)}") do
@@ -135,25 +139,22 @@ module VMC
         return unless input[:really, "ALL SERVICES", :bad]
 
         with_progress("Deleting all services") do
-          client.services.collect(&:delete!)
+          client.service_instances.collect(&:delete!)
         end
 
         return
       end
 
-      if input.given? :name
-        name = input[:name]
-      else
-        services = client.services
-        fail "No services." if services.empty?
+      instances = client.service_instances
+      fail "No services." if instances.empty?
 
-        name = input[:name, services.collect(&:name)]
-      end
+      name = input[:name, instances.collect(&:name)]
+      service = instances.find { |i| i.name == name }
 
       return unless input[:really, name, :name]
 
       with_progress("Deleting #{c(name, :name)}") do
-        client.service(name).delete!
+        service.delete!
       end
     end
 

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.14"
+  VERSION = "0.4.0.beta.15"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 62196479
+  hash: 62196477
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 14
-  version: 0.4.0.beta.14
+  - 15
+  version: 0.4.0.beta.15
 platform: ruby
 authors: 
 - VMware
@@ -281,12 +281,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 17
         segments: 
         - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 1
+        version: 0.3.1
   type: :runtime
   version_requirements: *id016
 description: