vmc 0.4.7 → 0.5.0.beta.1

data/lib/vmc/cli/app/push/create.rb

@@ -1,3 +1,5 @@
+require "vmc/detect"
+
 module VMC::App
   module Create
     attr_accessor :input

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

@@ -1,22 +1,12 @@
-require "vmc/detect"
-
 require "vmc/cli/app/base"
 
 module VMC::App
   class Rename < Base
     desc "Rename an application"
     group :apps, :manage, :hidden => true
-    input(:app, :argument => :optional, :desc => "Application to rename",
-          :from_given => by_name("app")) {
-      apps = client.apps
-      fail "No applications." if apps.empty?
-
-      ask("Rename which application?", :choices => apps.sort_by(&:name),
-          :display => proc(&:name))
-    }
-    input(:name, :argument => :optional, :desc => "New application name") {
-      ask("New name")
-    }
+    input :app, :desc => "Application to rename", :argument => :optional,
+          :from_given => by_name(:app)
+    input :name, :desc => "New application name", :argument => :optional
     def rename
       app = input[:app]
       name = input[:name]
@@ -27,5 +17,19 @@ module VMC::App
         app.update!
       end
     end
+
+    private
+
+    def ask_app
+      apps = client.apps
+      fail "No applications." if apps.empty?
+
+      ask("Rename which application?", :choices => apps.sort_by(&:name),
+          :display => proc(&:name))
+    end
+
+    def ask_name
+      ask("New name")
+    end
   end
 end

data/lib/vmc/cli/app/restart.rb

@@ -4,13 +4,10 @@ module VMC::App
   class Restart < Base
     desc "Stop and start an application"
     group :apps, :manage
-    input :apps, :argument => :splat, :singular => :app,
-      :desc => "Applications to start",
-      :from_given => by_name("app")
-    input :debug_mode, :aliases => "-d",
-      :desc => "Debug mode to start in"
-    input :all, :type => :boolean, :default => false,
-      :desc => "Restart all applications"
+    input :apps, :desc => "Applications to start", :argument => :splat,
+          :singular => :app, :from_given => by_name(:app)
+    input :debug_mode, :desc => "Debug mode to start in", :aliases => "-d"
+    input :all, :desc => "Restart all applications", :default => false
     def restart
       invoke :stop, :all => input[:all], :apps => input[:apps]
 

data/lib/vmc/cli/app/routes.rb

@@ -1,14 +1,14 @@
 require "vmc/cli/app/base"
 
+# TODO: split up, as the URL interaction will differ (see other TODO)
 module VMC::App
   class Routes < Base
     desc "Add a URL mapping for an app"
     group :apps, :info, :hidden => true
-    input :app, :argument => true,
-      :desc => "Application to add the URL to",
-      :from_given => by_name("app")
-    input :url, :argument => true,
-      :desc => "URL to map to the application"
+    input :app, :desc => "Application to add the URL to", :argument => true,
+          :from_given => by_name(:app)
+    input :url, :desc => "URL to map to the application", :argument => true
+    # TODO: move push's URL interaction here, and have it just invoke
     def map
       app = input[:app]
 
@@ -51,12 +51,9 @@ module VMC::App
 
     desc "Remove a URL mapping from an app"
     group :apps, :info, :hidden => true
-    input :app, :argument => true,
-      :desc => "Application to remove the URL from",
-      :from_given => by_name("app")
-    input(:url, :argument => true, :desc => "URL to unmap") { |choices|
-      ask("Which URL?", :choices => choices)
-    }
+    input :app, :desc => "Application to remove the URL from",
+          :argument => true, :from_given => by_name(:app)
+    input :url, :desc => "URL to unmap", :argument => :optional
     def unmap
       app = input[:app]
       url = input[:url, app.urls]
@@ -93,5 +90,11 @@ module VMC::App
         end
       end
     end
+
+    private
+
+    def ask_url(choices)
+      ask("Which URL?", :choices => choices)
+    end
   end
 end

data/lib/vmc/cli/app/scale.rb

@@ -4,21 +4,12 @@ module VMC::App
   class Scale < Base
     desc "Update the instances/memory limit for an application"
     group :apps, :info, :hidden => true
-    input :app, :argument => true, :desc => "Application to update",
-      :from_given => by_name("app")
-    input(:instances, :type => :numeric,
-          :desc => "Number of instances to run") { |default|
-      ask("Instances", :default => default)
-    }
-    input(:memory, :desc => "Memory limit") { |default|
-      ask("Memory Limit", :choices => memory_choices(default),
-          :allow_other => true,
-          :default => human_mb(default))
-    }
-    input :plan, :default => "D100",
-      :desc => "Application plan (e.g. D100, P200)"
-    input :restart, :type => :boolean, :default => true,
-      :desc => "Restart app after updating?"
+    input :app, :desc => "Application to update", :argument => true,
+          :from_given => by_name(:app)
+    input :instances, :desc => "Number of instances to run", :type => :numeric
+    input :memory, :desc => "Memory limit"
+    input :plan, :desc => "Application plan", :default => "D100"
+    input :restart, :desc => "Restart app after updating?", :default => true
     def scale
       app = input[:app]
 
@@ -63,5 +54,16 @@ module VMC::App
         invoke :restart, :app => app
       end
     end
+
+    private
+
+    def ask_instances(default)
+      ask("Instances", :default => default)
+    end
+
+    def ask_memory(default)
+      ask("Memory Limit", :choices => memory_choices(default),
+          :default => human_mb(default), :allow_other => true)
+    end
   end
 end

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

@@ -6,13 +6,10 @@ module VMC::App
 
     desc "Start an application"
     group :apps, :manage
-    input :apps, :argument => :splat, :singular => :app,
-      :desc => "Applications to start",
-      :from_given => by_name("app")
-    input :debug_mode, :aliases => "-d",
-      :desc => "Debug mode to start in"
-    input :all, :type => :boolean, :default => false,
-      :desc => "Start all applications"
+    input :apps, :desc => "Applications to start", :argument => :splat,
+          :singular => :app, :from_given => by_name(:app)
+    input :debug_mode, :desc => "Debug mode to start in", :aliases => "-d"
+    input :all, :desc => "Start all applications", :default => false
     def start
       apps = input[:all] ? client.apps : input[:apps]
       fail "No applications given." if apps.empty?

data/lib/vmc/cli/app/stats.rb

@@ -4,9 +4,8 @@ module VMC::App
   class Stats < Base
     desc "Display application instance status"
     group :apps, :info, :hidden => true
-    input :app, :argument => true,
-      :desc => "Application to get the stats for",
-      :from_given => by_name("app")
+    input :app, :desc => "Application to get the stats for",
+          :argument => true, :from_given => by_name(:app)
     def stats
       app = input[:app]
 

data/lib/vmc/cli/app/stop.rb

@@ -4,11 +4,9 @@ module VMC::App
   class Stop < Base
     desc "Stop an application"
     group :apps, :manage
-    input :apps, :argument => :splat, :singular => :app,
-      :desc => "Applications to start",
-      :from_given => by_name("app")
-    input :all, :type => :boolean, :default => false,
-      :desc => "Stop all applications"
+    input :apps, :desc => "Applications to start", :argument => :splat,
+          :singular => :app, :from_given => by_name(:app)
+    input :all, :desc => "Stop all applications", :default => false
     def stop
       apps = input[:all] ? client.apps : input[:apps]
       fail "No applications given." if apps.empty?

data/lib/vmc/cli/domain/add_domain.rb

@@ -4,12 +4,10 @@ module VMC::Domain
   class AddDomain < Base
     desc "Add a domain to a space"
     group :domains
-    input :name, :argument => :required,
-          :desc => "Domain to add"
-    input :space, :from_given => by_name("space"),
+    input :name, :desc => "Domain to add", :argument => :required
+    input :space, :desc => "Space to add the domain to",
           :default => proc { client.current_space },
-          :desc => "Space to add the domain to"
-
+          :from_given => by_name(:space)
     def add_domain
       space = input[:space]
       name = input[:name].sub(/^\*\./, "")

data/lib/vmc/cli/domain/create_domain.rb

@@ -4,15 +4,12 @@ module VMC::Domain
   class CreateDomain < Base
     desc "Create a domain"
     group :domains
-    input :name, :argument => :required,
-          :desc => "Domain name to create"
-    input :organization, :aliases => ["--org", "-o"],
-          :from_given => by_name("organization"),
+    input :name, :desc => "Domain name to create", :argument => :required
+    input :organization, :desc => "Organization to add the domain to",
+          :aliases => %w{--org -o},
           :default => proc { client.current_organization },
-          :desc => "Organization to add the domain to"
-    input :shared, :type => :boolean, :default => false,
-          :desc => "Create a shared domain (admin-only)"
-
+          :from_given => by_name(:organization)
+    input :shared, :desc => "Create a shared domain", :default => false
     def create_domain
       org = input[:organization]
       name = input[:name].sub(/^\*\./, "")

data/lib/vmc/cli/domain/delete_domain.rb

@@ -2,26 +2,18 @@ require "vmc/cli/domain/base"
 
 module VMC::Domain
   class DeleteDomain < Base
+    # TODO: refactor; using find_by_name, and target cycling between
+    # org/client, is awkward
+
     desc "Delete a domain"
     group :domains
-    input(:domain, :argument => :optional,
-          :from_given => find_by_name("domain"),
-          :desc => "URL to map to the application") { |domains|
-      fail "No domains." if domains.empty?
-
-      ask "Which domain?", :choices => domains.sort_by(&:name),
-          :display => proc(&:name)
-    }
-    input :organization, :aliases => ["--org", "-o"],
-          :from_given => by_name("organization"),
-          :desc => "Organization to delete the domain from"
-    input(:really, :type => :boolean, :forget => true,
-          :default => proc { force? || interact }) { |name, color|
-      ask("Really delete #{c(name, color)}?", :default => false)
-    }
-    input :all, :type => :boolean, :default => false,
-          :desc => "Delete all domains"
-
+    input :domain, :desc => "URL to map to the application",
+          :argument => :optional, :from_given => find_by_name("domain")
+    input :organization, :desc => "Organization to delete the domain from",
+          :aliases => %w{--org -o}, :from_given => by_name(:organization)
+    input :all, :desc => "Delete all domains", :default => false
+    input :really, :type => :boolean, :forget => true, :hidden => true,
+          :default => proc { force? || interact }
     def delete_domain
       target = input[:organization] || client
 
@@ -47,5 +39,18 @@ module VMC::Domain
         domain.delete!
       end
     end
+
+    private
+
+    def ask_domain(domains)
+      fail "No domains." if domains.empty?
+
+      ask "Which domain?", :choices => domains.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/domain/domains.rb

@@ -4,13 +4,10 @@ module VMC::Domain
   class Domains < Base
     desc "List domains in a space"
     group :domains
-    input :space, :argument => :optional,
-          :default => proc { client.current_space },
-          :from_given => by_name("space"),
-          :desc => "Space to list the domains from"
-    input :all, :type => :boolean, :default => false,
-          :desc => "List all domains"
-
+    input :space, :desc => "Space to list the domains from",
+          :argument => :optional, :default => proc { client.current_space },
+          :from_given => by_name(:space)
+    input :all, :desc => "List all domains", :default => false
     def domains
       space = input[:space]
 

data/lib/vmc/cli/domain/remove_domain.rb

@@ -4,16 +4,11 @@ module VMC::Domain
   class RemoveDomain < Base
     desc "Remove a domain from a space"
     group :domains
-    input(:domain, :argument => :optional,
-          :from_given => by_name("domain"),
-          :desc => "Domain to add") { |space|
-      ask "Which domain?", :choices => space.domains,
-          :display => proc(&:name)
-    }
-    input :space, :from_given => by_name("space"),
-          :default => proc { client.current_space },
-          :desc => "Space to add the domain to"
-
+    input :domain, :desc => "Domain to add", :argument => :optional,
+          :from_given => by_name(:domain)
+    input :space, :desc => "Space to add the domain to",
+          :from_given => by_name(:space),
+          :default => proc { client.current_space }
     def remove_domain
       space = input[:space]
       domain = input[:domain, space]
@@ -22,5 +17,12 @@ module VMC::Domain
         space.remove_domain(domain)
       end
     end
+
+    private
+
+    def ask_domain(space)
+      ask "Which domain?", :choices => space.domains,
+          :display => proc(&:name)
+    end
   end
 end

data/lib/vmc/cli/organization/org.rb

@@ -4,13 +4,12 @@ module VMC::Organization
   class Org < Base
     desc "Show organization information"
     group :organizations
-    input :organization, :aliases => ["--org", "-o"],
-          :argument => :optional,
-          :from_given => by_name("organization"),
-          :default => proc { client.current_organization },
-          :desc => "Organization to show"
-    input :full, :type => :boolean,
-          :desc => "Show full information for spaces, domains, etc."
+    input :organization, :desc => "Organization to show",
+          :aliases => %w{--org -o}, :argument => :optional,
+          :from_given => by_name(:organization),
+          :default => proc { client.current_organization }
+    input :full, :desc => "Show full information for spaces, domains, etc.",
+          :default => false
     def org
       org = input[:organization]
 

data/lib/vmc/cli/organization/orgs.rb

@@ -4,32 +4,32 @@ module VMC::Organization
   class Orgs < Base
     desc "List available organizations"
     group :organizations
-    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 orgs
       orgs =
-          with_progress("Getting organizations") do
-            client.organizations
-          end
+        with_progress("Getting organizations") do
+          client.organizations.sort_by(&:name)
+        end
+
+      return if orgs.empty?
 
       line unless quiet?
 
-      if input[:one_line]
-        table(
-            %w{name spaces domains},
-            orgs.collect { |o|
-              [ c(o.name, :name),
-                name_list(o.spaces),
-                name_list(o.domains)
-              ]
-            })
-      else
+      if input[:full]
         orgs.each do |o|
-          invoke :org, :organization => o, :full => input[:full]
+          invoke :org, :organization => o, :full => true
         end
+      else
+        table(
+          %w{name spaces domains},
+          orgs.collect { |o|
+            [ c(o.name, :name),
+              name_list(o.spaces),
+              name_list(o.domains)
+            ]
+          })
       end
     end
   end
-end
+end

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

@@ -1,23 +1,13 @@
-require "vmc/detect"
-
 require "vmc/cli/organization/base"
 
 module VMC::Organization
   class Rename < Base
     desc "Rename an organization"
     group :organizations, :hidden => true
-    input(:organization, :aliases => ["--org", "-o"],
-          :argument => :optional, :desc => "Organization to rename",
-          :from_given => by_name("organization")) {
-      organizations = client.organizations
-      fail "No organizations." if organizations.empty?
-
-      ask("Rename which organization?", :choices => organizations.sort_by(&:name),
-          :display => proc(&:name))
-    }
-    input(:name, :argument => :optional, :desc => "New organization name") {
-      ask("New name")
-    }
+    input :organization, :desc => "Organization to rename",
+          :aliases => ["--org", "-o"], :argument => :optional,
+          :from_given => by_name(:organization)
+    input :name, :desc => "New organization name", :argument => :optional
     def rename_org
       organization = input[:organization]
       name = input[:name]
@@ -28,5 +18,19 @@ module VMC::Organization
         organization.update!
       end
     end
+
+    private
+
+    def ask_name
+      ask("New name")
+    end
+
+    def ask_organization
+      organizations = client.organizations
+      fail "No organizations." if organizations.empty?
+
+      ask("Rename which organization?", :choices => organizations.sort_by(&:name),
+          :display => proc(&:name))
+    end
   end
 end