udn 0.3.23.0.pre → 0.3.23.1

data/README.md

@@ -1,14 +1,21 @@
-# VMC
+# UDN
 
-The VMware Cloud CLI. This is the command line interface to VMware's Application Platform
+UDN is the command line interface to Cloudn PaaS.
+This command is based on vmc.
+
+## Installation
+
+    $ sudo gem install udn
+
+## Usage
 
 _Copyright 2010-2012, VMware, Inc. Licensed under the
 MIT license, please see the LICENSE file.  All rights reserved._
 
-    Usage: vmc [options] command [<args>] [command_options]
-    Try 'vmc help [command]' or 'vmc help options' for more information.
+    Usage: udn [options] command [<args>] [command_options]
+    Try 'udn help [command]' or 'udn help options' for more information.
 
-    Currently available vmc commands are:
+    Currently available udn commands are:
 
     Getting Started
       target [url]                                 Reports current target or sets a new target
@@ -103,11 +110,6 @@ MIT license, please see the LICENSE file.  All rights reserved._
 
 ## Simple Story (for Ruby apps)
 
-    vmc target api.cloudfoundry.com
-    vmc login
+    udn login
     bundle package
-    vmc push
-
-## File a Bug
-
-To file a bug against Cloud Foundry Open Source and its components, sign up and use our bug tracking system: [http://cloudfoundry.atlassian.net](http://cloudfoundry.atlassian.net)
+    udn push

data/lib/cli/commands/apps.rb

@@ -49,7 +49,7 @@ module VMC::Cli::Command
 
     def console(appname, interactive=true)
       unless defined? Caldecott
-        display "To use `vmc rails-console', you must first install Caldecott:"
+        display "To use `udn rails-console', you must first install Caldecott:"
         display ""
         display "\tgem install caldecott"
         display ""
@@ -356,7 +356,7 @@ module VMC::Cli::Command
         display 'OK'.green
         restart appname if app[:state] == 'STARTED'
       else
-        display 'OK'.green
+        display "Can't find specific environments: #{variable}".red
       end
     end
 
@@ -816,7 +816,7 @@ module VMC::Cli::Command
           display "\nApplication '#{appname}' cannot start in '#{@options[:debug]}' mode"
 
           if push
-            display "Try 'vmc start' with one of the following modes: #{modes.inspect}"
+            display "Try 'udn start' with one of the following modes: #{modes.inspect}"
           else
             display "Available modes: #{modes.inspect}"
           end

data/lib/cli/commands/misc.rb

@@ -2,7 +2,7 @@ module VMC::Cli::Command
 
   class Misc < Base
     def version
-      say "vmc #{VMC::Cli::VERSION}"
+      say "udn #{VMC::Cli::VERSION}"
     end
 
     def target

data/lib/cli/commands/services.rb

@@ -6,8 +6,11 @@ module VMC::Cli::Command
     include VMC::Cli::ServicesHelper
     include VMC::Cli::TunnelHelper
 
+    CLOUDN_RDB = "cloudn_rdb"
+
     def services
       ss = client.services_info
+      css = client.cloudn_services_info
       ps = client.services
       ps.sort! {|a, b| a[:name] <=> b[:name] }
 
@@ -16,6 +19,7 @@ module VMC::Cli::Command
         return display JSON.pretty_generate(services)
       end
       display_system_services(ss)
+      display_cloudn_services(css)
       display_provisioned_services(ps)
     end
 
@@ -98,7 +102,7 @@ module VMC::Cli::Command
 
     def tunnel(service=nil, client_name=nil)
       unless defined? Caldecott
-        display "To use `vmc tunnel', you must first install Caldecott:"
+        display "To use `udn tunnel', you must first install Caldecott:"
         display ""
         display "\tgem install caldecott"
         display ""
@@ -179,36 +183,32 @@ module VMC::Cli::Command
       else
         wait_for_tunnel_start(port)
         unless start_local_prog(clients, client_name, conn_info, port)
-          err "'#{client_name}' execution failed; is it in your $PATH?"
+          err '\'#{client_name}\' execution failed; is it in your PATH?'
         end
       end
     end
 
-    def register_service(service=nil, instance=nil, name=nil)
+    def register_service(service=nil, service_instance=nil)
       service = ask_service unless service
-      instance = ask_instance(service) unless instance
-
-      name = @options[:name] unless name
-      unless name
-        name = random_service_name(service)
-        picked_name = true
-      end
+      service_instance = ask_service_instance(service) unless service_instance
 
       options = {}
-      if service == 'cloudnrdb'
-        options = ask_cloudn_rdb(instance, options)
+      if service == CLOUDN_RDB
+        options = ask_cloudn_rdb(service_instance, options)
       end
 
-      register_service_banner(service, instance, name, options, picked_name)
+      name = "#{service_instance}-#{options[:database]}"
+
+      register_service_banner(service, service_instance, name, options)
     end
 
     def ask_service
-      services = client.external_services_info
-      err 'No external services available to register' if services.empty?
+      services = client.cloudn_services_info
+      err 'No cloudn services available to register' if services.empty?
       service = ask(
         "Which service would you like to register?",
         { :indexed => true,
-          :choices => 
+          :choices =>
             services.values.collect { |type|
               type.keys.collect(&:to_s)
             }.flatten
@@ -216,29 +216,29 @@ module VMC::Cli::Command
       )
     end
 
-    def ask_instance(service)
-      instances = client.external_service_instances(service).collect {|item|
+    def ask_service_instance(service)
+      service_instances = client.cloudn_service_instances(service).collect {|item|
         item[:name]
       }
-      err "No instance in your #{service}" if instances.empty?
+      err "No instance in your #{service}" if service_instances.empty?
 
-      instance = ask(
+      service_instance = ask(
         "Which instance would you like to register?",
         { :indexed => true,
-          :choices => instances
+          :choices => service_instances
         }
       )
     end
 
-    def ask_cloudn_rdb(instance, options)
+    def ask_cloudn_rdb(service_instance, options)
       options[:credentials] = {}
       options[:credentials][:MasterUsername] = @options[:MasterUsername] || ask("Master Username")
-      options[:credentials][:MasterUserPassword] = @options[:MasterUserPassword] || ask("Master Password")
+      options[:credentials][:MasterUserPassword] = @options[:MasterUserPassword] || ask("Master Password", :echo => "*")
 
-      databases = client.rdb_databases("cloudnrdb", instance, options[:credentials])
+      databases = client.rdb_databases(CLOUDN_RDB, service_instance, options[:credentials])
       err "No database in your Cloudn RDB instance" unless databases[:properties][:databases][:unregistered]
       if @options[:DBName]
-        err "No such unregistered database in your Cloudn RDB instance" unless options[:properties][:databases][:unregistered].include?(@options[:DBName])
+        err "No such unregistered database in your Cloudn RDB instance" unless databases[:properties][:databases][:unregistered].include?(@options[:DBName])
         options[:database] = @options[:DBName]
       else
         options[:database] = ask(

data/lib/cli/config.rb

@@ -7,7 +7,7 @@ require 'json/pure'
 module VMC::Cli
   class Config
 
-    DEFAULT_TARGET  = 'api.vcap.me'
+    DEFAULT_TARGET  = 'api.cloudnpaas.com'
 
     TARGET_FILE    = '~/.udn_target'
     TOKEN_FILE     = '~/.udn_token'

data/lib/cli/runner.rb

@@ -168,11 +168,11 @@ class VMC::Cli::Runner
     case verb
 
     when 'version'
-      usage('vmc version')
+      usage('udn version')
       set_cmd(:misc, :version)
 
     when 'target'
-      usage('vmc target [url] [--url]')
+      usage('udn target [url] [--url]')
       if @args.size == 1
         set_cmd(:misc, :set_target, 1)
       else
@@ -180,31 +180,31 @@ class VMC::Cli::Runner
       end
 
     when 'targets'
-      usage('vmc targets')
+      usage('udn targets')
       set_cmd(:misc, :targets)
 
     when 'tokens'
-      usage('vmc tokens')
+      usage('udn tokens')
       set_cmd(:misc, :tokens)
 
     when 'info'
-      usage('vmc info')
+      usage('udn info')
       set_cmd(:misc, :info)
 
     when 'runtimes'
-      usage('vmc runtimes')
+      usage('udn runtimes')
       set_cmd(:misc, :runtimes)
 
     when 'frameworks'
-      usage('vmc frameworks')
+      usage('udn frameworks')
       set_cmd(:misc, :frameworks)
 
     when 'user'
-      usage('vmc user')
+      usage('udn user')
       set_cmd(:user, :info)
 
     when 'login'
-      usage('vmc login [email] [--email EMAIL] [--passwd PASS]')
+      usage('udn login [email] [--email EMAIL] [--passwd PASS]')
       if @args.size == 1
         set_cmd(:user, :login, 1)
       else
@@ -212,11 +212,11 @@ class VMC::Cli::Runner
       end
 
     when 'logout'
-      usage('vmc logout')
+      usage('udn logout')
       set_cmd(:user, :logout)
 
     when 'passwd'
-      usage('vmc passwd')
+      usage('udn passwd')
       if @args.size == 1
         set_cmd(:user, :change_password, 1)
       else
@@ -224,7 +224,7 @@ class VMC::Cli::Runner
       end
 
     when 'add-user', 'add_user', 'create_user', 'create-user', 'register'
-      usage('vmc add-user [user] [--email EMAIL] [--passwd PASS]')
+      usage('udn add-user [user] [--email EMAIL] [--passwd PASS]')
       if @args.size == 1
         set_cmd(:admin, :add_user, 1)
       else
@@ -232,35 +232,35 @@ class VMC::Cli::Runner
       end
 
     when 'delete-user', 'delete_user', 'unregister'
-      usage('vmc delete-user <user>')
+      usage('udn delete-user <user>')
       set_cmd(:admin, :delete_user, 1)
 
     when 'users'
-      usage('vmc users')
+      usage('udn users')
       set_cmd(:admin, :users)
 
     when 'apps'
-      usage('vmc apps')
+      usage('udn apps')
       set_cmd(:apps, :apps)
 
     when 'list'
-      usage('vmc list')
+      usage('udn list')
       set_cmd(:apps, :list)
 
     when 'start'
-      usage('vmc start <appname>')
+      usage('udn start <appname>')
       set_cmd(:apps, :start, @args.size == 1 ? 1 : 0)
 
     when 'stop'
-      usage('vmc stop <appname>')
+      usage('udn stop <appname>')
       set_cmd(:apps, :stop, @args.size == 1 ? 1 : 0)
 
     when 'restart'
-      usage('vmc restart <appname>')
+      usage('udn restart <appname>')
       set_cmd(:apps, :restart, @args.size == 1 ? 1 : 0)
 
     when 'mem'
-      usage('vmc mem <appname> [memsize]')
+      usage('udn mem <appname> [memsize]')
       if @args.size == 2
         set_cmd(:apps, :mem, 2)
       else
@@ -268,19 +268,19 @@ class VMC::Cli::Runner
       end
 
     when 'stats'
-      usage('vmc stats <appname>')
+      usage('udn stats <appname>')
       set_cmd(:apps, :stats, @args.size == 1 ? 1 : 0)
 
     when 'map'
-      usage('vmc map <appname> <url>')
+      usage('udn map <appname> <url>')
       set_cmd(:apps, :map, 2)
 
     when 'unmap'
-      usage('vmc unmap <appname> <url>')
+      usage('udn unmap <appname> <url>')
       set_cmd(:apps, :unmap, 2)
 
     when 'delete'
-      usage('vmc delete <appname>')
+      usage('udn delete <appname>')
       if @options[:all] && @args.size == 0
         set_cmd(:apps, :delete)
       else
@@ -288,7 +288,7 @@ class VMC::Cli::Runner
       end
 
     when 'files'
-      usage('vmc files <appname> [path] [--instance N] [--all] [--prefix]')
+      usage('udn files <appname> [path] [--instance N] [--all] [--prefix]')
       if @args.size == 1
         set_cmd(:apps, :files, 1)
       else
@@ -296,28 +296,28 @@ class VMC::Cli::Runner
       end
 
     when 'logs'
-      usage('vmc logs <appname> [--instance N] [--all] [--prefix]')
+      usage('udn logs <appname> [--instance N] [--all] [--prefix]')
       set_cmd(:apps, :logs, 1)
 
     when 'instances', 'scale'
       if @args.size > 1
-        usage('vmc instances <appname> <num|delta>')
+        usage('udn instances <appname> <num|delta>')
         set_cmd(:apps, :instances, 2)
       else
-        usage('vmc instances <appname>')
+        usage('udn instances <appname>')
         set_cmd(:apps, :instances, 1)
       end
 
     when 'crashes'
-      usage('vmc crashes <appname>')
+      usage('udn crashes <appname>')
       set_cmd(:apps, :crashes, 1)
 
     when 'crashlogs'
-      usage('vmc crashlogs <appname>')
+      usage('udn crashlogs <appname>')
       set_cmd(:apps, :crashlogs, 1)
 
     when 'push'
-      usage('vmc push [appname] [--path PATH] [--url URL] [--instances N] [--mem] [--runtime RUNTIME] [--no-start]')
+      usage('udn push [appname] [--path PATH] [--url URL] [--instances N] [--mem] [--runtime RUNTIME] [--no-start]')
       if @args.size == 1
         set_cmd(:apps, :push, 1)
       else
@@ -325,19 +325,19 @@ class VMC::Cli::Runner
       end
 
     when 'update'
-      usage('vmc update <appname> [--path PATH]')
+      usage('udn update <appname> [--path PATH]')
       set_cmd(:apps, :update, @args.size == 1 ? 1 : 0)
 
     when 'services'
-      usage('vmc services')
+      usage('udn services')
       set_cmd(:services, :services)
 
     when 'env'
-      usage('vmc env <appname>')
+      usage('udn env <appname>')
       set_cmd(:apps, :environment, 1)
 
     when 'env-add'
-      usage('vmc env-add <appname> <variable[=]value>')
+      usage('udn env-add <appname> <variable[=]value>')
       if @args.size == 2
         set_cmd(:apps, :environment_add, 2)
       elsif @args.size == 3
@@ -345,11 +345,11 @@ class VMC::Cli::Runner
       end
 
     when 'env-del'
-      usage('vmc env-del <appname> <variable>')
+      usage('udn env-del <appname> <variable>')
       set_cmd(:apps, :environment_del, 2)
 
     when 'create-service', 'create_service'
-      usage('vmc create-service [service] [servicename] [plan] [appname] [--name servicename] [--bind appname] [--plan plan]')
+      usage('udn create-service [service] [servicename] [plan] [appname] [--name servicename] [--bind appname] [--plan plan]')
       set_cmd(:services, :create_service) if @args.size == 0
       set_cmd(:services, :create_service, 1) if @args.size == 1
       set_cmd(:services, :create_service, 2) if @args.size == 2
@@ -357,15 +357,13 @@ class VMC::Cli::Runner
       set_cmd(:services, :create_service, 4) if @args.size == 4
 
     when 'register-service', 'register_service'
-      usage('vmc register-service [external] [type] [credentials] [appname] [--name servicename] [--bind appname] [--plan plan]')
+      usage( 'register-service [type] [instanceid] [--MasterUsername masterusername] [--MasterUserPassword masteruserpassword] [--DBName DBName]')
       set_cmd(:services, :register_service) if @args.size == 0
       set_cmd(:services, :register_service, 1) if @args.size == 1
       set_cmd(:services, :register_service, 2) if @args.size == 2
-      set_cmd(:services, :register_service, 3) if @args.size == 3
-      set_cmd(:services, :register_service, 4) if @args.size == 4
 
     when 'delete-service', 'delete_service'
-      usage('vmc delete-service <service>')
+      usage('udn delete-service <service>')
       if @args.size == 1
         set_cmd(:services, :delete_service, 1)
       else
@@ -373,23 +371,23 @@ class VMC::Cli::Runner
       end
 
     when 'bind-service', 'bind_service'
-      usage('vmc bind-service <servicename> <appname>')
+      usage('udn bind-service <servicename> <appname>')
       set_cmd(:services, :bind_service, 2)
 
     when 'unbind-service', 'unbind_service'
-      usage('vmc unbind-service <servicename> <appname>')
+      usage('udn unbind-service <servicename> <appname>')
       set_cmd(:services, :unbind_service, 2)
 
     when 'clone-services'
-      usage('vmc clone-services <src-app> <dest-app>')
+      usage('udn clone-services <src-app> <dest-app>')
       set_cmd(:services, :clone_services, 2)
 
     when 'aliases'
-      usage('vmc aliases')
+      usage('udn aliases')
       set_cmd(:misc, :aliases)
 
     when 'alias'
-      usage('vmc alias <alias[=]command>')
+      usage('udn alias <alias[=]command>')
       if @args.size == 1
         set_cmd(:misc, :alias, 1)
       elsif @args.size == 2
@@ -397,21 +395,21 @@ class VMC::Cli::Runner
       end
 
     when 'unalias'
-      usage('vmc unalias <alias>')
+      usage('udn unalias <alias>')
       set_cmd(:misc, :unalias, 1)
 
     when 'tunnel'
-      usage('vmc tunnel [servicename] [clientcmd] [--port port]')
+      usage('udn tunnel [servicename] [clientcmd] [--port port]')
       set_cmd(:services, :tunnel, 0) if @args.size == 0
       set_cmd(:services, :tunnel, 1) if @args.size == 1
       set_cmd(:services, :tunnel, 2) if @args.size == 2
 
     when 'rails-console'
-      usage('vmc rails-console <appname>')
+      usage('udn rails-console <appname>')
       set_cmd(:apps, :console, 1)
 
     when 'micro'
-      usage('vmc micro <online|offline|status> [--password password] [--save] [--vmx file] [--vmrun executable]')
+      usage('udn micro <online|offline|status> [--password password] [--save] [--vmx file] [--vmrun executable]')
       if %w[online offline status].include?(@args[0])
           set_cmd(:micro, @args[0].to_sym, 1)
       end
@@ -431,16 +429,16 @@ class VMC::Cli::Runner
       parse_options!
 
     when 'manifest'
-      usage('vmc manifest')
+      usage('udn manifest')
       set_cmd(:manifest, :edit)
 
     when 'extend-manifest'
-      usage('vmc extend-manifest')
+      usage('udn extend-manifest')
       set_cmd(:manifest, :extend, 1)
 
     else
       if verb
-        display "vmc: Unknown command [#{verb}]"
+        display "udn: Unknown command [#{verb}]"
         display basic_usage
         exit(false)
       end

data/lib/cli/services_helper.rb

@@ -3,11 +3,19 @@ module VMC::Cli
   module ServicesHelper
     def display_system_services(services=nil)
       services ||= client.services_info
-
       display "\n============== System Services ==============\n\n"
-
       return display "No system services available" if services.empty?
+      display_services_table(services)
+    end
 
+    def display_cloudn_services(services=nil)
+      services ||= client.cloudn_services_info
+      display "\n============== Cloudn Services ==============\n\n"
+      return display "No cloudn services available" if services.empty?
+      display_services_table(services)
+    end
+
+    def display_services_table(services)
       displayed_services = []
       services.each do |service_type, value|
         value.each do |vendor, version|
@@ -73,8 +81,8 @@ module VMC::Cli
       display 'OK'.green
     end
 
-    def register_service_banner(service, instance, name, options, display_name=false)
-      sn = " [#{name}]" if display_name
+    def register_service_banner(service, instance, name, options)
+      sn = " [#{name}]"
       display "Register Service#{sn}: ", false
       client.register_service(service, instance, name, options)
       display 'OK'.green

data/lib/cli/usage.rb

@@ -1,8 +1,8 @@
 class VMC::Cli::Runner
 
   def basic_usage
-    "Usage: vmc [options] command [<args>] [command_options]\n" +
-    "Try 'vmc help [command]' or 'vmc help options' for more information."
+    "Usage: udn [options] command [<args>] [command_options]\n" +
+    "Try 'udn help [command]' or 'udn help options' for more information."
   end
 
   def display_usage
@@ -22,7 +22,7 @@ class VMC::Cli::Runner
 
 #{basic_usage}
 
-Currently available vmc commands are:
+Currently available udn commands are:
 
   Getting Started
     target [url]                                 Reports current target or sets a new target
@@ -81,9 +81,8 @@ Currently available vmc commands are:
     clone-services <src-app> <dest-app>          Clone service bindings from <src-app> application to <dest-app>
     tunnel <servicename> [--port]                Create a local tunnel to a service
     tunnel <servicename> <clientcmd>             Create a local tunnel to a service and start a local client
-    register-service <external>                  Register a external service (e.g. Cloudn RDB)
-    register-service <external> <type>           Register a external service and assign it <type>
-    register-service <external> <type> <credential>   Register a external service and assign it <type> with <credentials>
+    register-service <type>                      Register a cloudn service and assign it <type> (e.g. Cloudn RDB)
+    register-service <type> <credential>         Register a cloudn service and assign it <type> with <credentials>
 
   Administration
     user                                         Display user account information

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.23.0.pre'
+    VERSION = '0.3.23.1'
   end
 end

data/lib/vmc/client.rb

@@ -167,42 +167,6 @@ class VMC::Client
     json_get(VMC::SERVICES_PATH)
   end
 
-  def create_service(service, name, plan=nil)
-    check_login_status
-    services = services_info
-    services ||= []
-    service_hash = nil
-
-    service = service.to_s
-    service_plans = []
-    default_plan = nil
-
-    # FIXME!
-    services.each do |service_type, value|
-      value.each do |vendor, version|
-        version.each do |version_str, service_descr|
-          if service == service_descr[:vendor]
-            service_plans = service_descr[:tiers].keys.map{|plan_name| plan_name.to_s} if service_descr[:tiers]
-            default_plan = service_descr[:default_plan]
-            service_hash = {
-              :type => service_descr[:type], :tier => 'free',
-              :vendor => service, :version => version_str
-            }
-            break
-          end
-        end
-      end
-    end
-
-    raise TargetError, "Service [#{service}] is not a valid service choice" unless service_hash
-    plan = default_plan || 'free' if plan.nil? || plan.empty?
-    service_hash[:tier] = plan
-    raise TargetError, "Please specify a plan in (#{service_plans.join(', ')})" if service_plans.size > 0 && (! service_plans.include? plan)
-    service_hash[:name] = name
-    json_post(path(VMC::SERVICES_PATH), service_hash)
-  end
-
-
   def create_service(service, name, plan=nil)
     check_login_status
     services = services_info
@@ -264,17 +228,36 @@ class VMC::Client
   end
 
   ######################################################
-  # External Services
+  # Access Logs
   ######################################################
 
-  def external_services_info
+  def get_accesslog_list(name)
     check_login_status
-    json_get(path(VMC::EXTERNAL_SERVICES_PATH))
+    json_get(path(VMC::APPS_PATH, name, "accesslogs.json"))
   end
 
-  def register_service(service, instance, name, options)
+  def get_accesslog(name, date)
     check_login_status
-    services = external_services_info.values.collect { |type|
+    begin
+      Date.strptime(date, "%Y-%m-%d")
+    rescue
+      raise TargetError, "Invalid date format"
+    end
+    json_get(path(VMC::APPS_PATH, name, "accesslogs", date))
+  end
+
+  ######################################################
+  # Cloudn Services
+  ######################################################
+
+  def cloudn_services_info
+    check_login_status
+    json_get(path(VMC::CLOUDN_SERVICES_PATH))
+  end
+
+  def register_service(service, service_instance, name, options)
+    check_login_status
+    services = cloudn_services_info.values.collect { |type|
                  type.keys.collect(&:to_s)
                }.flatten
     services ||= []
@@ -289,18 +272,20 @@ class VMC::Client
       :options => options,
     }
 
-    json_post(path(VMC::EXTERNAL_SERVICES_PATH, service, instance), service_hash)
+    json_post(path(VMC::CLOUDN_SERVICES_PATH, service, service_instance), service_hash)
   end
 
-  def external_service_instances(service)
+  def cloudn_service_instances(service)
     check_login_status
-    json_get(path(VMC::EXTERNAL_SERVICES_PATH, service))
+    json_get(path(VMC::CLOUDN_SERVICES_PATH, service))
   end
 
-  def rdb_databases(service, instance, credentials)
+  def rdb_databases(service, service_instance, credentials)
     check_login_status
-    json_get(path(VMC::EXTERNAL_SERVICES_PATH, service, instance),
-             {:MasterUsername => credentials[:MasterUsername], :MasterUserPassword => credentials[:MasterUserPassword]})
+    headers = {
+      'X-CLOUDN-SERVICE-AUTHENTICATION' => "#{credentials[:MasterUsername]}:#{credentials[:MasterUserPassword]}",
+    }
+    json_get(path(VMC::CLOUDN_SERVICES_PATH, service, service_instance), nil, headers)
   end
 
   ######################################################
@@ -411,12 +396,12 @@ class VMC::Client
     self.class.path(*args, &blk)
   end
 
-  def json_get(url, params = nil)
+  def json_get(url, params = nil, headers = {})
     if params
       param = params.map {|key, value| key.to_s + "=" + value}.join("&")
       url = url + "?" + param
     end
-    status, body, headers = http_get(url, 'application/json')
+    status, body, headers = http_get(url, 'application/json', headers)
     json_parse(body)
   rescue JSON::ParserError
     raise BadResponse, "Can't parse response into JSON", body
@@ -440,8 +425,8 @@ class VMC::Client
 
   # HTTP helpers
 
-  def http_get(path, content_type=nil)
-    request(:get, path, content_type)
+  def http_get(path, content_type=nil, headers={})
+    request(:get, path, content_type, nil, headers)
   end
 
   def http_post(path, body, content_type=nil)

data/lib/vmc/const.rb

@@ -11,7 +11,7 @@ module VMC
   # General Paths
   INFO_PATH            = 'info'
   GLOBAL_SERVICES_PATH = ['info', 'services']
-  EXTERNAL_SERVICES_PATH = ['external_services']
+  CLOUDN_SERVICES_PATH = ['cloudn_services']
   GLOBAL_RUNTIMES_PATH = ['info', 'runtimes']
   RESOURCES_PATH       = 'resources'
 

data/lib/vmc/micro/switcher/base.rb

@@ -18,7 +18,7 @@ module VMC::Micro::Switcher
         end
       end
 
-      err "Micro Cloud Foundry VM initial setup needs to be completed before using 'vmc micro'" unless @vmrun.ready?
+      err "Micro Cloud Foundry VM initial setup needs to be completed before using 'udn micro'" unless @vmrun.ready?
     end
 
     def offline

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: udn
 version: !ruby/object:Gem::Version
-  version: 0.3.23.0.pre
-  prerelease: 9
+  version: 0.3.23.1
+  prerelease: 
 platform: ruby
 authors:
 - NTT Communications
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure
@@ -297,9 +297,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23