af 0.5.0.beta.10 → 0.5.0.beta.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDk1NDE1ZjhjNWU3YThiMDlmMDEzYzRlYTlmZmI5MTE3ZWE1OWZhYg==
+    M2FkZjBkNWU3NWI2YTcyOGUxZTgzYjlmOTgyZDBjOGQ1NmI4MTVlMw==
   data.tar.gz: !binary |-
-    YzE5NmZmMzhkYTVlNjkyNTZjYTIzZjY3ODg5YzAyZTdjNTZhOTg5Zg==
+    NDIwNzJjZGUxY2RiZTMyOTU5OGQ5Mjc3MTM3Nzg3N2FmYzUxNmY5Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjgyODYwNjQyZGEyZDkxYmQwZDFlM2YzNjk3MTE5MzE0NjAwNWI4ODgzNTUy
-    ZmJkODBmMWI4YTEzNGE4MGNjZDI3OTM1ZWYwYjEzNmNiM2Y5NDEyOTZhNWM1
-    Njg5ODdiZDFlZTJhMWRlZDgzYWFkNTA3ZTNkNDVkZWE1ODEwZmI=
+    NGYxNmY3ZDM2NTBmOTQxZTVhYzhmYTE5YzY3Y2Y2MGFiNzZjMjAzYTk4NzUw
+    ZGViMTZjOThlNzNlNzRjZDM1MTE2YTlhYTM0NmY4NGIzOWRkMjc2ZmM3MTZm
+    Y2M3NmRiYTY1MDRkZjk2MmQ3MGMzZWQwYmVhMzhjZDVkY2FmMDc=
   data.tar.gz: !binary |-
-    YmI3ZmYwZWE3NDhjMGE2YWU1N2RiMDg0OWVhYmUzYTIyNjdiYmNlYWU0NTdj
-    YWU1MWUwYWI0OGFkODNmNmQ3YWU4ZjBkY2MxMzcwYWViZmZlMzhiZjU5MDUx
-    MDM1NGI0MDQyMTVkNWVhMjdmNjM4MjEwNTFiYWVlNzA5MjNiYTM=
+    MDc2YzlkYmMyMTEyMjg3N2MyNGU5MTJkZmY4YmNiNjRkODQwMzRiMmY2ZmJm
+    YjJmNmFlY2E2NjhhYmZiNmFlNTRkMDNmZjE2YzRlYjdlMTdhMzEwNTAwZmMx
+    YTcxMTZkZGZiMWI3YjU5ZTczY2U1Nzc2YTdjNTEwYmE0NDNmYzg=

data/lib/af/version.rb

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

data/lib/vmc/cli.rb

@@ -56,6 +56,8 @@ module VMC
     option :trace, :desc => "Show API traffic", :alias => "-t",
       :default => false
 
+    option :infras, :desc => "Query infras",
+      :type => :boolean, :default => proc { true }
 
     def default_action
       if input[:version]
@@ -234,6 +236,10 @@ module VMC
       input[:color]
     end
 
+    def infras_enabled?
+      input[:infras]
+    end
+
     def verbose?
       input[:verbose]
     end
@@ -405,14 +411,14 @@ module VMC
       token = info[:token] && CFoundry::AuthToken.from_hash(info)
 
       @@client =
-        case info[:version]
-        when 2
-          CFoundry::V2::Client.new(target, token)
-        when 1
-          CFoundry::V1::Client.new(target, token)
-        else
+      #   case info[:version]
+      #   when 2
+      #     CFoundry::V2::Client.new(target, token)
+      #   when 1
+      #     CFoundry::V1::Client.new(target, token)
+      #   else
           CFoundry::Client.new(target, token)
-        end
+        # end
 
       @@client.proxy = input[:proxy]
       @@client.trace = input[:trace]

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

@@ -59,10 +59,10 @@ module VMC::App
 
     def display_apps_table(apps)
       table(
-        ["name", "infra", "status", "usage", v2? && "plan", "runtime", "url"],
+        ["name", infras_enabled? && "infra", "status", "usage", v2? && "plan", "runtime", "url"],
         apps.collect { |a|
           [ c(a.name, :name),
-            c(a.infra.name, :infra),
+            infras_enabled? && c(a.infra.name, :infra),
             app_status(a),
             "#{a.total_instances} x #{human_mb(a.memory)}",
             v2? && (a.production ? "prod" : "dev"),

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

@@ -32,7 +32,7 @@ module VMC::App
     input :plan,      :desc => "Application plan", :default => "D100"
     input :start,     :desc => "Start app after pushing?", :default => true
     input :restart,   :desc => "Restart app after updating?", :default => true
-    input :buildpack, :desc => "Custom buildpack URL", :default => nil
+    # input :buildpack, :desc => "Custom buildpack URL", :default => nil
     input :create_services, :desc => "Interactively create services?",
           :type => :boolean, :default => proc { force? ? false : interact }
     input :bind_services, :desc => "Interactively bind services?",

data/lib/vmc/cli/app/push/create.rb

@@ -8,7 +8,7 @@ module VMC::App
     def get_inputs
       inputs = {}
       inputs[:name] = name = input[:name]
-      inputs[:infra] = infra = determine_infra
+      inputs[:infra] = infra = determine_infra if infras_enabled?
       inputs[:url] = input[:url, name, infra]
       inputs[:uris] = [inputs[:url]]
       inputs[:total_instances] = input[:instances]
@@ -26,12 +26,12 @@ module VMC::App
     end
 
     def ask_url(name, infra)
-      ask("Enter URL?", :default => "#{name}.#{infra.base}")
+      urlbase = !infra.nil? ? "#{infra.base}" : "no-infra.af.cm"
+      ask("Enter URL?", :default => "#{name}.#{urlbase}")
     end
 
     def determine_infra
       return input[:infra] if input.has?(:infra)
-
       input[:infra, detector.all_infras, nil, nil]
     end
 

data/lib/vmc/cli/app/push/interactions.rb

@@ -40,7 +40,11 @@ module VMC::App
     end
 
     def ask_infra(choices, default, other)
-      ask_with_other("Infrastructure", client.infras, choices, default, other)
+      ask("Infrastructure?", :choices => client.infras,
+        :display => proc { |s|
+          str = "#{c(s.name, :name)} - #{s.description}"
+        },
+        :complete => proc { |s| "#{s.name} #{s.description}" })
     end
 
     def ask_runtime(choices, default, other)

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

@@ -25,7 +25,7 @@ module VMC::Service
     def create_service
       offerings = client.services
 
-      if input[:infra]
+      if infras_enabled? && input[:infra] 
         offerings.reject! { |s| s.infra.to_s != input[:infra].name }
       end
 
@@ -66,7 +66,7 @@ module VMC::Service
 
       service = client.service_instance
 
-      service.infra_name = input[:infra].name
+      service.infra_name = input[:infra].name if infras_enabled?
       service.name = input[:name, offering]
 
       if v2?

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

@@ -45,7 +45,7 @@ module VMC::Service
         end
       else
         table(
-          ["name", "infra", "service", "version", v2? && "plan", v2? && "bound apps"],
+          ["name", infras_enabled? && "infra", "service", "version", v2? && "plan", v2? && "bound apps"],
           services.collect { |i|
             if v2?
               plan = i.service_plan
@@ -60,7 +60,7 @@ module VMC::Service
             end
 
             [ c(i.name, :name),
-              c(i.infra.name, :infra),
+              infras_enabled? && c(i.infra.name, :infra),
               label,
               version,
               v2? && plan.name,

metadata

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