vmc 0.4.0.beta.5 → 0.4.0.beta.6

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.rb

@@ -56,7 +56,7 @@ module VMC
 
         runtimes.each do |r|
           puts ""
-          puts "#{c(r["name"], :blue)}:"
+          puts "#{c(r["name"], :name)}:"
           puts "  version: #{b(r["version"])}"
           puts "  description: #{b(r["description"])}"
         end
@@ -79,7 +79,7 @@ module VMC
 
         services.each do |name, meta|
           puts ""
-          puts "#{c(name, :blue)}:"
+          puts "#{c(name, :name)}:"
           puts "  versions: #{meta[:versions].join ", "}"
           puts "  description: #{meta[:description]}"
           puts "  type: #{meta[:type]}"
@@ -134,7 +134,7 @@ module VMC
       end
 
       target = sane_target_url(url)
-      display = c(target.sub(/https?:\/\//, ""), :blue)
+      display = c(target.sub(/https?:\/\//, ""), :name)
       with_progress("Setting target to #{display}") do
         unless force?
           # check that the target is valid
@@ -209,7 +209,7 @@ module VMC
     flag(:no_login, :type => :boolean)
     def register(email = nil)
       unless simple_output?
-        puts "Target: #{c(client_target, :blue)}"
+        puts "Target: #{c(client_target, :name)}"
         puts ""
       end
 
@@ -282,7 +282,7 @@ module VMC
       end
     end
 
-    desc "help [COMMAND]", "usage instructions"
+    desc "help [COMMAND]", "Usage instructions"
     flag :all, :default => false
     group :start
     def help(task = nil)
@@ -303,13 +303,21 @@ module VMC
       end
     end
 
+    desc "colors", "Show color configuration"
+    group :start, :hidden => true
+    def colors
+      user_colors.each do |n, c|
+        puts "#{n}: #{c(c.to_s, n)}"
+      end
+    end
+
     private
 
     def display_service(s)
       if simple_output?
         puts s.name
       else
-        puts "#{c(s.name, :blue)}: #{s.vendor} v#{s.version}"
+        puts "#{c(s.name, :name)}: #{s.vendor} v#{s.version}"
       end
     end
 
@@ -318,8 +326,8 @@ module VMC
         puts u.email
       else
         puts ""
-        puts "#{c(u.email, :blue)}:"
-        puts "  admin?: #{c(u.admin?, u.admin? ? :green : :red)}"
+        puts "#{c(u.email, :name)}:"
+        puts "  admin?: #{c(u.admin?, u.admin? ? :yes : :no)}"
       end
     end
 
@@ -327,7 +335,7 @@ module VMC
       if simple_output?
         puts client.target
       else
-        puts "Target: #{c(client.target, :blue)}"
+        puts "Target: #{c(client.target, :name)}"
       end
     end
   end

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

@@ -134,7 +134,7 @@ module VMC
           service.version = version
           service.tier = "free"
 
-          with_progress("Creating service #{c(service_name, :blue)}") do
+          with_progress("Creating service #{c(service_name, :name)}") do
             service.create!
           end
 
@@ -162,7 +162,7 @@ module VMC
 
       app.services = bindings
 
-      with_progress("Creating #{c(name, :blue)}") do
+      with_progress("Creating #{c(name, :name)}") do
         app.create!
       end
 
@@ -194,7 +194,7 @@ module VMC
 
         switch_mode(app, input(:debug_mode))
 
-        with_progress("Starting #{c(name, :blue)}") do |s|
+        with_progress("Starting #{c(name, :name)}") do |s|
           if app.running?
             s.skip do
               err "Already started."
@@ -224,7 +224,7 @@ module VMC
       fail "No applications given." if names.empty?
 
       names.each do |name|
-        with_progress("Stopping #{c(name, :blue)}") do |s|
+        with_progress("Stopping #{c(name, :name)}") do |s|
           app = client.app(name)
 
           unless app.exists?
@@ -265,7 +265,7 @@ module VMC
     flag(:all, :default => false)
     def delete(*names)
       if input(:all)
-        return unless input(:really, "ALL APPS", :red)
+        return unless input(:really, "ALL APPS", :bad)
 
         with_progress("Deleting all applications") do
           client.apps.collect(&:delete!)
@@ -282,13 +282,13 @@ module VMC
       end
 
       names.each do |name|
-        really = input(:really, name, :blue)
+        really = input(:really, name, :name)
 
         forget(:really)
 
         next unless really
 
-        with_progress("Deleting #{c(name, :blue)}") do
+        with_progress("Deleting #{c(name, :name)}") do
           client.app(name).delete!
         end
       end
@@ -306,7 +306,7 @@ module VMC
 
       names.each do |name|
         instances =
-          with_progress("Getting instances for #{c(name, :blue)}") do
+          with_progress("Getting instances for #{c(name, :name)}") do
             client.app(name).instances
           end
 
@@ -342,7 +342,7 @@ module VMC
         memory = input(:memory, app.memory)
       end
 
-      with_progress("Scaling #{c(name, :blue)}") do
+      with_progress("Scaling #{c(name, :name)}") do
         app.total_instances = instances.to_i if instances
         app.memory = megabytes(memory) if memory
         app.update!
@@ -376,8 +376,8 @@ module VMC
         logs =
           with_progress(
             "Getting logs for " +
-              c(name, :blue) + " " +
-              c("\##{i.index}", :yellow)) do
+              c(name, :name) + " " +
+              c("\##{i.index}", :instance)) do
             i.files("logs")
           end
 
@@ -441,7 +441,7 @@ module VMC
       apps.each do |name, status|
         unless simple_output?
           puts ""
-          print "#{c(name, :blue)}: "
+          print "#{c(name, :name)}: "
         end
 
         puts status
@@ -460,7 +460,7 @@ module VMC
         stats = info["stats"]
         usage = stats["usage"]
         puts ""
-        puts "instance #{c("#" + idx, :blue)}:"
+        puts "instance #{c("#" + idx, :name)}:"
         print "  cpu: #{percentage(usage["cpu"])} of"
         puts " #{b(stats["cores"])} cores"
         puts "  memory: #{usage(usage["mem"] * 1024, stats["mem_quota"])}"
@@ -479,7 +479,7 @@ module VMC
       def map(name, url)
         simple = url.sub(/^https?:\/\/(.*)\/?/i, '\1')
 
-        with_progress("Updating #{c(name, :blue)}") do
+        with_progress("Updating #{c(name, :name)}") do
           app = client.app(name)
           app.urls << simple
           app.update!
@@ -494,7 +494,7 @@ module VMC
         app = client.app(name)
         fail "Unknown application." unless app.exists?
 
-        with_progress("Updating #{c(name, :blue)}") do |s|
+        with_progress("Updating #{c(name, :name)}") do |s|
           unless app.urls.delete(simple)
             s.fail do
               err "URL #{url} is not mapped to this application."
@@ -523,7 +523,7 @@ module VMC
         app = client.app(appname)
         fail "Unknown application." unless app.exists?
 
-        with_progress("Updating #{c(app.name, :blue)}") do
+        with_progress("Updating #{c(app.name, :name)}") do
           app.update!("env" =>
                         app.env.reject { |v|
                           v.start_with?("#{name}=")
@@ -537,7 +537,7 @@ module VMC
         app = client.app(appname)
         fail "Unknown application." unless app.exists?
 
-        with_progress("Updating #{c(app.name, :blue)}") do
+        with_progress("Updating #{c(app.name, :name)}") do
           app.update!("env" =>
                         app.env.reject { |v|
                           v.start_with?("#{name}=")
@@ -566,7 +566,7 @@ module VMC
 
         vars.each do |pair|
           name, val = pair.split("=", 2)
-          puts "#{c(name, :blue)}: #{val}"
+          puts "#{c(name, :name)}: #{val}"
         end
       end
     end
@@ -577,7 +577,7 @@ module VMC
     private
 
     def upload_app(app, path)
-      with_progress("Uploading #{c(app.name, :blue)}") do
+      with_progress("Uploading #{c(app.name, :name)}") do
         app.upload(path)
       end
     end
@@ -597,7 +597,7 @@ module VMC
         return true
       end
 
-      with_progress("Switching mode to #{c(mode, :blue)}") do |s|
+      with_progress("Switching mode to #{c(mode, :name)}") do |s|
         runtimes = client.system_runtimes
         modes = runtimes[app.runtime]["debug_modes"] || []
         if modes.include?(mode)
@@ -616,7 +616,7 @@ module VMC
     APP_CHECK_LIMIT = 60
 
     def check_application(app)
-      with_progress("Checking #{c(app.name, :blue)}") do |s|
+      with_progress("Checking #{c(app.name, :name)}") do |s|
         if app.debug_mode == "suspend"
           s.skip do
             puts "Application is in suspended debugging mode."
@@ -642,17 +642,17 @@ module VMC
     def state_color(s)
       case s
       when "STARTING"
-        :blue
+        :neutral
       when "STARTED", "RUNNING"
-        :green
+        :good
       when "DOWN"
-        :red
+        :bad
       when "FLAPPING"
-        :magenta
+        :error
       when "N/A"
-        :cyan
+        :unknown
       else
-        :yellow
+        :warning
       end
     end
 
@@ -660,7 +660,7 @@ module VMC
       health = a.health
 
       if a.debug_mode == "suspend" && health == "0%"
-        c("suspended", :yellow)
+        c("suspended", :neutral)
       else
         c(health.downcase, state_color(health))
       end
@@ -676,7 +676,7 @@ module VMC
 
       status = app_status(a)
 
-      print "#{c(a.name, :blue)}: #{status}"
+      print "#{c(a.name, :name)}: #{status}"
 
       unless a.total_instances == 1
         print ", #{b(a.total_instances)} instances"
@@ -694,13 +694,13 @@ module VMC
     end
 
     def display_instance(i)
-      print "instance #{c("\##{i.index}", :blue)}: "
+      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)}"
 
       if d = i.debugger
-        puts "  debugger: port #{c(d["port"], :blue)} at #{c(d["ip"], :blue)}"
+        puts "  debugger: port #{b(d["port"])} at #{b(d["ip"])}"
       end
 
       if c = i.console

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

@@ -48,7 +48,7 @@ module VMC
 
     def list_choices(choices, options)
       choices.each_with_index do |o, i|
-        puts "#{c(i + 1, :green)}: #{o}"
+        puts "#{c(i + 1, :number)}: #{o}"
       end
     end
 
@@ -70,7 +70,7 @@ module VMC
         end
 
       print "#{question}"
-      print c("> ", :blue)
+      print c("> ", :prompt)
 
       unless value.empty?
         print "#{c(value, :black) + "\b" * value.size}"
@@ -288,7 +288,7 @@ module VMC
       if script?
         $stderr.puts(msg)
       else
-        puts c(msg, :red)
+        puts c(msg, :error)
       end
 
       $exit_status = 1
@@ -489,11 +489,11 @@ module VMC
     def percentage(num, low = 50, mid = 70)
       color =
         if num <= low
-          :green
+          :good
         elsif num <= mid
-          :yellow
+          :warning
         else
-          :red
+          :bad
         end
 
       c(format("%.1f\%", num), color)

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

@@ -1,3 +1,5 @@
+require "rbconfig"
+
 module VMC
   module Dots
     DOT_COUNT = 3
@@ -9,15 +11,15 @@ module VMC
       end
 
       def skip(&callback)
-        @return.call("SKIPPED", :yellow, callback)
+        @return.call("SKIPPED", :warning, callback)
       end
 
       def give_up(&callback)
-        @return.call("GAVE UP", :red, callback)
+        @return.call("GAVE UP", :bad, callback)
       end
 
       def fail(&callback)
-        @return.call("FAILED", :red, callback)
+        @return.call("FAILED", :error, callback)
       end
     end
 
@@ -40,21 +42,23 @@ module VMC
         res = yield skipper
         unless simple_output?
           stop_dots!
-          puts "... #{c("OK", :green)}"
+          puts "... #{c("OK", :good)}"
         end
         res
       rescue
         unless simple_output?
           stop_dots!
-          puts "... #{c("FAILED", :red)}"
+          puts "... #{c("FAILED", :error)}"
         end
 
         raise
       end
     end
 
+    WINDOWS = !!(RbConfig::CONFIG['host_os'] =~ /mingw|mswin32|cygwin/)
+
     def color?
-      $stdout.tty?
+      !WINDOWS && $stdout.tty?
     end
 
     COLOR_CODES = {
@@ -68,13 +72,64 @@ module VMC
       :white => 7
     }
 
+    DEFAULT_COLORS = {
+      :name => :blue,
+      :neutral => :blue,
+      :good => :green,
+      :bad => :red,
+      :error => :magenta,
+      :unknown => :cyan,
+      :warning => :yellow,
+      :instance => :yellow,
+      :number => :green,
+      :prompt => :blue,
+      :yes => :green,
+      :no => :red
+    }
+
+    def user_colors
+      return @user_colors if @user_colors
+
+      colors = File.expand_path VMC::COLORS_FILE
+
+      if File.exists? colors
+        @user_colors = DEFAULT_COLORS.dup
+
+        YAML.load_file(colors).each do |k, v|
+          if k == true
+            k = :yes
+          elsif k == false
+            k = :no
+          else
+            k = k.to_sym
+          end
+
+          @user_colors[k] = v.to_sym
+        end
+
+        @user_colors
+      else
+        @user_colors = DEFAULT_COLORS
+      end
+    end
+
     # colored text
     #
     # shouldn't use bright colors, as some color themes abuse
     # the bright palette (I'm looking at you, Solarized)
-    def c(str, color)
+    def c(str, type)
       return str unless color?
-      "\e[3#{COLOR_CODES[color]}m#{str}\e[0m"
+
+      bright = false
+      color = user_colors[type]
+      if color =~ /bright-(.+)/
+        bright = true
+        color = $1.to_sym
+      end
+
+      return str unless color
+
+      "\e[#{bright ? 9 : 3}#{COLOR_CODES[color]}m#{str}\e[0m"
     end
     module_function :c