af 0.5.0.beta.5 → 0.5.0.beta.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjE3N2IxMmU2NDFjY2Q1ZWJhOTQwMGI4OWI5NzJjMjBmYWEzYjQ3MQ==
+    MDhjMjcyMGIzZWJiOGQ3ODkzYmMyN2U5OTRkZGZjMGVjZjJlOGY3NQ==
   data.tar.gz: !binary |-
-    YzY2YzdiNGRlMWE0OGU5ZWI2ZWZiOTk1OGZjNjU2NGRiYzAyODYzZA==
+    ZTQyNGM4YmJjOWU0M2Q3ZTIxZmE2OGI5MDRjOGQwMjBlNmYzNDllNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjgzYjA4OWZhY2I2ZDUwY2E0MDM3ZjZiYjMyYzkyZDZjY2Q4ZDI4ODI4ZGU1
-    ZWQ5NzE2OGRiYTdjZTcyYWE1ZTBkMjNiYWZjMjVmOGQyMTMyOWE2YzM3OWFl
-    NThkNGJjNDg3OTVmZDk3YmM3NTlmZGE5ZDUwYWMwMzhlNDczNTc=
+    NTAyZDhlZDgwNDEyYTlkOTYwMzI5YTllN2I1NGNjZTUyZmI1ZjQyNDBhMjhm
+    NTFjMjczYTAyZDFhMDMxZDg1N2Q5ZGM2MDI0Yjc5ODI2MDNhZGRkYWIzZDYw
+    OTc3YWQ0YjU4ZTU0NmM1MGNhY2RmNzQ3ZjUyYzM0YmE4YzIzZmE=
   data.tar.gz: !binary |-
-    ZmE3ZTM2OTBkNGU4MTNiMjZlZmJiNTg4MjA5NzEyNzNmM2FhNWM4NGQ2ZTEz
-    MzllZWY0OTIyY2M3MDE2M2ZmYWIyNGIwZDM2NjhjMjRiZGNhZDA0NTY0ZDI5
-    YWJlNzU2NDZkNGRlOWZmY2RlMjlhMDM5YzUxNzYyYzhiZTA2NzA=
+    MzQ5YjYxODU2NjQ0ZjY2ZWM2YjAwMGNiOTQ4Zjk2ZmI2MDkwZDlkMDBhNzI4
+    ZTdkNjM3N2YzZTNmYTRmNGNmZTg4MDI0YzhlZDQ3MTUyZjhmZjU5ZWI0NmM4
+    ZjlmMjJjMDA2NWM0MWExNWYwYzBiYWVmZTZmOWEwMDBhMjJkOGM=

data/lib/af/version.rb

@@ -1,3 +1,3 @@
 module AF
-  VERSION = "0.5.0.beta.5".freeze
+  VERSION = "0.5.0.beta.6".freeze
 end

data/lib/vmc/cli/app/start.rb

@@ -78,7 +78,7 @@ module VMC::App
 
         seconds = 0
         until app.healthy?
-          sleep 1
+          sleep 4
           seconds += 1
           if seconds == APP_CHECK_LIMIT
             s.give_up do

data/lib/vmc/cli/route/map.rb

@@ -5,28 +5,76 @@ module VMC::Route
     def precondition; end
 
     desc "Add a URL mapping"
-    group :apps, :info
+    group :apps, :info, :hidden => true
     input :app, :desc => "Application to add the URL to",
           :argument => :optional, :from_given => by_name(:app)
-    input :url, :desc => "URL to map", :argument => :optional
+    input :host, :desc => "Host name for the route",
+          :argument => :optional, :default => ""
+    input :domain, :desc => "Domain to add the route to",
+          :argument => true,
+          :from_given => proc { |name, space|
+            if v2?
+              space.domain_by_name(name) ||
+                fail_unknown("domain", name)
+            else
+              name
+            end
+          }
     def map
       app = input[:app]
-      url = input[:url]
+      space = app.space if v2?
 
-      with_progress("Updating #{c(app.name, :name)}") do
-        app.urls << url
-        app.update!
+      host = input[:host]
+      domain = input[:domain, space]
+
+      if v2?
+        route = find_or_create_route(domain, host, space)
+        bind_route(route, app) if app
+      else
+        with_progress("Updating #{c(app.name, :name)}") do
+          app.urls << domain
+          app.update!
+        end
       end
     end
 
     private
 
-    def ask_app
-      ask("Which application?", :choices => client.apps, :display => proc(&:name))
+    def bind_route(route, app)
+      with_progress("Binding #{c(route.name, :name)} to #{c(app.name, :name)}") do
+        app.add_route(route)
+      end
     end
 
-    def ask_url
-      ask("Enter URL?")
+    def find_or_create_route(domain, host, space)
+      find_route(domain, host) || create_route(domain, host, space)
+    end
+
+    def find_route(domain, host)
+      client.routes_by_host(host, :depth => 0).find { |r| r.domain == domain }
+    end
+
+    def create_route(domain, host, space)
+      route = client.route
+      route.host = host
+      route.domain = domain
+      route.space = space
+
+      with_progress("Creating route #{c(route.name, :name)}") do
+        route.create!
+      end
+
+      route
+    end
+
+    def find_domain(space, name)
+      domain = space.domain_by_name(name, :depth => 0)
+      fail "Invalid domain '#{name}'" unless domain
+      domain
+    end
+
+    def ask_app
+      ask("Which application?", :choices => client.apps, :display => proc(&:name))
     end
   end
 end

data/lib/vmc/cli/route/unmap.rb

@@ -3,23 +3,70 @@ require "vmc/cli/route/base"
 module VMC::Route
   class Unmap < Base
     desc "Remove a URL mapping"
-    group :apps, :info
+    group :apps, :info, :hidden => true
+    input :url, :desc => "URL to unmap", :argument => :optional,
+          :from_given => find_by_name("route") { client.routes }
     input :app, :desc => "Application to remove the URL from",
           :argument => :optional, :from_given => by_name(:app)
-    input :url, :desc => "URL to unmap", :argument => :optional
+    input :delete, :desc => "Delete route", :type => :boolean
     input :all, :desc => "Act on all routes", :type => :boolean
+    input :really, :type => :boolean, :forget => true, :hidden => true,
+          :default => proc { force? || interact }
     def unmap
+      return invoke :v1_unmap, input.inputs, input.given unless v2?
+
+      if input[:all]
+        if input.has?(:app)
+          app = target = input[:app]
+          return unless !input[:delete] || input[:really, "ALL URLS bound to #{target.name}", :bad]
+        else
+          target = client
+          return unless !input[:delete] || input[:really, "ALL URLS", :bad]
+        end
+
+        target.routes.each do |r|
+          begin
+            invoke :unmap, :delete => input[:delete], :url => r, :really => true, :app => app
+          rescue CFoundry::APIError => e
+            err "#{e.class}: #{e.message}"
+          end
+        end
+
+        return
+      end
+
       app = input[:app]
+      url = input[:url, app ? app.routes : client.routes]
+
+      if input[:delete]
+        with_progress("Deleting route #{c(url.name, :name)}") do
+          url.delete!
+        end
+      elsif app
+        with_progress("Unbinding #{c(url.name, :name)} from #{c(app.name, :name)}") do
+          app.remove_route(url)
+        end
+      else
+        fail "Missing either --delete or --app."
+      end
+    end
 
-      fail "No urls to unmap." if app.urls.empty?
 
-      url = input[:url, (app.urls.map{|url| OpenStruct.new({name: url})})] unless input[:all]
+    desc "V1 ONLY UNMAP YOU SHOULD NOT SEE THIS"
+    input :url, :desc => "URL to unmap", :argument => :optional,
+          :interact => :v1_ask_url
+    input :app, :desc => "Application to remove the URL from",
+          :argument => :optional, :from_given => by_name(:app)
+    input :all, :desc => "Act on all routes", :type => :boolean
+    def v1_unmap
+      app = input[:app]
+      url = input[:url, app.urls] unless input[:all]
 
       with_progress("Updating #{c(app.name, :name)}") do |s|
         if input[:all]
           app.urls = []
         else
-          simple = url.name.sub(/^https?:\/\/(.*)\/?/i, '\1')
+          simple = url.sub(/^https?:\/\/(.*)\/?/i, '\1')
 
           unless app.urls.delete(simple)
             fail "URL #{url} is not mapped to this application."
@@ -32,12 +79,16 @@ module VMC::Route
 
     private
 
-    def ask_app
-      ask("Which application?", :choices => client.apps, :display => proc(&:name))
-    end
-
     def ask_url(choices)
       ask("Which URL?", :choices => choices.sort_by(&:name), :display => proc(&:name))
     end
+
+    def v1_ask_url(choices)
+      ask("Which URL?", :choices => choices.sort)
+    end
+
+    def ask_really(name, color)
+      ask("Really delete #{c(name, color)}?", :default => false)
+    end
   end
 end

data/lib/vmc/cli/service/create.rb

@@ -92,12 +92,12 @@ module VMC::Service
 
     private
 
-    def ask_infra(choices, default, other)
-      [ask("Infrastructure?", :choices => client.infras,
+    def ask_infra
+      ask("Infrastructure?", :choices => client.infras,
            :display => proc { |s|
               str = "#{c(s.name, :name)} - #{s.description}"
            },
-           :complete => proc { |s| "#{s.name} #{s.description}" })]
+           :complete => proc { |s| "#{s.name} #{s.description}" })
     end
 
     def ask_offering(offerings)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: af
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta.5
+  version: 0.5.0.beta.6
 platform: ruby
 authors:
 - Cloud Foundry Team
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-11 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure