vmc 0.4.0.beta.28 → 0.4.0.beta.29

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

@@ -25,15 +25,13 @@ module VMC
 
     desc "List your service instances"
     group :services
-    input :name, :desc => "Filter by name regexp"
-    input :app, :desc => "Filter by bound application regexp"
-    input :service, :desc => "Filter by service regexp"
+    input :name, :desc => "Filter by name"
+    input :service, :desc => "Filter by service type"
     input :plan, :desc => "Filter by service plan"
     input :provider, :desc => "Filter by service provider"
     input :version, :desc => "Filter by service version"
-    # TODO: not in v2
-    input :type, :desc => "Filter by service type regexp"
-    input :tier, :desc => "Filter by service tier regexp"
+    input :app, :desc => "Limit to application's service bindings",
+      :from_given => by_name("app")
     def services(input)
       instances =
         with_progress("Getting service instances") do
@@ -271,37 +269,39 @@ module VMC
 
     def instance_matches(i, options)
       if app = options[:app]
-        return false if i.service_bindings.none? { |b|
-          b.app.name == app
-        }
+        return false unless app.services.include? i
       end
 
       if name = options[:name]
-        return false if i.name !~ /#{name}/
+        return false unless File.fnmatch(name, i.name)
       end
 
-      if service = options[:service]
-        return false if i.service_plan.service.label !~ /#{service}/
-      end
+      plan = i.service_plan if v2?
 
-      if !v2? && type = options[:type]
-        return false if i.type !~ /#{type}/
-      end
-
-      if !v2? && tier = options[:tier]
-        return false if i.tier !~ /#{tier}/
+      if service = options[:service]
+        if v2?
+          return false unless File.fnmatch(service, plan.service.label)
+        else
+          return false unless File.fnmatch(service, i.vendor)
+        end
       end
 
-      if v2? && plan = options[:plan]
-        return false if i.service_plan.name !~ /#{plan}/i
+      if plan = options[:plan]
+        fail "--plan is not supported on this target" unless v2?
+        return false unless File.fnmatch(plan.upcase, plan.name.upcase)
       end
 
-      if v2? && provider = options[:provider]
-        return false if i.service_plan.service.provider !~ /#{provider}/
+      if provider = options[:provider]
+        fail "--provider is not supported on this target" unless v2?
+        return false unless File.fnmatch(provider, plan.service.provider)
       end
 
-      if v2? && version = options[:version]
-        return false if i.service_plan.service.version !~ /#{version}/
+      if version = options[:version]
+        if v2?
+          return false unless File.fnmatch(version, plan.service.version)
+        else
+          return false unless File.fnmatch(version, i.version)
+        end
       end
 
       true

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

@@ -1,3 +1,3 @@
 module VMC
-  VERSION = "0.4.0.beta.28"
+  VERSION = "0.4.0.beta.29"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: vmc
 version: !ruby/object:Gem::Version 
-  hash: 62196443
+  hash: 62196441
   prerelease: 6
   segments: 
   - 0
   - 4
   - 0
   - beta
-  - 28
-  version: 0.4.0.beta.28
+  - 29
+  version: 0.4.0.beta.29
 platform: ruby
 authors: 
 - VMware
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-29 00:00:00 Z
+date: 2012-07-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json_pure
@@ -249,12 +249,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 49
         segments: 
         - 0
         - 3
-        - 15
-        version: 0.3.15
+        - 17
+        version: 0.3.17
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency