vmc 0.4.0.beta.91 → 0.4.0.beta.92

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

@@ -117,7 +117,7 @@ module VMC
       err e.message
     rescue SystemExit
       raise
-    rescue CFoundry::Forbidden, CFoundry::InvalidAuthToken
+    rescue CFoundry::Forbidden, CFoundry::InvalidAuthToken => e
       if !$vmc_asked_auth
         $vmc_asked_auth = true
 

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

@@ -27,7 +27,7 @@ module VMC
       else
         apps =
           with_progress("Getting applications") do
-            client.apps(2)
+            client.apps(:depth => 2)
           end
       end
 
@@ -575,8 +575,15 @@ module VMC
       app = input[:app]
 
       stats =
-        with_progress("Getting stats for #{c(app.name, :name)}") do
-          app.stats
+        with_progress("Getting stats for #{c(app.name, :name)}") do |s|
+          begin
+            app.stats
+          rescue CFoundry::StatsError
+            s.fail do
+              err "Application #{b(app.name)} is not running."
+              return
+            end
+          end
         end
 
       line unless quiet?
@@ -622,11 +629,11 @@ module VMC
         host, domain_name = simple.split(".", 2)
 
         domain =
-          client.current_space.domains(0, :name => domain_name).first
+          client.current_space.domain_by_name(domain_name, :depth => 0)
 
         fail "Invalid domain '#{domain_name}'" unless domain
 
-        route = client.routes(0, :host => host).find do |r|
+        route = client.routes_by_host(host, :depth => 0).find do |r|
           r.domain == domain
         end
 
@@ -671,11 +678,11 @@ module VMC
         host, domain_name = simple.split(".", 2)
 
         domain =
-          client.current_space.domains(0, :name => domain_name).first
+          client.current_space.domain_by_name(domain_name, :depth => 0)
 
         fail "Invalid domain '#{domain_name}'" unless domain
 
-        route = app.routes(0, :host => host).find do |r|
+        route = app.routes_by_host(host, :depth => 0).find do |r|
           r.domain == domain
         end
 

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

@@ -46,7 +46,7 @@ module VMC
         if input[:full]
           line "spaces:"
 
-          spaced(org.spaces(2)) do |s|
+          spaced(org.spaces(:depth => 2)) do |s|
             indented do
               invoke :space, :space => s
             end
@@ -67,7 +67,7 @@ module VMC
     def orgs
       orgs =
         with_progress("Getting organizations") do
-          client.organizations(1)
+          client.organizations
         end
 
       line unless quiet?

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

@@ -27,7 +27,7 @@ module VMC
 
       instances =
         with_progress(msg) do
-          client.service_instances(2)
+          client.service_instances(:depth => 2)
         end
 
       line unless quiet?
@@ -129,6 +129,8 @@ module VMC
 
       if input[:version]
         services.reject! { |s| s.version != input[:version] }
+      elsif !v2?
+        services.reject!(&:deprecated?)
       end
 
       if v2? && plan = input.given(:plan)
@@ -193,7 +195,7 @@ module VMC
     input(:app, :argument => true,
           :from_given => by_name("app"),
           :desc => "Application to bind to") {
-      ask "Which application?", :choices => client.apps(2),
+      ask "Which application?", :choices => client.apps(:depth => 2),
         :display => proc(&:name)
     }
     def bind_service
@@ -217,19 +219,19 @@ module VMC
     group :services, :manage
     input(:instance, :argument => true,
           :from_given => find_by_name("service instance"),
-          :desc => "Service to bind") { |app|
-      ask "Which service instance?", :choices => app.services,
+          :desc => "Service to bind") { |services|
+      ask "Which service instance?", :choices => services,
         :display => proc(&:name)
     }
     input(:app, :argument => true,
-          :from_given => find_by_name("app"),
+          :from_given => by_name("app"),
           :desc => "Application to bind to") {
-      ask "Which application?", :choices => client.apps(2),
+      ask "Which application?", :choices => client.apps(:depth => 2),
         :display => proc(&:name)
     }
     def unbind_service
       app = input[:app]
-      instance = input[:instance, app]
+      instance = input[:instance, app.services]
 
       with_progress(
           "Unbinding #{c(instance.name, :name)} from #{c(app.name, :name)}") do
@@ -253,6 +255,12 @@ module VMC
           :default => proc { force? || interact }) { |name, color|
       ask("Really delete #{c(name, color)}?", :default => false)
     }
+    input(:unbind, :type => :boolean, :forget => true,
+          :default => proc { force? || interact }) { |apps|
+      names = human_list(apps.collect { |a| c(a.name, :name) })
+
+      ask("Unbind from #{names} before deleting?", :default => true)
+    }
     input :all, :type => :boolean, :default => false,
       :desc => "Delete all services"
     def delete_service
@@ -270,9 +278,21 @@ module VMC
 
       return unless input[:really, instance.name, :name]
 
-      with_progress("Deleting #{c(instance.name, :name)}") do |s|
-        bindings = v2? ? instance.service_bindings : []
+      bindings = []
+
+      if v2?
+        bindings = instance.service_bindings
+
+        unless bindings.empty? || !input[:unbind, bindings.collect(&:app)]
+          bindings.each do |b|
+            invoke :unbind_service, :instance => instance, :app => b.app
+          end
 
+          bindings = []
+        end
+      end
+
+      with_progress("Deleting #{c(instance.name, :name)}") do |s|
         if bindings.empty?
           instance.delete!
         else

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

@@ -18,7 +18,7 @@ module VMC
 
     def self.space_by_name
       proc { |name, org, *_|
-        org.spaces(1, :name => name).first ||
+        org.space_by_name(name) ||
           fail("Unknown space '#{name}'")
       }
     end
@@ -58,7 +58,7 @@ module VMC
           line
           line "apps:"
 
-          spaced(space.apps(2)) do |a|
+          spaced(space.apps(:depth => 2)) do |a|
             indented do
               invoke :app, :app => a
             end
@@ -70,7 +70,7 @@ module VMC
         if input[:full]
           line
           line "services:"
-          spaced(space.service_instances(2)) do |i|
+          spaced(space.service_instances(:depth => 2)) do |i|
             indented do
               invoke :service, :instance => i
             end
@@ -99,7 +99,7 @@ module VMC
       org = input[:organization]
       spaces =
         with_progress("Getting spaces in #{c(org.name, :name)}") do
-          org.spaces(1)
+          org.spaces
         end
 
       line unless quiet?

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

@@ -83,25 +83,14 @@ module VMC
         if runtimes.empty? && !quiet?
           line "#{d("none")}"
         elsif input[:quiet]
-          sorted_runtimes(runtimes).each do |r|
+          runtimes.each do |r|
             line r.name
           end
         else
-          status_colors = {
-            "current" => :good,
-            "next" => :name,
-            "deprecated" => :bad
-          }
-
           table(
-            %w{runtime version info},
-            sorted_runtimes(runtimes).collect { |r|
-              if r.status
-                info = r.deprecated? ? "End of Life: #{r.status[:eol_date]}" : nil
-                [c(r.name, status_colors[r.status[:name]]), r.version, info]
-              else
-                [c(r.name, :name), r.version, nil]
-              end
+            %w{runtime description},
+            runtimes.sort_by(&:name).collect { |r|
+              [c(r.name, :name), r.description]
             })
         end
       end
@@ -137,6 +126,8 @@ module VMC
           table(
             ["service", "version", "provider", v2? && "plans", "description"],
             services.sort_by(&:label).collect { |s|
+              next if !v2? && s.deprecated?
+
               [ c(s.label, :name),
                 s.version,
                 s.provider,
@@ -437,39 +428,5 @@ module VMC
         end
       end
     end
-
-    def sorted_runtimes(runtimes)
-      return runtimes if runtimes.empty?
-
-      # Sort by name if V2 or other server that doesn't yet have category, status, series
-      if v2? || !(runtimes[0].category && runtimes[0].status &&
-                  runtimes[0].series)
-        return runtimes.sort_by(&:name)
-      end
-
-      # Sort by category (i.e java, ruby, node, etc)
-      by_category = runtimes.group_by(&:category)
-
-      # Sort by status (current, next, deprecated)
-      sorted = []
-      by_category.sort.each do |category, runtimes|
-        by_status = {}
-        runtimes.each do |runtime|
-          by_status[runtime.status[:name]] ||= []
-          by_status[runtime.status[:name]] << runtime
-        end
-
-        %w(current next deprecated).each do |status|
-          next unless by_status[status]
-
-          # Sort by series descending (ruby19, ruby18, etc)
-          by_status[status].sort_by(&:series).reverse_each do |r|
-            sorted << r
-          end
-        end
-      end
-
-      sorted
-    end
   end
 end

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

@@ -7,7 +7,7 @@ module VMC
     def users
       users =
         with_progress("Getting users") do
-          client.users(0)
+          client.users(:depth => 0)
         end
 
       spaced(users) do |u|

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

@@ -38,12 +38,12 @@ module VMCHelpers
 
   # cache frameworks for app generation
   def frameworks
-    @@frameworks ||= client.frameworks(0)
+    @@frameworks ||= client.frameworks(:depth => 0)
   end
 
   # cache runtimes for app generation
   def runtimes
-    @@runtimes ||= client.runtimes(0)
+    @@runtimes ||= client.runtimes(:depth => 0)
   end
 
   def with_random_app(space = client.current_space)

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.91"
+  VERSION = "0.4.0.beta.92"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 4072072421
+  hash: 1993979039
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 91
-  version: 0.4.0.beta.91
+  - 92
+  version: 0.4.0.beta.92
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-15 00:00:00 -08:00
+date: 2012-11-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -266,12 +266,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 105
+        hash: 15
         segments: 
         - 0
-        - 3
-        - 61
-        version: 0.3.61
+        - 4
+        - 0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
@@ -298,12 +298,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 29
         segments: 
         - 0
         - 2
-        - 4
-        version: 0.2.4
+        - 5
+        version: 0.2.5
   type: :runtime
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
@@ -478,7 +478,6 @@ files:
 - vmc-ng/lib/vmc/cli/domain.rb
 - vmc-ng/lib/vmc.rb
 - vmc-ng/spec/helpers.rb
-- vmc-ng/spec/start/info_spec.rb
 - vmc-ng/spec/start/target_spec.rb
 - vmc-ng/spec/app/push_spec.rb
 - vmc-ng/spec/app/app_spec.rb

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

@@ -1,23 +0,0 @@
-require File.expand_path("../../helpers", __FILE__)
-
-describe "Start#info" do
-  it "orders runtimes by category, status, and series" do
-    running(:info, :runtimes => true) do
-      does("Getting runtimes")
-      known_runtimes = %w(java7 java node08 node06 node ruby19 ruby18)
-
-      expected_order = known_runtimes.dup
-
-      client.runtimes.size.times do
-        with_output do |str|
-          if known_runtimes.include? str
-            expected_order.first.should == str
-            expected_order.shift
-          end
-        end
-      end
-
-      expected_order.size.should == 0
-    end
-  end
-end