ibm_watson 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f867b01332162f178deb7bb0382b95c2dc90254ff079f840b3fb64f6c8b2102
-  data.tar.gz: f5ede7a5fe4313e2e921ad7bac8700be471d250b89c3f03ad5b18c891d0feae1
+  metadata.gz: b87852bad66c7293b30582cf1132423fa52c44c8807265bc7ac51a0347937734
+  data.tar.gz: db46dca5381564614209204d1a0ad2211e34e3b5a08bdf353d50fc40bdd898cc
 SHA512:
-  metadata.gz: 732f0fa20dfe3c4d29b48cb6cfcb6574eaac7188bf8b496af4e103a50ea258c3accef20f627b0e9a9e76d75e1dc7eed24511b81cfb47848a121d939403e92981
-  data.tar.gz: 812d8afe21c7076c9ad8f9009ea2627621dbc0c179d825f5d34a9abda2ec5d0ae13aad11102ffa341e644b4d5b490b56954010943072c49b7549ab1ef425320b
+  metadata.gz: 67f106391369de42ea88b9d017833a0d434723e5854e5d732d12b8392536529e9d4fa75567980e3cbe00269f0a90d33f1f1cd00ebb8880a376caca0e070a2ec1
+  data.tar.gz: 4bdd105efcda1ddd1b7d9f464a703c576d463cd2da8ad332df772159fc55267d1c1243557146ec4c5beeb3b9d3811c8204b5268eb890bc99968a795b57c39368

data/README.md

@@ -1,6 +1,7 @@
 # IBM Watson Ruby SDK
 
 [![Build Status](https://travis-ci.org/watson-developer-cloud/ruby-sdk.svg)](https://travis-ci.org/watson-developer-cloud/ruby-sdk)
+[![Build status](https://ci.appveyor.com/api/projects/status/ir3k0ue138o4u67e?svg=true)](https://ci.appveyor.com/project/maxnussbaum/ruby-sdk)
 [![Slack](https://wdc-slack-inviter.mybluemix.net/badge.svg)](https://wdc-slack-inviter.mybluemix.net)
 [![codecov.io](https://codecov.io/github/watson-developer-cloud/ruby-sdk/coverage.svg)](https://codecov.io/github/watson-developer-cloud/ruby-sdk)
 [![Gem Version](https://badge.fury.io/rb/ibm_watson.svg)](https://badge.fury.io/rb/ibm_watson)
@@ -275,7 +276,9 @@ Note: `recognize_with_websocket` has been **deprecated** in favor of **`recogniz
 
 ## Ruby version
 
-Tested on Ruby 2.3, 2.4, 2.5
+Tested on:
+* MRI Ruby (RVM): 2.3.7, 2.4.4, 2.5.1
+* RubyInstaller (Windows x64): 2.3.3, 2.4.4, 2.5.1
 
 ## Contributing
 

data/lib/ibm_watson/speech_to_text_v1.rb

@@ -1537,7 +1537,7 @@ module IBMWatson
     end
 
     ##
-    # @!method add_word(customization_id:, word_name:, sounds_like: nil, display_as: nil)
+    # @!method add_word(customization_id:, word_name:, word: nil, sounds_like: nil, display_as: nil)
     # Add a custom word.
     # Adds a custom word to a custom language model. The service populates the words
     #   resource for a custom model with out-of-vocabulary (OOV) words found in each
@@ -1579,6 +1579,11 @@ module IBMWatson
     # @param word_name [String] The custom word for the custom language model. When you add or update a custom
     #   word with the **Add a custom word** method, do not include spaces in the word. Use
     #   a `-` (dash) or `_` (underscore) to connect the tokens of compound words.
+    # @param word [String] For the **Add custom words** method, you must specify the custom word that is to
+    #   be added to or updated in the custom model. Do not include spaces in the word. Use
+    #   a `-` (dash) or `_` (underscore) to connect the tokens of compound words.
+    #
+    #   Omit this field for the **Add a custom word** method.
     # @param sounds_like [Array[String]] An array of sounds-like pronunciations for the custom word. Specify how words that
     #   are difficult to pronounce, foreign words, acronyms, and so on can be pronounced
     #   by users. For a word that is not in the service's base vocabulary, omit the
@@ -1593,13 +1598,13 @@ module IBMWatson
     #   the parameter when you want the word to have a spelling that is different from its
     #   usual representation or from its spelling in corpora training data.
     # @return [nil]
-    def add_word(customization_id:, word_name:, sounds_like: nil, display_as: nil)
+    def add_word(customization_id:, word_name:, word: nil, sounds_like: nil, display_as: nil)
       raise ArgumentError("customization_id must be provided") if customization_id.nil?
       raise ArgumentError("word_name must be provided") if word_name.nil?
       headers = {
       }
       data = {
-        "word" => word_name,
+        "word" => word,
         "sounds_like" => sounds_like,
         "display_as" => display_as
       }

data/lib/ibm_watson/version.rb

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

data/rakefile

@@ -16,6 +16,7 @@ namespace :test do
     t.test_files = FileList["test/unit/*.rb"]
     t.verbose = true
     t.warning = true
+    t.deps = [:rubocop]
   end
 
   Rake::TestTask.new do |t|
@@ -25,7 +26,16 @@ namespace :test do
     t.test_files = FileList["test/integration/*.rb"]
     t.verbose = true
     t.warning = true
-    t.deps = [:dotenv]
+    t.deps = %i[dotenv rubocop]
+  end
+
+  Rake::TestTask.new do |t|
+    t.name = "appveyor_status"
+    t.description = "Checks to ensure that AppVeyor tests pass before deploying from Travis"
+    t.libs << "test"
+    t.test_files = FileList["test/appveyor_status.rb"]
+    t.verbose = false
+    t.warning = false
   end
 end
 
@@ -41,5 +51,5 @@ task :coverage do
   Rake::Task["test"].execute
 end
 
-task def: %i[rubocop coverage] do
+task def: %i[coverage] do
 end

data/test/appveyor_status.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require("minitest/reporters")
+require("minitest/autorun")
+require("minitest/retry")
+require("http")
+require("json")
+
+Minitest::Retry.use!
+Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(color: true), Minitest::Reporters::SpecReporter.new]
+
+# Test to run from Travis to ensure that AppVeyor tests pass before attempting to deploy to RubyGems
+class AppVeyorStatusTest < Minitest::Test
+  def test_appveyor_status
+    skip "Branch is NOT master and/or Ruby != 2.5.1, so AppVeyor check before deployment will not be run." if ENV["TRAVIS_BRANCH"] != "master" || ENV["TRAVIS_RUBY_VERSION"] != "2.5.1"
+    client = HTTP::Client.new
+    attempts = 0
+    status = JSON.parse(client.get("https://ci.appveyor.com/api/projects/maxnussbaum/ruby-sdk").body.to_s)["build"]["status"]
+    puts("0 AppVeyor Status: #{status}")
+    while status != "success" && status != "failed" && status != "cancelled"
+      attempts += 1
+      sleep(15)
+      status = JSON.parse(client.get("https://ci.appveyor.com/api/projects/maxnussbaum/ruby-sdk").body.to_s)["build"]["status"]
+      puts("#{attempts} AppVeyor Status: #{status}")
+    end
+    if status == "success"
+      assert(true)
+    else
+      assert(false, "AppVeyor tests have NOT passed! Please ensure that AppVeyor passes before deploying")
+    end
+  end
+end

data/test/integration/test_natural_language_understanding_v1.rb

@@ -82,6 +82,7 @@ unless ENV["NATURAL_LANGUAGE_UNDERSTANDING_USERNAME"].nil? || ENV["NATURAL_LANGU
     end
 
     def test_list_models
+      skip
       service = IBMWatson::NaturalLanguageUnderstandingV1.new(
         version: "2018-03-16",
         username: ENV["NATURAL_LANGUAGE_UNDERSTANDING_USERNAME"],

data/test/test_helper.rb

@@ -2,6 +2,7 @@
 
 require("simplecov")
 require("codecov")
+require("minitest/reporters")
 
 if ENV["COVERAGE"]
   SimpleCov.formatter = SimpleCov::Formatter::Codecov if ENV["CI"]
@@ -19,3 +20,9 @@ end
 
 require("minitest/autorun")
 require_relative("./../lib/ibm_watson.rb")
+require("minitest/retry")
+
+Minitest::Retry.use!
+
+Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(color: true, slow_count: 10), Minitest::Reporters::SpecReporter.new, Minitest::Reporters::HtmlReporter.new] if ENV["CI"].nil?
+Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(color: true, slow_count: 10), Minitest::Reporters::SpecReporter.new] if ENV["CI"]

data/test/unit/test_speech_to_text_v1.rb

@@ -408,7 +408,7 @@ class SpeechToTextV1Test < Minitest::Test
     )
     stub_request(:put, "https://stream.watsonplatform.net/speech-to-text/api/v1/customizations/custid/words/IEEE")
       .with(
-        body: "{\"word\":\"IEEE\",\"sounds_like\":[\"i triple e\"],\"display_as\":\"IEEE\"}",
+        body: "{\"sounds_like\":[\"i triple e\"],\"display_as\":\"IEEE\"}",
         headers: {
           "Accept" => "application/json",
           "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_watson
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Max Nussbaum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2018-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -150,6 +150,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: minitest-retry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -234,6 +262,7 @@ files:
 - lib/ibm_watson/websocket/recognize_callback.rb
 - lib/ibm_watson/websocket/speech_to_text_websocket_listener.rb
 - rakefile
+- test/appveyor_status.rb
 - test/integration/test_assistant_v1.rb
 - test/integration/test_discovery_v1.rb
 - test/integration/test_iam_assistant_v1.rb