kubeclient 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e56c3b573a2c07c74aa8de8048af1dda5e579f8a
-  data.tar.gz: 1e05214d7d5873ebb19c18495ed4085a66dc47aa
+  metadata.gz: 4683f1e62a19fc625503044618924b1af4ff86e3
+  data.tar.gz: c00b7d81ef2ddf4e0989a41ac672d6d60b9ce7c4
 SHA512:
-  metadata.gz: 1a1d759639dd39f6e9fb7c21108469f50a90116f8e4cc9b3725b9fe4d3fa241945c5f5523cb99bbee922db296f7d719bde706d9cd2fb4cddfefa2866348dbd20
-  data.tar.gz: 2fa195b4588382542a48cb80a68f161a5d609b594a4987a47fcc01edbad314b64876aa963bd78e0307f6d71a60aeaba9ef408aed3884ba61057328e1da190b40
+  metadata.gz: 0f59df446d480eae9100131ed724d33b1b575668a93418c5cb9846e4f41c4cabea36517231ab127b6cdb14540d8b1389b0f4eedc405bfc2fe21a75d16b63ae28
+  data.tar.gz: 3ab1f5980bd52ef68eb2b6e47d8a5d28e10f02a005e89f4f83f6df93933050462e766f872971dc0419f05f4b30c2e465f6a2573750e8fdc19a63e35aa70f64a8

data/lib/kubeclient.rb

@@ -39,18 +39,6 @@ module Kubeclient
       retrieve_all_entities(ENTITY_TYPES)
     end
 
-    def api
-      response = handle_exception do
-        create_rest_client.get
-      end
-      JSON.parse(response)
-    end
-
-    def api_valid?
-      result = api
-      result.is_a?(Hash) && result['versions'].is_a?(Array)
-    end
-
     define_entity_methods(ENTITY_TYPES)
   end
 end

data/lib/kubeclient/common.rb

@@ -194,6 +194,18 @@ module Kubeclient
         entity_type.pluralize.downcase
       end
 
+      def api_valid?
+        result = api
+        result.is_a?(Hash) && (result['versions'] || []).include?(@api_version)
+      end
+
+      def api
+        response = handle_exception do
+          create_rest_client.get
+        end
+        JSON.parse(response)
+      end
+
       def ssl_options(client_cert: nil, client_key: nil, ca_file: nil,
                       verify_ssl: OpenSSL::SSL::VERIFY_PEER)
         @ssl_options = {

data/lib/kubeclient/version.rb

@@ -1,4 +1,4 @@
 # Kubernetes REST-API Client
 module Kubeclient
-  VERSION = '0.1.13'
+  VERSION = '0.1.14'
 end

data/test/test_kubeclient.rb

@@ -92,13 +92,33 @@ class KubeClientTest < MiniTest::Test
     stub_request(:get, 'http://localhost:8080/api')
       .to_return(status: 200, body: open_test_json_file('versions_list.json'))
 
+    args = ['http://localhost:8080/api/']
+
+    [nil, 'v1beta1', 'v1beta2', 'v1beta3'].each do |version|
+      client = Kubeclient::Client.new(*(version ? args + [version] : args))
+      assert client.api_valid?
+    end
+  end
+
+  def test_api_valid_with_invalid_version
+    stub_request(:get, 'http://localhost:8080/api')
+      .to_return(status: 200, body: open_test_json_file('versions_list.json'))
+
+    client = Kubeclient::Client.new 'http://localhost:8080/api/', 'foobar1'
+    refute client.api_valid?
+  end
+
+  def test_api_valid_with_unreported_versions
+    stub_request(:get, 'http://localhost:8080/api')
+      .to_return(status: 200, body: '{}')
+
     client = Kubeclient::Client.new 'http://localhost:8080/api/'
-    assert client.api_valid?
+    refute client.api_valid?
   end
 
   def test_api_valid_with_invalid_json
     stub_request(:get, 'http://localhost:8080/api')
-      .to_return(status: 200, body: '{}')
+      .to_return(status: 200, body: '[]')
 
     client = Kubeclient::Client.new 'http://localhost:8080/api/'
     refute client.api_valid?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubeclient
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Alissa Bonas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler