cf-app-utils 0.1 → 0.2

data/lib/cf-app-utils/cf/app/credentials.rb

@@ -1,23 +1,39 @@
 module CF::App
   class Credentials
     class << self
-      # Returns credentials for the service with the given +name+.
+      # Returns credentials for the service instance with the given +name+.
       def find_by_service_name(name)
         service = Service.find_by_name(name)
         service['credentials'] if service
       end
 
-      # Returns credentials for the first service with the given +tag+.
+      # Returns credentials for the first service instance with the given +tag+.
       def find_by_service_tag(tag)
         service = Service.find_by_tag(tag)
         service['credentials'] if service
       end
 
-      # Returns credentials for the first service with the given +label+.
+      def find_all_by_service_tag(tag)
+        services = Service.find_all_by_tag(tag)
+        services.map do |service|
+          service['credentials']
+        end
+      end
+
+
+      # Returns credentials for the first service instance with the given +label+.
       def find_by_service_label(label)
         service = Service.find_by_label(label)
         service['credentials'] if service
       end
+
+      # Returns credentials for all service instances with the given +label+.
+      def find_all_by_service_label(label)
+        services = Service.find_all_by_label(label)
+        services.map do |service|
+          service['credentials']
+        end
+      end
     end
   end
 end

data/lib/cf-app-utils/cf/app/service.rb

@@ -10,30 +10,29 @@ module CF::App
       end
 
       def find_by_tag(tag)
-        all.detect do |service|
+        find_all_by_tag(tag).first
+      end
+
+      def find_all_by_tag(tag)
+        all.select do |service|
           service['tags'].include?(tag)
         end
       end
 
       def find_by_label(label)
-        all.detect do |service|
-          service['label'] == label
+        find_all_by_label(label).first
+      end
+
+      def find_all_by_label(label)
+        all.select do |service|
+          service['label'].match /^#{label}(-.*)?$/
         end
       end
 
       private
 
       def all
-        @services ||= begin
-          services = JSON.parse(ENV['VCAP_SERVICES']).map(&:last).flatten
-          services.map do |service|
-            service['label'] =~ /^(.*)-(.*)$/
-            label, version = $1, $2
-            service['label'] = label
-            service['version'] = version
-            service
-          end
-        end
+        @services ||= JSON.parse(ENV['VCAP_SERVICES']).values.flatten
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-app-utils
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,18 +85,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1116896598145755807
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1116896598145755807
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23