Merge pull request #253 from Abdulwahaab710/master

Updated outdated dependencies

.travis.yml

@@ -1,7 +1,5 @@
 language: ruby
 rvm:
-  - "2.0"
-  - "2.1"
   - "2.2"
   - "2.3.0"
   - "2.4.0"

Rakefile

@@ -3,7 +3,7 @@ require 'rake/testtask'
 require 'rubocop/rake_task'
 require 'yaml'
 
-task default: [:test, :rubocop] # same as .travis.yml
+task default: %i[test rubocop] # same as .travis.yml
 
 Rake::TestTask.new do |t|
   t.libs << 'test'

kubeclient.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'kubeclient/version'
@@ -20,13 +21,13 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'minitest-rg'
-  spec.add_development_dependency 'webmock', '~> 2.3.1'
+  spec.add_development_dependency 'webmock', '~> 3.0.1'
   spec.add_development_dependency 'vcr'
-  spec.add_development_dependency 'rubocop', '= 0.47.1'
+  spec.add_development_dependency 'rubocop', '= 0.49.1'
   spec.add_dependency 'rest-client'
-  spec.add_dependency 'recursive-open-struct', '~> 1.0.0'
-  spec.add_dependency 'http', '~> 2.0'
+  spec.add_dependency 'recursive-open-struct', '~> 1.0.4'
+  spec.add_dependency 'http', '~> 2.2.2'
 end

lib/kubeclient/common.rb

@@ -4,7 +4,7 @@ module Kubeclient
   # Common methods
   # this is mixed in by other gems
   module ClientMixin
-    ENTITY_METHODS = %w(get watch delete create update patch).freeze
+    ENTITY_METHODS = %w[get watch delete create update patch].freeze
 
     DEFAULT_SSL_OPTIONS = {
       client_cert: nil,
@@ -394,7 +394,7 @@ def watch_pod_log(pod_name, namespace, container: nil)
     def proxy_url(kind, name, port, namespace = '')
       discover unless @discovered
       entity_name_plural =
-        if %w(services pods nodes).include?(kind.to_s)
+        if %w[services pods nodes].include?(kind.to_s)
           kind.to_s
         else
           @entities[kind.to_s].resource_name
@@ -467,13 +467,13 @@ def validate_auth_options(opts)
       # maintain backward compatibility:
       opts[:username] = opts[:user] if opts[:user]
 
-      if [:bearer_token, :bearer_token_file, :username].count { |key| opts[key] } > 1
+      if %i[bearer_token bearer_token_file username].count { |key| opts[key] } > 1
         raise(
           ArgumentError,
           'Invalid auth options: specify only one of username/password,' \
           ' bearer_token or bearer_token_file'
         )
-      elsif [:username, :password].count { |key| opts[key] } == 1
+      elsif %i[username password].count { |key| opts[key] } == 1
         raise ArgumentError, 'Basic auth requires both username & password'
       end
     end

lib/kubeclient/config.rb

@@ -116,7 +116,7 @@ def fetch_user_auth_options(user)
       if user.key?('token')
         options[:bearer_token] = user['token']
       else
-        %w(username password).each do |attr|
+        %w[username password].each do |attr|
           options[attr.to_sym] = user[attr] if user.key?(attr)
         end
       end

test/test_common.rb

@@ -3,7 +3,7 @@
 # Unit tests for the common module
 class CommonTest < MiniTest::Test
   def test_underscore_entity
-    %w(
+    %w[
       Pod pod
       Service service
       ReplicationController replication_controller
@@ -25,7 +25,7 @@ def test_underscore_entity
       BuildConfig build_config
       Image image
       ImageStream image_stream
-    ).each_slice(2) do |singular, plural|
+    ].each_slice(2) do |singular, plural|
       assert_equal(Kubeclient::ClientMixin.underscore_entity(singular), plural)
     end
   end

test/test_kubeclient.rb

@@ -405,10 +405,10 @@ def test_api_bearer_token_failure
 
   def test_api_basic_auth_success
     stub_request(:get, 'http://localhost:8080/api/v1')
-      .with(basic_auth: %w(username password))
+      .with(basic_auth: %w[username password])
       .to_return(body: open_test_file('core_api_resource_list.json'), status: 200)
     stub_request(:get, 'http://localhost:8080/api/v1/pods')
-      .with(basic_auth: %w(username password))
+      .with(basic_auth: %w[username password])
       .to_return(body: open_test_file('pod_list.json'), status: 200)
 
     client = Kubeclient::Client.new(
@@ -429,10 +429,10 @@ def test_api_basic_auth_success
 
   def test_api_basic_auth_back_comp_success
     stub_request(:get, 'http://localhost:8080/api/v1')
-      .with(basic_auth: %w(username password))
+      .with(basic_auth: %w[username password])
       .to_return(body: open_test_file('core_api_resource_list.json'), status: 200)
     stub_request(:get, 'http://localhost:8080/api/v1/pods')
-      .with(basic_auth: %w(username password))
+      .with(basic_auth: %w[username password])
       .to_return(body: open_test_file('pod_list.json'), status: 200)
 
     client = Kubeclient::Client.new(
@@ -452,7 +452,7 @@ def test_api_basic_auth_failure
     response = OpenStruct.new(code: 401, message: '401 Unauthorized')
 
     stub_request(:get, 'http://localhost:8080/api/v1')
-      .with(basic_auth: %w(username password))
+      .with(basic_auth: %w[username password])
       .to_raise(Kubeclient::HttpError.new(401, error_message, response))
 
     client = Kubeclient::Client.new(

test/test_resource_list_without_kind.rb

@@ -15,19 +15,19 @@ def test_get_from_json_api_v1
         entity: 'pod',
         type: 'Pod',
         name: 'pods',
-        methods: %w(pod pods)
+        methods: %w[pod pods]
       },
       {
         entity: 'node',
         type: 'Node',
         name: 'nodes',
-        methods: %w(node nodes)
+        methods: %w[node nodes]
       },
       {
         entity: 'service',
         type: 'Service',
         name: 'services',
-        methods: %w(service services)
+        methods: %w[service services]
       }
     ].each { |h| assert_entities(client.instance_variable_get(:@entities)[h[:entity]], h) }
 
@@ -49,19 +49,19 @@ def test_get_from_json_oapi_v1
         entity: 'template',
         type: 'Template',
         name: 'templates',
-        methods: %w(template templates)
+        methods: %w[template templates]
       },
       {
         entity: 'build',
         type: 'Build',
         name: 'builds',
-        methods: %w(build builds)
+        methods: %w[build builds]
       },
       {
         entity: 'project',
         type: 'Project',
         name: 'projects',
-        methods: %w(project projects)
+        methods: %w[project projects]
       }
     ].each { |h| assert_entities(client.instance_variable_get(:@entities)[h[:entity]], h) }