vmc 0.4.7 → 0.5.0.beta.1

data/lib/vmc.rb

@@ -1,9 +1,8 @@
 require "vmc/version"
 
 require "vmc/cli"
-require "vmc/cli/user"
 
-command_files = "../vmc/cli/{app,route,domain,organization,space,service,start}/*.rb"
+command_files = "../vmc/cli/{app,route,domain,organization,space,service,start,user}/*.rb"
 Dir[File.expand_path(command_files, __FILE__)].each do |file|
   require file unless File.basename(file) == 'base.rb'
 end

data/lib/vmc/cli.rb

@@ -23,36 +23,32 @@ module VMC
     include VMC::Interactive
     include VMC::Spacing
 
-    option :help, :alias => "-h", :type => :boolean,
-      :desc => "Show command usage & instructions"
+    option :help, :desc => "Show command usage", :alias => "-h",
+      :default => false
 
-    option :proxy, :alias => "-u", :value => :email,
-      :desc => "Act as another user (admin only)"
+    option :proxy, :desc => "Act as another user (admin)", :alias => "-u",
+      :value => :email
 
-    option :version, :alias => "-v", :type => :boolean,
-      :desc => "Print version number"
+    option :version, :desc => "Print version number", :alias => "-v",
+      :default => false
 
-    option :verbose, :alias => "-V", :type => :boolean,
-      :desc => "Print extra information"
+    option :verbose, :desc => "Print extra information", :alias => "-V",
+      :default => false
 
-    option :force, :alias => "-f", :type => :boolean,
-      :default => proc { input[:script] },
-      :desc => "Skip interaction when possible"
+    option :force, :desc => "Skip interaction when possible", :alias => "-f",
+      :type => :boolean, :default => proc { input[:script] }
 
-    option :quiet, :alias => "-q", :type => :boolean,
-      :default => proc { input[:script] },
-      :desc => "Simplify output format"
+    option :quiet, :desc => "Simplify output format", :alias => "-q",
+      :type => :boolean, :default => proc { input[:script] }
 
-    option :script, :type => :boolean,
-      :default => proc { !$stdout.tty? },
-      :desc => "Shortcut for --quiet and --force"
+    option :script, :desc => "Shortcut for --quiet and --force",
+      :type => :boolean, :default => proc { !$stdout.tty? }
 
-    option :color, :type => :boolean,
-      :default => proc { !input[:quiet] },
-      :desc => "Use colorful output"
+    option :color, :desc => "Use colorful output",
+      :type => :boolean, :default => proc { !input[:quiet] }
 
-    option :trace, :alias => "-t", :type => :boolean,
-      :desc => "Show API requests and responses"
+    option :trace, :desc => "Show API traffic", :alias => "-t",
+      :default => false
 
 
     def default_action
@@ -394,24 +390,30 @@ module VMC
 
       private
 
-      def find_by_name(what)
-        proc { |name, choices, *_|
+      def find_by_name(display, &blk)
+        proc { |name, *args|
+          choices, _ = args
+          choices ||= instance_exec(&blk) if block_given?
+
           choices.find { |c| c.name == name } ||
-            fail("Unknown #{what} '#{name}'.")
+            fail("Unknown #{display} '#{name}'.")
         }
       end
 
-      def by_name(what, obj = what)
+      def by_name(what, display = what)
         proc { |name, *_|
-          client.send(:"#{obj}_by_name", name) ||
-            fail("Unknown #{what} '#{name}'.")
+          client.send(:"#{what}_by_name", name) ||
+            fail("Unknown #{display} '#{name}'.")
         }
       end
 
-      def find_by_name_insensitive(what)
-        proc { |name, choices|
+      def find_by_name_insensitive(display, &blk)
+        proc { |name, *args|
+          choices, _ = args
+          choices ||= instance_exec(&blk) if block_given?
+
           choices.find { |c| c.name.upcase == name.upcase } ||
-            fail("Unknown #{what} '#{name}'.")
+            fail("Unknown #{display} '#{name}'.")
         }
       end
     end

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

@@ -6,8 +6,8 @@ module VMC::App
 
     desc "Show app information"
     group :apps
-    input :app, :argument => :required, :from_given => by_name("app"),
-      :desc => "App to show"
+    input :app, :desc => "App to show", :argument => :required,
+          :from_given => by_name(:app)
     def app
       app = input[:app]
 

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

@@ -4,15 +4,14 @@ module VMC::App
   class Apps < Base
     desc "List your applications"
     group :apps
-    input :space, :from_given => by_name("space"),
-      :default => proc { client.current_space },
-      :desc => "Show apps in given space"
+    input :space, :desc => "Show apps in given space",
+          :default => proc { client.current_space },
+          :from_given => by_name(:space)
     input :name, :desc => "Filter by name regexp"
     input :runtime, :desc => "Filter by runtime regexp"
     input :framework, :desc => "Filter by framework regexp"
     input :url, :desc => "Filter by url regexp"
-    input :full, :type => :boolean, :default => false,
-      :desc => "Verbose output format"
+    input :full, :desc => "Verbose output format", :default => false
     def apps
       if space = input[:space]
         begin

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

@@ -4,9 +4,8 @@ module VMC::App
   class Crashes < Base
     desc "List an app's crashed instances"
     group :apps, :info, :hidden => true
-    input :apps, :argument => :splat, :singular => :app,
-      :desc => "Applications whose crashed instances to list",
-      :from_given => by_name("app")
+    input :apps, :desc => "Applications whose crashed instances to list",
+          :argument => :splat, :singular => :app, :from_given => by_name(:app)
     def crashes
       apps = input[:apps]
       fail "No applications given." if apps.empty?

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

@@ -6,25 +6,14 @@ module VMC::App
   class Delete < Base
     desc "Delete an application"
     group :apps, :manage
-    input(:apps, :argument => :splat, :singular => :app,
-          :desc => "Applications to delete",
-          :from_given => by_name("app")) {
-      apps = client.apps
-      fail "No applications." if apps.empty?
-
-      [ask("Delete which application?", :choices => apps.sort_by(&:name),
-           :display => proc(&:name))]
-    }
-    input(:really, :type => :boolean, :forget => true,
-          :default => proc { force? || interact }) { |name, color|
-      ask("Really delete #{c(name, color)}?", :default => false)
-    }
-    input :routes, :type => :boolean, :default => false,
-      :desc => "Delete associated routes"
-    input :orphaned, :aliases => "-o", :type => :boolean,
-      :desc => "Delete orphaned instances"
-    input :all, :type => :boolean, :default => false,
-      :desc => "Delete all applications"
+    input :apps, :desc => "Applications to delete", :argument => :splat,
+          :singular => :app, :from_given => by_name(:app)
+    input :routes, :desc => "Delete associated routes", :default => false
+    input :orphaned, :desc => "Delete orphaned services", :aliases => "-o",
+          :default => false
+    input :all, :desc => "Delete all applications", :default => false
+    input :really, :type => :boolean, :forget => true, :hidden => true,
+          :default => proc { force? || interact }
     def delete
       apps = client.apps
 
@@ -72,19 +61,33 @@ module VMC::App
       orphaned.each(&:invalidate!)
     end
 
-    def delete_orphaned_services(instances, orphaned)
-      return if instances.empty?
+    def delete_orphaned_services(service, orphaned)
+      return if service.empty?
 
       line unless quiet? || force?
 
-      instances.select { |i|
+      service.select { |i|
         orphaned ||
-          ask("Delete orphaned service instance #{c(i.name, :name)}?",
+          ask("Delete orphaned service #{c(i.name, :name)}?",
               :default => false)
-      }.each do |instance|
+      }.each do |service|
         # TODO: splat
-        invoke :delete_service, :instance => instance, :really => true
+        invoke :delete_service, :service => service, :really => true
       end
     end
+
+    private
+
+    def ask_app
+      apps = client.apps
+      fail "No applications." if apps.empty?
+
+      [ask("Delete which application?", :choices => apps.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/app/env.rb

@@ -6,9 +6,8 @@ module VMC::App
 
     desc "Show all environment variables set for an app"
     group :apps, :info, :hidden => true
-    input :app, :argument => true,
-      :desc => "Application to inspect the environment of",
-      :from_given => by_name("app")
+    input :app, :desc => "Application to inspect the environment of",
+          :argument => true, :from_given => by_name(:app)
     def env
       app = input[:app]
 
@@ -26,15 +25,11 @@ module VMC::App
 
     desc "Set an environment variable"
     group :apps, :info, :hidden => true
-    input :app, :argument => true,
-      :desc => "Application to set the variable for",
-      :from_given => by_name("app")
-    input :name, :argument => true,
-      :desc => "Environment variable name"
-    input :value, :argument => :optional,
-      :desc => "Environment variable value"
-    input :restart, :type => :boolean, :default => true,
-      :desc => "Restart app after updating?"
+    input :app, :desc => "Application to set the variable for",
+          :argument => true, :from_given => by_name(:app)
+    input :name, :desc => "Variable name", :argument => true
+    input :value, :desc => "Variable value", :argument => :optional
+    input :restart, :desc => "Restart app after updating?", :default => true
     def set_env
       app = input[:app]
       name = input[:name]
@@ -62,13 +57,10 @@ module VMC::App
 
     desc "Remove an environment variable"
     group :apps, :info, :hidden => true
-    input :app, :argument => true,
-      :desc => "Application to set the variable for",
-      :from_given => by_name("app")
-    input :name, :argument => true,
-      :desc => "Environment variable name"
-    input :restart, :type => :boolean, :default => true,
-      :desc => "Restart app after updating?"
+    input :app, :desc => "Application to set the variable for",
+          :argument => true, :from_given => by_name(:app)
+    input :name, :desc => "Variable name", :argument => true
+    input :restart, :desc => "Restart app after updating?", :default => true
     def unset_env
       app = input[:app]
       name = input[:name]

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

@@ -5,11 +5,10 @@ module VMC::App
   class Files < Base
     desc "Print out an app's file contents"
     group :apps, :info, :hidden => true
-    input :app, :argument => true,
-      :desc => "Application to inspect the files of",
-      :from_given => by_name("app")
-    input :path, :argument => true, :default => "/",
-      :desc => "Path of file to read"
+    input :app, :desc => "Application to inspect the files of",
+          :argument => true, :from_given => by_name(:app)
+    input :path, :desc => "Path of file to read", :argument => :optional,
+          :default => "/"
     def file
       app = input[:app]
       path = input[:path]
@@ -36,11 +35,10 @@ module VMC::App
 
     desc "Examine an app's files"
     group :apps, :info, :hidden => true
-    input :app, :argument => true,
-      :desc => "Application to inspect the files of",
-      :from_given => by_name("app")
-    input :path, :argument => :optional, :default => "/",
-      :desc => "Path of directory to list"
+    input :app, :desc => "Application to inspect the files of",
+          :argument => true, :from_given => by_name(:app)
+    input :path, :desc => "Path of directory to list", :argument => :optional,
+          :default => "/"
     def files
       app = input[:app]
       path = input[:path]
@@ -65,11 +63,9 @@ module VMC::App
 
     desc "Stream an app's file contents"
     group :apps, :info, :hidden => true
-    input :app, :argument => true,
-      :desc => "Application to inspect the file of",
-      :from_given => by_name("app")
-    input :path, :argument => :optional, :default => nil,
-      :desc => "Path of file to stream (default: all)"
+    input :app, :desc => "Application to inspect the files of",
+          :argument => true, :from_given => by_name(:app)
+    input :path, :desc => "Path of file to stream", :argument => :optional
     def tail
       app = input[:app]
 

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

@@ -4,9 +4,8 @@ module VMC::App
   class Health < Base
     desc "Get application health"
     group :apps, :info, :hidden => true
-    input :apps, :argument => :splat, :singular => :app,
-      :desc => "Applications to start",
-      :from_given => by_name("app")
+    input :apps, :desc => "Applications to start", :argument => :splat,
+          :singular => :app, :from_given => by_name(:app)
     def health
       apps = input[:apps]
       fail "No applications given." if apps.empty?

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

@@ -4,9 +4,9 @@ module VMC::App
   class Instances < Base
     desc "List an app's instances"
     group :apps, :info, :hidden => true
-    input :apps, :argument => :splat, :singular => :app,
-      :desc => "Applications whose instances to list",
-      :from_given => by_name("app")
+    input :apps, :desc => "Applications whose instances to list",
+          :argument => :splat, :singular => :app,
+          :from_given => by_name(:app)
     def instances
       apps = input[:apps]
       fail "No applications given." if apps.empty?

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

@@ -4,13 +4,11 @@ module VMC::App
   class Logs < Base
     desc "Print out an app's logs"
     group :apps, :info, :hidden => true
-    input :app, :argument => true,
-      :desc => "Application to get the logs of",
-      :from_given => by_name("app")
-    input :instance, :default => "0",
-      :desc => "Instance of application to get the logs of"
-    input :all, :type => :boolean, :default => false,
-      :desc => "Get logs for every instance"
+    input :app, :desc => "Application to get the logs of", :argument => true,
+          :from_given => by_name(:app)
+    input :instance, :desc => "Instance of application to get the logs of",
+          :default => "0"
+    input :all, :desc => "Get logs for every instance", :default => false
     def logs
       app = input[:app]
 
@@ -36,9 +34,8 @@ module VMC::App
 
     desc "Print out the logs for an app's crashed instances"
     group :apps, :info, :hidden => true
-    input :app, :argument => true,
-      :desc => "Application to get the logs of",
-      :from_given => by_name("app")
+    input :app, :desc => "Application to get the logs of", :argument => true,
+          :from_given => by_name(:app)
     def crashlogs
       app = input[:app]
 

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

@@ -1,7 +1,7 @@
-require "vmc/detect"
 require "vmc/cli/app/base"
 require "vmc/cli/app/push/sync"
 require "vmc/cli/app/push/create"
+require "vmc/cli/app/push/interactions"
 
 module VMC::App
   class Push < Base
@@ -10,67 +10,22 @@ module VMC::App
 
     desc "Push an application, syncing changes if it exists"
     group :apps, :manage
-    input(:name, :argument => true, :desc => "Application name") {
-      ask("Name")
-    }
-    input :path, :default => ".",
-      :desc => "Path containing the application"
-    input(:url, :desc => "URL bound to app") { |name|
-      choices = url_choices(name)
-
-      options = {
-        :choices => choices + ["none"],
-        :allow_other => true
-      }
-
-      options[:default] = choices.first if choices.size == 1
-
-      url = ask "URL", options
-
-      unless url == "none"
-        url
-      end
-    }
-    input(:memory, :desc => "Memory limit") { |default|
-      ask("Memory Limit",
-          :choices => memory_choices,
-          :allow_other => true,
-          :default => default || "64M")
-    }
-    input(:instances, :type => :integer,
-          :desc => "Number of instances to run") {
-      ask("Instances", :default => 1)
-    }
-    input(:framework, :from_given => by_name("framework"),
-          :desc => "Framework to use") { |choices, default, other|
-      ask_with_other("Framework", client.frameworks, choices, default, other)
-    }
-    input(:runtime, :from_given => by_name("runtime"),
-          :desc => "Runtime to use") { |choices, default, other|
-      ask_with_other("Runtime", client.runtimes, choices, default, other)
-    }
-    input(:command, :desc => "Startup command for standalone app") {
-      ask("Startup command")
-    }
-    input :plan, :default => "D100",
-      :desc => "Application plan (e.g. D100, P200)"
-    input :start, :type => :boolean, :default => true,
-      :desc => "Start app after pushing?"
-    input :restart, :type => :boolean, :default => true,
-      :desc => "Restart app after updating?"
-    input(:create_services, :type => :boolean,
-          :default => proc { force? ? false : interact },
-          :desc => "Interactively create services?") {
-      line unless quiet?
-      ask "Create services for application?", :default => false
-    }
-    input(:bind_services, :type => :boolean,
-          :default => proc { force? ? false : interact },
-          :desc => "Interactively bind services?") {
-      unless all_instances.empty?
-        ask "Bind other services to application?", :default => false
-      end
-    }
+    input :name,      :desc => "Application name", :argument => :optional
+    input :path,      :desc => "Path containing the bits", :default => "."
+    input :url,       :desc => "URL to bind to app"
+    input :memory,    :desc => "Memory limit"
+    input :instances, :desc => "Number of instances to run"
+    input :framework, :desc => "Framework to use", :from_given => by_name(:framework)
+    input :runtime,   :desc => "Runtime to use", :from_given => by_name(:runtime)
+    input :command,   :desc => "Startup command for standalone app"
+    input :plan,      :desc => "Application plan", :default => "D100"
+    input :start,     :desc => "Start app after pushing?", :default => true
+    input :restart,   :desc => "Restart app after updating?", :default => true
+    input :create_services, :desc => "Interactively create services?",
+          :type => :boolean, :default => proc { force? ? false : interact }
+    input :bind_services, :desc => "Interactively bind services?",
+          :type => :boolean, :default => proc { force? ? false : interact }
+    interactions PushInteractions
     def push
       name = input[:name]
       path = File.expand_path(input[:path])
@@ -122,32 +77,5 @@ module VMC::App
       err "Upload failed. Try again with 'vmc push'."
       raise
     end
-
-    def ask_with_other(message, all, choices, default, other)
-      choices = choices.sort_by(&:name)
-      choices << other if other
-
-      opts = {
-        :choices => choices,
-        :display => proc { |x|
-          if other && x == other
-            "other"
-          else
-            x.name
-          end
-        }
-      }
-
-      opts[:default] = default if default
-
-      res = ask(message, opts)
-
-      if other && res == other
-        opts[:choices] = all
-        res = ask(message, opts)
-      end
-
-      res
-    end
   end
 end