vmc 0.3.10 → 0.3.12.beta.1

data/README.md

@@ -86,7 +86,7 @@ MIT license, please see the LICENSE file.  All rights reserved._
 
 ## Simple Story (for Ruby apps)
 
-    vmc target api.vcloudlabs.com
+    vmc target api.cloudfoundry.com
     vmc login
     bundle package
     vmc push

data/lib/cli/commands/admin.rb

@@ -2,6 +2,25 @@ module VMC::Cli::Command
 
   class Admin < Base
 
+    def list_users
+      users = client.users
+      users.sort! {|a, b| a[:email] <=> b[:email] }
+      return display JSON.pretty_generate(users || []) if @options[:json]
+
+      display "\n"
+      return display "No Users" if users.nil? || users.empty?
+
+      users_table = table do |t|
+        t.headings = 'Email', 'Admin', 'Apps'
+        users.each do |user|
+          t << [user[:email], user[:admin], user[:apps].map {|x| x[:name]}.join(', ')]
+        end
+      end
+      display users_table
+    end
+
+    alias :users :list_users
+
     def add_user(email=nil)
       email    = @options[:email] unless email
       password = @options[:password]
@@ -48,6 +67,7 @@ module VMC::Cli::Command
       end
 
       display 'Deleting User: ', false
+      client.proxy = nil
       client.delete_user(user_email)
       display 'OK'.green
     end

data/lib/cli/commands/apps.rb

@@ -11,6 +11,7 @@ module VMC::Cli::Command
 
     def list
       apps = client.apps
+      apps.sort! {|a, b| a[:name] <=> b[:name] }
       return display JSON.pretty_generate(apps || []) if @options[:json]
 
       display "\n"
@@ -483,7 +484,7 @@ module VMC::Cli::Command
       etable = table do |t|
         t.headings = 'Variable', 'Value'
         env.each do |e|
-          k,v = e.split('=')
+          k,v = e.split('=', 2)
           t << [k, v]
         end
       end
@@ -494,7 +495,7 @@ module VMC::Cli::Command
     def environment_add(appname, k, v=nil)
       app = client.app_info(appname)
       env = app[:env] || []
-      k,v = k.split('=') unless v
+      k,v = k.split('=', 2) unless v
       env << "#{k}=#{v}"
       display "Adding Environment Variable [#{k}=#{v}]: ", false
       app[:env] = env
@@ -558,6 +559,8 @@ module VMC::Cli::Command
         else
           FileUtils.mkdir(explode_dir)
           files = Dir.glob('{*,.[^\.]*}')
+          # Do not process .git files
+          files.delete('.git') if files
           FileUtils.cp_r(files, explode_dir)
         end
 
@@ -639,7 +642,7 @@ module VMC::Cli::Command
       return unless prompt_ok
       selected = false
       choose do |menu|
-        menu.header = "The following provisioned services are available:"
+        menu.header = "The following provisioned services are available"
         menu.prompt = 'Please select one you wish to provision: '
         menu.select_by = :index_or_name
         user_services.each do |s|
@@ -657,7 +660,7 @@ module VMC::Cli::Command
     def choose_new_service(appname, services)
       return unless prompt_ok
       choose do |menu|
-        menu.header = "The following system services are available:"
+        menu.header = "The following system services are available"
         menu.prompt = 'Please select one you wish to provision: '
         menu.select_by = :index_or_name
         service_choices = []

data/lib/cli/commands/services.rb

@@ -6,6 +6,8 @@ module VMC::Cli::Command
     def services
       ss = client.services_info
       ps = client.services
+      ps.sort! {|a, b| a[:name] <=> b[:name] }
+
       if @options[:json]
         services = { :system => ss, :provisioned => ps }
         return display JSON.pretty_generate(services)

data/lib/cli/frameworks.rb

@@ -9,10 +9,12 @@ module VMC::Cli
       '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'}],
+      'Lift'   =>   ['lift',    { :mem => '512M', :description => 'Scala Lift 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'}],
+      'Erlang/OTP Rebar' => ['otp_rebar',  { :mem => '64M',  :description => 'Erlang/OTP Rebar Application'}]
     }
 
     class << self
@@ -37,9 +39,11 @@ module VMC::Cli
             war_file = Dir.glob('*.war').first
             contents = ZipUtil.entry_lines(war_file)
 
-            # Spring Variations
+            # Spring/Lift Variations
             if contents =~ /WEB-INF\/lib\/grails-web.*\.jar/
               return Framework.lookup('Grails')
+            elsif contents =~ /WEB-INF\/lib\/lift-webkit.*\.jar/
+              return Framework.lookup('Lift')
             elsif contents =~ /WEB-INF\/classes\/org\/springframework/
               return Framework.lookup('Spring')
             elsif contents =~ /WEB-INF\/lib\/spring-core.*\.jar/
@@ -55,7 +59,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
@@ -66,10 +70,13 @@ module VMC::Cli
 
           # Node.js
           elsif !Dir.glob('*.js').empty?
-            # Fixme, make other files work too..
-            if File.exist?('app.js') || File.exist?('index.js') || File.exist?('main.js')
+            if File.exist?('server.js') || File.exist?('app.js') || File.exist?('index.js') || File.exist?('main.js')
               return Framework.lookup('Node')
             end
+
+          # Erlang/OTP using Rebar
+          elsif !Dir.glob('releases/*/*.rel').empty? && !Dir.glob('releases/*/*.boot').empty?
+            return Framework.lookup('Erlang/OTP Rebar')
           end
         end
         nil

data/lib/cli/runner.rb

@@ -107,7 +107,6 @@ class VMC::Cli::Runner
   def convert_options!
     # make sure certain options are valid and in correct form.
     @options[:instances] = Integer(@options[:instances]) if @options[:instances]
-    @options[:instance] = Integer(@options[:instance]) if @options[:instance]
   end
 
   def set_cmd(namespace, action, args_range=0)
@@ -204,6 +203,10 @@ class VMC::Cli::Runner
       usage('vmc delete-user <user>')
       set_cmd(:admin, :delete_user, 1)
 
+    when 'users'
+      usage('vmc users')
+      set_cmd(:admin, :users)
+
     when 'apps'
       usage('vmc apps')
       set_cmd(:apps, :apps)
@@ -286,7 +289,7 @@ class VMC::Cli::Runner
       set_cmd(:apps, :crashlogs, 1)
 
     when 'push'
-      usage('vmc push [appname] [--path PATH] [--url URL] [--instances N] [--mem] [--no-start]')
+      usage('vmc push [appname] [--path PATH] [--url URL] [--instances N] [--mem] [--runtime RUNTIME] [--no-start]')
       if @args.size == 1
         set_cmd(:apps, :push, 1)
       else

data/lib/cli/services_helper.rb

@@ -8,16 +8,20 @@ module VMC::Cli
 
       return display "No system services available" if services.empty?
 
-      services_table = table do |t|
-        t.headings = 'Service', 'Version', 'Description'
-        services.each do |service_type, value|
-          value.each do |vendor, version|
-            version.each do |version_str, service|
-              t << [ vendor, version_str, service[:description] ]
-            end
+      displayed_services = []
+      services.each do |service_type, value|
+        value.each do |vendor, version|
+          version.each do |version_str, service|
+            displayed_services << [ vendor, version_str, service[:description] ]
           end
         end
       end
+      displayed_services.sort! { |a, b| a.first.to_s <=> b.first.to_s}
+
+      services_table = table do |t|
+        t.headings = 'Service', 'Version', 'Description'
+        displayed_services.each { |s| t << s }
+      end
       display services_table
     end
 

data/lib/cli/usage.rb

@@ -38,6 +38,7 @@ Currently available vmc commands are:
     push [appname] --url                         Set the url for the application
     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] --no-start                    Do not auto-start the application
 
   Application Operations

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.10'
+    VERSION = '0.3.12.beta.1'
   end
 end

data/lib/vmc/client.rb

@@ -11,6 +11,7 @@
 
 require 'rubygems'
 require 'json/pure'
+require 'open-uri'
 
 require File.expand_path('../const', __FILE__)
 
@@ -293,11 +294,17 @@ class VMC::Client
     @proxy = proxy
   end
 
+  def users
+    check_login_status
+    json_get(VMC::USERS_PATH)
+  end
+
   def add_user(user_email, password)
     json_post(VMC::USERS_PATH, { :email => user_email, :password => password })
   end
 
   def delete_user(user_email)
+    check_login_status
     http_delete("#{VMC::USERS_PATH}/#{user_email}")
   end
 
@@ -374,7 +381,7 @@ class VMC::Client
   end
 
   def perform_http_request(req)
-    RestClient.proxy = ENV['https_proxy'] || ENV['http_proxy']
+    RestClient.proxy = URI.parse(req[:url]).find_proxy()
 
     # Setup tracing if needed
     unless trace.nil?

data/lib/vmc/const.rb

@@ -5,7 +5,7 @@ module VMC
   VERSION = '0.3.2'
 
   # Targets
-  DEFAULT_TARGET = 'http://api.cloudfoundry.com'
+  DEFAULT_TARGET = 'https://api.cloudfoundry.com'
   DEFAULT_LOCAL_TARGET = 'http://api.vcap.me'
 
   # General Paths

data/spec/assets/list_users.txt

@@ -0,0 +1,13 @@
+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/unit/client_spec.rb

@@ -20,9 +20,14 @@ describe 'VMC::Client' do
     client.target.should == VMC::DEFAULT_TARGET
   end
 
+  it 'should default to use secure protocol' do
+    client = VMC::Client.new
+    client.target.match(/^https/)
+  end
+
   it 'should normalize target with no scheme' do
     client = VMC::Client.new('api.cloudfoundry.com')
-    client.target.should == @target
+    client.target.should == 'http://api.cloudfoundry.com'
   end
 
   it 'should properly initialize with auth_token' do
