vmc 0.4.0.beta.6 → 0.4.0.beta.7

data/bin/vmc

@@ -1,14 +1,15 @@
 #!/usr/bin/env ruby
-# vim: ft=ruby
 
-require "rubygems"
-require "thor"
+vmc = File.expand_path("../../vmc", __FILE__)
+vmc_ng = File.expand_path("../../vmc-ng", __FILE__)
 
-require "vmc"
-require "vmc/plugin"
+bin =
+  if File.exists?(File.expand_path("~/.vmc/use-ng"))
+    $LOAD_PATH.unshift "#{vmc_ng}/lib"
+    "#{vmc_ng}/bin/vmc"
+  else
+    "#{vmc}/bin/vmc"
+  end
 
-VMC::Plugin.load_all
-
-$exit_status = 0
-VMC::CLI.start(ARGV)
-exit($exit_status)
+$0 = bin
+load bin

data/vmc-ng/bin/vmc

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+# vim: ft=ruby
+
+require "rubygems"
+require "thor"
+
+require "vmc"
+require "vmc/plugin"
+
+VMC::Plugin.load_all
+
+$exit_status = 0
+VMC::CLI.start(ARGV)
+exit($exit_status)

data/{lib → vmc-ng/lib}/vmc/cli/app.rb

@@ -55,7 +55,7 @@ module VMC
       opts = {:choices => choices}
       opts[:default] = default if default
 
-      ask("Framework", :choices => choices)
+      ask("Framework", opts)
     }
     flag(:runtime) { |choices|
       ask("Runtime", :choices => choices)
@@ -93,7 +93,7 @@ module VMC
       if detected.empty?
         framework = input(:framework, frameworks.keys.sort, nil)
       else
-        framework = input(:framework, ["other"] + detected.keys.sort, default)
+        framework = input(:framework, detected.keys.sort + ["other"], default)
         if framework == "other"
           forget(:framework)
           framework = input(:framework, frameworks.keys.sort, nil)

data/{lib → vmc-ng/lib}/vmc/cli/command.rb

@@ -73,7 +73,7 @@ module VMC
       print c("> ", :prompt)
 
       unless value.empty?
-        print "#{c(value, :black) + "\b" * value.size}"
+        print "#{c(value, :default) + "\b" * value.size}"
       end
     end
 
@@ -362,7 +362,7 @@ module VMC
     rescue UserError => e
       err e.message
     rescue CFoundry::Denied => e
-      err NotAuthorized.new.message
+      err "Denied: #{e.description}"
     rescue Exception => e
       msg = e.class.name
       msg << ": #{e}" unless e.to_s.empty?

data/{lib → vmc-ng/lib}/vmc/cli/dots.rb

@@ -84,7 +84,9 @@ module VMC
       :number => :green,
       :prompt => :blue,
       :yes => :green,
-      :no => :red
+      :no => :red,
+      :dim => :black,
+      :default => :black
     }
 
     def user_colors

data/vmc-ng/lib/vmc/version.rb

@@ -0,0 +1,3 @@
+module VMC
+  VERSION = "0.4.0.beta.7"
+end

data/vmc/LICENSE

@@ -0,0 +1,24 @@
+Copyright (c) 2010-2011 VMware Inc, All Rights Reserved
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+This software downloads additional open source software components upon install
+that are distributed under separate terms and conditions.  Please see the license
+information provided in the individual software components for more information.
+

data/vmc/README.md

@@ -0,0 +1,102 @@
+# VMC
+
+The VMware Cloud CLI. This is the command line interface to VMware's Application Platform
+
+_Copyright 2010-2011, 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.
+
+    Currently available vmc commands are:
+
+    Getting Started
+      target [url]                                 Reports current target or sets a new target
+      login  [email] [--email, --passwd]           Login
+      info                                         System and account information
+
+    Applications
+      apps                                         List deployed applications
+
+    Application Creation
+      push [appname]                               Create, push, map, and start a new application
+      push [appname] --path                        Push application from specified path
+      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] --no-start                    Do not auto-start the application
+
+    Application Operations
+      start <appname>                              Start the application
+      stop  <appname>                              Stop the application
+      restart <appname>                            Restart the application
+      delete <appname>                             Delete the application
+
+    Application Updates
+      update <appname> [--path]                    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
+      instances <appname> <num|delta>              Scale the application instances up or down
+
+    Application Information
+      crashes <appname>                            List recent application crashes
+      crashlogs <appname>                          Display log information for crashed applications
+      logs <appname> [--all]                       Display log information for the application
+      files <appname> [path] [--all]               Display directory listing or file download for path
+      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
+      create-service <service> <name>              Create a provisioned service and assign it <name>
+      create-service <service> <name> <app>        Create a provisioned service and assign it <name>, and bind to <app>
+      delete-service [servicename]                 Delete a provisioned service
+      bind-service <servicename> <appname>         Bind a service to an application
+      unbind-service <servicename> <appname>       Unbind service from the application
+      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
+
+    Administration
+      user                                         Display user account information
+      passwd                                       Change the password for the current user
+      logout                                       Logs current user out of the target system
+      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
+
+    Micro Cloud Foundry
+      micro status                                 Display Micro Cloud Foundry VM status
+      mciro offline                                Configure Micro Cloud Foundry VM for offline mode
+      micro online                                 Configure Micro Cloud Foundry VM for online mode
+        [--vmx file]                               Path to micro.vmx
+        [--vmrun executable]                       Path to vmrun executable
+        [--password cleartext]                     Cleartext password for guest VM vcap user
+        [--save]                                   Save cleartext password in ~/.vmc_micro
+
+    Misc
+      aliases                                      List aliases
+      alias <alias[=]command>                      Create an alias for a command
+      unalias <alias>                              Remove an alias
+      targets                                      List known targets and associated authorization tokens
+
+    Help
+      help [command]                               Get general help or help on a specific command
+      help options                                 Get help on available options
+
+## Simple Story (for Ruby apps)
+
+    vmc target api.cloudfoundry.com
+    vmc login
+    bundle package
+    vmc push

data/vmc/Rakefile

@@ -0,0 +1,101 @@
+require 'rake'
+require 'spec/rake/spectask'
+
+desc "Run specs"
+task :spec => :build do
+  Spec::Rake::SpecTask.new('spec') do |t|
+    t.spec_opts = %w(-fs -c)
+    t.spec_files = FileList['spec/**/*_spec.rb']
+  end
+end
+
+desc "Synonym for spec"
+task :test => :spec
+desc "Synonym for spec"
+task :tests => :spec
+task :default => :spec
+
+def tests_path
+  if @tests_path == nil
+    @tests_path = File.join(Dir.pwd, "spec/assets/tests")
+  end
+  @tests_path
+end
+TESTS_PATH = tests_path
+
+BUILD_ARTIFACT = File.join(Dir.pwd, "spec/assets/.build")
+
+TESTS_TO_BUILD = ["#{TESTS_PATH}/java_web/java_tiny_app",
+#             "#{TESTS_PATH}/grails/guestbook",
+             "#{TESTS_PATH}/lift/hello_lift",
+             "#{TESTS_PATH}/spring/roo-guestbook",
+             "#{TESTS_PATH}/spring/spring-osgi-hello",
+             "#{TESTS_PATH}/standalone/java_app",
+             "#{TESTS_PATH}/standalone/python_app"
+            ]
+
+desc "Build the tests. If the git hash associated with the test assets has not changed, nothing is built. To force a build, invoke 'rake build[--force]'"
+task :build, [:force] do |t, args|
+  sh('bundle install')
+  sh('git submodule update --init')
+  puts "\nBuilding tests"
+  if build_required? args.force
+    ENV['MAVEN_OPTS']="-XX:MaxPermSize=256M"
+    TESTS_TO_BUILD.each do |test|
+      puts "\tBuilding '#{test}'"
+      Dir.chdir test do
+        sh('mvn package -DskipTests') do |success, exit_code|
+          unless success
+            clear_build_artifact
+            do_mvn_clean('-q')
+            fail "\tFailed to build #{test} - aborting build"
+          end
+        end
+      end
+      puts "\tCompleted building '#{test}'"
+    end
+    save_git_hash
+  else
+    puts "Built artifacts in sync with test assets - no build required"
+  end
+end
+
+desc "Clean the build artifacts"
+task :clean do
+  puts "\nCleaning tests"
+  clear_build_artifact
+  TESTS_TO_BUILD.each do |test|
+    puts "\tCleaning '#{test}'"
+    Dir.chdir test do
+      do_mvn_clean
+    end
+    puts "\tCompleted cleaning '#{test}'"
+  end
+end
+
+def build_required? (force_build=nil)
+  if File.exists?(BUILD_ARTIFACT) == false or (force_build and force_build == "--force")
+    return true
+  end
+  Dir.chdir(tests_path) do
+    saved_git_hash = IO.readlines(BUILD_ARTIFACT)[0].split[0]
+    git_hash = `git rev-parse --short=8 --verify HEAD`
+    saved_git_hash.to_s.strip != git_hash.to_s.strip
+  end
+end
+
+def save_git_hash
+  Dir.chdir(tests_path) do
+    git_hash = `git rev-parse --short=8 --verify HEAD`
+    File.open(BUILD_ARTIFACT, 'w') {|f| f.puts("#{git_hash}")}
+  end
+end
+
+def clear_build_artifact
+  puts "\tClearing build artifact #{BUILD_ARTIFACT}"
+  File.unlink BUILD_ARTIFACT if File.exists? BUILD_ARTIFACT
+end
+
+def do_mvn_clean options=nil
+  sh("mvn clean #{options}")
+end

data/vmc/bin/vmc

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+
+require File.expand_path('../../lib/cli', __FILE__)
+
+VMC::Cli::Runner.run(ARGV.dup)
+

data/vmc/caldecott_helper/Gemfile

@@ -0,0 +1,10 @@
+source "http://rubygems.org"
+
+gem 'rack', '~> 1.2.0'
+gem 'caldecott', '= 0.0.3'
+gem 'bundler'
+gem 'em-websocket'
+gem 'async_sinatra'
+gem 'thin'
+gem 'json'
+gem 'uuidtools'

data/vmc/caldecott_helper/Gemfile.lock

@@ -0,0 +1,48 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    addressable (2.2.6)
+    async_sinatra (0.5.0)
+      rack (>= 1.2.1)
+      sinatra (>= 1.0)
+    caldecott (0.0.3)
+      addressable (= 2.2.6)
+      async_sinatra (= 0.5.0)
+      em-http-request (= 0.3.0)
+      em-websocket (= 0.3.1)
+      json (= 1.6.1)
+      uuidtools (= 2.1.2)
+    daemons (1.1.4)
+    em-http-request (0.3.0)
+      addressable (>= 2.0.0)
+      escape_utils
+      eventmachine (>= 0.12.9)
+    em-websocket (0.3.1)
+      addressable (>= 2.1.1)
+      eventmachine (>= 0.12.9)
+    escape_utils (0.2.4)
+    eventmachine (0.12.10)
+    json (1.6.1)
+    rack (1.2.4)
+    sinatra (1.2.7)
+      rack (~> 1.1)
+      tilt (>= 1.2.2, < 2.0)
+    thin (1.2.11)
+      daemons (>= 1.0.9)
+      eventmachine (>= 0.12.6)
+      rack (>= 1.0.0)
+    tilt (1.3.3)
+    uuidtools (2.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  async_sinatra
+  bundler
+  caldecott (= 0.0.3)
+  em-websocket
+  json
+  rack (~> 1.2.0)
+  thin
+  uuidtools

data/vmc/caldecott_helper/server.rb

@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+# Copyright (c) 2009-2011 VMware, Inc.
+$:.unshift(File.dirname(__FILE__) + '/lib')
+
+require 'rubygems'
+require 'bundler/setup'
+
+require 'caldecott'
+require 'sinatra'
+require 'json'
+require 'eventmachine'
+
+port = ENV['VMC_APP_PORT']
+port ||= 8081
+
+# add vcap specific stuff to Caldecott
+class VcapHttpTunnel < Caldecott::Server::HttpTunnel
+  get '/info' do
+    { "version" => '0.0.4' }.to_json
+  end
+
+  def self.get_tunnels
+    super
+  end
+
+  get '/services' do
+    services_env = ENV['VMC_SERVICES']
+    return "no services env" if services_env.nil? or services_env.empty?
+    services_env
+  end
+
+  get '/services/:service' do |service_name|
+    services_env = ENV['VMC_SERVICES']
+    not_found if services_env.nil?
+
+    services = JSON.parse(services_env)
+    service = services.find { |s| s["name"] == service_name }
+    not_found if service.nil?
+    service["options"].to_json
+  end
+end
+
+VcapHttpTunnel.run!(:port => port, :auth_token => ENV["CALDECOTT_AUTH"])