vmc 0.2.11 → 0.3.6

data/README.md

@@ -48,6 +48,11 @@ MIT license, please see the LICENSE file.  All rights reserved._
       stats <appname>                              Display resource usage for the application
       instances <appname>                          List application instances
 
+    Application Environment
+      env <appname>                                List application environment variables
+      env-add <appname> <variable[=]value>         Add an environment variable to an application
+      env-del <appname> <variable>                 Delete an environment variable to an application
+
     Services
       services                                     Lists of services available and provisioned
       create-service <service> [--name,--bind]     Create a provisioned service
@@ -65,6 +70,10 @@ MIT license, please see the LICENSE file.  All rights reserved._
       add-user [--email, --passwd]                 Register a new user (requires admin privileges)
       delete-user <user>                            Delete a user and all apps and services (requires admin privileges)
 
+    System
+      runtimes                                     Display the supported runtimes of the target system
+      frameworks                                   Display the recognized frameworks of the target system
+
     Misc
       aliases                                      List aliases
       alias <alias[=]command>                      Create an alias for a command

data/lib/cli/commands/apps.rb

@@ -125,7 +125,7 @@ module VMC::Cli::Command
       display "Updating Memory Reservation to #{mem_quota_to_choice(memsize)}: ", false
 
       # check memsize here for capacity
-      check_has_capacity_for(memsize - mem)
+      check_has_capacity_for((memsize - mem) * app[:instances])
 
       mem = memsize
 
@@ -308,12 +308,11 @@ module VMC::Cli::Command
 
     def update(appname)
       app = client.app_info(appname)
-      path = @options[:path] || '.'
-      upload_app_bits(appname, path)
-      display "Successfully updated Application: '#{appname}'".green
       if @options[:canary]
         display "[--canary] is deprecated and will be removed in a future version".yellow
       end
+      path = @options[:path] || '.'
+      upload_app_bits(appname, path)
       restart appname if app[:state] == 'STARTED'
     end
 
@@ -342,7 +341,9 @@ module VMC::Cli::Command
       check_app_limit
 
       # check memsize here for capacity
-      check_has_capacity_for(mem_choice_to_quota(memswitch)) if memswitch && !no_start
+      if memswitch && !no_start
+        check_has_capacity_for(mem_choice_to_quota(memswitch) * instances)
+      end
 
       unless no_prompt || @options[:path]
         proceed = ask('Would you like to deploy from the current directory? [Yn]: ')
@@ -407,15 +408,15 @@ module VMC::Cli::Command
       mem_quota = mem_choice_to_quota(mem)
 
       # check memsize here for capacity
