gp-ruby-client 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 561123effe59497e101e045b0a9357f86778d9a3
-  data.tar.gz: a3f8bccc0cdcd129a2f0887b5c3b2736d668b2c8
+  metadata.gz: 6c015def523f8f5b042d248552563b6d747a3abe
+  data.tar.gz: e76b774ec48bfa43d0192f56c1e523319004aedb
 SHA512:
-  metadata.gz: 69db20dfef746f04106c603acc78853b9a6e02020cbeb310cd8499052d4082753279409c214d7b3290bedda1b4c1db47fd4ea0031c4c198a9759b173ae717f03
-  data.tar.gz: 9d7222d165f6131b8d50db6df5a74da09157c31f2f953727a0018e0ca442398a5cfe3328999fcf8c2924b6a8507ccebaa184291b7add4f2da7be71d4aeb6e5bd
+  metadata.gz: 472bd77b6a4e72d45e426eb39c0ce5d75144c2cdd2decb70a562b87e1a4be5aa7c7498a3954a88af7623fcbaefac039b17ab6dc21b9632566f71ccaffcc7606a
+  data.tar.gz: 6f29eb94f4b2790fcd0c77381a2f859dd73e2a674731a53f16f3baeb8cc268c78cb14b863cbe374ce66fb6ce2570b983fd0a4f919dc9588458f720ea6483245b

data/lib/gp-ruby-client.rb

@@ -44,8 +44,8 @@ module GP
 			@@just_started = true
 			@@use_service = true
 
-			def initialize(bundle_id)
-				@@bundle_id = bundle_id
+			def initialize(bundle_id, srvc_account=ServiceAccount.new)
+			  @@bundle_id = bundle_id
 				
 				if @@use_service && (Time.now - @@cache_control.get_last_accessed_time >= @@cache_control.get_ttl || @@just_started)
 					@@just_started = false
@@ -54,7 +54,7 @@ module GP
 					backend = {}
 					I18n.backend = I18n::Backend::Chain.new(I18n::Backend::KeyValue.new(backend), I18n.backend)
 					
-					@@service_account = ServiceAccount.new
+					@@service_account = srvc_account
 					if @@service_account.nil?
 						raise "No valid service account"
 					end

data/lib/service_account.rb

@@ -91,14 +91,17 @@ class ServiceAccount
 	
 	def initialize(url_string = "", user_id = "", pwd = "", instance_id = "", api_key="", credsFilePath = "")
 	  
-	  if !url_string.empty? && !user_id.empty? && !pwd.empty? && !instance_id.empty?
+	  if !url_string.nil?  && !url_string.empty? && 
+      !user_id.nil? &&  !user_id.empty? && 
+      !pwd.nil? &&  !pwd.empty? &&
+      !instance_id.nil? &&  !instance_id.empty?
 			@url_string = url_string
 			@user_id = user_id
 			@pwd = pwd
 			@instance_id = instance_id
 			@iam_enabled = false
 			
-		elsif !url_string.empty? && !instance_id.empty? && !api_key.empty?
+		elsif !url_string.nil? && !url_string.empty? && !instance_id.nil? && !instance_id.empty? && !api_key.nil? && !api_key.empty?
       @url_string = url_string
       @instance_id = instance_id
       @api_key = api_key
@@ -110,14 +113,18 @@ class ServiceAccount
 	      account = get_service_account_via_vcap_service
 			end
 			if account.nil? && !credsFilePath.empty?
-            credsFile = File.open credsFilePath
-            creds = JSON.parse(credsFile)
-            if !creds.nil
-              if creds.has_key?("credentials")
-                creds=creds["credentials"]
-              end
-              account = extractCredsFromJson(creds)
+			  File.open(credsFilePath) do |credsFile|
+          creds = JSON.parse(credsFile.read) 
+          if !creds.nil?
+            if creds.has_key?("credentials")
+              creds=creds["credentials"]
             end
+            account = extractCredsFromJson(creds)
+            if account.nil?
+                   raise "Couldn't create a service account from file"
+            end
+          end
+        end
       end
       if account.nil?
         raise "Couldn't create a service account"
@@ -196,7 +203,7 @@ private
       return
     end
     
-    iam_enabled=api_key.nil?false:true
+    iam_enabled=api_key.nil??false:true
 
     return [url_string, user_id, pwd, instance_id, api_key, iam_enabled]
   end
@@ -213,7 +220,7 @@ private
     
     app_name = ""
     json_vcap_services.each do |key, value|
-      if (key =~ APP_NAME_REGEX or key.equals?(APP_NAME))
+      if (key =~ APP_NAME_REGEX or APP_NAME.eql? key)
         app_name = key
         break
       end
@@ -239,7 +246,7 @@ private
     if (user_id.nil? || pwd.nil?) && api_key.nil?
       return
     end
-    iam_enabled=api_key.nil?false:true
+    iam_enabled=api_key.nil??false:true
     return [url, user_id, pwd, instance_id, api_key, iam_enabled]
   end
 	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gp-ruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Visaahan Anandarajah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-09 00:00:00.000000000 Z
+date: 2019-05-13 00:00:00.000000000 Z
 dependencies: []
 description: Ruby SDK for Globalization Pipeline on IBM Cloud
 email: icuintl@us.ibm.com
@@ -24,7 +24,9 @@ files:
 homepage: https://github.com/IBM-Cloud/gp-ruby-client
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  documentation_uri: https://github.com/IBM-Cloud/gp-ruby-client
+  source_code_uri: https://github.com/IBM-Cloud/gp-ruby-client
 post_install_message: 
 rdoc_options: []
 require_paths: