kubeclient 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGU0ZWMzMDI2NTkyM2E2OWJjNjg3ZGM3ZmNkZDBkZmYyNmI5YTYzNg==
+    NmEwNzNiNzUyOWYxZDFlYzE2M2Q4MDY1MjdhMDIwNjM5YmFkZDMzNQ==
   data.tar.gz: !binary |-
-    Yzc4YzNkMDA5MWM2OGQ0ZjlmNTUzNjQ0NDc0NzJmYjdiNjRhZjEwNA==
+    Mzc5MGZlMWI5OWMxNWU5YjI4OGEwODBjM2ExNzkxMzBhNGY4ZDYyNA==
 SHA512:
   metadata.gz: !binary |-
-    YjFhN2QzNDg3YTkwZWFkYTA1MzQ4OGJiYjk5ZDBkZTM3NjBjMzBjOWQyYzZj
-    ZDY1NmUyOTVhYTBlMjVhZDE3MzdhYWU1ZDYxZTEzNjU3YmIwMDg0YmE4NTQ1
-    N2RhNmYzZDJkMzdlMTc4ZTYwNmYyMDM0ZTg2OGY1MTVjYThmMzM=
+    NGQzYjU2ZTQ3NGMyNWFiMmM5OTc4MTdhNWMxMDAzZDFiNTIyZTUzMTk1N2Zi
+    NGQxNTUyMGI4N2VkYjI0NGFhYTJjMDIwNmRmOThiNjkzOGRiYjRhOGMxNjdj
+    NTBlOWQ2MDNlMWNiN2NmNzZiMmE3OGJmNTQ2ZWMyNmE3ZjJiMTY=
   data.tar.gz: !binary |-
-    YzU5MDAwZGU1MTEyMTU0YmE3MmZhYTlkZmRmYTYzNGRiNzEzNjViN2YyN2Q0
-    YzlmMWMwZGNiNGE1ZGIyOTc2OGM2YzFlNWJlNTZlNTlkNDk5ZDVhNTBiMzI2
-    NTg1NjhhN2VkNGVjNTRhMmJiYTMxNzhmODBhODhkODQzY2QyNDk=
+    Y2JhZmZhM2U5NzViZDgzMzgyODc5YzRlNzQ0MzgwODU4NmUyNDNkYjNmYjg3
+    MjFlNTYzNzU2Nzg3MmM3MjA0ZTA1MTliNWE1ZWRhYzZkZThlNzdmYmJkYTJh
+    MWFkYWJmZjkzM2FiM2NkZGQzMzhiMGVhOWRmZTMxMDYzZDlkYjQ=

data/lib/kubeclient.rb

@@ -28,6 +28,14 @@ module Kubeclient
       RestClient::Resource.new(@api_endpoint)
     end
 
+    protected
+    def create_entity(hash, entity, method_name)
+      entity.classify.constantize.new(hash)
+    end
+
+
+    public
+
    ENTITIES.each do |entity|
 
      #get all entities of a type e.g. get_nodes, get_pods, etc.
@@ -58,33 +66,6 @@ module Kubeclient
          create_entity(result, entity, "underscore")
      end
 
-     protected
-     def create_entity(hash, entity, method_name)
-       rename_keys(hash,method_name, nil)
-       entity.classify.constantize.new(hash)
-     end
-
-     #recursively rename the keys in hash including
-     #nested hashes to/from ruby style
-     protected
-     def rename_keys(hash, method_name, method_param)
-       hash.keys.each { |key|
-         method_object = key.to_s.method(method_name)
-         if method_param != nil
-           new_key = method_object.call(method_param)
-         else
-           new_key = method_object.call
-         end
-         hash[new_key] = hash[key]
-         hash.delete(key) unless new_key == key
-
-         #recursive call to take care of values that are hashes themselves
-         if hash[new_key].is_a?(Hash) then rename_keys(hash[new_key],method_name, method_param) end
-
-       }
-       hash
-     end
-
      define_method("delete_#{entity.underscore}") do |id|
        begin
          rest_client[entity.underscore.pluralize+"/" +id].delete
@@ -98,8 +79,6 @@ module Kubeclient
      define_method("create_#{entity.underscore}") do |entity_config|
        #to_hash should be called because of issue #9 in recursive open struct
        hash = entity_config.to_hash
-       #keys should be renamed from underscore to k8s json naming style (camelized w first word lowercase)
-       hash = rename_keys(hash, "camelize", :lower)
        begin
          rest_client[entity.pluralize.camelize(:lower)].post(hash.to_json)
        rescue  RestClient::Exception => e
@@ -114,8 +93,6 @@ module Kubeclient
        hash = entity_config.to_hash
        #temporary solution to delete id till this issue is solved: https://github.com/GoogleCloudPlatform/kubernetes/issues/3085
        hash.delete(:id)
-       #keys should be renamed from underscore to k8s json naming style (camelized w first word lowercase)
-       hash = rename_keys(hash, "camelize", :lower)
        begin
          rest_client[entity.underscore.pluralize+"/#{id}"].put(hash.to_json)
        rescue  RestClient::Exception => e
@@ -134,7 +111,7 @@ module Kubeclient
         # build hash of entity name to array of the entities
         method_name = "get_#{entity.underscore.pluralize}"
         key_name = entity.underscore
-        result_hash[key_name] = self.method(method_name).call
+        result_hash[key_name] = send(method_name)
       end
      result_hash
     end

data/lib/kubeclient/version.rb

@@ -1,3 +1,3 @@
 module Kubeclient
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/kubeclient_test.rb

@@ -2,51 +2,10 @@ require 'minitest/autorun'
 require 'json'
 require 'webmock/minitest'
 require './lib/kubeclient'
-require './test/kubeclient'
 
 
 class KubeClientTest < MiniTest::Test
 
-  def test_renaming_keys
-    json_response = "{\n  \"kind\": \"Node\",\n  \"id\": \"127.0.0.1\",\n  \"uid\": \"b0ddfa00-8b5b-11e4-a8c4-3c970e4a436a\",\n  \"creationTimestamp\": \"2014-12-24T12:57:45+02:00\",\n  \"selfLink\": \"/api/v1beta1/nodes/127.0.0.1\",\n  \"resourceVersion\": 7,\n  \"apiVersion\": \"v1beta1\",\n  \"resources\": {\n    \"capacity\": {\n      \"cpu\": 1000,\n      \"memory\": 3221225472\n    }\n  }\n}"
-    stub_request(:get, /.*nodes*/).
-        to_return(:body => json_response, :status => 200)
-
-    client = Kubeclient::Client.new 'http://localhost:8080/api/' , "v1beta1"
-    original_hash = JSON.parse(json_response)
-    #convert to ruby style
-    hash_after_rename_underscore = client.rename_keys(deep_copy(original_hash),"underscore", nil)
-    #convert back to camelized style with first word downcase
-    hash_after_rename_camelize = client.rename_keys(deep_copy(hash_after_rename_underscore), "camelize", :lower)
-
-    assert_equal(original_hash, hash_after_rename_camelize)
-    assert_equal(7,hash_after_rename_camelize["resourceVersion"])
-    assert_equal(7,hash_after_rename_underscore["resource_version"])
-    assert_equal(nil, hash_after_rename_underscore["resourceVersion"])
-
-
-  end
-
-  #testing that keys renaming works on deeper level
-  #the json doesn't necessarily represent a valid k8s entity , it's for testing renaming purposes
-  def test_renaming_keys_deep
-    json_response = "{\n  \"kind\": \"Node\",\n  \"id\": \"127.0.0.1\",\n  \"uid\": \"b0ddfa00-8b5b-11e4-a8c4-3c970e4a436a\",\n  \"creationTimestamp\": \"2014-12-24T12:57:45+02:00\",\n  \"selfLink\": \"/api/v1beta1/nodes/127.0.0.1\",\n  \"resourceVersion\": 7,\n  \"apiVersion\": \"v1beta1\",\n  \"hostResources\": {\n    \"capacity\": {\n      \"cpu\": 1000,\n      \"memorySize\": 3221225472\n    }\n  }\n}"
-    stub_request(:get, /.*nodes*/).
-        to_return(:body => json_response, :status => 200)
-
-    client = Kubeclient::Client.new 'http://localhost:8080/api/' , "v1beta1"
-    original_hash = JSON.parse(json_response)
-    #convert to ruby style
-    hash_after_rename_underscore = client.rename_keys(deep_copy(original_hash),"underscore", nil)
-    #convert back to camelized style with first word downcase
-    hash_after_rename_camelize = client.rename_keys(deep_copy(hash_after_rename_underscore), "camelize", :lower)
-
-    assert_equal(original_hash, hash_after_rename_camelize)
-    assert_equal(3221225472,hash_after_rename_camelize["hostResources"]["capacity"]["memorySize"])
-    assert_equal(nil,hash_after_rename_underscore["host_resources"]["capacity"]["memorySize"])
-    assert_equal(3221225472,hash_after_rename_underscore["host_resources"]["capacity"]["memory_size"])
-  end
-
   def test_json
     our_object = Service.new
     our_object.foo = 'bar'

data/test/node_test.rb

@@ -16,14 +16,14 @@ class NodeTest < MiniTest::Test
 
     assert_instance_of(Node,node)
     #checking that creationTimestamp was renamed properly
-    assert_respond_to(node, "creation_timestamp")
+    assert_respond_to(node, "creationTimestamp")
     assert_respond_to(node, "uid")
     assert_respond_to(node, "id")
     assert_respond_to(node, "resources")
-    assert_respond_to(node, "resource_version")
-    assert_respond_to(node, "api_version")
+    assert_respond_to(node, "resourceVersion")
+    assert_respond_to(node, "apiVersion")
 
-    assert_equal 7, node.resource_version
+    assert_equal 7, node.resourceVersion
     assert_equal 1000, node.resources.capacity.cpu
   end
 

data/test/pod_test.rb

@@ -18,7 +18,7 @@ class PodTest < MiniTest::Test
 
     assert_instance_of(Pod,pod)
     assert_equal("redis-master-pod",pod.id)
-    assert_equal("redis-master",pod.desired_state.manifest.containers[0]['name'])
+    assert_equal("redis-master",pod.desiredState.manifest.containers[0]['name'])
   end
 
 end

data/test/replication_controller_test.rb

@@ -18,10 +18,10 @@ class ReplicationControllerTest < MiniTest::Test
     assert_equal("frontendController",rc.id)
     assert_equal("f4e5966c-8eb2-11e4-a6e7-3c970e4a436a",rc.uid)
     assert_equal("default",rc.namespace)
-    assert_equal(3,rc.desired_state.replicas)
-    assert_equal("frontend",rc.desired_state.replica_selector.name)
+    assert_equal(3,rc.desiredState.replicas)
+    assert_equal("frontend",rc.desiredState.replicaSelector.name)
     #the access to containers is not as nice as rest of the properties, but it's about to change in beta v3,
     #hence it can significantly impact the design of the client. to be revisited after beta v3 api is released.
-    assert_equal("php-redis",rc.desired_state.pod_template.desired_state.manifest.containers[0]['name'])
+    assert_equal("php-redis",rc.desiredState.podTemplate.desiredState.manifest.containers[0]['name'])
   end
 end

data/test/service_test.rb

@@ -42,13 +42,13 @@ class ServiceTest < MiniTest::Test
 
     assert_instance_of(Service,service)
     #checking that creationTimestamp was renamed properly
-    assert_equal("2014-12-28T17:37:21+02:00",service.creation_timestamp)
+    assert_equal("2014-12-28T17:37:21+02:00",service.creationTimestamp)
     assert_equal("6a022e83-8ea7-11e4-a6e7-3c970e4a436a",service.uid)
     assert_equal("redisslave",service.id)
-    assert_equal(8,service.resource_version)
-    assert_equal("v1beta1",service.api_version)
-    assert_equal("10.0.0.248",service.portal_ip)
-    assert_equal(6379,service.container_port)
+    assert_equal(8,service.resourceVersion)
+    assert_equal("v1beta1",service.apiVersion)
+    assert_equal("10.0.0.248",service.portalIP)
+    assert_equal(6379,service.containerPort)
     assert_equal("TCP",service.protocol)
     assert_equal(10001,service.port)
     assert_equal("default",service.namespace)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubeclient
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Alissa Bonas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -143,7 +143,6 @@ files:
 - lib/kubeclient/replication_controller.rb
 - lib/kubeclient/service.rb
 - lib/kubeclient/version.rb
-- test/kubeclient.rb
 - test/kubeclient_test.rb
 - test/node_test.rb
 - test/pod_test.rb
@@ -174,7 +173,6 @@ signing_key:
 specification_version: 4
 summary: A client for Kubernetes REST api
 test_files:
-- test/kubeclient.rb
 - test/kubeclient_test.rb
 - test/node_test.rb
 - test/pod_test.rb

data/test/kubeclient.rb

@@ -1,6 +0,0 @@
-module Kubeclient
-  #using this in order to test a protected method
-  class Client
-    public :rename_keys
-   end
-end