cf-app-utils 0.4 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7c74061e68cd361e8c46c461906b9a187ef1efb
-  data.tar.gz: 55bf5352c5cb652fd3b14b62d6c54cb68f5410ef
+  metadata.gz: 4b06c1f28aaf815c8d05d16ca2bfa75ba89afb53
+  data.tar.gz: b929438f367b7fc1ebf01851403ce98914e3e8f0
 SHA512:
-  metadata.gz: 62fa32eea74739117c19db4474c55720aae8960fef4795b84d4f347652070889fa96bd69abe5f9111bd5524b619442d017535123626abcf63715910f54cf17f7
-  data.tar.gz: e0a9c7557397e177e0f687556a4c7b1b6393211e76e6f87a347c76cdafd9ec9a721e991ec8fce94ecdd7cafed30616a4f8602e8acd96d7b951cabceb4e88c37a
+  metadata.gz: 2d50b5c16ab0c2751e1a35f8c9f2bb3485fd100cddfb2cef469fd2d6e1f6342fdb777ebe5d72d1037be54772ed80f9bf216a6201d587eb47e237a192ac8400d5
+  data.tar.gz: b2bfe53032e67d817c674705367c3c47f29c2bc92c3f8186c3888a9c43bb8a83ce5283c195fc52a15e2a9e0cb3737cb157d2694ccd02589ed3cb40e798d6cf1b

data/README.md

@@ -40,7 +40,7 @@ CF::App::Credentials.find_by_service_name('master-db')
 CF::App::Credentials.find_by_service_tag('relational')
 
 # Get credentials for all service instances with the given tag
-CF::APP::Credentials.find_all_by_service_tag('relational')
+CF::App::Credentials.find_all_by_service_tag('relational')
 
 # Get credentials for all service instances that match all of the given tags
 CF::App::Credentials.find_all_by_all_service_tags(['cleardb', 'relational'])
@@ -57,3 +57,8 @@ The keys in the hash are strings. For example, to get the `uri` value you can do
 ```ruby
 cleardb_url = credentials['uri']
 ```
+
+```ruby
+# Inject your own environment variables
+CF::App::Credentials.new(my_env)
+```

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

@@ -1,45 +1,87 @@
 module CF::App
   class Credentials
     class << self
-      # 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 instance with the given +tag+.
-      def find_by_service_tag(tag)
-        service = Service.find_by_tag(tag)
-        service['credentials'] if service
+        credentials.find_by_service_name(name)
       end
 
       def find_all_by_service_tag(tag)
-        services = Service.find_all_by_tag(tag)
-        services.map do |service|
-          service['credentials']
-        end
+        credentials.find_all_by_service_tag(tag)
       end
 
       # Returns credentials for the service instances with all the given +tags+.
       def find_all_by_all_service_tags(tags)
-        return [] if tags.empty?
+        credentials.find_all_by_all_service_tags(tags)
+      end
 
-        Service.find_all_by_tags(tags).map { |service| service['credentials'] }
+      # Returns credentials for the first service instance with the given +tag+.
+      def find_by_service_tag(tag)
+        credentials.find_by_service_tag(tag)
       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
+        credentials.find_by_service_label(label)
       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
+        credentials.find_all_by_service_label(label)
       end
+
+      def credentials
+        Credentials.new(ENV)
+      end
+      private :credentials
+    end
+
+    def initialize(env)
+      @locator = Service.new(env)
+    end
+
+    # Returns credentials for the service instance with the given +name+.
+    def find_by_service_name(name)
+      service = locator.find_by_name(name)
+      service['credentials'] if service
+    end
+
+    # Returns credentials for the first service instance with the given +tag+.
+    def find_by_service_tag(tag)
+      service = locator.find_by_tag(tag)
+      service['credentials'] if service
     end
+
+    def find_all_by_service_tag(tag)
+      services = locator.find_all_by_tag(tag)
+      services.map do |service|
+        service['credentials']
+      end
+    end
+
+    # Returns credentials for the service instances with all the given +tags+.
+    def find_all_by_all_service_tags(tags)
+      return [] if tags.empty?
+
+      locator.find_all_by_tags(tags).map { |service| service['credentials'] }
+    end
+
+    # Returns credentials for the first service instance with the given +label+.
+    def find_by_service_label(label)
+      service = locator.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 = locator.find_all_by_label(label)
+      services.map do |service|
+        service['credentials']
+      end
+    end
+
+    private
+
+    attr_reader :locator
+
   end
 end

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

@@ -2,7 +2,10 @@ require 'json'
 
 module CF::App
   class Service #:nodoc:
-    class << self
+    def initialize(env = ENV)
+      @env = env
+    end
+
       def find_by_name(name)
         all.detect do |service|
           service['name'] == name
@@ -40,8 +43,7 @@ module CF::App
       private
 
       def all
-        @services ||= JSON.parse(ENV['VCAP_SERVICES']).values.flatten
+        @services ||= JSON.parse(@env['VCAP_SERVICES']).values.flatten
       end
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cf-app-utils
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.6'
 platform: ruby
 authors:
 - Cloud Foundry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Helper methods for apps running on Cloud Foundry