af 0.3.13.beta.5 → 0.3.16.1

data/lib/cli/commands/base.rb

@@ -1,5 +1,5 @@
-
 require 'rubygems'
+require 'interact'
 require 'terminal-table/import'
 
 module VMC::Cli
@@ -7,8 +7,12 @@ module VMC::Cli
   module Command
 
     class Base
+      include Interactive
+
       attr_reader :no_prompt, :prompt_ok
 
+      MANIFEST = "manifest.yml"
+
       def initialize(options={})
         @options = options.dup
         @no_prompt = @options[:noprompts]
@@ -18,9 +22,168 @@ module VMC::Cli
         if WINDOWS
           VMC::Cli::Config.colorize = false
         end
+
+        @path = @options[:path] || '.'
+
+        load_manifest manifest_file if manifest_file
+      end
+
+      def manifest_file
+        return @options[:manifest] if @options[:manifest]
+        return @manifest_file if @manifest_file
+
+        where = File.expand_path(@path)
+        while true
+          if File.exists?(File.join(where, MANIFEST))
+            @manifest_file = File.join(where, MANIFEST)
+            break
+          elsif File.basename(where) == "/"
+            @manifest_file = nil
+            break
+          else
+            where = File.expand_path("../", where)
+          end
+        end
+
+        @manifest_file
       end
 
-      def client
+      def load_manifest_structure(file)
+        manifest = YAML.load_file file
+
+        Array(manifest["inherit"]).each do |p|
+          manifest = merge_parent(manifest, p)
+        end
+
+        if apps = manifest["applications"]
+          apps.each do |k, v|
+            abs = File.expand_path(k, file)
+            if Dir.pwd.start_with? abs
+              manifest = merge_manifest(manifest, v)
+            end
+          end
+        end
+
+        manifest
+      end
+
+      def resolve_manifest(manifest)
+        if apps = manifest["applications"]
+          apps.each_value do |v|
+            resolve_lexically(v, [manifest])
+          end
+        end
+
+        resolve_lexically(manifest, [manifest])
+      end
+
+      def load_manifest(file)
+        @manifest = load_manifest_structure(file)
+        resolve_manifest(@manifest)
+      end
+
+      def merge_parent(child, path)
+        file = File.expand_path("../" + path, manifest_file)
+        merge_manifest(child, load_manifest_structure(file))
+      end
+
+      def merge_manifest(child, parent)
+        merge = proc do |_, old, new|
+          if new.is_a?(Hash) and old.is_a?(Hash)
+            old.merge(new, &merge)
+          else
+            new
+          end
+        end
+
+        parent.merge(child, &merge)
+      end
+
+      def resolve_lexically(val, ctx = [@manifest])
+        case val
+        when Hash
+          val.each_value do |v|
+            resolve_lexically(v, [val] + ctx)
+          end
+        when Array
+          val.each do |v|
+            resolve_lexically(v, ctx)
+          end
+        when String
+          val.gsub!(/\$\{([[:alnum:]\-]+)\}/) do
+            resolve_symbol($1, ctx)
+          end
+        end
+
+        nil
+      end
+
+      def resolve_symbol(sym, ctx)
+        case sym
+        when "target-base"
+          target_base(ctx)
+
+        when "target-url"
+          target_url(ctx)
+
+        when "random-word"
+          "%04x" % [rand(0x0100000)]
+
+        else
+          found = find_symbol(sym, ctx)
+
+          if found
+            resolve_lexically(found, ctx)
+            found
+          else
+            err(sym, "Unknown symbol in manifest: ")
+          end
+        end
+      end
+
+      def find_symbol(sym, ctx)
+        ctx.each do |h|
+          if val = resolve_in(h, sym)
+            return val
+          end
+        end
+
+        nil
+      end
+
+      def resolve_in(hash, *where)
+        find_in_hash(hash, ["properties"] + where) ||
+          find_in_hash(hash, ["applications", @application] + where) ||
+          find_in_hash(hash, where)
+      end
+
+      def manifest(*where)
+        resolve_in(@manifest, *where)
+      end
+
+      def find_in_hash(hash, where)
+        what = hash
+        where.each do |x|
+          return nil unless what.is_a?(Hash)
+          what = what[x]
+        end
+
+        what
+      end
+
+      def target_url(ctx = [])
+        find_symbol("target", ctx) ||
+          (@client && @client.target) ||
+          VMC::Cli::Config.target_url
+      end
+
+      def target_base(ctx = [])
+        VMC::Cli::Config.base_of(find_symbol("target", ctx) || target_url)
+      end
+
+      # Inject a client to help in testing.
+      def client(cli=nil)
+        @client ||= cli
         return @client if @client
         @client = VMC::Client.new(target_url, auth_token)
         @client.trace = VMC::Cli::Config.trace if VMC::Cli::Config.trace
@@ -32,16 +195,8 @@ module VMC::Cli
         @client_info ||= client.info
       end
 
-      def target_url
-        @target_url ||= VMC::Cli::Config.target_url
-      end
-
-      def target_base
-        @target_base ||= VMC::Cli::Config.suggest_url
-      end
-
       def auth_token
-        @auth_token ||= VMC::Cli::Config.auth_token
+        @auth_token = VMC::Cli::Config.auth_token(@options[:token_file])
       end
 
       def runtimes_info

data/lib/cli/commands/manifest.rb

@@ -0,0 +1,56 @@
+module VMC::Cli::Command
+  class Manifest < Base
+    include VMC::Cli::ManifestHelper
+
+    def initialize(options)
+      super
+
+      # don't resolve any of the manifest template stuff
+      if manifest_file
+        @manifest = load_manifest_structure manifest_file
+      else
+        @manifest = {}
+      end
+    end
+
+    def edit
+      build_manifest
+      save_manifest
+    end
+
+    def extend(which)
+      parent = load_manifest_structure which
+      @manifest = load_manifest_structure which
+
+      build_manifest
+
+      simplify(@manifest, parent)
+
+      @manifest["inherit"] ||= []
+      @manifest["inherit"] << which
+
+      save_manifest(ask("Save where?"))
+    end
+
+    private
+
+    def simplify(child, parent)
+      return unless child.is_a?(Hash) and parent.is_a?(Hash)
+
+      child.reject! do |k, v|
+        if v == parent[k]
+          puts "rejecting #{k}"
+          true
+        else
+          simplify(v, parent[k])
+          false
+        end
+      end
+    end
+
+    def build_manifest
+      @application = ask("Configure for which application?", :default => ".")
+      interact true
+    end
+  end
+end

data/lib/cli/commands/micro.rb

@@ -0,0 +1,115 @@
+module VMC::Cli::Command
+  class Micro < Base
+
+    def initialize(args)
+      super(args)
+    end
+
+    def offline(mode)
+      command('offline')
+    end
+
+    def online(mode)
+      command('online')
+    end
+
+    def status(mode)
+      command('status')
+    end
+
+    def command(cmd)
+      config = build_config
+      switcher(config).send(cmd)
+      store_config(config)
+    end
+
+    def switcher(config)
+      case Micro.platform
+      when :darwin
+        switcher = VMC::Micro::Switcher::Darwin.new(config)
+      when :linux
+        switcher = VMC::Micro::Switcher::Linux.new(config)
+      when :windows
+        switcher = VMC::Micro::Switcher::Windows.new(config)
+      when :dummy # for testing only
+        switcher = VMC::Micro::Switcher::Dummy.new(config)
+      else
+        err "unsupported platform: #{Micro.platform}"
+      end
+    end
+
+    # Returns the configuration needed to run the micro related subcommands.
+    # First loads saved config from file (if there is any), then overrides
+    # loaded values with command line arguments, and finally tries to guess
+    # in case neither was used:
+    #   vmx       location of micro.vmx file
+    #   vmrun     location of vmrun command
+    #   password  password for vcap user (in the guest vm)
+    #   platform  current platform
+    def build_config
+      conf = VMC::Cli::Config.micro # returns {} if there isn't a saved config
+
+      override(conf, 'vmx', true) do
+        locate_vmx(Micro.platform)
+      end
+
+      override(conf, 'vmrun', true) do
+        VMC::Micro::VMrun.locate(Micro.platform)
+      end
+
+      override(conf, 'password') do
+        @password = ask("Please enter your Micro Cloud Foundry VM password (vcap user) password", :echo => "*")
+      end
+
+      conf['platform'] = Micro.platform
+
+      conf
+    end
+
+    # Save the cleartext password if --save is supplied.
+    # Note: it is due to vix we have to use a cleartext password :(
+    # Only if --password is used and not --save is the password deleted from the
+    # config file before it is stored to disk.
+    def store_config(config)
+      if @options[:save]
+        warn("cleartext password saved in: #{VMC::Cli::Config::MICRO_FILE}")
+      elsif @options[:password] || @password
+        config.delete('password')
+      end
+
+      VMC::Cli::Config.store_micro(config)
+    end
+
+    # override with command line arguments and yield the block in case the option isn't set
+    def override(config, option, escape=false, &blk)
+      # override if given on the command line
+      if opt = @options[option.to_sym]
+        opt = VMC::Micro.escape_path(opt) if escape
+        config[option] = opt
+      end
+      config[option] = yield unless config[option]
+    end
+
+    def locate_vmx(platform)
+      paths = YAML.load_file(VMC::Micro.config_file('paths.yml'))
+      vmx_paths = paths[platform.to_s]['vmx']
+      vmx = VMC::Micro.locate_file('micro.vmx', 'micro', vmx_paths)
+      err "Unable to locate micro.vmx, please supply --vmx option" unless vmx
+      vmx
+    end
+
+    def self.platform
+      case RUBY_PLATFORM
+      when /darwin/  # x86_64-darwin11.2.0
+        :darwin
+      when /linux/   # x86_64-linux
+        :linux
+      when /mingw|mswin32|cygwin/ # i386-mingw32
+        :windows
+      else
+        RUBY_PLATFORM
+      end
+    end
+
+  end
+end

data/lib/cli/commands/misc.rb

@@ -38,7 +38,7 @@ module VMC::Cli::Command
         exit(false)
       else
         VMC::Cli::Config.store_target(target_url)
-        say "Succesfully targeted to [#{target_url}]".green
+        say "Successfully targeted to [#{target_url}]".green
       end
     end
 

data/lib/cli/commands/services.rb

@@ -1,7 +1,10 @@
+require "uuidtools"
+
 module VMC::Cli::Command
 
   class Services < Base
     include VMC::Cli::ServicesHelper
+    include VMC::Cli::TunnelHelper
 
     def services
       ss = client.services_info
@@ -81,5 +84,97 @@ module VMC::Cli::Command
       check_app_for_restart(dest_app)
     end
 
+    def tunnel(service=nil, client_name=nil)
+      unless defined? Caldecott
+        display "To use `vmc tunnel', you must first install Caldecott:"
+        display ""
+        display "\tgem install caldecott"
+        display ""
+        display "Note that you'll need a C compiler. If you're on OS X, Xcode"
+        display "will provide one. If you're on Windows, try DevKit."
+        display ""
+        display "This manual step will be removed in the future."
+        display ""
+        err "Caldecott is not installed."
+      end
+
+      ps = client.services
+      err "No services available to tunnel to" if ps.empty?
+
+      unless service
+        choices = ps.collect { |s| s[:name] }.sort
+        service = ask(
+          "Which service to tunnel to?",
+          :choices => choices,
+          :indexed => true
+        )
+      end
+
+      info = ps.select { |s| s[:name] == service }.first
+
+      err "Unknown service '#{service}'" unless info
+
+      port = pick_tunnel_port(@options[:port] || 10000)
+
+      raise VMC::Client::AuthError unless client.logged_in?
+
+      if not tunnel_pushed?
+        display "Deploying tunnel application '#{tunnel_appname}'."
+        auth = UUIDTools::UUID.random_create.to_s
+        push_caldecott(auth)
+        bind_service_banner(service, tunnel_appname, false)
+        start_caldecott
+      else
+        auth = tunnel_auth
+      end
+
+      if not tunnel_healthy?(auth)
+        display "Redeploying tunnel application '#{tunnel_appname}'."
+
+        # We don't expect caldecott not to be running, so take the
+        # most aggressive restart method.. delete/re-push
+        client.delete_app(tunnel_appname)
+        invalidate_tunnel_app_info
+
+        push_caldecott(auth)
+        bind_service_banner(service, tunnel_appname, false)
+        start_caldecott
+      end
+
+      if not tunnel_bound?(service)
+        bind_service_banner(service, tunnel_appname)
+      end
+
+      conn_info = tunnel_connection_info info[:vendor], service, auth
+      display_tunnel_connection_info(conn_info)
+      display "Starting tunnel to #{service.bold} on port #{port.to_s.bold}."
+      start_tunnel(port, conn_info, auth)
+
+      clients = get_clients_for(info[:vendor])
+
+      if clients.empty?
+        client_name ||= "none"
+      else
+        client_name ||= ask(
+          "Which client would you like to start?",
+          :choices => ["none"] + clients.keys,
+          :indexed => true
+        )
+      end
+
+      if client_name == "none"
+        wait_for_tunnel_end
+      else
+        wait_for_tunnel_start(port)
+        unless start_local_prog(clients, client_name, conn_info, port)
+          err "'#{client_name}' executation failed; is it in your $PATH?"
+        end
+      end
+    end
+
+    def get_clients_for(type)
+      conf = VMC::Cli::Config.clients
+      conf[type] || {}
+    end
   end
 end