ibm_watson 0.11.0 → 0.12.0

data/lib/ibm_watson/text_to_speech_v1.rb

@@ -85,6 +85,7 @@ module IBMWatson
       args = defaults.merge(args)
       args[:vcap_services_name] = "text_to_speech"
       super
+      args[:display_name] = "Text to Speech"
     end
 
     #########################
@@ -99,11 +100,12 @@ module IBMWatson
     #   about a specific voice, use the **Get a voice** method.
     #
     #   **See also:** [Specifying a
-    #   voice](https://console.bluemix.net/docs/services/text-to-speech/http.html#voices).
+    #   voice](https://cloud.ibm.com/docs/services/text-to-speech/http.html#voices).
     # @return [DetailedResponse] A `DetailedResponse` object representing the response.
     def list_voices
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=text_to_speech;service_version=V1;operation_id=list_voices"
 
       method_url = "/v1/voices"
 
@@ -125,7 +127,7 @@ module IBMWatson
     #   information about all available voices, use the **List voices** method.
     #
     #   **See also:** [Specifying a
-    #   voice](https://console.bluemix.net/docs/services/text-to-speech/http.html#voices).
+    #   voice](https://cloud.ibm.com/docs/services/text-to-speech/http.html#voices).
     # @param voice [String] The voice for which information is to be returned.
     # @param customization_id [String] The customization ID (GUID) of a custom voice model for which information is to be
     #   returned. You must make the request with service credentials created for the
@@ -137,6 +139,7 @@ module IBMWatson
 
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=text_to_speech;service_version=V1;operation_id=get_voice"
 
       params = {
         "customization_id" => customization_id
@@ -168,7 +171,7 @@ module IBMWatson
     #   pass a maximum of 5 KB of text to the service.
     #
     #   **See also:** [Synthesizing text to
-    #   audio](https://console.bluemix.net/docs/services/text-to-speech/http.html#synthesize).
+    #   audio](https://cloud.ibm.com/docs/services/text-to-speech/http.html#synthesize).
     #
     #   ### Audio formats (accept types)
     #
@@ -236,7 +239,7 @@ module IBMWatson
     #
     #   For more information about specifying an audio format, including additional
     #   details about some of the formats, see [Specifying an audio
-    #   format](https://console.bluemix.net/docs/services/text-to-speech/http.html#format).
+    #   format](https://cloud.ibm.com/docs/services/text-to-speech/http.html#format).
     #
     #   ### Warning messages
     #
@@ -266,6 +269,7 @@ module IBMWatson
       headers = {
         "Accept" => accept
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=text_to_speech;service_version=V1;operation_id=synthesize"
 
       params = {
         "voice" => voice,
@@ -303,7 +307,7 @@ module IBMWatson
     #   **Note:** This method is currently a beta release.
     #
     #   **See also:** [Querying a word from a
-    #   language](https://console.bluemix.net/docs/services/text-to-speech/custom-entries.html#cuWordsQueryLanguage).
+    #   language](https://cloud.ibm.com/docs/services/text-to-speech/custom-entries.html#cuWordsQueryLanguage).
     # @param text [String] The word for which the pronunciation is requested.
     # @param voice [String] A voice that specifies the language in which the pronunciation is to be returned.
     #   All voices for the same language (for example, `en-US`) return the same
@@ -323,6 +327,7 @@ module IBMWatson
 
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=text_to_speech;service_version=V1;operation_id=get_pronunciation"
 
       params = {
         "text" => text,
@@ -357,7 +362,7 @@ module IBMWatson
     #   **Note:** This method is currently a beta release.
     #
     #   **See also:** [Creating a custom
-    #   model](https://console.bluemix.net/docs/services/text-to-speech/custom-models.html#cuModelsCreate).
+    #   model](https://cloud.ibm.com/docs/services/text-to-speech/custom-models.html#cuModelsCreate).
     # @param name [String] The name of the new custom voice model.
     # @param language [String] The language of the new custom voice model. Omit the parameter to use the the
     #   default language, `en-US`.
@@ -369,6 +374,7 @@ module IBMWatson
 
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=text_to_speech;service_version=V1;operation_id=create_voice_model"
 
       data = {
         "name" => name,
@@ -401,7 +407,7 @@ module IBMWatson
     #   **Note:** This method is currently a beta release.
     #
     #   **See also:** [Querying all custom
-    #   models](https://console.bluemix.net/docs/services/text-to-speech/custom-models.html#cuModelsQueryAll).
+    #   models](https://cloud.ibm.com/docs/services/text-to-speech/custom-models.html#cuModelsQueryAll).
     # @param language [String] The language for which custom voice models that are owned by the requesting
     #   service credentials are to be returned. Omit the parameter to see all custom voice
     #   models that are owned by the requester.
@@ -409,6 +415,7 @@ module IBMWatson
     def list_voice_models(language: nil)
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=text_to_speech;service_version=V1;operation_id=list_voice_models"
 
       params = {
         "language" => language
@@ -454,10 +461,11 @@ module IBMWatson
     #
     #   **See also:**
     #   * [Updating a custom
-    #   model](https://console.bluemix.net/docs/services/text-to-speech/custom-models.html#cuModelsUpdate)
+    #   model](https://cloud.ibm.com/docs/services/text-to-speech/custom-models.html#cuModelsUpdate)
     #   * [Adding words to a Japanese custom
-    #   model](https://console.bluemix.net/docs/services/text-to-speech/custom-entries.html#cuJapaneseAdd)
-    #   * [Understanding customization](https://console.bluemix.net/docs/services/text-to-speech/custom-intro.html).
+    #   model](https://cloud.ibm.com/docs/services/text-to-speech/custom-entries.html#cuJapaneseAdd)
+    #   * [Understanding
+    #   customization](https://cloud.ibm.com/docs/services/text-to-speech/custom-intro.html).
     # @param customization_id [String] The customization ID (GUID) of the custom voice model. You must make the request
     #   with service credentials created for the instance of the service that owns the
     #   custom model.
@@ -472,6 +480,7 @@ module IBMWatson
 
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=text_to_speech;service_version=V1;operation_id=update_voice_model"
 
       data = {
         "name" => name,
@@ -502,7 +511,7 @@ module IBMWatson
     #   **Note:** This method is currently a beta release.
     #
     #   **See also:** [Querying a custom
-    #   model](https://console.bluemix.net/docs/services/text-to-speech/custom-models.html#cuModelsQuery).
+    #   model](https://cloud.ibm.com/docs/services/text-to-speech/custom-models.html#cuModelsQuery).
     # @param customization_id [String] The customization ID (GUID) of the custom voice model. You must make the request
     #   with service credentials created for the instance of the service that owns the
     #   custom model.
@@ -512,6 +521,7 @@ module IBMWatson
 
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=text_to_speech;service_version=V1;operation_id=get_voice_model"
 
       method_url = "/v1/customizations/%s" % [ERB::Util.url_encode(customization_id)]
 
@@ -533,7 +543,7 @@ module IBMWatson
     #   **Note:** This method is currently a beta release.
     #
     #   **See also:** [Deleting a custom
-    #   model](https://console.bluemix.net/docs/services/text-to-speech/custom-models.html#cuModelsDelete).
+    #   model](https://cloud.ibm.com/docs/services/text-to-speech/custom-models.html#cuModelsDelete).
     # @param customization_id [String] The customization ID (GUID) of the custom voice model. You must make the request
     #   with service credentials created for the instance of the service that owns the
     #   custom model.
@@ -543,6 +553,7 @@ module IBMWatson
 
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=text_to_speech;service_version=V1;operation_id=delete_voice_model"
 
       method_url = "/v1/customizations/%s" % [ERB::Util.url_encode(customization_id)]
 
@@ -585,10 +596,11 @@ module IBMWatson
     #
     #   **See also:**
     #   * [Adding multiple words to a custom
-    #   model](https://console.bluemix.net/docs/services/text-to-speech/custom-entries.html#cuWordsAdd)
+    #   model](https://cloud.ibm.com/docs/services/text-to-speech/custom-entries.html#cuWordsAdd)
     #   * [Adding words to a Japanese custom
-    #   model](https://console.bluemix.net/docs/services/text-to-speech/custom-entries.html#cuJapaneseAdd)
-    #   * [Understanding customization](https://console.bluemix.net/docs/services/text-to-speech/custom-intro.html).
+    #   model](https://cloud.ibm.com/docs/services/text-to-speech/custom-entries.html#cuJapaneseAdd)
+    #   * [Understanding
+    #   customization](https://cloud.ibm.com/docs/services/text-to-speech/custom-intro.html).
     # @param customization_id [String] The customization ID (GUID) of the custom voice model. You must make the request
     #   with service credentials created for the instance of the service that owns the
     #   custom model.
@@ -608,6 +620,7 @@ module IBMWatson
 
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=text_to_speech;service_version=V1;operation_id=add_words"
 
       data = {
         "words" => words
@@ -636,7 +649,7 @@ module IBMWatson
     #   **Note:** This method is currently a beta release.
     #
     #   **See also:** [Querying all words from a custom
-    #   model](https://console.bluemix.net/docs/services/text-to-speech/custom-entries.html#cuWordsQueryModel).
+    #   model](https://cloud.ibm.com/docs/services/text-to-speech/custom-entries.html#cuWordsQueryModel).
     # @param customization_id [String] The customization ID (GUID) of the custom voice model. You must make the request
     #   with service credentials created for the instance of the service that owns the
     #   custom model.
@@ -646,6 +659,7 @@ module IBMWatson
 
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=text_to_speech;service_version=V1;operation_id=list_words"
 
       method_url = "/v1/customizations/%s/words" % [ERB::Util.url_encode(customization_id)]
 
@@ -685,10 +699,11 @@ module IBMWatson
     #
     #   **See also:**
     #   * [Adding a single word to a custom
-    #   model](https://console.bluemix.net/docs/services/text-to-speech/custom-entries.html#cuWordAdd)
+    #   model](https://cloud.ibm.com/docs/services/text-to-speech/custom-entries.html#cuWordAdd)
     #   * [Adding words to a Japanese custom
-    #   model](https://console.bluemix.net/docs/services/text-to-speech/custom-entries.html#cuJapaneseAdd)
-    #   * [Understanding customization](https://console.bluemix.net/docs/services/text-to-speech/custom-intro.html).
+    #   model](https://cloud.ibm.com/docs/services/text-to-speech/custom-entries.html#cuJapaneseAdd)
+    #   * [Understanding
+    #   customization](https://cloud.ibm.com/docs/services/text-to-speech/custom-intro.html).
     # @param customization_id [String] The customization ID (GUID) of the custom voice model. You must make the request
     #   with service credentials created for the instance of the service that owns the
     #   custom model.
@@ -702,7 +717,7 @@ module IBMWatson
     #   with or without a single part of speech, for any word; you cannot create multiple
     #   entries with different parts of speech for the same word. For more information,
     #   see [Working with Japanese
-    #   entries](https://console.bluemix.net/docs/services/text-to-speech/custom-rules.html#jaNotes).
+    #   entries](https://cloud.ibm.com/docs/services/text-to-speech/custom-rules.html#jaNotes).
     # @return [nil]
     def add_word(customization_id:, word:, translation:, part_of_speech: nil)
       raise ArgumentError.new("customization_id must be provided") if customization_id.nil?
@@ -713,6 +728,7 @@ module IBMWatson
 
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=text_to_speech;service_version=V1;operation_id=add_word"
 
       data = {
         "translation" => translation,
@@ -741,7 +757,7 @@ module IBMWatson
     #   **Note:** This method is currently a beta release.
     #
     #   **See also:** [Querying a single word from a custom
-    #   model](https://console.bluemix.net/docs/services/text-to-speech/custom-entries.html#cuWordQueryModel).
+    #   model](https://cloud.ibm.com/docs/services/text-to-speech/custom-entries.html#cuWordQueryModel).
     # @param customization_id [String] The customization ID (GUID) of the custom voice model. You must make the request
     #   with service credentials created for the instance of the service that owns the
     #   custom model.
@@ -754,6 +770,7 @@ module IBMWatson
 
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=text_to_speech;service_version=V1;operation_id=get_word"
 
       method_url = "/v1/customizations/%s/words/%s" % [ERB::Util.url_encode(customization_id), ERB::Util.url_encode(word)]
 
@@ -776,7 +793,7 @@ module IBMWatson
     #   **Note:** This method is currently a beta release.
     #
     #   **See also:** [Deleting a word from a custom
-    #   model](https://console.bluemix.net/docs/services/text-to-speech/custom-entries.html#cuWordDelete).
+    #   model](https://cloud.ibm.com/docs/services/text-to-speech/custom-entries.html#cuWordDelete).
     # @param customization_id [String] The customization ID (GUID) of the custom voice model. You must make the request
     #   with service credentials created for the instance of the service that owns the
     #   custom model.
@@ -789,6 +806,7 @@ module IBMWatson
 
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=text_to_speech;service_version=V1;operation_id=delete_word"
 
       method_url = "/v1/customizations/%s/words/%s" % [ERB::Util.url_encode(customization_id), ERB::Util.url_encode(word)]
 
@@ -817,7 +835,7 @@ module IBMWatson
     #   with a request that passes the data.
     #
     #   **See also:** [Information
-    #   security](https://console.bluemix.net/docs/services/text-to-speech/information-security.html).
+    #   security](https://cloud.ibm.com/docs/services/text-to-speech/information-security.html).
     # @param customer_id [String] The customer ID for which all data is to be deleted.
     # @return [nil]
     def delete_user_data(customer_id:)
@@ -825,6 +843,7 @@ module IBMWatson
 
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=text_to_speech;service_version=V1;operation_id=delete_user_data"
 
       params = {
         "customer_id" => customer_id

data/lib/ibm_watson/tone_analyzer_v3.rb

@@ -90,6 +90,7 @@ module IBMWatson
       args[:vcap_services_name] = "tone_analyzer"
       super
       @version = args[:version]
+      args[:display_name] = "Tone Analyzer"
     end
 
     #########################
@@ -118,7 +119,7 @@ module IBMWatson
     #   analyzes only the textual content.
     #
     #   **See also:** [Using the general-purpose
-    #   endpoint](https://console.bluemix.net/docs/services/tone-analyzer/using-tone.html#using-the-general-purpose-endpoint).
+    #   endpoint](https://cloud.ibm.com/docs/services/tone-analyzer/using-tone.html#using-the-general-purpose-endpoint).
     # @param tone_input [ToneInput] JSON, plain text, or HTML input that contains the content to be analyzed. For JSON
     #   input, provide an object of type `ToneInput`.
     # @param content_type [String] The type of the input. A character encoding can be specified by including a
@@ -153,6 +154,7 @@ module IBMWatson
         "Content-Language" => content_language,
         "Accept-Language" => accept_language
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=tone_analyzer;service_version=V3;operation_id=tone"
 
       params = {
         "version" => @version,
@@ -195,7 +197,7 @@ module IBMWatson
     #   character encoding for JSON content is effectively always UTF-8.
     #
     #   **See also:** [Using the customer-engagement
-    #   endpoint](https://console.bluemix.net/docs/services/tone-analyzer/using-tone-chat.html#using-the-customer-engagement-endpoint).
+    #   endpoint](https://cloud.ibm.com/docs/services/tone-analyzer/using-tone-chat.html#using-the-customer-engagement-endpoint).
     # @param utterances [Array[Utterance]] An array of `Utterance` objects that provides the input content that the service
     #   is to analyze.
     # @param content_language [String] The language of the input text for the request: English or French. Regional
@@ -217,6 +219,7 @@ module IBMWatson
         "Content-Language" => content_language,
         "Accept-Language" => accept_language
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=tone_analyzer;service_version=V3;operation_id=tone_chat"
 
       params = {
         "version" => @version

data/lib/ibm_watson/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IBMWatson
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

data/lib/ibm_watson/visual_recognition_v3.rb

@@ -70,6 +70,7 @@ module IBMWatson
       args[:vcap_services_name] = "watson_vision_combined"
       super
       @version = args[:version]
+      args[:display_name] = "Visual Recognition"
     end
 
     #########################
@@ -119,6 +120,7 @@ module IBMWatson
       headers = {
         "Accept-Language" => accept_language
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=watson_vision_combined;service_version=V3;operation_id=classify"
 
       params = {
         "version" => @version
@@ -197,6 +199,7 @@ module IBMWatson
       headers = {
         "Accept-Language" => accept_language
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=watson_vision_combined;service_version=V3;operation_id=detect_faces"
 
       params = {
         "version" => @version
@@ -271,6 +274,7 @@ module IBMWatson
 
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=watson_vision_combined;service_version=V3;operation_id=create_classifier"
 
       params = {
         "version" => @version
@@ -320,6 +324,7 @@ module IBMWatson
     def list_classifiers(verbose: nil)
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=watson_vision_combined;service_version=V3;operation_id=list_classifiers"
 
       params = {
         "version" => @version,
@@ -349,6 +354,7 @@ module IBMWatson
 
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=watson_vision_combined;service_version=V3;operation_id=get_classifier"
 
       params = {
         "version" => @version
@@ -412,6 +418,7 @@ module IBMWatson
 
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=watson_vision_combined;service_version=V3;operation_id=update_classifier"
 
       params = {
         "version" => @version
@@ -460,6 +467,7 @@ module IBMWatson
 
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=watson_vision_combined;service_version=V3;operation_id=delete_classifier"
 
       params = {
         "version" => @version
@@ -492,6 +500,7 @@ module IBMWatson
 
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=watson_vision_combined;service_version=V3;operation_id=get_core_ml_model"
 
       params = {
         "version" => @version
@@ -529,6 +538,7 @@ module IBMWatson
 
       headers = {
       }
+      headers["X-IBMCloud-SDK-Analytics"] = "service_name=watson_vision_combined;service_version=V3;operation_id=delete_user_data"
 
       params = {
         "version" => @version,

data/lib/ibm_watson/watson_service.rb

@@ -18,9 +18,11 @@ require_relative("./version.rb")
 #   config.log_response  = true
 # end
 
+DEFAULT_CREDENTIALS_FILE_NAME = "ibm-credentials.env"
+
 # Class for interacting with the Watson API
 class WatsonService
-  attr_accessor :password, :url, :username
+  attr_accessor :password, :url, :username, :display_name
   attr_reader :conn, :token_manager
   def initialize(vars)
     defaults = {
@@ -30,7 +32,8 @@ class WatsonService
       use_vcap_services: true,
       iam_apikey: nil,
       iam_access_token: nil,
-      iam_url: nil
+      iam_url: nil,
+      display_name: nil
     }
     vars = defaults.merge(vars)
     @url = vars[:url]
@@ -41,6 +44,7 @@ class WatsonService
     @temp_headers = nil
     @icp_prefix = vars[:password]&.start_with?("icp-") ? true : false
     @disable_ssl = false
+    @display_name = vars[:display_name]
 
     user_agent_string = "watson-apis-ruby-sdk-" + IBMWatson::VERSION
     user_agent_string += " #{RbConfig::CONFIG["host"]}"
@@ -49,17 +53,6 @@ class WatsonService
     headers = {
       "User-Agent" => user_agent_string
     }
-    if vars[:use_vcap_services]
-      @vcap_service_credentials = load_from_vcap_services(service_name: vars[:vcap_services_name])
-      if !@vcap_service_credentials.nil? && @vcap_service_credentials.instance_of?(Hash)
-        @url = @vcap_service_credentials["url"]
-        @username = @vcap_service_credentials["username"] if @vcap_service_credentials.key?("username")
-        @password = @vcap_service_credentials["password"] if @vcap_service_credentials.key?("password")
-        @iam_apikey = @vcap_service_credentials["iam_apikey"] if @vcap_service_credentials.key?("iam_apikey")
-        @iam_access_token = @vcap_service_credentials["iam_access_token"] if @vcap_service_credentials.key?("iam_access_token")
-        @iam_url = @vcap_service_credentials["iam_url"] if @vcap_service_credentials.key?("iam_url")
-      end
-    end
 
     if !vars[:iam_access_token].nil? || !vars[:iam_apikey].nil?
       set_token_manager(iam_apikey: vars[:iam_apikey], iam_access_token: vars[:iam_access_token], iam_url: vars[:iam_url])
@@ -71,6 +64,24 @@ class WatsonService
         @password = vars[:password]
       end
     end
+
+    if @display_name && !@username && !@iam_apikey
+      service_name = @display_name.sub(" ", "_").downcase
+      load_from_credential_file(service_name)
+    end
+
+    if vars[:use_vcap_services] && !@username && !@iam_apikey
+      @vcap_service_credentials = load_from_vcap_services(service_name: vars[:vcap_services_name])
+      if !@vcap_service_credentials.nil? && @vcap_service_credentials.instance_of?(Hash)
+        @url = @vcap_service_credentials["url"]
+        @username = @vcap_service_credentials["username"] if @vcap_service_credentials.key?("username")
+        @password = @vcap_service_credentials["password"] if @vcap_service_credentials.key?("password")
+        @iam_apikey = @vcap_service_credentials["iam_apikey"] if @vcap_service_credentials.key?("iam_apikey")
+        @iam_access_token = @vcap_service_credentials["iam_access_token"] if @vcap_service_credentials.key?("iam_access_token")
+        @iam_url = @vcap_service_credentials["iam_url"] if @vcap_service_credentials.key?("iam_url")
+      end
+    end
+
     raise ArgumentError.new('The username shouldn\'t start or end with curly brackets or quotes. Be sure to remove any {} and \" characters surrounding your username') if check_bad_first_or_last_char(@username)
     raise ArgumentError.new('The password shouldn\'t start or end with curly brackets or quotes. Be sure to remove any {} and \" characters surrounding your password') if check_bad_first_or_last_char(@password)
     raise ArgumentError.new('The url shouldn\'t start or end with curly brackets or quotes. Be sure to remove any {} and \" characters surrounding your url') if check_bad_first_or_last_char(@url)
@@ -81,6 +92,31 @@ class WatsonService
     )
   end
 
+  # Initiates the credentials based on the credential file
+  def load_from_credential_file(service_name, separator = "=")
+    credential_file_path = ENV["IBM_CREDENTIALS_FILE"]
+
+    # Home directory
+    if credential_file_path.nil?
+      file_path = ENV["HOME"] + DEFAULT_CREDENTIALS_FILE_NAME
+      credential_file_path = file_path if File.exist?(file_path)
+    end
+
+    # Top-level directory of the project
+    if credential_file_path.nil?
+      file_path = File.join(File.dirname(__FILE__), "/../../" + DEFAULT_CREDENTIALS_FILE_NAME)
+      credential_file_path = file_path if File.exist?(file_path)
+    end
+
+    return if credential_file_path.nil?
+
+    file_contents = File.open(credential_file_path, "r")
+    file_contents.each_line do |line|
+      key_val = line.strip.split(separator)
+      set_credential_based_on_type(service_name, key_val[0].downcase, key_val[1].downcase) if key_val.length == 2
+    end
+  end
+
   def load_from_vcap_services(service_name:)
     vcap_services = ENV["VCAP_SERVICES"]
     unless vcap_services.nil?
@@ -200,6 +236,16 @@ class WatsonService
 
   private
 
+  def set_credential_based_on_type(service_name, key, value)
+    return unless key.include?(service_name)
+
+    @iam_apikey = value if key.include?("iam_apikey")
+    @iam_url = value if key.include?("iam_url")
+    @url = value if key.include?("url")
+    @username = value if key.include?("username")
+    @password = value if key.include?("password")
+  end
+
   def check_bad_first_or_last_char(str)
     return str.start_with?("{", "\"") || str.end_with?("}", "\"") unless str.nil?
   end

data/test/unit/test_discovery_v1.rb

@@ -1369,14 +1369,33 @@ class DiscoveryV1Test < Minitest::Test
     assert_equal({ "updated" => "true" }, service_response.result)
   end
 
+  def test_get_stopword_list_status
+    service = IBMWatson::DiscoveryV1.new(
+      username: "username",
+      password: "password",
+      version: "2018-03-05"
+    )
+    stub_request(:get, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/collid/word_lists/stopwords?version=2018-03-05")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "gateway.watsonplatform.net"
+        }
+      ).to_return(status: 200, body: { "received" => "true" }.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.get_stopword_list_status(
+      environment_id: "envid",
+      collection_id: "collid"
+    )
+    assert_equal({ "received" => "true" }, service_response.result)
+  end
+
   def test_create_stopword_list
     service = IBMWatson::DiscoveryV1.new(
       username: "username",
       password: "password",
       version: "2018-03-05"
     )
-    stub_request(:post, "https://gateway.watsonplatform.net/compare-comply/api/v1/element_classification").with do |req|
-    end
 
     stub_request(:post, "https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/colid/word_lists/stopwords?version=2018-03-05").with do |req|
       assert_equal(req.headers["Accept"], "application/json")

data/test/unit/test_watson_service.rb

@@ -41,4 +41,19 @@ class WatsonServiceTest < Minitest::Test
     )
     refute_nil(service)
   end
+
+  def test_set_credentials_from_path_in_env
+    file_path = File.join(File.dirname(__FILE__), "../../resources/ibm-credentials.env")
+    ENV["IBM_CREDENTIALS_FILE"] = file_path
+    service = IBMWatson::AssistantV1.new(display_name: "Visual Recognition")
+    assert_equal(service.url, "https://gateway.ronaldo.com")
+    refute_nil(service)
+    ENV.delete("IBM_CREDENTIALS_FILE")
+  end
+
+  def test_set_credentials_when_no_file
+    service = IBMWatson::AssistantV1.new(display_name: "Visual Recognition")
+    assert_equal(service.url, "https://gateway.watsonplatform.net/assistant/api")
+    refute_nil(service)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_watson
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Max Nussbaum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-17 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby