vmc 0.4.0.beta.30 → 0.4.0.beta.31

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

@@ -70,6 +70,10 @@ module VMC
     end
 
     def precondition
+      unless File.exists? target_file
+        fail "Please select a target with 'vmc target'."
+      end
+
       unless client.logged_in?
         fail "Please log in with 'vmc login'."
       end

data/vmc-ng/lib/vmc/cli/app.rb

@@ -151,7 +151,11 @@ module VMC
 
       if exists = client.app_by_name(name)
         upload_app(exists, path)
-        invoke :restart, :app => exists if input[:restart]
+
+        if input[:restart] && exists.started?
+          invoke :restart, :app => exists
+        end
+
         return
       end
 
@@ -737,6 +741,7 @@ module VMC
 
 
     desc "DEPRECATED. Use 'push' instead."
+    input :app, :argument => :optional
     def update(input)
       fail "The 'update' command is no longer needed; use 'push' instead."
     end
@@ -795,10 +800,6 @@ module VMC
     end
 
     def upload_app(app, path)
-      if v2?
-        fail "V2 API currently does not support uploading or starting apps."
-      end
-
       with_progress("Uploading #{c(app.name, :name)}") do
         app.upload(path)
       end

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

@@ -10,11 +10,16 @@ module VMC
 
     def self.load_all
       # auto-load gems with 'vmc-plugin' in their name
-      enabled =
-        Set.new(
-          Gem::Specification.find_all { |s|
+      matching =
+        if Gem::Specification.respond_to? :find_all
+          Gem::Specification.find_all do |s|
             s.name =~ /vmc-plugin/
-          }.collect(&:name))
+          end
+        else
+          Gem.source_index.find_name(/vmc-plugin/)
+        end
+
+      enabled = Set.new(matching.collect(&:name))
 
       # allow explicit enabling/disabling of gems via config
       plugins = File.expand_path(VMC::PLUGINS_FILE)

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.30"
+  VERSION = "0.4.0.beta.31"
 end

data/vmc-ng/spec/app/push_spec.rb

@@ -3,16 +3,18 @@ require "./helpers"
 describe "App#push" do
   it "pushes interactively" do
     name = "app-#{random_str}"
-    instances = rand(3) + 1
-    framework = sample(client.frameworks)
-    runtime = sample(client.runtimes)
+    instances = 1 # rand(3) + 1
+    framework = client.framework_by_name("sinatra")
+    runtime = client.runtime_by_name("ruby19")
     url = "#{name}.fakecloud.com"
-    memory = sample([64, 128, 256, 512])
+    memory = 256 # sample([64, 128, 256, 512])
 
     client.app_by_name(name).should_not be
 
+    hello_sinatra = File.expand_path("../../assets/hello-sinatra", __FILE__)
+
     begin
-      running(:push) do
+      running(:push, :path => hello_sinatra) do
         asks("Name")
         given(name)
         has_input(:name, name)
@@ -37,6 +39,8 @@ describe "App#push" do
         given("#{memory}M")
         has_input(:memory, "#{memory}M")
 
+        does("Creating #{name}")
+
         asks("Create services for application?")
         given("n")
         has_input(:create_instances, false)
@@ -44,16 +48,13 @@ describe "App#push" do
         asks("Bind other services to application?")
         given("n")
         has_input(:bind_instances, false)
+
+        does("Uploading #{name}")
+        does("Starting #{name}")
       end
-    rescue VMC::UserError => e
-      unless e.to_s == "V2 API currently does not support uploading or starting apps."
-        raise
-      end
-    end
 
-    app = client.app_by_name(name)
+      app = client.app_by_name(name)
 
-    begin
       app.should be
       app.name.should == name
       app.instances.should == instances
@@ -62,7 +63,9 @@ describe "App#push" do
       #app.url.should == url # TODO v2
       app.memory.should == memory
     ensure
-      app.delete!
+      if created = client.app_by_name(name)
+        created.delete!
+      end
     end
   end
 end

data/vmc-ng/spec/assets/hello-sinatra/Gemfile

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gem "sinatra"

data/vmc-ng/spec/assets/hello-sinatra/main.rb

@@ -0,0 +1,5 @@
+require "sinatra"
+
+get "/" do
+  "Sup, world? Ruby #{RUBY_VERSION}, Gem #{Gem::VERSION}"
+end

data/vmc-ng/spec/assets/hello-sinatra/manifest.yml

@@ -0,0 +1,9 @@
+---
+applications:
+  .:
+    name: hello-sinatra
+    instances: 2
+    framework: sinatra
+    memory: 128M
+    url: ${name}-suraci.${target-base}
+    runtime: ruby19

data/vmc-ng/spec/eventlog.rb

@@ -116,6 +116,26 @@ class EventLog
     @queue << GotInput.new(name, val)
   end
 
+  def raised(exception)
+    @queue << Raised.new(exception)
+  end
+
+  def did(message)
+    @queue << Did.new(message)
+  end
+
+  def skipped(message)
+    @queue << Skipped.new(message)
+  end
+
+  def failed_to(message)
+    @queue << FailedTo.new(message)
+  end
+
+  def gave_up(message)
+    @queue << GaveUp.new(message)
+  end
+
 
   class Printed
     attr_reader :line
@@ -154,4 +174,85 @@ class EventLog
       "<GotInput #@name '#@value'>"
     end
   end
+
+  class Raised
+    attr_reader :exception
+
+    def initialize(exception)
+      @exception = exception
+    end
+
+    def to_s
+      "<Raised #{@exception.class} '#@exception'>"
+    end
+  end
+
+  class Progress
+    attr_reader :message
+
+    def initialize(message)
+      @message = message
+    end
+
+    def ==(other)
+      other.is_a?(self.class) &&
+        @message == other.message
+    end
+  end
+
+  class Did < Progress
+    def to_s
+      "<Did '#@message'>"
+    end
+
+    def report
+      "do '#@message'"
+    end
+
+    def report_past
+      "did '#@message'"
+    end
+  end
+
+  class Skipped < Progress
+    def to_s
+      "<Skipped '#@message'>"
+    end
+
+    def report
+      "skip '#@message'"
+    end
+
+    def report_past
+      "skipped '#@message'"
+    end
+  end
+
+  class FailedTo < Progress
+    def to_s
+      "<FailedTo '#@message'>"
+    end
+
+    def report
+      "fail to '#@message'"
+    end
+
+    def report_past
+      "failed to '#@message'"
+    end
+  end
+
+  class GaveUp < Progress
+    def to_s
+      "<GaveUp '#@message'>"
+    end
+
+    def report
+      "give up on '#@message'"
+    end
+
+    def report_past
+      "gave up on '#@message'"
+    end
+  end
 end

data/vmc-ng/spec/helpers.rb

@@ -116,7 +116,7 @@ stderr:
 EOF
         end
       rescue => e
-        main.raise(e)
+        $vmc_event.raised(e)
       end
     end
 
@@ -264,6 +264,86 @@ module VMCMatchers
   end
 
 
+  class FailWith
+    def initialize(exception)
+      @expected = exception
+    end
+
+    def matches?(log)
+      @actual = log.wait_for_event(EventLog::Raised).exception
+      @actual.is_a?(@expected)
+    end
+
+    def failure_message
+      "expected #@expected to be raised, but got #{@actual.class}: '#@actual"
+    end
+
+    def negative_failure_message
+      "expected #@expected to NOT be raised, but it was"
+    end
+  end
+
+  def fail_with(exception)
+    FailWith.new(exception)
+  end
+
+
+  class ProgressExpectation
+    def matches?(log)
+      @actual = log.wait_for_event(EventLog::Progress)
+      @actual == @expected
+    end
+
+    def failure_message
+      "expected to #{@expected.report}, but #{@actual.report_past} instead"
+    end
+
+    def negative_failure_message
+      "expected not to #{@expected.report}"
+    end
+  end
+
+  class Successfully < ProgressExpectation
+    def initialize(message)
+      @expected = EventLog::Did.new(message)
+    end
+  end
+
+  class Skip < ProgressExpectation
+    def initialize(message)
+      @expected = EventLog::Skipped.new(message)
+    end
+  end
+
+  class FailTo < ProgressExpectation
+    def initialize(message)
+      @expected = EventLog::FailedTo.new(message)
+    end
+  end
+
+  class GiveUp < ProgressExpectation
+    def initialize(message)
+      @expected = EventLog::GaveUp.new(message)
+    end
+  end
+
+  def successfully(message)
+    Successfully.new(message)
+  end
+
+  def skip(message)
+    Skip.new(message)
+  end
+
+  def fail_to(message)
+    FailTo.new(message)
+  end
+
+  def give_up(message)
+    GiveUp.new(message)
+  end
+
+
   def asks(what)
     $vmc_event.should ask(what)
   end
@@ -276,6 +356,10 @@ module VMCMatchers
     $vmc_event.should have_input(name, value)
   end
 
+  def raises(exception)
+    $vmc_event.should fail_with(exception)
+  end
+
   def finish
     $vmc_event.should complete
   end
@@ -283,6 +367,22 @@ module VMCMatchers
   def outputs(what)
     $vmc_event.should output(what)
   end
+
+  def does(what)
+    $vmc_event.should successfully(what)
+  end
+
+  def skips(what)
+    $vmc_event.should skip(what)
+  end
+
+  def fails_to(what)
+    $vmc_event.should fail_to(what)
+  end
+
+  def gives_up(what)
+    $vmc_event.should give_up(what)
+  end
 end
 
 RSpec.configure do |c|

data/vmc-ng/spec/patches.rb

@@ -2,6 +2,36 @@
 $vmc_event = nil
 
 class VMC::CLI
+  class ProgressEventReporter
+    def initialize(message, skipper)
+      @message = message
+      @skipper = skipper
+      @skipped = false
+    end
+
+    def skip(&blk)
+      @skipped = true
+      $vmc_event.skipped(@message)
+      @skipper.skip(&blk)
+    end
+
+    def fail(&blk)
+      @skipped = true
+      $vmc_event.failed_to(@message)
+      @skipper.fail(&blk)
+    end
+
+    def give_up(&blk)
+      @skipped = true
+      $vmc_event.gave_up(@message)
+      @skipper.give_up(&blk)
+    end
+
+    def skipped?
+      @skipped
+    end
+  end
+
   def ask(*args)
     $vmc_event.asking(*args) if $vmc_event
     super
@@ -15,6 +45,21 @@ class VMC::CLI
   def force?
     false
   end
+
+  def with_progress(msg, &blk)
+    super(msg) do |s|
+      reporter = ProgressEventReporter.new(msg, s)
+
+      res = blk.call(reporter)
+
+      $vmc_event.did(msg) unless reporter.skipped?
+
+      res
+    end
+  rescue
+    $vmc_event.failed_to(msg)
+    raise
+  end
 end
 
 class Mothership::Inputs

data/vmc-ng/spec/start/target_spec.rb

@@ -9,12 +9,19 @@ describe "Start#target" do
 
   describe "switching target url" do
     before(:all) do
-      @old_target = File.read(File.expand_path(VMC::TARGET_FILE))
+      tgt = File.expand_path(VMC::TARGET_FILE)
+      @old_target = File.read(tgt) if File.exists? tgt
     end
 
     after(:all) do
-      File.open(File.expand_path(VMC::TARGET_FILE), "w") do |io|
-        io.print @old_target
+      tgt = File.expand_path(VMC::TARGET_FILE)
+
+      if @old_target
+        File.open(tgt, "w") do |io|
+          io.print @old_target
+        end
+      else
+        File.delete(tgt)
       end
     end
 

data/vmc/README.md

@@ -2,7 +2,7 @@
 
 The VMware Cloud CLI. This is the command line interface to VMware's Application Platform
 
-_Copyright 2010-2011, VMware, Inc. Licensed under the
+_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]
@@ -100,3 +100,7 @@ MIT license, please see the LICENSE file.  All rights reserved._
     vmc 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)

data/vmc/lib/cli/console_helper.rb

@@ -32,9 +32,20 @@ module VMC::Cli
 
     def start_local_console(port, appname)
       auth_info = console_credentials(appname)
-      display "Connecting to '#{appname}' console: ", false
+      banner = "Connecting to '#{appname}' console: "
+      display banner, false
+      t = Thread.new do
+        count = 0
+        while count < 90 do
+          display '.', false
+          sleep 1
+          count += 1
+        end
+      end
       prompt = console_login(auth_info, port)
-      display "OK".green
+      Thread.kill(t)
+      clear(80)
+      display "#{banner}#{'OK'.green}"
       display "\n"
       initialize_readline
       run_console prompt
@@ -47,7 +58,7 @@ module VMC::Cli
       @telnet_client = telnet_client(port)
       prompt = nil
       err_msg = "Login attempt timed out."
-      5.times do
+      3.times do
         begin
           results = @telnet_client.login("Name"=>auth_info["username"],
             "Password"=>auth_info["password"])
@@ -67,7 +78,6 @@ module VMC::Cli
           sleep 5
           @telnet_client = telnet_client(port)
         end
-        display ".", false
       end
       unless prompt
         close_console

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 62196447
+  hash: 1290961179
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 30
-  version: 0.4.0.beta.30
+  - 31
+  version: 0.4.0.beta.31
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-06 00:00:00 Z
+date: 2012-08-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -388,6 +388,9 @@ files:
 - vmc-ng/lib/vmc.rb
 - vmc-ng/spec/app/apps_spec.rb
 - vmc-ng/spec/app/push_spec.rb
+- vmc-ng/spec/assets/hello-sinatra/Gemfile
+- vmc-ng/spec/assets/hello-sinatra/main.rb
+- vmc-ng/spec/assets/hello-sinatra/manifest.yml
 - vmc-ng/spec/eventlog.rb
 - vmc-ng/spec/helpers.rb
 - vmc-ng/spec/patches.rb
@@ -426,7 +429,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Client library and CLI that provides access to the VMware Cloud Application Platform.