vmc 0.4.7 → 0.5.0.beta.1

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

@@ -1,24 +1,20 @@
-require "vmc/detect"
-
 require "vmc/cli/service/base"
 
 module VMC::Service
   class Services < Base
-    desc "List your service instances"
+    desc "List your service"
     group :services
-    input :space,
-      :from_given => by_name("space"),
-      :default => proc { client.current_space },
-      :desc => "Show services in given space"
+    input :space, :desc => "Show services in given space",
+          :from_given => by_name(:space),
+          :default => proc { client.current_space }
     input :name, :desc => "Filter by name"
     input :service, :desc => "Filter by service type"
     input :plan, :desc => "Filter by service plan"
     input :provider, :desc => "Filter by service provider"
     input :version, :desc => "Filter by service version"
     input :app, :desc => "Limit to application's service bindings",
-      :from_given => by_name("app")
-    input :full, :type => :boolean, :default => false,
-      :desc => "Verbose output format"
+          :from_given => by_name(:app)
+    input :full, :desc => "Verbose output format", :default => false
     def services
       msg =
         if space = input[:space]
@@ -27,30 +23,30 @@ module VMC::Service
           "Getting services"
         end
 
-      instances =
+      services =
         with_progress(msg) do
           client.service_instances(:depth => 2)
         end
 
       line unless quiet?
 
-      if instances.empty? and !quiet?
+      if services.empty? and !quiet?
         line "No services."
         return
       end
 
-      instances.reject! do |i|
-        !instance_matches(i, input)
+      services.reject! do |i|
+        !service_matches(i, input)
       end
 
       if input[:full]
-        spaced(instances) do |i|
-          display_service_instance(i)
+        spaced(services) do |s|
+          invoke :service, :service => s
         end
       else
         table(
           ["name", "service", "version", v2? && "plan", v2? && "bound apps"],
-          instances.collect { |i|
+          services.collect { |i|
             if v2?
               plan = i.service_plan
               service = plan.service
@@ -75,7 +71,7 @@ module VMC::Service
 
     private
 
-    def instance_matches(i, options)
+    def service_matches(i, options)
       if app = options[:app]
         return false unless app.services.include? i
       end

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

@@ -3,12 +3,12 @@ require "vmc/detect"
 require "vmc/cli/service/base"
 
 module VMC::Service
-  class Binding < Base
+  class Unbind < Base
     desc "Unbind a service from an application"
     group :services, :manage
-    input :service, :desc => "Service to unbind", :argument => true,
-          :from_given => by_name(:service, :service_instance)
-    input :app, :desc => "Application to unbind from", :argument => true,
+    input :service, :desc => "Service to unbind", :argument => :optional,
+          :from_given => by_name(:service_instance, :service)
+    input :app, :desc => "Application to unbind from", :argument => :optional,
           :from_given => by_name(:app)
     def unbind_service
       app = input[:app]

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

@@ -1,26 +1,19 @@
-require "vmc/detect"
-
 require "vmc/cli/space/base"
 
 module VMC::Space
   class Create < Base
     desc "Create a space in an organization"
     group :spaces
-    input(:name, :argument => :optional, :desc => "Space name") {
-      ask("Name")
-    }
-    input :organization, :argument => :optional, :aliases => ["--org", "-o"],
-      :from_given => by_name("organization"),
-      :default => proc { client.current_organization },
-      :desc => "Parent organization"
-    input :target, :alias => "-t", :type => :boolean,
-      :desc => "Switch to the space after creation"
-    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"
+    input :name, :desc => "Space name", :argument => :optional
+    input :organization, :desc => "Parent organization",
+          :argument => :optional, :aliases => ["--org", "-o"],
+          :from_given => by_name(:organization),
+          :default => proc { client.current_organization }
+    input :target, :desc => "Switch to the space after creation",
+          :alias => "-t", :default => false
+    input :manager, :desc => "Add yourself as manager", :default => true
+    input :developer, :desc => "Add yourself as developer", :default => true
+    input :auditor, :desc => "Add yourself as auditor", :default => false
     def create_space
       space = client.space
       space.organization = input[:organization]
@@ -53,5 +46,11 @@ module VMC::Space
           :space => space
       end
     end
+
+    private
+
+    def ask_name
+      ask("Name")
+    end
   end
 end

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

@@ -1,33 +1,20 @@
-require "vmc/detect"
-
 require "vmc/cli/space/base"
 
 module VMC::Space
   class Delete < Base
     desc "Delete a space and its contents"
     group :spaces
-    input(:spaces, :argument => :splat,
-          :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"),
-      :default => proc { client.current_organization },
-      :desc => "Space's organization"
-    input(:really, :type => :boolean, :forget => true,
-          :default => proc { force? || interact }) { |space|
-      ask("Really delete #{c(space.name, :name)}?", :default => false)
-    }
-    input(:recursive, :alias => "-r", :type => :boolean, :forget => true) {
-      ask "Delete #{c("EVERYTHING", :bad)}?", :default => false
-    }
-    input :warn, :type => :boolean, :default => true,
-      :desc => "Show warning if it was the last space"
+    input :organization, :desc => "Space's organization",
+          :aliases => ["--org", "-o"], :from_given => by_name(:organization),
+          :default => proc { client.current_organization }
+    input :spaces, :desc => "Spaces to delete", :argument => :splat,
+          :singular => :space, :from_given => space_by_name
+    input :recursive, :desc => "Delete recursively", :alias => "-r",
+          :default => false, :forget => true
+    input :warn, :desc => "Show warning if it was the last space",
+          :default => true
+    input :really, :type => :boolean, :forget => true, :hidden => true,
+          :default => proc { force? || interact }
     def delete_space
       org = input[:organization]
       spaces = input[:spaces, org]
@@ -60,19 +47,17 @@ module VMC::Space
       end
     end
 
-    private
-
     def clear_space(space)
       apps = space.apps
-      instances = space.service_instances
+      services = space.service_instances
 
-      return true if apps.empty? && instances.empty?
+      return true if apps.empty? && services.empty?
 
       unless force?
         line "This space is not empty!"
         line
         line "apps: #{name_list(apps)}"
-        line "service instances: #{name_list(instances)}"
+        line "service: #{name_list(services)}"
         line
 
         return unless input[:recursive]
@@ -82,11 +67,29 @@ module VMC::Space
         invoke :delete, :app => a, :really => true
       end
 
-      instances.each do |i|
-        invoke :delete_service, :instance => i, :really => true
+      services.each do |i|
+        invoke :delete_service, :service => i, :really => true
       end
 
       true
     end
+
+    private
+
+    def ask_spaces(org)
+      spaces = org.spaces
+      fail "No spaces." if spaces.empty?
+
+      [ask("Which space in #{c(org.name, :name)}?", :choices => spaces,
+           :display => proc(&:name))]
+    end
+
+    def ask_really(space)
+      ask("Really delete #{c(space.name, :name)}?", :default => false)
+    end
+
+    def ask_recursive
+      ask "Delete #{c("EVERYTHING", :bad)}?", :default => false
+    end
   end
 end

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

@@ -1,26 +1,15 @@
-require "vmc/detect"
-
 require "vmc/cli/space/base"
 
 module VMC::Space
   class Rename < Base
     desc "Rename a space"
     group :spaces, :hidden => true
-    input :organization, :aliases => ["--org", "-o"],
-      :from_given => by_name("organization"),
-      :default => proc { client.current_organization },
-      :desc => "Space's organization"
-    input(:space, :argument => :optional, :from_given => space_by_name,
-          :desc => "Space to rename") {
-      spaces = client.spaces
-      fail "No spaces." if spaces.empty?
-
-      ask("Rename which space?", :choices => spaces.sort_by(&:name),
-          :display => proc(&:name))
-    }
-    input(:name, :argument => :optional, :desc => "New space name") {
-      ask("New name")
-    }
+    input :organization, :desc => "Space's organization",
+          :aliases => ["--org", "-o"], :from_given => by_name(:organization),
+          :default => proc { client.current_organization }
+    input :space, :desc => "Space to rename", :argument => :optional,
+          :from_given => by_name(:space)
+    input :name, :desc => "New space name", :argument => :optional
     def rename_space
       org = input[:organization]
       space = input[:space, org]
@@ -32,5 +21,19 @@ module VMC::Space
         space.update!
       end
     end
+
+    private
+
+    def ask_space(org)
+      spaces = org.spaces
+      fail "No spaces." if spaces.empty?
+
+      ask("Rename which space?", :choices => spaces.sort_by(&:name),
+          :display => proc(&:name))
+    end
+
+    def ask_name
+      ask("New name")
+    end
   end
 end

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

@@ -1,21 +1,18 @@
-require "vmc/detect"
-
 require "vmc/cli/space/base"
 
 module VMC::Space
   class Space < Base
     desc "Show space information"
     group :spaces
-    input :organization, :aliases => ["--org", "-o"],
-      :from_given => by_name("organization"),
-      :default => proc { client.current_organization },
-      :desc => "Space's organization"
-    input :space, :argument => :optional,
-      :from_given => space_by_name,
-      :default => proc { client.current_space },
-      :desc => "Space to show"
-    input :full, :type => :boolean,
-      :desc => "Show full information for apps, service instances, etc."
+    input :organization, :desc => "Space's organization",
+          :aliases => %w{--org -o},
+          :default => proc { client.current_organization },
+          :from_given => by_name(:organization)
+    input :space, :desc => "Space to show", :argument => :optional,
+          :default => proc { client.current_space },
+          :from_given => space_by_name
+    input :full, :desc => "Show full information for apps, services, etc.",
+          :default => false
     def space
       org = input[:organization]
       space = input[:space, org]
@@ -51,9 +48,9 @@ module VMC::Space
         if input[:full]
           line
           line "services:"
-          spaced(space.service_instances(:depth => 2)) do |i|
+          spaced(space.service_instances(:depth => 2)) do |s|
             indented do
-              invoke :service, :instance => i
+              invoke :service, :service => s
             end
           end
         else

data/lib/vmc/cli/space/spaces.rb

@@ -1,34 +1,36 @@
-require "vmc/detect"
-
 require "vmc/cli/space/base"
 
 module VMC::Space
   class Spaces < Base
     desc "List spaces in an organization"
     group :spaces
-    input :organization, :argument => :optional, :aliases => ["--org", "-o"],
-      :from_given => by_name("organization"),
-      :default => proc { client.current_organization },
-      :desc => "Organization to list spaces from"
+    input :organization, :desc => "Organization to list spaces from",
+          :aliases => %w{--org -o}, :argument => :optional,
+          :from_given => by_name(:organization),
+          :default => proc { client.current_organization }
     input :name, :desc => "Filter by name"
-    input :one_line, :alias => "-l", :type => :boolean, :default => false,
-      :desc => "Single-line tabular format"
-    input :full, :type => :boolean, :default => false,
-      :desc => "Show full information for apps, service instances, etc."
+    input :full, :desc => "Show full information for apps, services, etc.",
+          :default => false
     def spaces
       org = input[:organization]
       spaces =
         with_progress("Getting spaces in #{c(org.name, :name)}") do
-          org.spaces(:depth => quiet? ? 0 : 1)
+          org.spaces(:depth => quiet? ? 0 : 1).sort_by(&:name)
         end
 
+      return if spaces.empty?
+
       line unless quiet?
 
       spaces.reject! do |s|
         !space_matches?(s, input)
       end
 
-      if input[:one_line]
+      if input[:full]
+        spaced(spaces) do |s|
+          invoke :space, :space => s, :full => input[:full]
+        end
+      else
         table(
           %w{name apps services},
           spaces.collect { |s|
@@ -37,10 +39,6 @@ module VMC::Space
               name_list(s.service_instances)
             ]
           })
-      else
-        spaced(spaces) do |s|
-          invoke :space, :space => s, :full => input[:full]
-        end
       end
     end
 

data/lib/vmc/cli/space/take.rb

@@ -1,12 +1,10 @@
-require "vmc/detect"
-
 require "vmc/cli/space/base"
 
 module VMC::Space
   class Take < Base
     desc "Switch to a space, creating it if it doesn't exist"
     group :spaces, :hidden => true
-    input :name, :argument => true, :desc => "Space name"
+    input :name, :desc => "Space name", :argument => true
     def take_space
       if space = client.space_by_name(input[:name])
         invoke :target, :space => space

data/lib/vmc/cli/start/base.rb

@@ -51,6 +51,8 @@ module VMC
 
         # switching org means switching space
         if changed_org || input.given?(:space) || !space_valid?(info[:space])
+          line if changed_org && !quiet?
+
           space = input[:space, org]
           return unless space
 

data/lib/vmc/cli/start/colors.rb

@@ -1,4 +1,3 @@
-require "vmc/detect"
 require "vmc/cli/start/base"
 
 module VMC::Start

data/lib/vmc/cli/start/info.rb

@@ -1,19 +1,17 @@
-require "vmc/detect"
 require "vmc/cli/start/base"
 
 module VMC::Start
   class Info < Base
     desc "Display information on the current target, user, etc."
     group :start
-    input :runtimes, :type => :boolean,
-          :desc => "List supported runtimes"
-    input :frameworks, :type => :boolean,
-          :desc => "List supported frameworks"
-    input :services, :type => :boolean,
-          :desc => "List supported services"
-    input :all, :type => :boolean, :alias => "-a",
-          :desc => "Show all information"
-
+    input :runtimes, :desc => "List supported runtimes", :alias => "-r",
+          :default => false
+    input :frameworks, :desc => "List supported frameworks", :alias => "-f",
+          :default => false
+    input :services, :desc => "List supported services", :alias => "-s",
+          :default => false
+    input :all, :desc => "Show all information", :alias => "-a",
+          :default => false
     def info
       all = input[:all]