af 0.5.0.beta.2 → 0.5.0.beta.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTI2Mjg4MTI3MzgyYzlkZDJiYTdjYTlhODgwMGMwZDBhMzg3NjZjZA==
+    ZGY0YjUzZjEzODc2M2M3ZWRmZmQ1MzgxYTNhYWI0YjRkMjZhZjQ2NQ==
   data.tar.gz: !binary |-
-    ZWZjNDk3ZDNiNjE5ZWI0MDlhMDZmODdkODNjNDRhZGQxOWJlYjk0ZQ==
+    MTI0Yzc1YTllOWYzOWQ2YzMyMDg1ODVmYzkyOTQ1MDZkNjZhZjJlYg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWU1YTA2YmQ4MjE1ZWEyMjk1ZTk1YjEzODU5NTIzZDZjOTA1ZTFkNzY4ZjJh
-    MTBkYzA0NmEzOGNhZDU5MzE2ZjNlOWU1NmZiMDM2ZDcwNWQ1NzJlMGZkNjE5
-    Y2NmN2IxYWY5NDU1OWM2YWFhMGY2MDUyNmRhZTkyNGI0Y2RjNzA=
+    MGNiOTA0NGQxOGM2NDZmOTc5YmY2YWFhYzJmZDFmNDEzZGM0NDU0OGFkZmFj
+    MDUyNTc0ZGEwNzA1MmUzMzQ5ZjFhNTE4NmNkZTE3MWQ2OTdhOTNlNGY1YjIy
+    NjVjMzJlZmVlMjY0MmNjNmM4NGZjODQ3ODU1MGVhMWNkMWI5ZTc=
   data.tar.gz: !binary |-
-    NGIzYzM2NzVjZGZhNDBjYzAzZjE1NTY0MTU1MzBhNTQwYWRmMmRlZWJlMzM4
-    ZTU5YmFhNDBiYmRlMDJmMTExZDI2N2NkNWQ1NGFmMmIyMzVjZDBmOGIwOTk5
-    M2JlYzE4N2QzYjA0N2YxNjI4NmM0MWExNmI2OTE1MzA3ZDQ4OGQ=
+    YTk2NTdhM2VjNzhiZTRjNGZjZDk3MmIzOGU0OTM5Y2RhZTE4ZWIxNzVkZTRm
+    MDIyYTcxMDU1YWY0MTc2YjIxNjMxYzE0MWI1YThmZjIzNzk2YWM0ZDU5YzY4
+    NTllNjQ5MzgyZjk3NTJmMWU1ZGEzZDUyODZkNzdmZDZiMjlmYTY=

data/lib/af/version.rb

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

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

@@ -3,10 +3,7 @@ require "vmc/cli"
 module VMC
   module Route
     class Base < CLI
-      def precondition
-        super
-        fail "This command is v2-only." unless v2?
-      end
+
     end
   end
 end

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

@@ -8,73 +8,25 @@ module VMC::Route
     group :apps, :info
     input :app, :desc => "Application to add the URL to",
           :argument => :optional, :from_given => by_name(:app)
-    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
-          }
+    input :url, :desc => "URL to map", :argument => :optional
     def map
       app = input[:app]
-      space = app.space if v2?
+      url = input[:url]
 
-      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
+      with_progress("Updating #{c(app.name, :name)}") do
+        app.urls << url
+        app.update!
       end
     end
 
     private
 
-    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 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
+
+    def ask_url
+      ask("Enter URL?")
+    end
   end
 end

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

@@ -4,69 +4,22 @@ module VMC::Route
   class Unmap < Base
     desc "Remove a URL mapping"
     group :apps, :info
-    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 :delete, :desc => "Delete route", :type => :boolean
+    input :url, :desc => "URL to unmap", :argument => :optional
     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?
 
-    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]
+      url = input[:url, (app.urls.map{|url| OpenStruct.new({name: url})})] unless input[:all]
 
       with_progress("Updating #{c(app.name, :name)}") do |s|
         if input[:all]
           app.urls = []
         else
-          simple = url.sub(/^https?:\/\/(.*)\/?/i, '\1')
+          simple = url.name.sub(/^https?:\/\/(.*)\/?/i, '\1')
 
           unless app.urls.delete(simple)
             fail "URL #{url} is not mapped to this application."
@@ -79,16 +32,12 @@ module VMC::Route
 
     private
 
-    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)
+    def ask_app
+      ask("Which application?", :choices => client.apps, :display => proc(&:name))
     end
 
-    def ask_really(name, color)
-      ask("Really delete #{c(name, color)}?", :default => false)
+    def ask_url(choices)
+      ask("Which URL?", :choices => choices.sort_by(&:name), :display => proc(&:name))
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: af
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta.2
+  version: 0.5.0.beta.3
 platform: ruby
 authors:
 - Cloud Foundry Team