vmc 0.4.0.beta.22 → 0.4.0.beta.23

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

@@ -370,7 +370,7 @@ module VMC
 
       unless deleted.empty?
         delete_orphaned_services(
-          find_orphaned_services(deleted),
+          find_orphaned_services(deleted, apps - deleted),
           input[:orphaned])
       end
     end
@@ -910,18 +910,18 @@ module VMC
       end
     end
 
-    def find_orphaned_services(apps)
+    def find_orphaned_services(apps, others = [])
       orphaned = []
 
       apps.each do |a|
         a.services.each do |i|
-          if apps.none? { |x| x != a && x.services.include?(i) }
+          if others.none? { |x| x.binds?(i) }
             orphaned << i
           end
         end
       end
 
-      orphaned
+      orphaned.each(&:invalidate!)
     end
 
     def delete_orphaned_services(instances, orphaned)

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

@@ -51,13 +51,13 @@ module VMC
           :from_given => services_from_label) { |services|
       [ask("What kind?", :choices => services.sort_by(&:label),
            :display => proc { |s|
-              str = "#{c(s.label, :name)} v#{s.version}"
+              str = "#{c(s.label, :name)} #{s.version}"
               if s.provider != "core"
                 str << ", via #{s.provider}"
               end
               str
            },
-           :complete => proc { |s| "#{s.label} v#{s.version}" })]
+           :complete => proc { |s| "#{s.label} #{s.version}" })]
     }
     input(:name, :argument => true,
           :desc => "Name for your instance") { |service|
@@ -150,8 +150,14 @@ module VMC
       instance = input[:instance, app]
 
       with_progress(
-          "Binding #{c(instance.name, :name)} to #{c(app.name, :name)}") do
-        app.bind(instance)
+          "Binding #{c(instance.name, :name)} to #{c(app.name, :name)}") do |s|
+        if app.binds?(instance)
+          s.skip do
+            err "App #{b(app.name)} already binds #{b(instance.name)}."
+          end
+        else
+          app.bind(instance)
+        end
       end
     end
 
@@ -261,7 +267,7 @@ module VMC
         service = plan.service
 
         puts ""
-        puts "#{c(i.name, :name)}: #{service.label} v#{service.version}"
+        puts "#{c(i.name, :name)}: #{service.label} #{service.version}"
         puts "  description: #{service.description}"
         puts "  plan: #{c(plan.name, :name)}"
         puts "    description: #{plan.description}"

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.22"
+  VERSION = "0.4.0.beta.23"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 62196431
+  hash: 62196429
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 22
-  version: 0.4.0.beta.22
+  - 23
+  version: 0.4.0.beta.23
 platform: ruby
 authors: 
 - VMware
@@ -249,12 +249,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 7
         segments: 
         - 0
         - 3
-        - 9
-        version: 0.3.9
+        - 10
+        version: 0.3.10
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
@@ -265,12 +265,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 0
         - 0
-        - 10
-        version: 0.0.10
+        - 11
+        version: 0.0.11
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency