vmc 0.4.0.beta.32 → 0.4.0.beta.33

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

@@ -198,8 +198,7 @@ module VMC
           app.urls = []
         end
       else
-        domain = client.target.sub(/^https?:\/\/[^\.]+\.(.+)\/?/, '\1')
-        app.urls = [input[:url, "#{name}.#{domain}"]]
+        app.urls = [input[:url, "#{name}.#{target_base}"]]
       end
 
       app.memory = megabytes(input[:memory, framework, runtime])
@@ -709,10 +708,6 @@ module VMC
       end
     end
 
-    alias_command :set_env, :env_set
-    alias_command :set_env, :add_env
-    alias_command :set_env, :env_add
-
 
     desc "Remove an environment variable"
     group :apps, :info, :hidden => true
@@ -723,7 +718,7 @@ module VMC
       :desc => "Environment variable name"
     input :restart, :type => :boolean, :default => true,
       :desc => "Restart app after updating?"
-    def delete_env(input)
+    def unset_env(input)
       app = input[:app]
       name = input[:name]
 
@@ -737,8 +732,6 @@ module VMC
       end
     end
 
-    alias_command :delete_env, :env_del
-
 
     desc "DEPRECATED. Use 'push' instead."
     input :app, :argument => :optional
@@ -789,7 +782,11 @@ module VMC
 
         line
 
-        unless a.urls.empty?
+        if a.urls.empty?
+          if v2?
+            line "urls: #{b("#{a.guid}.#{target_base}")}"
+          end
+        else
           line "urls: #{a.urls.collect { |u| b(u) }.join(", ")}"
         end
 
@@ -976,5 +973,9 @@ module VMC
 
       format("%.#{precision}fB", num)
     end
+
+    def target_base
+      client.target.sub(/^https?:\/\/([^\.]+\.)?(.+)\/?/, '\2')
+    end
   end
 end

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

@@ -231,7 +231,7 @@ module VMC
       return unless input[:really, instance.name, :name]
 
       with_progress("Deleting #{c(instance.name, :name)}") do |s|
-        bindings = instance.service_bindings
+        bindings = v2? ? instance.service_bindings : []
 
         if bindings.empty?
           instance.delete!

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.32"
+  VERSION = "0.4.0.beta.33"
 end

data/vmc-ng/spec/Rakefile

@@ -11,4 +11,3 @@ RSpec::Core::RakeTask.new do |t|
   t.pattern = "**/*_spec.rb"
   t.rspec_opts = ["--format", "documentation", "--colour"]
 end
-

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

@@ -0,0 +1,19 @@
+require File.expand_path("../../helpers", __FILE__)
+
+describe "App#app" do
+  it "shows the app name if it exists" do
+    with_random_app do |app|
+      running(:app, {}, :app => app.name) do
+        outputs(app.name)
+      end
+    end
+  end
+
+  it "fails if an unknown app is provided" do
+    running(:app, {}, :app => "unknown-app") do
+      raises(VMC::UserError) do |e|
+        e.message.should == "Unknown app 'unknown-app'"
+      end
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-require "./helpers"
+require File.expand_path("../../helpers", __FILE__)
 
 describe "App#apps" do
   it "lists app names" do

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

@@ -1,13 +1,13 @@
-require "./helpers"
+require File.expand_path("../../helpers", __FILE__)
 
 describe "App#push" do
   it "pushes interactively" do
     name = "app-#{random_str}"
-    instances = 1 # rand(3) + 1
+    instances = rand(3) + 1
     framework = client.framework_by_name("sinatra")
     runtime = client.runtime_by_name("ruby19")
     url = "#{name}.fakecloud.com"
-    memory = 256 # sample([64, 128, 256, 512])
+    memory = sample([64, 128, 256, 512])
 
     client.app_by_name(name).should_not be
 

data/vmc-ng/spec/helpers.rb

@@ -1,8 +1,15 @@
+require "simplecov"
+
+SimpleCov.start do
+  root File.expand_path("../../", __FILE__)
+  add_filter "spec/"
+end
+
 require "cfoundry"
 require "vmc"
 
-require "./eventlog"
-require "./patches"
+require File.expand_path("../eventlog", __FILE__)
+require File.expand_path("../patches", __FILE__)
 
 
 TARGET = ENV["VMC_TEST_TARGET"] || "http://localhost:8181"
@@ -44,8 +51,10 @@ module VMCHelpers
     @@runtimes ||= client.runtimes(0)
   end
 
-  def with_random_app
-    with_random_apps(1)
+  def with_random_app(space = client.current_space)
+    with_random_apps(space, 1) do |apps|
+      yield apps.first
+    end
   end
 
   # create 2-5 random apps, call the block, and then delete them
@@ -82,7 +91,7 @@ module VMCHelpers
     space.delete!
   end
 
-  def running(command, inputs = {})
+  def running(command, inputs = {}, given = {})
     VMC::CLI.new.exit_status 0
 
     before_in = $stdin
@@ -102,7 +111,7 @@ module VMCHelpers
 
     thd = Thread.new do
       begin
-        VMC::CLI.new.invoke(command, inputs)
+        VMC::CLI.new.invoke(command, inputs, given)
       rescue SystemExit => e
         unless e.status == 0
           raise <<EOF
@@ -265,17 +274,23 @@ module VMCMatchers
 
 
   class FailWith
-    def initialize(exception)
+    def initialize(exception, predicate = nil)
       @expected = exception
+      @predicate = predicate
     end
 
     def matches?(log)
       @actual = log.wait_for_event(EventLog::Raised).exception
-      @actual.is_a?(@expected)
+
+      return false unless @actual.is_a?(@expected)
+
+      @predicate.call(@actual) if @predicate
+
+      true
     end
 
     def failure_message
-      "expected #@expected to be raised, but got #{@actual.class}: '#@actual"
+      "expected #@expected to be raised, but got #{@actual.class}: '#@actual'"
     end
 
     def negative_failure_message
@@ -283,8 +298,8 @@ module VMCMatchers
     end
   end
 
-  def fail_with(exception)
-    FailWith.new(exception)
+  def fail_with(exception, &blk)
+    FailWith.new(exception, blk)
   end
 
 
@@ -356,8 +371,8 @@ module VMCMatchers
     $vmc_event.should have_input(name, value)
   end
 
-  def raises(exception)
-    $vmc_event.should fail_with(exception)
+  def raises(exception, &blk)
+    $vmc_event.should fail_with(exception, &blk)
   end
 
   def finish

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

@@ -1,4 +1,4 @@
-require "./helpers"
+require File.expand_path("../../helpers", __FILE__)
 
 describe "Start#target" do
   it "shows target url with no arguments" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 1321150223
+  hash: -3286034684
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 32
-  version: 0.4.0.beta.32
+  - 33
+  version: 0.4.0.beta.33
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-15 00:00:00 Z
+date: 2012-08-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -233,12 +233,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 0
         - 4
-        - 6
-        version: 0.4.6
+        - 7
+        version: 0.4.7
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -265,12 +265,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
         - 0
         - 0
-        - 12
-        version: 0.0.12
+        - 14
+        version: 0.0.14
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
@@ -281,12 +281,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 9
         segments: 
         - 0
         - 4
-        - 1
-        version: 0.4.1
+        - 3
+        version: 0.4.3
   type: :runtime
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
@@ -317,6 +317,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id018
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  prerelease: false
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id019
 description: 
 email: support@vmware.com
 executables: 
@@ -386,6 +400,7 @@ files:
 - vmc-ng/lib/vmc/spacing.rb
 - vmc-ng/lib/vmc/version.rb
 - vmc-ng/lib/vmc.rb
+- vmc-ng/spec/app/app_spec.rb
 - vmc-ng/spec/app/apps_spec.rb
 - vmc-ng/spec/app/push_spec.rb
 - vmc-ng/spec/assets/hello-sinatra/Gemfile