vmc 0.4.0.beta.8 → 0.4.0.beta.9

data/bin/vmc

@@ -1,15 +1,14 @@
 #!/usr/bin/env ruby
+# vim: ft=ruby
 
-vmc = File.expand_path("../../vmc", __FILE__)
-vmc_ng = File.expand_path("../../vmc-ng", __FILE__)
+require "rubygems"
+require "thor"
 
-bin =
-  if File.exists?(File.expand_path("~/.vmc/use-ng"))
-    $LOAD_PATH.unshift "#{vmc_ng}/lib"
-    "#{vmc_ng}/bin/vmc"
-  else
-    "#{vmc}/bin/vmc"
-  end
+require "vmc"
+require "vmc/plugin"
 
-$0 = bin
-load bin
+VMC::Plugin.load_all
+
+$exit_status = 0
+VMC::CLI.start(ARGV)
+exit($exit_status)

data/{vmc-ng/lib → lib}/vmc/cli/app.rb

@@ -37,8 +37,8 @@ module VMC
     group :apps, :manage
     flag(:name) { ask("Name") }
     flag(:path)
-    flag(:url) { |name, target|
-      ask("URL", :default => "#{name}.#{target}")
+    flag(:url) { |default|
+      ask("URL", :default => default)
     }
     flag(:memory) { |framework, runtime|
       ask("Memory Limit",
@@ -60,6 +60,9 @@ module VMC
     flag(:runtime) { |choices|
       ask("Runtime", :choices => choices)
     }
+    flag(:command) {
+      ask("Startup command")
+    }
     flag(:start, :default => true)
     flag(:restart, :default => true)
     flag(:create_services, :type => :boolean) {
@@ -87,9 +90,6 @@ module VMC
 
       app.total_instances = input(:instances)
 
-      domain = client.target.sub(/^https?:\/\/api\.(.+)\/?/, '\1')
-      app.urls = [input(:url, name, domain)]
-
       if detected.empty?
         framework = input(:framework, frameworks.keys.sort, nil)
       else
@@ -108,6 +108,19 @@ module VMC
       app.framework = framework
       app.runtime = runtime
 
+      if framework == "standalone"
+        app.command = input(:command)
+
+        if (url = input(:url, "none")) != "none"
+          app.urls = [url]
+        else
+          app.urls = []
+        end
+      else
+        domain = client.target.sub(/^https?:\/\/api\.(.+)\/?/, '\1')
+        app.urls = [input(:url, "#{name}.#{domain}")]
+      end
+
       app.memory = megabytes(input(:memory, framework, runtime))
 
       bindings = []
@@ -179,7 +192,7 @@ module VMC
     desc "start APPS...", "Start an application"
     group :apps, :manage
     flag :name
-    flag :debug_mode
+    flag :debug_mode, :aliases => "-d"
     def start(*names)
       if name = passed_value(:name)
         names = [name]
@@ -195,7 +208,7 @@ module VMC
         switch_mode(app, input(:debug_mode))
 
         with_progress("Starting #{c(name, :name)}") do |s|
-          if app.running?
+          if app.started?
             s.skip do
               err "Already started."
             end
@@ -247,7 +260,7 @@ module VMC
     desc "restart APPS...", "Stop and start an application"
     group :apps, :manage
     flag :name
-    flag :debug_mode
+    flag :debug_mode, :aliases => "-d"
     def restart(*names)
       stop(*names)
       start(*names)
@@ -262,36 +275,52 @@ module VMC
     flag(:name) { |names|
       ask("Delete which application?", :choices => names)
     }
+    flag(:orphaned, :aliases => "-o", :type => :boolean,
+          :desc => "Delete orphaned instances")
     flag(:all, :default => false)
     def delete(*names)
       if input(:all)
         return unless input(:really, "ALL APPS", :bad)
 
-        with_progress("Deleting all applications") do
-          client.apps.collect(&:delete!)
+        apps = client.apps
+
+        orphaned = find_orphaned_services(apps)
+
+        apps.each do |a|
+          with_progress("Deleting #{c(a.name, :name)}") do
+            a.delete!
+          end
         end
 
+        delete_orphaned_services(orphaned)
+
         return
       end
 
+      apps = client.apps
+
       if names.empty?
-        apps = client.apps
         fail "No applications." if apps.empty?
 
         names = [input(:name, apps.collect(&:name).sort)]
       end
 
-      names.each do |name|
-        really = input(:really, name, :name)
+      to_delete = names.collect { |n| apps.find { |a| a.name == n } }
+      orphaned = find_orphaned_services(to_delete)
+
+      to_delete.each do |app|
+        really = input(:really, app.name, :name)
 
         forget(:really)
 
         next unless really
 
-        with_progress("Deleting #{c(name, :name)}") do
-          client.app(name).delete!
+        with_progress("Deleting #{c(app.name, :name)}") do
+          app.delete!
         end
       end
+
+      delete_orphaned_services(orphaned)
     end
 
     desc "instances APPS...", "List an app's instances"
@@ -323,6 +352,7 @@ module VMC
 
     desc "scale APP", "Update the instances/memory limit for an application"
     group :apps, :info, :hidden => true
+    flag :name
     flag(:instances, :type => :numeric) { |default|
       ask("Instances", :default => default)
     }
@@ -331,7 +361,9 @@ module VMC
           :default => human_size(default * 1024 * 1024, 0),
           :choices => MEM_CHOICES)
     }
-    def scale(name)
+    def scale(name = nil)
+      name ||= input(:name)
+
       app = client.app(name)
 
       instances = passed_value(:instances)
@@ -351,9 +383,12 @@ module VMC
 
     desc "logs APP", "Print out an app's logs"
     group :apps, :info, :hidden => true
+    flag :name
     flag(:instance, :type => :numeric, :default => 0)
     flag(:all, :default => false)
-    def logs(name)
+    def logs(name = nil)
+      name ||= input(:name)
+
       app = client.app(name)
       fail "Unknown application." unless app.exists?
 
@@ -397,7 +432,10 @@ module VMC
 
     desc "file APP [PATH]", "Print out an app's file contents"
     group :apps, :info, :hidden => true
-    def file(name, path = "/")
+    flag :name
+    def file(name = nil, path = "/")
+      name ||= input(:name)
+
       file =
         with_progress("Getting file contents") do
           client.app(name).file(*path.split("/"))
@@ -410,16 +448,18 @@ module VMC
 
     desc "files APP [PATH]", "Examine an app's files"
     group :apps, :info, :hidden => true
-    def files(name, path = "/")
+    flag :name
+    def files(name = nil, path = "/")
+      name ||= input(:name)
+
       files =
         with_progress("Getting file listing") do
           client.app(name).files(*path.split("/"))
         end
 
       puts "" unless simple_output?
-
       files.each do |file|
-        puts file
+        puts file.join("/")
       end
     end
 
@@ -450,17 +490,26 @@ module VMC
 
     desc "stats APP", "Display application instance status"
     group :apps, :info, :hidden => true
-    def stats(name)
+    flag :name
+    def stats(name = nil)
+      name ||= input(:name)
+
       stats =
         with_progress("Getting stats") do
           client.app(name).stats
         end
 
       stats.sort_by { |k, _| k }.each do |idx, info|
+        puts ""
+
+        if info["state"] == "DOWN"
+          puts "Instance #{c("\##{idx}", :instance)} is down."
+          next
+        end
+
         stats = info["stats"]
         usage = stats["usage"]
-        puts ""
-        puts "instance #{c("#" + idx, :name)}:"
+        puts "instance #{c("\##{idx}", :instance)}:"
         print "  cpu: #{percentage(usage["cpu"])} of"
         puts " #{b(stats["cores"])} cores"
         puts "  memory: #{usage(usage["mem"] * 1024, stats["mem_quota"])}"
@@ -585,13 +634,14 @@ module VMC
     # set app debug mode, ensuring it's valid, and shutting it down
     def switch_mode(app, mode)
       mode = nil if mode == "none"
+      mode = "run" if mode == "debug_mode" # no value given
 
       return false if app.debug_mode == mode
 
       if mode.nil?
         with_progress("Removing debug mode") do
           app.debug_mode = nil
-          app.stop! if app.running?
+          app.stop! if app.started?
         end
 
         return true
@@ -602,13 +652,9 @@ module VMC
         modes = runtimes[app.runtime]["debug_modes"] || []
         if modes.include?(mode)
           app.debug_mode = mode
-          app.stop! if app.running?
-          true
+          app.stop! if app.started?
         else
-          s.fail do
-            err "Unknown mode '#{mode}'; available: #{modes.inspect}"
-            false
-          end
+          fail "Unknown mode '#{mode}'; available: #{modes.join ", "}"
         end
       end
     end
@@ -666,45 +712,47 @@ module VMC
       end
     end
 
-    def display_app(a)
-      if simple_output?
-        puts a.name
-        return
-      end
-
-      puts ""
+    def display_instance(i)
+      print "instance #{c("\##{i.index}", :instance)}: "
+      puts "#{b(c(i.state.downcase, state_color(i.state)))} "
 
-      status = app_status(a)
+      puts "  started: #{c(i.since.strftime("%F %r"), :cyan)}"
 
-      print "#{c(a.name, :name)}: #{status}"
+      if d = i.debugger
+        puts "  debugger: port #{b(d[:port])} at #{b(d[:ip])}"
+      end
 
-      unless a.total_instances == 1
-        print ", #{b(a.total_instances)} instances"
+      if c = i.console
+        puts "  console: port #{b(c[:port])} at #{b(c[:ip])}"
       end
+    end
 
-      puts ""
+    def find_orphaned_services(apps)
+      orphaned = []
 
-      unless a.urls.empty?
-        puts "  urls: #{a.urls.collect { |u| b(u) }.join(", ")}"
+      apps.each do |a|
+        a.services.each do |s|
+          if apps.none? { |x| x != a && x.services.include?(s) }
+            orphaned << s
+          end
+        end
       end
 
-      unless a.services.empty?
-        puts "  services: #{a.services.collect { |s| b(s) }.join(", ")}"
-      end
+      orphaned
     end
 
-    def display_instance(i)
-      print "instance #{c("\##{i.index}", :instance)}: "
-      puts "#{b(c(i.state.downcase, state_color(i.state)))} "
-
-      puts "  started: #{c(i.since.strftime("%F %r"), :cyan)}"
+    def delete_orphaned_services(names)
+      return if names.empty?
 
-      if d = i.debugger
-        puts "  debugger: port #{b(d["port"])} at #{b(d["ip"])}"
-      end
+      puts "" unless simple_output?
 
-      if c = i.console
-        puts "  console: port #{b(c["port"])} at #{b(c["ip"])}"
+      names.select { |s|
+        input(: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
       end
     end
   end

data/{vmc-ng/lib → lib}/vmc/cli/command.rb

@@ -10,6 +10,8 @@ require "vmc/cli/dots"
 require "vmc/cli/better_help"
 
 
+$vmc_asked_auth = false
+
 module VMC
   module Interactive
     include ::Interactive::Rewindable
@@ -362,6 +364,18 @@ module VMC
     rescue UserError => e
       err e.message
     rescue CFoundry::Denied => e
+      if !$vmc_asked_auth && e.error_code == 200
+        $vmc_asked_auth = true
+
+        puts ""
+        puts c("Not authenticated! Try logging in:", :warning)
+
+        VMC::CLI.start(["login"])
+        @client = nil
+
+        retry
+      end
+
       err "Denied: #{e.description}"
     rescue Exception => e
       msg = e.class.name

data/{vmc-ng/lib → lib}/vmc/cli.rb

@@ -233,6 +233,10 @@ module VMC
 
     desc "apps", "List your applications"
     group :apps
+    flag :name, :desc => "Filter by name regexp"
+    flag :runtime, :desc => "Filter by runtime regexp"
+    flag :framework, :desc => "Filter by framework regexp"
+    flag :url, :desc => "Filter by url regexp"
     def apps
       apps =
         with_progress("Getting applications") do
@@ -246,12 +250,17 @@ module VMC
       end
 
       apps.each.with_index do |a, num|
-        display_app(a)
+        display_app(a) if app_matches(a)
       end
     end
 
     desc "services", "List your services"
     group :services
+    flag :name, :desc => "Filter by name regexp"
+    flag :app, :desc => "Filter by bound application regexp"
+    flag :type, :desc => "Filter by service type regexp"
+    flag :vendor, :desc => "Filter by service vendor regexp"
+    flag :tier, :desc => "Filter by service tier regexp"
     def services
       services =
         with_progress("Getting services") do
@@ -264,8 +273,15 @@ module VMC
         puts "No services."
       end
 
+      if app = options[:app]
+        apps = client.apps
+        services.reject! do |s|
+          apps.none? { |a| a.services.include? s.name }
+        end
+      end
+
       services.each do |s|
-        display_service(s)
+        display_service(s) if service_matches(s)
       end
     end
 
@@ -313,6 +329,76 @@ module VMC
 
     private
 
+    def app_matches(a)
+      if name = options[:name]
+        return false if a.name !~ /#{name}/
+      end
+
+      if runtime = options[:runtime]
+        return false if a.runtime !~ /#{runtime}/
+      end
+
+      if framework = options[:framework]
+        return false if a.framework !~ /#{framework}/
+      end
+
+      if url = options[:url]
+        return false if a.urls.none? { |u| u =~ /#{url}/ }
+      end
+
+      true
+    end
+
+    IS_UTF8 = !!(ENV["LC_ALL"] || ENV["LC_CTYPE"] || ENV["LANG"])["UTF-8"]
+
+    def display_app(a)
+      if simple_output?
+        puts a.name
+        return
+      end
+
+      puts ""
+
+      status = app_status(a)
+
+      puts "#{c(a.name, :name)}: #{status}"
+
+      puts "  platform: #{b(a.framework)} on #{b(a.runtime)}"
+
+      print "  usage: #{b(human_size(a.memory * 1024 * 1024, 0))}"
+      print " #{c(IS_UTF8 ? "\xc3\x97" : "x", :dim)} #{b(a.total_instances)}"
+      print " instance#{a.total_instances == 1 ? "" : "s"}"
+      puts ""
+
+      unless a.urls.empty?
+        puts "  urls: #{a.urls.collect { |u| b(u) }.join(", ")}"
+      end
+
+      unless a.services.empty?
+        puts "  services: #{a.services.collect { |s| b(s) }.join(", ")}"
+      end
+    end
+
+    def service_matches(s)
+      if name = options[:name]
+        return false if s.name !~ /#{name}/
+      end
+
+      if type = options[:type]
+        return false if s.type !~ /#{type}/
+      end
+
+      if vendor = options[:vendor]
+        return false if s.vendor !~ /#{vendor}/
+      end
+
+      if tier = options[:tier]
+        return false if s.tier !~ /#{tier}/
+      end
+
+      true
+    end
+
     def display_service(s)
       if simple_output?
         puts s.name

data/lib/vmc/version.rb

@@ -0,0 +1,3 @@
+module VMC
+  VERSION = "0.4.0.beta.9"
+end