-      check_has_capacity_for(mem_quota) unless no_start
+      check_has_capacity_for(mem_quota * instances) unless no_start
 
       display 'Creating Application: ', false
 
       manifest = {
         :name => "#{appname}",
         :staging => {
-          :model => framework.name,
-          :stack => exec
+           :framework => framework.name,
+           :runtime => @options[:runtime]
         },
         :uris => [url],
         :instances => instances,
@@ -443,6 +444,57 @@ module VMC::Cli::Command
       start(appname, true) unless no_start
     end
 
+    def environment(appname)
+      app = client.app_info(appname)
+      env = app[:env] || []
+      return display JSON.pretty_generate(env) if @options[:json]
+      return display "No Environment Variables" if env.empty?
+      etable = table do |t|
+        t.headings = 'Variable', 'Value'
+        env.each do |e|
+          k,v = e.split('=')
+          t << [k, v]
+        end
+      end
+      display "\n"
+      display etable
+    end
+
+    def environment_add(appname, k, v=nil)
+      app = client.app_info(appname)
+      env = app[:env] || []
+      k,v = k.split('=') unless v
+      env << "#{k}=#{v}"
+      display "Adding Environment Variable [#{k}=#{v}]: ", false
+      app[:env] = env
+      client.update_app(appname, app)
+      display 'OK'.green
+      restart appname if app[:state] == 'STARTED'
+    end
+
+    def environment_del(appname, variable)
+      app = client.app_info(appname)
+      env = app[:env] || []
+      deleted_env = nil
+      env.each do |e|
+        k,v = e.split('=')
+        if (k == variable)
+          deleted_env = e
+          break;
+        end
+      end
+      display "Deleting Environment Variable [#{variable}]: ", false
+      if deleted_env
+        env.delete(deleted_env)
+        app[:env] = env
+        client.update_app(appname, app)
+        display 'OK'.green
+        restart appname if app[:state] == 'STARTED'
+      else
+        display 'OK'.green
+      end
+    end
+
     private
 
     def app_exists?(appname)

data/lib/cli/commands/base.rb

@@ -30,7 +30,7 @@ module VMC::Cli
       def client
         return @client if @client
         @client = VMC::Client.new(target_url, auth_token)
-        @client.trace = true if VMC::Cli::Config.trace
+        @client.trace = VMC::Cli::Config.trace if VMC::Cli::Config.trace
         @client.proxy_for @options[:proxy] if @options[:proxy]
         @client
       end
@@ -50,6 +50,29 @@ module VMC::Cli
         @auth_token = VMC::Cli::Config.auth_token
       end
 
+      def runtimes_info
+        return @runtimes if @runtimes
+        info = client_info
+        @runtimes = {}
+        if info[:frameworks]
+          info[:frameworks].each_value do |f|
+            next unless f[:runtimes]
+            f[:runtimes].each { |r| @runtimes[r[:name]] = r}
+          end
+        end
+        @runtimes
+      end
+
+      def frameworks_info
+        return @frameworks if @frameworks
+        info = client_info
+        @frameworks = []
+        if info[:frameworks]
+          info[:frameworks].each_value { |f| @frameworks << [f[:name]] }
+        end
+        @frameworks
+      end
+
     end
   end
 end

data/lib/cli/commands/misc.rb

@@ -42,7 +42,7 @@ module VMC::Cli::Command
     end
 
     def info
-      info = client.info
+      info = client_info
       return display JSON.pretty_generate(info) if @options[:json]
 
       display "\n#{info[:description]}"
@@ -67,12 +67,36 @@ module VMC::Cli::Command
       end
     end
 
+    def runtimes
+      raise VMC::Client::AuthError unless client.logged_in?
+      return display JSON.pretty_generate(runtimes_info) if @options[:json]
+      return display "No Runtimes" if runtimes_info.empty?
+      rtable = table do |t|
+        t.headings = 'Name', 'Description', 'Version'
+        runtimes_info.each_value { |rt| t << [rt[:name], rt[:description], rt[:version]] }
+      end
+      display "\n"
+      display rtable
+    end
+
+    def frameworks
+      raise VMC::Client::AuthError unless client.logged_in?
+      return display JSON.pretty_generate(frameworks_info) if @options[:json]
+      return display "No Frameworks" if frameworks_info.empty?
+      rtable = table do |t|
+        t.headings = ['Name']
+        frameworks_info.each { |f| t << f }
+      end
+      display "\n"
+      display rtable
+    end
+
     def aliases
       aliases = VMC::Cli::Config.aliases
       return display JSON.pretty_generate(aliases) if @options[:json]
       return display "No Aliases" if aliases.empty?
       atable = table do |t|
-        t.headings = 'Alias', "Command"
+        t.headings = 'Alias', 'Command'
         aliases.each { |k,v| t << [k, v] }
       end
       display "\n"

data/lib/cli/commands/user.rb

@@ -3,7 +3,7 @@ module VMC::Cli::Command
   class User < Base
 
     def info
-      info = client.info
+      info = client_info
       username = info[:user] || 'N/A'
       return display JSON.pretty_generate([username]) if @options[:json]
       display "\n[#{username}]"
@@ -34,7 +34,7 @@ module VMC::Cli::Command
     end
 
     def change_password(password=nil)
-      info = client.info
+      info = client_info
       email = info[:user]
       err "Need to be logged in to change password." unless email
       say "Changing password for '#{email}'\n"

data/lib/cli/frameworks.rb

@@ -6,13 +6,21 @@ module VMC::Cli
     DEFAULT_MEM = '256M'
 
     FRAMEWORKS = {
-      'Rails'    => ['rails/1.0',       { :mem => '256M', :description => 'Rails Application'}],
-      'Spring'   => ['spring_web/1.0',  { :mem => '512M', :description => 'Java SpringSource Spring Application'}],
-      'Grails'   => ['grails/1.0',      { :mem => '512M', :description => 'Java SpringSource Grails Application'}],
-      'Roo'      => ['spring_web/1.0',  { :mem => '512M', :description => 'Java SpringSource Roo Application'}],
-      'JavaWeb'  => ['spring_web/1.0',  { :mem => '512M', :description => 'Java Web Application'}],
-      'Sinatra'  => [DEFAULT_FRAMEWORK, { :mem => '128M', :description => 'Sinatra Application'}],
-      'Node'     => ['nodejs/1.0',      { :mem => '64M',  :description => 'Node.js Application'}],
+#      'Rails'    => ['rails/1.0',       { :mem => '256M', :description => 'Rails Application'}],
+#      'Spring'   => ['spring_web/1.0',  { :mem => '512M', :description => 'Java SpringSource Spring Application'}],
+#      'Grails'   => ['grails/1.0',      { :mem => '512M', :description => 'Java SpringSource Grails Application'}],
+#      'Roo'      => ['spring_web/1.0',  { :mem => '512M', :description => 'Java SpringSource Roo Application'}],
+#      'JavaWeb'  => ['spring_web/1.0',  { :mem => '512M', :description => 'Java Web Application'}],
+#      'Sinatra'  => [DEFAULT_FRAMEWORK, { :mem => '128M', :description => 'Sinatra Application'}],
+#      'Node'     => ['nodejs/1.0',      { :mem => '64M',  :description => 'Node.js Application'}],
+
+      'Rails'    => ['rails3',  { :mem => '256M', :description => 'Rails Application'}],
+      'Spring'   => ['spring',  { :mem => '512M', :description => 'Java SpringSource Spring Application'}],
+      'Grails'   => ['grails',  { :mem => '512M', :description => 'Java SpringSource Grails Application'}],
+      'Roo'      => ['spring',  { :mem => '512M', :description => 'Java SpringSource Roo Application'}],
+      'JavaWeb'  => ['spring',  { :mem => '512M', :description => 'Java Web Application'}],
+      'Sinatra'  => ['sinatra', { :mem => '128M', :description => 'Sinatra Application'}],
+      'Node'     => ['node',    { :mem => '64M',  :description => 'Node.js Application'}],
     }
 
     class << self
@@ -55,7 +63,7 @@ module VMC::Cli
               next if matched_file
               File.open(fname, 'r') do |f|
                 str = f.read # This might want to be limited
-                matched_file = fname if (str && str.match(/^\s*require\s*'sinatra'/))
+                matched_file = fname if (str && str.match(/^\s*require\s*['"]sinatra['"]/))
               end
             end
             if matched_file

data/lib/cli/runner.rb

@@ -45,7 +45,9 @@ class VMC::Cli::Runner
       opts.on('--all')             {         @options[:all] = true }
 
       # generic tracing and debugging
-      opts.on('-t', '--trace')     {         @options[:trace] = true }
+      opts.on('-t [TKEY]')         { |tkey|  @options[:trace] = tkey || true }
+      opts.on('--trace [TKEY]')    { |tkey|  @options[:trace] = tkey || true }
+
       opts.on('-q', '--quiet')     {         @options[:quiet] = true }
 
       # Don't use builtin zip
@@ -71,6 +73,8 @@ class VMC::Cli::Runner
       opts.on('-v', '--version')   {         set_cmd(:misc, :version) }
       opts.on('-h', '--help')      {         puts "#{command_usage}\n"; exit }
 
+      opts.on('--runtime RUNTIME') { |rt|    @options[:runtime] = rt }
+
       # deprecated
       opts.on('--exec EXEC')       { |exec|  @options[:exec] = exec }
       opts.on('--noframework')     {         @options[:noframework] = true }
@@ -156,6 +160,14 @@ class VMC::Cli::Runner
       usage('vmc info')
       set_cmd(:misc, :info)
 
+    when 'runtimes'
+      usage('vmc runtimes')
+      set_cmd(:misc, :runtimes)
+
+    when 'frameworks'
+      usage('vmc frameworks')
+      set_cmd(:misc, :frameworks)
+
     when 'user'
       usage('vmc user')
       set_cmd(:user, :info)
@@ -289,6 +301,22 @@ class VMC::Cli::Runner
       usage('vmc services')
       set_cmd(:services, :services)
 
+    when 'env'
+      usage('vmc env <appname>')
+      set_cmd(:apps, :environment, 1)
+
+    when 'env-add'
+      usage('vmc env-add <appname> <variable[=]value>')
+      if @args.size == 2
+        set_cmd(:apps, :environment_add, 2)
+      elsif @args.size == 3
+        set_cmd(:apps, :environment_add, 3)
+      end
+
+    when 'env-del'
+      usage('vmc env-del <appname> <variable>')
+      set_cmd(:apps, :environment_del, 2)
+
     when 'create-service', 'create_service'
       usage('vmc create-service [service] [servicename] [appname] [--name servicename] [--bind appname]')
       set_cmd(:services, :create_service) if @args.size == 0
@@ -387,8 +415,8 @@ class VMC::Cli::Runner
     @options[:colorize] = false unless STDOUT.tty?
 
     VMC::Cli::Config.colorize   = @options.delete(:colorize)
-    VMC::Cli::Config.trace      = @options.delete(:trace)
     VMC::Cli::Config.nozip      = @options.delete(:nozip)
+    VMC::Cli::Config.trace      = @options.delete(:trace)
     VMC::Cli::Config.output   ||= STDOUT unless @options[:quiet]
 
     process_aliases!
@@ -432,6 +460,10 @@ class VMC::Cli::Runner
     @exit_status = false
   rescue SystemExit => e
     @exit_status = e.success?
+  rescue SyntaxError => e
+    puts e.message.red
+    puts e.backtrace
+    @exit_status = false
   rescue => e
     puts e.message.red
     puts e.backtrace

data/lib/cli/usage.rb

@@ -62,6 +62,11 @@ Currently available vmc commands are:
     stats <appname>                              Display resource usage for the application
     instances <appname>                          List application instances
 
+  Application Environment
+    env <appname>                                List application environment variables
+    env-add <appname> <variable[=]value>         Add an environment variable to an application
+    env-del <appname> <variable>                 Delete an environment variable to an application
+
   Services
     services                                     Lists of services available and provisioned
     create-service <service> [--name,--bind]     Create a provisioned service
@@ -79,6 +84,10 @@ Currently available vmc commands are:
     add-user [--email, --passwd]                 Register a new user (requires admin privileges)
     delete-user <user>                           Delete a user and all apps and services (requires admin privileges)
 
+  System
+    runtimes                                     Display the supported runtimes of the target system
+    frameworks                                   Display the recognized frameworks of the target system
+
   Misc
     aliases                                      List aliases
     alias <alias[=]command>                      Create an alias for a command

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.2.11'
+    VERSION = '0.3.6'
   end
 end

data/lib/cli/zip_util.rb

@@ -51,7 +51,7 @@ module VMC::Cli
           excludes = PACK_EXCLUSION_GLOBS.map { |e| "\\#{e}" }
           excludes = excludes.join(' ')
           Dir.chdir(dir) do
-            `zip -q -r #{zipfile} . -x #{excludes} 2> /dev/null`
+            `zip -y -q -r #{zipfile} . -x #{excludes} 2> /dev/null`
             return unless $? != 0
           end
         end

data/lib/vmc/client.rb

@@ -367,13 +367,19 @@ class VMC::Client
   def perform_http_request(req)
     RestClient.proxy = ENV['https_proxy'] || ENV['http_proxy']
 
+    # Setup tracing if needed
+    unless trace.nil?
+      req[:headers]['X-VCAP-Trace'] = (trace == true ? '22' : trace)
+    end
+
     result = nil
     RestClient::Request.execute(req) do |response, request|
       result = [ response.code, response.body, response.headers ]
-      if trace
+      unless trace.nil?
         puts '>>>'
         puts "PROXY: #{RestClient.proxy}" if RestClient.proxy
         puts "REQUEST: #{req[:method]} #{req[:url]}"
+        puts "RESPONSE_HEADERS: #{response.headers}"
         puts "REQUEST_BODY: #{req[:payload]}" if req[:payload]
         puts "RESPONSE: [#{response.code}] #{response.body}"
         puts '<<<'

data/lib/vmc/const.rb

@@ -2,7 +2,7 @@ module VMC
 
   # This is the internal VMC version number, and is not necessarily
   # the same as the RubyGem version (VMC::Cli::VERSION).
-  VERSION = '0.2.8'
+  VERSION = '0.3.0'
 
   # Targets
   DEFAULT_TARGET = 'http://api.cloudfoundry.com'

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 1
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 11
-  version: 0.2.11
+  version: 0.3.6
 platform: ruby
 authors: 
 - VMware
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 -05:00
+date: 2011-04-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
         version: 1.5.1
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 2
-        - 0
-        - 1
         version: 2.0.1
   type: :runtime
   version_requirements: *id002
@@ -58,11 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
         version: 1.6.1
   type: :runtime
   version_requirements: *id003
@@ -74,19 +54,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
         version: 1.6.1
     - - <
       - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 1
-        - 7
-        - 0
         version: 1.7.0
   type: :runtime
   version_requirements: *id004
@@ -98,11 +68,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 4
-        - 2
         version: 1.4.2
   type: :runtime
   version_requirements: *id005
@@ -114,9 +79,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -128,11 +90,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
         version: 1.3.0
   type: :development
   version_requirements: *id007
@@ -144,11 +101,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
         version: 1.5.0
   type: :development
   version_requirements: *id008
@@ -219,18 +171,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []