vmc 0.3.13.beta.2 → 0.3.13.beta.3

data/lib/cli/frameworks.rb

@@ -10,7 +10,7 @@ module VMC::Cli
       'Spring'   => ['spring',  { :mem => '512M', :description => 'Java SpringSource Spring Application'}],
       'Grails'   => ['grails',  { :mem => '512M', :description => 'Java SpringSource Grails Application'}],
       'Lift'   =>   ['lift',    { :mem => '512M', :description => 'Scala Lift Application'}],
-      'JavaWeb'  => ['spring',  { :mem => '512M', :description => 'Java Web Application'}],
+      'JavaWeb'  => ['java_web',{ :mem => '512M', :description => 'Java Web Application'}],
       'Sinatra'  => ['sinatra', { :mem => '128M', :description => 'Sinatra Application'}],
       'Node'     => ['node',    { :mem => '64M',  :description => 'Node.js Application'}],
       'PHP'      => ['php',     { :mem => '128M', :description => 'PHP Application'}],
@@ -37,9 +37,14 @@ module VMC::Cli
             return Framework.lookup('Rails')
 
           # Java
-          elsif Dir.glob('*.war').first
+          elsif Dir.glob('*.war').first || File.exist?('WEB-INF/web.xml')
             war_file = Dir.glob('*.war').first
-            contents = ZipUtil.entry_lines(war_file)
+
+            if war_file
+              contents = ZipUtil.entry_lines(war_file)
+            else
+              contents = Dir['**/*'].join("\n")
+            end
 
             # Spring/Lift Variations
             if contents =~ /WEB-INF\/lib\/grails-web.*\.jar/
@@ -50,10 +55,11 @@ module VMC::Cli
               return Framework.lookup('Spring')
             elsif contents =~ /WEB-INF\/lib\/spring-core.*\.jar/
               return Framework.lookup('Spring')
+            elsif contents =~ /WEB-INF\/lib\/org\.springframework\.core.*\.jar/
+              return Framework.lookup('Spring')
             else
               return Framework.lookup('JavaWeb')
             end
-
           # Simple Ruby Apps
           elsif !Dir.glob('*.rb').empty?
             matched_file = nil

data/lib/cli/runner.rb

@@ -48,6 +48,10 @@ class VMC::Cli::Runner
       opts.on('-t [TKEY]')         { |tkey|  @options[:trace] = tkey || true }
       opts.on('--trace [TKEY]')    { |tkey|  @options[:trace] = tkey || true }
 
+      # start application in debug mode
+      opts.on('-d [MODE]')         { |mode|  @options[:debug] = mode || "run" }
+      opts.on('--debug [MODE]')    { |mode|  @options[:debug] = mode || "run" }
+
       opts.on('-q', '--quiet')     {         @options[:quiet] = true }
 
       # Don't use builtin zip

data/lib/cli/services_helper.rb

@@ -50,19 +50,25 @@ module VMC::Cli
     end
 
     def bind_service_banner(service, appname, check_restart=true)
-      display "Binding Service: ", false
+      display "Binding Service [#{service}]: ", false
       client.bind_service(service, appname)
       display 'OK'.green
       check_app_for_restart(appname) if check_restart
     end
 
     def unbind_service_banner(service, appname, check_restart=true)
-      display "Unbinding Service: ", false
+      display "Unbinding Service [#{service}]: ", false
       client.unbind_service(service, appname)
       display 'OK'.green
       check_app_for_restart(appname) if check_restart
     end
 
+    def delete_service_banner(service)
+      display "Deleting service [#{service}]: ", false
+      client.delete_service(service)
+      display 'OK'.green
+    end
+
     def random_service_name(service)
       r = "%04x" % [rand(0x0100000)]
       "#{service.to_s}-#{r}"

data/lib/cli/usage.rb

@@ -39,17 +39,18 @@ Currently available vmc commands are:
     push [appname] --instances <N>               Set the expected number <N> of instances
     push [appname] --mem M                       Set the memory reservation for the application
     push [appname] --runtime RUNTIME             Set the runtime to use for the application
