vmc 0.3.15 → 0.3.16.beta.1

data/lib/cli/tunnel_helper.rb

@@ -34,6 +34,15 @@ module VMC::Cli
       end
     end
 
+    def tunnel_auth
+      tunnel_app_info[:env].each do |e|
+        name, val = e.split("=", 2)
+        return val if name == "CALDECOTT_AUTH"
+      end
+
+      nil
+    end
+
     def tunnel_url
       return @tunnel_url if @tunnel_url
 
@@ -96,7 +105,7 @@ module VMC::Cli
       response = nil
       10.times do
         begin
-          response = RestClient.get("#{tunnel_url}/services/#{service}", "Auth-Token" => token)
+          response = RestClient.get(tunnel_url + "/" + VMC::Client.path("services", service), "Auth-Token" => token)
           break
         rescue RestClient::Exception
           sleep 1
@@ -201,12 +210,21 @@ module VMC::Cli
         begin
           TCPSocket.open('localhost', port)
           port += 1
-        rescue => e
+        rescue
           return port
         end
       end
 
-      err "Could not pick a port between #{original} and #{original + PORT_RANGE - 1}"
+      grab_ephemeral_port
+    end
+
+    def grab_ephemeral_port
+      socket = TCPServer.new('0.0.0.0', 0)
+      socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_REUSEADDR, true)
+      Socket.do_not_reverse_lookup = true
+      port = socket.addr[1]
+      socket.close
+      return port
     end
 
     def wait_for_tunnel_start(port)
@@ -247,16 +265,23 @@ module VMC::Cli
       end
     end
 
-    def start_local_prog(client, info, port)
+    def start_local_prog(clients, command, info, port)
+      client = clients[File.basename(command)]
+
+      cmdline = "#{command} "
+
       case client
       when Hash
-        cmdline = resolve_symbols(client["command"], info, port)
+        cmdline << resolve_symbols(client["command"], info, port)
         client["environment"].each do |e|
-          e =~ /([^=]+)=(["']?)([^"']*)\2/
-          ENV[$1] = resolve_symbols($3, info, port)
+          if e =~ /([^=]+)=(["']?)([^"']*)\2/
+            ENV[$1] = resolve_symbols($3, info, port)
+          else
+            err "Invalid environment variable: #{e}"
+          end
         end
       when String
-        cmdline = resolve_symbols(client, info, port)
+        cmdline << resolve_symbols(client, info, port)
       else
         err "Unknown client info: #{client.inspect}."
       end
@@ -279,19 +304,19 @@ module VMC::Cli
         }
       )
 
-      Command::Apps.new({}).send(:upload_app_bits, tunnel_appname, HELPER_APP)
+      Command::Apps.new(@options).send(:upload_app_bits, tunnel_appname, HELPER_APP)
 
       invalidate_tunnel_app_info
     end
 
     def stop_caldecott
-      Command::Apps.new({}).stop(tunnel_appname)
+      Command::Apps.new(@options).stop(tunnel_appname)
 
       invalidate_tunnel_app_info
     end
 
     def start_caldecott
-      Command::Apps.new({}).start(tunnel_appname)
+      Command::Apps.new(@options).start(tunnel_appname)
 
       invalidate_tunnel_app_info
     end

data/lib/cli/version.rb

@@ -2,6 +2,6 @@ module VMC
   module Cli
     # This version number is used as the RubyGem release version.
     # The internal VMC version number is VMC::VERSION.
-    VERSION = '0.3.15'
+    VERSION = '0.3.16.beta.1'
   end
 end

data/lib/cli.rb

@@ -12,6 +12,7 @@ module VMC
     autoload :ZipUtil,        "#{ROOT}/cli/zip_util"
     autoload :ServicesHelper, "#{ROOT}/cli/services_helper"
     autoload :TunnelHelper,   "#{ROOT}/cli/tunnel_helper"
+    autoload :ManifestHelper, "#{ROOT}/cli/manifest_helper"
 
     module Command
       autoload :Base,         "#{ROOT}/cli/commands/base"
@@ -20,6 +21,7 @@ module VMC
       autoload :Misc,         "#{ROOT}/cli/commands/misc"
       autoload :Services,     "#{ROOT}/cli/commands/services"
       autoload :User,         "#{ROOT}/cli/commands/user"
+      autoload :Manifest,     "#{ROOT}/cli/commands/manifest"
     end
 
   end

data/lib/vmc/client.rb

@@ -60,11 +60,11 @@ class VMC::Client
   # Global listing of services that are available on the target system
   def services_info
     check_login_status
-    json_get(VMC::GLOBAL_SERVICES_PATH)
+    json_get(path(VMC::GLOBAL_SERVICES_PATH))
   end
 
   def runtimes_info
-    json_get(VMC::GLOBAL_RUNTIMES_PATH)
+    json_get(path(VMC::GLOBAL_RUNTIMES_PATH))
   end
 
   ######################################################
@@ -86,7 +86,7 @@ class VMC::Client
 
   def update_app(name, manifest)
     check_login_status
-    json_put("#{VMC::APPS_PATH}/#{name}", manifest)
+    json_put(path(VMC::APPS_PATH, name), manifest)
   end
 
   def upload_app(name, zipfile, resource_manifest=nil)
@@ -103,29 +103,29 @@ class VMC::Client
       upload_data[:application] = file
     end
     upload_data[:resources] = resource_manifest.to_json if resource_manifest
-    http_post("#{VMC::APPS_PATH}/#{name}/application", upload_data)
+    http_post(path(VMC::APPS_PATH, name, "application"), upload_data)
   rescue RestClient::ServerBrokeConnection
     retry
   end
 
   def delete_app(name)
     check_login_status
-    http_delete("#{VMC::APPS_PATH}/#{name}")
+    http_delete(path(VMC::APPS_PATH, name))
   end
 
   def app_info(name)
     check_login_status
-    json_get("#{VMC::APPS_PATH}/#{name}")
+    json_get(path(VMC::APPS_PATH, name))
   end
 
   def app_update_info(name)
     check_login_status
-    json_get("#{VMC::APPS_PATH}/#{name}/update")
+    json_get(path(VMC::APPS_PATH, name, "update"))
   end
 
   def app_stats(name)
     check_login_status
-    stats_raw = json_get("#{VMC::APPS_PATH}/#{name}/stats")
+    stats_raw = json_get(path(VMC::APPS_PATH, name, "stats"))
     stats = []
     stats_raw.each_pair do |k, entry|
       # Skip entries with no stats
@@ -139,20 +139,20 @@ class VMC::Client
 
   def app_instances(name)
     check_login_status
-    json_get("#{VMC::APPS_PATH}/#{name}/instances")
+    json_get(path(VMC::APPS_PATH, name, "instances"))
   end
 
   def app_crashes(name)
     check_login_status
-    json_get("#{VMC::APPS_PATH}/#{name}/crashes")
+    json_get(path(VMC::APPS_PATH, name, "crashes"))
   end
 
   # List the directory or download the actual file indicated by
   # the path.
   def app_files(name, path, instance=0)
     check_login_status
-    url = "#{VMC::APPS_PATH}/#{name}/instances/#{instance}/files/#{path}"
-    url.gsub!('//', '/')
+    path = path.gsub('//', '/')
+    url = path(VMC::APPS_PATH, name, "instances", instance, "files", path)
     _, body, headers = http_get(url)
     body
   end
@@ -192,7 +192,7 @@ class VMC::Client
 
     raise TargetError, "Service [#{service}] is not a valid service choice" unless service_hash
     service_hash[:name] = name
-    json_post(VMC::SERVICES_PATH, service_hash)
+    json_post(path(VMC::SERVICES_PATH), service_hash)
   end
 
   def delete_service(name)
@@ -200,7 +200,7 @@ class VMC::Client
     svcs = services || []
     names = svcs.collect { |s| s[:name] }
     raise TargetError, "Service [#{name}] not a valid service" unless names.include? name
-    http_delete("#{VMC::SERVICES_PATH}/#{name}")
+    http_delete(path(VMC::SERVICES_PATH, name))
   end
 
   def bind_service(service, appname)
@@ -270,7 +270,7 @@ class VMC::Client
   # Auth token can be retained and used in creating
   # new clients, avoiding login.
   def login(user, password)
-    status, body, headers = json_post("#{VMC::USERS_PATH}/#{user}/tokens", {:password => password})
+    status, body, headers = json_post(path(VMC::USERS_PATH, user, "tokens"), {:password => password})
     response_info = json_parse(body)
     if response_info
       @user = user
@@ -281,10 +281,10 @@ class VMC::Client
   # sets the password for the current logged user
   def change_password(new_password)
     check_login_status
-    user_info = json_get("#{VMC::USERS_PATH}/#{@user}")
+    user_info = json_get(path(VMC::USERS_PATH, @user))
     if user_info
       user_info[:password] = new_password
-      json_put("#{VMC::USERS_PATH}/#{@user}", user_info)
+      json_put(path(VMC::USERS_PATH, @user), user_info)
     end
   end
 
@@ -311,13 +311,23 @@ class VMC::Client
 
   def delete_user(user_email)
     check_login_status
-    http_delete("#{VMC::USERS_PATH}/#{user_email}")
+    http_delete(path(VMC::USERS_PATH, user_email))
   end
 
   ######################################################
 
+  def self.path(*path)
+    path.flatten.collect { |x|
+      URI.encode x, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")
+    }.join("/")
+  end
+
   private
 
+  def path(*args, &blk)
+    self.class.path(*args, &blk)
+  end
+
   def json_get(url)
     status, body, headers = http_get(url, 'application/json')
     json_parse(body)
@@ -370,7 +380,7 @@ class VMC::Client
     end
 
     req = {
-      :method => method, :url => "#{@target}#{path}",
+      :method => method, :url => "#{@target}/#{path}",
       :payload => payload, :headers => headers, :multipart => true
     }
     status, body, response_headers = perform_http_request(req)

data/lib/vmc/const.rb

@@ -9,14 +9,14 @@ module VMC
   DEFAULT_LOCAL_TARGET = 'http://api.vcap.me'
 
   # General Paths
-  INFO_PATH            = '/info'
-  GLOBAL_SERVICES_PATH = '/info/services'
-  GLOBAL_RUNTIMES_PATH = '/info/runtimes'
-  RESOURCES_PATH       = '/resources'
+  INFO_PATH            = 'info'
+  GLOBAL_SERVICES_PATH = ['info', 'services']
+  GLOBAL_RUNTIMES_PATH = ['info', 'runtimes']
+  RESOURCES_PATH       = 'resources'
 
   # User specific paths
-  APPS_PATH            = '/apps'
-  SERVICES_PATH        = '/services'
-  USERS_PATH           = '/users'
+  APPS_PATH            = 'apps'
+  SERVICES_PATH        = 'services'
+  USERS_PATH           = 'users'
 
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.3.15
+  prerelease: 7
+  version: 0.3.16.beta.1
 platform: ruby
 authors: 
 - VMware
@@ -19,20 +19,23 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 1.5.1
+    - - <
+      - !ruby/object:Gem::Version 
+        version: 1.7.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rubyzip2
+  name: rubyzip
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.0.1
+        version: 0.9.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -83,38 +86,49 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: uuidtools
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.1.0
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 1.3.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
         version: 1.5.0
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 description: Client library and CLI that provides access to the VMware Cloud Application Platform.
 email: support@vmware.com
 executables: 
@@ -132,6 +146,7 @@ files:
 - lib/cli/commands/admin.rb
 - lib/cli/commands/apps.rb
 - lib/cli/commands/base.rb
+- lib/cli/commands/manifest.rb
 - lib/cli/commands/misc.rb
 - lib/cli/commands/services.rb
 - lib/cli/commands/user.rb
@@ -139,6 +154,7 @@ files:
 - lib/cli/core_ext.rb
 - lib/cli/errors.rb
 - lib/cli/frameworks.rb
+- lib/cli/manifest_helper.rb
 - lib/cli/runner.rb
 - lib/cli/services_helper.rb
 - lib/cli/tunnel_helper.rb
@@ -171,9 +187,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: