vmc 0.4.7 → 0.5.0.beta.1

data/lib/vmc/cli/route/create_route.rb

@@ -4,24 +4,17 @@ module VMC::Route
   class CreateRoute < Base
     desc "Create a route"
     group :routes
-    input :url, :argument => :optional,
-          :desc => "Full route in URL form"
-    input(:host, :desc => "Host name") {
-      ask "Host name?"
-    }
-    input(:domain, :desc => "Domain to add the route to",
-          :from_given => find_by_name("domain")) { |domains|
-      ask "Which domain?", :choices => domains,
-          :display => proc(&:name)
-    }
-
+    input :url, :desc => "Full route in URL form", :argument => :optional
+    input :host, :desc => "Host name"
+    input :domain, :desc => "Domain to add the route to",
+          :from_given => by_name(:domain)
     def create_route
       if url = input[:url]
         host, domain_name = url.split(".", 2)
         return invoke :create_route, {}, :host => host, :domain => domain_name
       end
 
-      domain = input[:domain, client.current_organization.domains]
+      domain = input[:domain]
       host = input[:host]
 
       route = client.route
@@ -38,5 +31,19 @@ module VMC::Route
       input.forget(:host)
       retry
     end
+
+    private
+
+    def ask_host
+      ask("Host name?")
+    end
+
+    def ask_domain
+      domains = client.current_organization.domains
+      fail "No domains!" if domains.empty?
+
+      ask "Which domain?", :choices => domains,
+          :display => proc(&:name)
+    end
   end
-end
+end

data/lib/vmc/cli/route/{delete_route.rb → delete.rb}

@@ -1,21 +1,15 @@
 require "vmc/cli/route/base"
 
 module VMC::Route
-  class DeleteRoute < Base
+  class Delete < Base
     desc "Delete a route"
     group :routes
-    input(:route, :argument => :optional,
-          :from_given => find_by_name("route"),
-          :desc => "Route to delete") { |routes|
-      ask "Which route?", :choices => routes.sort_by(&:name),
-        :display => proc(&:name)
-    }
-    input(:really, :type => :boolean, :forget => true, :hidden => true,
-          :default => proc { force? || interact }) { |name, color|
-      ask("Really delete #{c(name, color)}?", :default => false)
-    }
-    input :all, :type => :boolean, :default => false,
-      :desc => "Delete all routes"
+    input :route, :desc => "Route to delete", :argument => :optional,
+          :from_given => find_by_name("route") { client.routes },
+          :default => proc { force? || interact }
+    input :all, :desc => "Delete all routes", :default => false
+    input :really, :type => :boolean, :forget => true, :hidden => true,
+          :default => proc { force? || interact }
     def delete_route
       if input[:all]
         return unless input[:really, "ALL ROUTES", :bad]
@@ -27,10 +21,7 @@ module VMC::Route
         return
       end
 
-      routes = client.routes
-      fail "No routes." if routes.empty?
-
-      route = input[:route, client.routes]
+      route = input[:route]
 
       return unless input[:really, route.name, :name]
 
@@ -38,5 +29,19 @@ module VMC::Route
         route.delete!
       end
     end
+
+    private
+
+    def ask_route
+      routes = client.routes
+      fail "No routes." if routes.empty?
+
+      ask "Which route?", :choices => routes.sort_by(&:name),
+        :display => proc(&:name)
+    end
+
+    def ask_really(name, color)
+      ask("Really delete #{c(name, color)}?", :default => false)
+    end
   end
 end

data/lib/vmc/cli/service/bind.rb

@@ -6,9 +6,9 @@ module VMC::Service
   class Bind < Base
     desc "Bind a service to an application"
     group :services, :manage
-    input :service, :desc => "Service to bind", :argument => true,
+    input :service, :desc => "Service to bind", :argument => :optional,
           :from_given => by_name(:service_instance, "service")
-    input :app, :desc => "Application to bind to", :argument => true,
+    input :app, :desc => "Application to bind to", :argument => :optional,
           :from_given => by_name(:app)
     def bind_service
       app = input[:app]

data/lib/vmc/cli/service/create.rb

@@ -1,62 +1,41 @@
-require "vmc/detect"
-
 require "vmc/cli/service/base"
 
 module VMC::Service
   class Create < Base
-    services_from_label = proc { |label, services|
-      services.select { |s| s.label == label }
+    offerings_from_label = proc { |label, offerings|
+      offerings.select { |s| s.label == label }
     }
 
     desc "Create a service"
     group :services, :manage
-    input(:service, :argument => true,
-          :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|
-              str = "#{c(s.label, :name)} #{s.version}"
-              if s.provider != "core"
-                str << ", via #{s.provider}"
-              end
-              str
-           },
-           :complete => proc { |s| "#{s.label} #{s.version}" })]
-    }
-    input(:name, :argument => true,
-          :desc => "Name for your instance") { |service|
-      random = sprintf("%x", rand(1000000))
-      ask "Name?", :default => "#{service.label}-#{random}"
-    }
-    input(:plan, :desc => "Service plan",
+    input :offering, :desc => "What kind of service (e.g. redis, mysql)",
+          :argument => :optional, :from_given => offerings_from_label
+    input :name, :desc => "Name for your service", :argument => :optional
+    input :plan, :desc => "Service plan",
+          :from_given => find_by_name_insensitive("plan"),
           :default => proc { |plans|
             plans.find { |p| p.name == "D100" } ||
               interact
-          },
-          :from_given => find_by_name_insensitive("plan")) { |plans|
-      ask "Which plan?", :choices => plans.sort_by(&:name),
-        :display => proc { |p| "#{p.name}: #{p.description}" },
-        :complete => proc(&:name)
-    }
+          }
     input :provider, :desc => "Service provider"
     input :version, :desc => "Service version"
-    input :app, :alias => "--bind", :from_given => by_name("app"),
-      :desc => "Application to immediately bind to"
+    input :app, :desc => "Application to immediately bind to",
+          :alias => "--bind", :from_given => by_name(:app)
     def create_service
-      services = client.services
+      offerings = client.services
 
       if input[:provider]
-        services.reject! { |s| s.provider != input[:provider] }
+        offerings.reject! { |s| s.provider != input[:provider] }
       end
 
       if input[:version]
-        services.reject! { |s| s.version != input[:version] }
+        offerings.reject! { |s| s.version != input[:version] }
       elsif !v2?
-        services.reject!(&:deprecated?)
+        offerings.reject!(&:deprecated?)
       end
 
       if v2? && plan = input.given(:plan)
-        services.reject! do |s|
+        offerings.reject! do |s|
           if plan.is_a?(String)
             s.service_plans.none? { |p| p.name == plan.upcase }
           else
@@ -65,40 +44,65 @@ module VMC::Service
         end
       end
 
-      until services.size < 2
+      until offerings.size < 2
         # cast to Array since it might be given as a Service with #invoke
-        services = Array(input[:service, services.sort_by(&:label)])
-        input.forget(:service)
+        offerings = Array(input[:offering, offerings.sort_by(&:label)])
+        input.forget(:offering)
       end
 
-      if services.empty?
+      if offerings.empty?
         fail "Cannot find services matching the given criteria."
       end
 
-      service = services.first
+      offering = offerings.first
 
-      instance = client.service_instance
-      instance.name = input[:name, service]
+      service = client.service_instance
+      service.name = input[:name, offering]
 
       if v2?
-        instance.service_plan = input[:plan, service.service_plans]
-        instance.space = client.current_space
+        service.service_plan = input[:plan, offering.service_plans]
+        service.space = client.current_space
       else
-        instance.type = service.type
-        instance.vendor = service.label
-        instance.version = service.version
-        instance.tier = "free"
+        service.type = offering.type
+        service.vendor = offering.label
+        service.version = offering.version
+        service.tier = "free"
       end
 
-      with_progress("Creating service #{c(instance.name, :name)}") do
-        instance.create!
+      with_progress("Creating service #{c(service.name, :name)}") do
+        service.create!
       end
 
       if app = input[:app]
-        invoke :bind_service, :instance => instance, :app => app
+        invoke :bind_service, :service => service, :app => app
       end
 
-      instance
+      service
+    end
+
+    private
+
+    def ask_offering(offerings)
+      [ask("What kind?", :choices => offerings.sort_by(&:label),
+           :display => proc { |s|
+              str = "#{c(s.label, :name)} #{s.version}"
+              if s.provider != "core"
+                str << ", via #{s.provider}"
+              end
+              str
+           },
+           :complete => proc { |s| "#{s.label} #{s.version}" })]
+    end
+
+    def ask_name(offering)
+      random = sprintf("%x", rand(1000000))
+      ask "Name?", :default => "#{offering.label}-#{random}"
+    end
+
+    def ask_plan(plans)
+      ask "Which plan?", :choices => plans.sort_by(&:name),
+        :display => proc { |p| "#{p.name}: #{p.description}" },
+        :complete => proc(&:name)
     end
   end
 end

data/lib/vmc/cli/service/delete.rb

@@ -1,68 +1,52 @@
-require "vmc/detect"
-
 require "vmc/cli/service/base"
 
 module VMC::Service
   class Delete < Base
     desc "Delete a service"
     group :services, :manage
-    input(:instance, :argument => true,
-          :from_given => by_name("service instance", :service_instance),
-          :desc => "Service to bind") {
-      instances = client.service_instances
-      fail "No services." if instances.empty?
-
-      ask "Which service instance?", :choices => instances,
-        :display => proc(&:name)
-    }
-    input(:really, :type => :boolean, :forget => true,
-          :default => proc { force? || interact }) { |name, color|
-      ask("Really delete #{c(name, color)}?", :default => false)
-    }
-    input(:unbind, :type => :boolean, :forget => true,
-          :default => proc { force? || interact }) { |apps|
-      names = human_list(apps.collect { |a| c(a.name, :name) })
-
-      ask("Unbind from #{names} before deleting?", :default => true)
-    }
-    input :all, :type => :boolean, :default => false,
-      :desc => "Delete all services"
+    input :service, :desc => "Service to bind", :argument => :optional,
+          :from_given => by_name(:service_instance, :service)
+    input :unbind, :desc => "Unbind from applications before deleting?",
+          :type => :boolean, :default => proc { force? || interact }
+    input :all, :desc => "Delete all services", :default => false
+    input :really, :type => :boolean, :forget => true, :hidden => true,
+          :default => proc { force? || interact }
     def delete_service
       if input[:all]
         return unless input[:really, "ALL SERVICES", :bad]
 
         client.service_instances.each do |i|
-          invoke :delete_service, :instance => i, :really => true
+          invoke :delete_service, :service => i, :really => true
         end
 
         return
       end
 
-      instance = input[:instance]
+      service = input[:service]
 
-      return unless input[:really, instance.name, :name]
+      return unless input[:really, service.name, :name]
 
       bindings = []
 
       if v2?
-        bindings = instance.service_bindings
+        bindings = service.service_bindings
 
         unless bindings.empty? || !input[:unbind, bindings.collect(&:app)]
           bindings.each do |b|
-            invoke :unbind_service, :instance => instance, :app => b.app
+            invoke :unbind_service, :service => service, :app => b.app
           end
 
           bindings = []
         end
       end
 
-      with_progress("Deleting #{c(instance.name, :name)}") do |s|
+      with_progress("Deleting #{c(service.name, :name)}") do |s|
         if bindings.empty?
-          instance.delete!
+          service.delete!
         else
           s.skip do
             apps = bindings.collect(&:app).collect { |a| b(a.name) }
-            err "Service instance is bound to #{human_list(apps)}."
+            err "Service is bound to #{human_list(apps)}."
           end
         end
       end
@@ -70,6 +54,24 @@ module VMC::Service
 
     private
 
+    def ask_service
+      services = client.service_instances
+      fail "No services." if services.empty?
+
+      ask "Which service?", :choices => services,
+        :display => proc(&:name)
+    end
+
+    def ask_unbind(apps)
+      names = human_list(apps.collect { |a| c(a.name, :name) })
+
+      ask("Unbind from #{names} before deleting?", :default => true)
+    end
+
+    def ask_really(name, color)
+      ask("Really delete #{c(name, color)}?", :default => false)
+    end
+
     def human_list(xs)
       if xs.size == 1
         xs.first

data/lib/vmc/cli/service/rename.rb

@@ -1,23 +1,12 @@
-require "vmc/detect"
-
 require "vmc/cli/service/base"
 
 module VMC::Service
   class Rename < Base
     desc "Rename a service"
     group :services, :manage, :hidden => true
-    input(:service, :aliases => ["--org", "-o"],
-          :argument => :optional, :desc => "service to rename",
-          :from_given => by_name("service", :service_instance)) {
-      services = client.service_instances
-      fail "No services." if services.empty?
-
-      ask("Rename which service?", :choices => services.sort_by(&:name),
-          :display => proc(&:name))
-    }
-    input(:name, :argument => :optional, :desc => "New service name") {
-      ask("New name")
-    }
+    input :service, :desc => "Service to rename", :argument => :optional,
+          :from_given => by_name(:service_instance, :service)
+    input :name, :desc => "New service name", :argument => :optional
     def rename_service
       service = input[:service]
       name = input[:name]
@@ -28,5 +17,19 @@ module VMC::Service
         service.update!
       end
     end
+
+    private
+
+    def ask_service
+      services = client.service_instances
+      fail "No services." if services.empty?
+
+      ask("Rename which service?", :choices => services.sort_by(&:name),
+          :display => proc(&:name))
+    end
+
+    def ask_name
+      ask("New name")
+    end
   end
 end

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

@@ -1,21 +1,18 @@
-require "vmc/detect"
-
 require "vmc/cli/service/base"
 
 module VMC::Service
   class Service < Base
-    desc "Show service instance information"
+    desc "Show service information"
     group :services
-    input :instance, :argument => :required,
-      :from_given => by_name("service instance", :service_instance),
-      :desc => "Service instance to show"
+    input :service, :desc => "Service to show", :argument => :required,
+          :from_given => by_name(:service_instance, :service)
     def service
-      display_service_instance(input[:instance])
+      display_service(input[:service])
     end
 
     private
 
-    def display_service_instance(i)
+    def display_service(i)
       if quiet?
         line i.name
       elsif v2?