+    push [appname] --debug [MODE]                Push application and start in a debug mode
     push [appname] --no-start                    Do not auto-start the application
 
   Application Operations
-    start <appname>                              Start the application
+    start <appname> [--debug [MODE]]             Start the application
     stop  <appname>                              Stop the application
-    restart <appname>                            Restart the application
+    restart <appname> [--debug [MODE]]           Restart the application
     delete <appname>                             Delete the application
     rename <appname> <newname>                   Rename the application
 
   Application Updates
-    update <appname> [--path]                    Update the application bits
+    update <appname> [--path,--debug [MODE]]     Update the application bits
     mem <appname> [memsize]                      Update the memory reservation for an application
     map <appname> <url>                          Register the application to the url
     unmap <appname> <url>                        Unregister the application from the url

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.13.beta.2'
+    VERSION = '0.3.13.beta.3'
   end
 end

data/lib/vmc/client.rb

@@ -63,6 +63,10 @@ class VMC::Client
     json_get(VMC::GLOBAL_SERVICES_PATH)
   end
 
+  def runtimes_info
+    json_get(VMC::GLOBAL_RUNTIMES_PATH)
+  end
+
   ######################################################
   # Apps
   ######################################################

data/lib/vmc/const.rb

@@ -11,6 +11,7 @@ module VMC
   # General Paths
   INFO_PATH            = '/info'
   GLOBAL_SERVICES_PATH = '/info/services'
+  GLOBAL_RUNTIMES_PATH = '/info/runtimes'
   RESOURCES_PATH       = '/resources'
 
   # User specific paths

metadata

@@ -2,7 +2,7 @@
 name: vmc
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 0.3.13.beta.2
+  version: 0.3.13.beta.3
 platform: ruby
 authors: 
 - VMware
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 -07:00
+date: 2011-10-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,21 +35,10 @@ dependencies:
         version: 2.0.1
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: highline
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.6.1
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,51 +48,51 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.7.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: terminal-table
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 1.4.2
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 1.3.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
         version: 1.5.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 description: Client library and CLI that provides access to the VMware Cloud Application Platform.
 email: support@vmware.com
 executables: 
@@ -136,28 +125,6 @@ files:
 - lib/vmc/client.rb
 - lib/vmc/const.rb
 - lib/vmc.rb
-- spec/assets/app_info.txt
-- spec/assets/app_listings.txt
-- spec/assets/bad_create_app.txt
-- spec/assets/delete_app.txt
-- spec/assets/global_service_listings.txt
-- spec/assets/good_create_app.txt
-- spec/assets/good_create_service.txt
-- spec/assets/info_authenticated.txt
-- spec/assets/info_return.txt
-- spec/assets/info_return_bad.txt
-- spec/assets/list_users.txt
-- spec/assets/login_fail.txt
-- spec/assets/login_success.txt
-- spec/assets/sample_token.txt
-- spec/assets/service_already_exists.txt
-- spec/assets/service_gateway_fail.txt
-- spec/assets/service_listings.txt
-- spec/assets/service_not_found.txt
-- spec/assets/user_info.txt
-- spec/spec_helper.rb
-- spec/unit/cli_opts_spec.rb
-- spec/unit/client_spec.rb
 - bin/vmc
 has_rdoc: true
 homepage: http://vmware.com

data/spec/assets/app_info.txt

@@ -1,9 +0,0 @@
-HTTP/1.1 200 OK
-Server: nginx/0.7.65
-Date: Fri, 04 Mar 2011 02:56:21 GMT
-Content-Type: application/json
-Connection: keep-alive
-Keep-Alive: timeout=20
-Content-Length: 243
-
-{"resources":{"memory":64},"uris":["foo.vcap.me"],"staging":{"stack":"ruby foo.rb","model":"http://b20nine.com/unknown"},"state":"STARTED","instances":1,"name":"foo","meta":{"version":1,"created":1299207348},"services":[],"runningInstances":1}

data/spec/assets/app_listings.txt

@@ -1,9 +0,0 @@
-HTTP/1.1 200 OK
-Server: nginx/0.7.65
-Date: Thu, 03 Mar 2011 19:46:19 GMT
-Content-Type: application/json
-Connection: keep-alive
-Keep-Alive: timeout=20
-Content-Length: 251
-
-[{"resources":{"memory":128},"uris":["r.vcap.me"],"staging":{"stack":"ruby redis_sample.rb","model":"http://b20nine.com/unknown"},"state":"STARTED","instances":1,"name":"r","meta":{"version":1,"created":1298681379},"services":[],"runningInstances":1}]

data/spec/assets/bad_create_app.txt

@@ -1,9 +0,0 @@
-HTTP/1.1 400 Bad Request
-Server: nginx/0.7.65
-Date: Thu, 03 Mar 2011 23:37:51 GMT
-Content-Type: text/html;charset=utf-8
-Connection: keep-alive
-Keep-Alive: timeout=20
-Content-Length: 157
-
-{"code":10050,"description":"Invalid number of instances: \"'', App instances not presentApp instances is not a numberInstances must be between 1 and 100\""}

data/spec/assets/delete_app.txt

@@ -1,9 +0,0 @@
-HTTP/1.1 204
-Server: nginx/0.7.65
-Date: Fri, 04 Mar 2011 00:07:10 GMT
-Content-Type: text/html;charset=utf-8
-Connection: keep-alive
-Keep-Alive: timeout=20
-Location: http://api.vcap.me/apps/foo
-Content-Length: 0
-

data/spec/assets/global_service_listings.txt

@@ -1,9 +0,0 @@
-HTTP/1.1 200 OK
-Server: nginx/0.7.65
-Date: Thu, 03 Mar 2011 20:20:15 GMT
-Content-Type: application/json
-Connection: keep-alive
-Keep-Alive: timeout=20
-Content-Length: 381
-
-{"key-value":{"redis":{"2":{"type":"key-value","tiers":{"free":{"order":1,"description":"Free offering (64MiB)"}},"version":"2","vendor":"redis","description":"Redis key-value store service"}}},"database":{"mysql":{"5.1":{"type":"database","tiers":{"free":{"order":1,"description":"Free offering (1GiB)"}},"version":"5.1","description":"MySQL database service","vendor":"mysql"}}}}

data/spec/assets/good_create_app.txt

@@ -1,9 +0,0 @@
-HTTP/1.1 302 Moved Temporarily
-Server: nginx/0.7.65
-Date: Fri, 04 Mar 2011 00:07:10 GMT
-Content-Type: text/html;charset=utf-8
-Connection: keep-alive
-Keep-Alive: timeout=20
-Location: http://api.vcap.me/apps/foo
-Content-Length: 0
-

data/spec/assets/good_create_service.txt

@@ -1,9 +0,0 @@
-HTTP/1.1 302 Moved Temporarily
-Server: nginx/0.7.65
-Date: Fri, 04 Mar 2011 02:15:55 GMT
-Content-Type: text/html;charset=utf-8
-Connection: keep-alive
-Keep-Alive: timeout=20
-Location: http://api.vcap.me/services/redis-86b7a8655555
-Content-Length: 0
-

data/spec/assets/info_authenticated.txt

@@ -1,27 +0,0 @@
-HTTP/1.1 200 OK
-Server: nginx/0.7.65
-Date: Thu, 03 Mar 2011 19:25:34 GMT
-Content-Type: application/json
-Connection: keep-alive
-Keep-Alive: timeout=20
-Content-Length: 380
-
-{
-  "name": "vcap",
-  "build": "3465a13ab528443f1afcd3c9c2861a078549b8e5",
-  "support": "ac-support@vmware.com",
-  "version": 0.999,
-  "limits": {
-    "apps": 50,
-    "memory": 8192,
-    "app_uris": 4,
-    "services": 4
-  },
-  "user": "derek@gmail.com",
-  "description": "VMware's Cloud Application Platform",
-  "usage": {
-    "apps": 1,
-    "memory": 128,
-    "services": 0
-  }
-}

data/spec/assets/info_return.txt

@@ -1,15 +0,0 @@
-HTTP/1.1 200 OK
-Server: nginx/0.7.65
-Date: Thu, 03 Mar 2011 19:04:04 GMT
-Content-Type: application/json
-Connection: keep-alive
-Keep-Alive: timeout=20
-Content-Length: 189
-
-{
-  "name": "vcap",
-  "build": "3465a13ab528443f1afcd3c9c2861a078549b8e5",
-  "support": "ac-support@vmware.com",
-  "version": 0.999,
-  "description": "VMware's Cloud Application Platform"
-}

data/spec/assets/info_return_bad.txt

@@ -1,16 +0,0 @@
-HTTP/1.1 301 Moved Permanently
-Location: http://www.google.com/
-Content-Type: text/html; charset=UTF-8
-Date: Thu, 03 Mar 2011 19:06:04 GMT
-Expires: Sat, 02 Apr 2011 19:06:04 GMT
-Cache-Control: public, max-age=2592000
-Server: gws
-Content-Length: 219
-X-XSS-Protection: 1; mode=block
-
-<HTML><HEAD><meta http-equiv="content-type" content="text/html;charset=utf-8">
-<TITLE>301 Moved</TITLE></HEAD><BODY>
-<H1>301 Moved</H1>
-The document has moved
-<A HREF="http://www.google.com/">here</A>.
-</BODY></HTML>

data/spec/assets/list_users.txt

@@ -1,13 +0,0 @@
-HTTP/1.1 200 OK
-Server: nginx/0.7.65
-Date: Sun, 22 May 2011 18:58:41 GMT
-Content-Type: application/json; charset=utf-8
-Transfer-Encoding: chunked
-Connection: keep-alive
-Keep-Alive: timeout=20
-ETag: "eb21ee2635a8b6b378f896e26b61f006"
-Cache-Control: max-age=0, private, must-revalidate
-X-UA-Compatible: IE=Edge
-Content-Length: 365
-
-[{"email":"test@example.com","admin":true,"apps":[{"name":"chat","state":"STARTED"},{"name":"smith","state":"STARTED"},{"name":"env","state":"STARTED"},{"name":"redirect","state":"STARTED"}]},{"email":"user2@example.com","admin":false,"apps":[]},{"email":"autotest@adamgreenfield.com","admin":false,"apps":[]},{"email":"user3@example.com","admin":false,"apps":[]}]

data/spec/assets/login_fail.txt

@@ -1,9 +0,0 @@
-HTTP/1.1 403 Forbidden
-Server: nginx/0.7.65
-Date: Thu, 03 Mar 2011 18:29:40 GMT
-Content-Type: application/json
-Connection: keep-alive
-Keep-Alive: timeout=20
-Content-Length: 43
-
-{"code":2002,"description":"Invalid token"}

data/spec/assets/login_success.txt

@@ -1,9 +0,0 @@
-HTTP/1.1 200 OK
-Server: nginx/0.7.65
-Date: Thu, 03 Mar 2011 18:26:45 GMT
-Content-Type: application/json
-Connection: keep-alive
-Keep-Alive: timeout=20
-Content-Length: 112
-
-{"token":"04085b082214646572656b40676d61696c2e636f6d6c2b07e517794d22198e59d96b40ccbc3625964dfb8dcca21174835d7e"}

data/spec/assets/sample_token.txt

@@ -1 +0,0 @@
-04085b082214646572656b40676d61696c2e636f6d6c2b07f014794d2219b3dd205faeaefc0a8c70bb3ba786628c8cb8d667

data/spec/assets/service_already_exists.txt

@@ -1,9 +0,0 @@
-HTTP/1.1 400 Bad Request
-Server: nginx/0.7.65
-Date: Fri, 04 Mar 2011 02:19:28 GMT
-Content-Type: text/html;charset=utf-8
-Connection: keep-alive
-Keep-Alive: timeout=20
-Content-Length: 93
-
-{"code":20001,"description":"A service with the name: \"redis-86b7a8655555\" already exists"}