@@ -129,6 +134,20 @@ describe 'VMC::Client' do
     app.should have_key :instances
   end
 
+  it 'should get a proper list of users' do
+    info_path = "#{@local_target}#{VMC::INFO_PATH}"
+    stub_request(:get, info_path).to_return(File.new(spec_asset('info_authenticated.txt')))
+    users_path = "#{@local_target}#{VMC::USERS_PATH}"
+    stub_request(:get, users_path).to_return(File.new(spec_asset('list_users.txt')))
+    client = VMC::Client.new(@local_target, @auth_token)
+    users = client.users
+    users.should have(4).items
+    user = users.first
+    user.should have_key :email
+    user.should have_key :admin
+    user.should have_key :apps
+  end
+
   it 'should get a proper list of services' do
     info_path = "#{@local_target}#{VMC::INFO_PATH}"
     stub_request(:get, info_path).to_return(File.new(spec_asset('info_authenticated.txt')))
@@ -266,16 +285,29 @@ describe 'VMC::Client' do
     ENV['http_proxy'] = nil
   end
 
-  it 'should set a secure proxy over a normal proxy if one is set' do
+  it 'should use a secure proxy over a normal proxy if one is set' do
+    info_path = "#{@target}#{VMC::INFO_PATH}"
+    stub_request(:get, info_path).to_return(File.new(spec_asset('info_return.txt')))
+    proxy = 'http://proxy.vmware.com:3128'
+    secure_proxy = 'http://secure-proxy.vmware.com:3128'
+    ENV['http_proxy'] = proxy
+    ENV['https_proxy'] = secure_proxy
+    client = VMC::Client.new(@target)
+    info = client.info
+    RestClient.proxy.should == secure_proxy
+    ENV['http_proxy'] = ENV['https_proxy'] = nil
+  end
+
+  it 'should not use a secure proxy for non-secure site' do
     info_path = "#{@local_target}#{VMC::INFO_PATH}"
     stub_request(:get, info_path).to_return(File.new(spec_asset('info_return.txt')))
     proxy = 'http://proxy.vmware.com:3128'
-    secure_proxy = 'https://proxy.vmware.com:3128'
+    secure_proxy = 'http://secure-proxy.vmware.com:3128'
     ENV['http_proxy'] = proxy
     ENV['https_proxy'] = secure_proxy
     client = VMC::Client.new(@local_target)
     info = client.info
-    RestClient.proxy.should == secure_proxy
+    RestClient.proxy.should == proxy
     ENV['http_proxy'] = ENV['https_proxy'] = nil
   end
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 10
-  version: 0.3.10
+  prerelease: 7
+  version: 0.3.12.beta.1
 platform: ruby
 authors: 
 - VMware
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 -07:00
+date: 2011-06-02 00:00:00 -07: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
@@ -165,45 +117,46 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- lib/cli/config.rb
-- lib/cli/services_helper.rb
 - lib/cli/commands/admin.rb
-- lib/cli/commands/services.rb
-- lib/cli/commands/misc.rb
 - lib/cli/commands/apps.rb
-- lib/cli/commands/user.rb
 - lib/cli/commands/base.rb
-- lib/cli/usage.rb
-- lib/cli/frameworks.rb
+- lib/cli/commands/misc.rb
+- lib/cli/commands/services.rb
+- lib/cli/commands/user.rb
+- lib/cli/config.rb
+- lib/cli/core_ext.rb
 - lib/cli/errors.rb
+- lib/cli/frameworks.rb
+- lib/cli/runner.rb
+- lib/cli/services_helper.rb
+- lib/cli/usage.rb
 - lib/cli/version.rb
 - lib/cli/zip_util.rb
-- lib/cli/core_ext.rb
-- lib/cli/runner.rb
+- lib/cli.rb
 - lib/vmc/client.rb
 - lib/vmc/const.rb
-- lib/cli.rb
 - lib/vmc.rb
-- spec/unit/client_spec.rb
-- spec/unit/cli_opts_spec.rb
-- spec/spec_helper.rb
-- spec/assets/info_return_bad.txt
-- spec/assets/info_return.txt
-- spec/assets/service_listings.txt
+- spec/assets/app_info.txt
+- spec/assets/app_listings.txt
+- spec/assets/bad_create_app.txt
 - spec/assets/delete_app.txt
-- spec/assets/user_info.txt
+- spec/assets/global_service_listings.txt
 - spec/assets/good_create_app.txt
-- spec/assets/service_already_exists.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/app_info.txt
 - spec/assets/login_success.txt
-- spec/assets/app_listings.txt
-- spec/assets/global_service_listings.txt
-- spec/assets/bad_create_app.txt
 - spec/assets/sample_token.txt
+- spec/assets/service_already_exists.txt
+- spec/assets/service_listings.txt
 - spec/assets/service_not_found.txt
-- spec/assets/info_authenticated.txt
-- spec/assets/good_create_service.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
@@ -219,19 +172,13 @@ 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"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: