vmc 0.4.0.beta.40 → 0.4.0.beta.41

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

@@ -188,17 +188,18 @@ module VMC
       app.framework = framework
       app.runtime = runtime
 
-      if framework == "standalone"
-        app.command = input[:command]
+      app.command = input[:command] if framework == "standalone"
 
-        if (url = input[:url, "none"]) != "none"
-          app.urls = [url]
+      url =
+        if framework == "standalone"
+          if (given = input[:url, "none"]) != "none"
+            given
+          end
         else
-          app.urls = []
+          input[:url, "#{name}.#{target_base}"]
         end
-      else
-        app.urls = [input[:url, "#{name}.#{target_base}"]]
-      end
+
+      app.urls = [url] if url && !v2?
 
       app.memory = megabytes(input[:memory, framework, runtime])
 
@@ -208,6 +209,8 @@ module VMC
         app.create!
       end
 
+      invoke :map, :app => app, :url => url if v2?
+
       bindings = []
 
       if input[:create_services] && !force?
@@ -606,17 +609,41 @@ module VMC
       :desc => "Application to add the URL to",
       :from_given => by_name("app")
     input :url, :argument => true,
-      :desc => "URL to route"
+      :desc => "URL to map to the application"
     def map
-      no_v2
-
       app = input[:app]
 
       simple = input[:url].sub(/^https?:\/\/(.*)\/?/i, '\1')
 
-      with_progress("Updating #{c(app.name, :name)}") do
-        app.urls << simple
-        app.update!
+      if v2?
+        host, domain_name = simple.split(".", 2)
+
+        route = client.routes.find { |r|
+          r.host == host && r.domain.name == domain_name
+        }
+
+        unless route
+          domain = client.domain_by_name(domain_name)
+          fail "Invalid domain '#{domain_name}'" unless domain
+
+          route = client.route
+
+          with_progress("Creating route #{c(simple, :name)}") do
+            route.host = host
+            route.domain = domain
+            route.organization = client.current_organization
+            route.create!
+          end
+        end
+
+        with_progress("Binding #{c(simple, :name)} to #{c(app.name, :name)}") do
+          app.add_route(route)
+        end
+      else
+        with_progress("Updating #{c(app.name, :name)}") do
+          app.urls << simple
+          app.update!
+        end
       end
     end
 
@@ -630,22 +657,34 @@ module VMC
       ask("Which URL?", :choices => choices)
     }
     def unmap
-      no_v2
-
       app = input[:app]
       url = input[:url, app.urls]
 
       simple = url.sub(/^https?:\/\/(.*)\/?/i, '\1')
 
-      with_progress("Updating #{c(app.name, :name)}") do |s|
-        unless app.urls.delete(simple)
-          s.fail do
-            err "URL #{url} is not mapped to this application."
-            return
-          end
+      if v2?
+        host, domain_name = simple.split(".", 2)
+
+        route = app.routes.find do |r|
+          r.host == host && r.domain.name == domain_name
         end
 
-        app.update!
+        fail "Invalid route '#{simple}'" unless route
+
+        with_progress("Removing route #{c(simple, :name)}") do
+          app.remove_route(route)
+        end
+      else
+        with_progress("Updating #{c(app.name, :name)}") do |s|
+          unless app.urls.delete(simple)
+            s.fail do
+              err "URL #{url} is not mapped to this application."
+              return
+            end
+          end
+
+          app.update!
+        end
       end
     end
 
@@ -782,11 +821,7 @@ module VMC
 
         line
 
-        if a.urls.empty?
-          if v2?
-            line "urls: #{b("#{a.guid}.#{target_base}")}"
-          end
-        else
+        unless a.urls.empty?
           line "urls: #{a.urls.collect { |u| b(u) }.join(", ")}"
         end
 

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.40"
+  VERSION = "0.4.0.beta.41"
 end

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

@@ -6,7 +6,7 @@ describe "App#push" do
     instances = rand(3) + 1
     framework = client.framework_by_name("sinatra")
     runtime = client.runtime_by_name("ruby19")
-    url = "#{name}.fakecloud.com"
+    url = "#{name}.vcap.me"
     memory = sample([64, 128, 256, 512])
 
     client.app_by_name(name).should_not be
@@ -41,6 +41,9 @@ describe "App#push" do
 
         does("Creating #{name}")
 
+        does("Creating route #{url}")
+        does("Binding #{url} to #{name}")
+
         asks("Create services for application?")
         given("n")
         has_input(:create_services, false)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: -2328282212
+  hash: -259037938
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 40
-  version: 0.4.0.beta.40
+  - 41
+  version: 0.4.0.beta.41
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-30 00:00:00 Z
+date: 2012-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -249,12 +249,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 39
+        hash: 37
         segments: 
         - 0
         - 3
-        - 26
-        version: 0.3.26
+        - 27
+        version: 0.3.27
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency