kubeclient 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9172bf5d56e7437d23e93ba1e6280af446e87282
-  data.tar.gz: 271517b25926b62222e193e3d722f18a24e1df6b
+  metadata.gz: 4cce5a424d82f97a745e142c887bb3f212e1cb44
+  data.tar.gz: bba2a4ba2dde980a5987d55b7dc16978a371ae29
 SHA512:
-  metadata.gz: 3dca5eb07416265317c30e4e2e35578bdb1d2dc7ea2971df475e295b685dc935e82ea643fdfa503b0d3f30fb0dc9ce0f1983f1bdbe59c912fc097680de52e560
-  data.tar.gz: 5bdc07a1ed661cb51c5cdf37ef7e410416f44a319707654660d639ab64b1d5c462d483ae4f0152471a9e7be08b11a3151761238cb66b346635f3d9be4a6202a2
+  metadata.gz: c4095bf9e4a000c1c42ef97aec6bae358decb35943193875003352a3ede9f50e156ad3cb4643d4f7c11d70505c38ad77711763a08b6d1f527a308b29622a3188
+  data.tar.gz: 6d516c2b91b6976cd4eb05f5c72e5044acfa9d8addd12829120628cab787d4911bab04e7cb504cffd4f0e987b4397a3af78337c43f47bd953ee5ec1d216fb5f7

data/README.md

@@ -55,6 +55,10 @@ Examples:
 <br>
 `pods = client.get_pods`
 <br>
+You can get entities which have specific labels by specifying input parameter named `labels`: <br>
+`pods = client.get_pods(labels: 'name=redis-master')` <br>
+You can specify multiple labels and that returns entities which have both labels:  <br>
+`pods = client.get_pods(labels: 'name=redis-master,app=redis')`
 
 2. Get a specific node (and respectively: get_service "service id" , get_pod "pod id" , get_replication_controller "rc id" )
 <br>

data/Rakefile

@@ -4,8 +4,8 @@ require 'rubocop/rake_task'
 
 task default: [:test, :rubocop]
 
-task :test do
-  Dir.glob('./test/*_test.rb').each { |file| require file }
+Rake::TestTask.new do |t|
+  t.libs << 'test'
 end
 
 RuboCop::RakeTask.new

data/lib/kubeclient.rb

@@ -53,11 +53,13 @@ module Kubeclient
       raise KubeException.new(e.http_code, JSON.parse(e.response)['message'])
     end
 
-    def get_entities(entity_type)
-      # TODO: labels support
+    def get_entities(entity_type, options)
+      params = {}
+      params['labels'] = options[:labels] if options[:labels]
+
       # TODO: namespace support?
       response = handling_kube_exception do
-        rest_client[get_resource_name(entity_type)].get # nil, labels
+        rest_client[get_resource_name(entity_type)].get(params: params)
       end
 
       result = JSON.parse(response)
@@ -165,8 +167,8 @@ module Kubeclient
       entity_name_plural = entity_name.pluralize
 
       # get all entities of a type e.g. get_nodes, get_pods, etc.
-      define_method("get_#{entity_name_plural}") do
-        get_entities(entity_type)
+      define_method("get_#{entity_name_plural}") do |options = {}|
+        get_entities(entity_type, options)
       end
 
       # watch all entities of a type e.g. watch_nodes, watch_pods, etc.

data/lib/kubeclient/version.rb

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

data/test/json/empty_pod_list_b3.json

@@ -0,0 +1,9 @@
+{
+  "kind": "PodList",
+  "apiVersion": "v1beta3",
+  "metadata": {
+      "selfLink": "/api/v1beta3/pods",
+      "resourceVersion": "565"
+  },
+  "items": []
+}

data/test/test_helper.rb

@@ -0,0 +1,4 @@
+require 'minitest/autorun'
+require 'webmock/minitest'
+require 'json'
+require 'kubeclient'

data/test/{kubeclient_test.rb → test_kubeclient.rb}

@@ -1,7 +1,4 @@
-require 'minitest/autorun'
-require 'json'
-require 'webmock/minitest'
-require './lib/kubeclient'
+require 'test_helper'
 
 def open_test_json_file(name)
   File.new(File.join(File.dirname(__FILE__), 'json', name))
@@ -61,6 +58,17 @@ class KubeClientTest < MiniTest::Test
     assert_instance_of(Service, services[1])
   end
 
+  def test_empty_list
+    stub_request(:get, /\/pods/)
+      .to_return(body: open_test_json_file('empty_pod_list_b3.json'),
+                 status: 200)
+
+    client = Kubeclient::Client.new 'http://localhost:8080/api/', 'v1beta3'
+    pods = client.get_pods
+    assert_instance_of(EntityList, pods)
+    assert_equal(0, pods.size)
+  end
+
   def test_get_all
     stub_request(:get, /\/services/)
       .to_return(body: open_test_json_file('get_all_services_b1.json'),

data/test/{namespace_test.rb → test_namespace.rb}

@@ -1,10 +1,7 @@
-require 'minitest/autorun'
-require 'webmock/minitest'
-require 'json'
-require './lib/kubeclient'
+require 'test_helper'
 
 # Namespace entity tests
-class NamespaceTest < MiniTest::Test
+class TestNamespace < MiniTest::Test
   def test_get_namespace_v1beta3
     stub_request(:get, /\/namespaces/)
       .to_return(body: open_test_json_file('namespace_b3.json'),

data/test/{node_test.rb → test_node.rb}

@@ -1,10 +1,7 @@
-require 'minitest/autorun'
-require 'webmock/minitest'
-require 'json'
-require './lib/kubeclient'
+require 'test_helper'
 
 # Node entity tests
-class NodeTest < MiniTest::Test
+class TestNode < MiniTest::Test
   def test_get_from_json_v1
     stub_request(:get, /\/nodes/)
       .to_return(body: open_test_json_file('node_b1.json'),

data/test/{pod_test.rb → test_pod.rb}

@@ -1,10 +1,7 @@
-require 'minitest/autorun'
-require 'webmock/minitest'
-require 'json'
-require './lib/kubeclient'
+require 'test_helper'
 
 # Pod entity tests
-class PodTest < MiniTest::Test
+class TestPod < MiniTest::Test
   def test_get_from_json_v1
     stub_request(:get, /\/pods/)
       .to_return(body: open_test_json_file('pod_b1.json'),

data/test/{replication_controller_test.rb → test_replication_controller.rb}

@@ -1,10 +1,7 @@
-require 'minitest/autorun'
-require 'webmock/minitest'
-require './lib/kubeclient'
-require 'json'
+require 'test_helper'
 
 # Replication Controller entity tests
-class ReplicationControllerTest < MiniTest::Test
+class TestReplicationController < MiniTest::Test
   def test_get_from_json_v1
     stub_request(:get, /\/replicationControllers/)
       .to_return(body: open_test_json_file('replication_controller_b1.json'),

data/test/{service_test.rb → test_service.rb}

@@ -1,10 +1,7 @@
-require 'minitest/autorun'
-require 'webmock/minitest'
-require 'json'
-require './lib/kubeclient'
+require 'test_helper'
 
 # Service entity tests
-class ServiceTest < MiniTest::Test
+class TestService < MiniTest::Test
   def test_get_from_json_v1
     mock = Service.new(
       'kind' => 'Service',

data/test/{watch_test.rb → test_watch.rb}

@@ -1,10 +1,7 @@
-require 'minitest/autorun'
-require 'webmock/minitest'
-require 'json'
-require './lib/kubeclient'
+require 'test_helper'
 
 # Watch entity tests
-class WatchTest < MiniTest::Test
+class TestWatch < MiniTest::Test
   def test_watch_pod_success
     expected = [
       { 'type' => 'ADDED', 'resourceVersion' => '1389' },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubeclient
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Alissa Bonas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,6 +157,7 @@ files:
 - lib/kubeclient/version.rb
 - lib/kubeclient/watch_notice.rb
 - lib/kubeclient/watch_stream.rb
+- test/json/empty_pod_list_b3.json
 - test/json/endpoint_list_b3.json
 - test/json/entity_list_b1.json
 - test/json/event_list_b3.json
@@ -176,13 +177,14 @@ files:
 - test/json/service_b3.json
 - test/json/service_exception_b1.json
 - test/json/watch_stream_b3.json
-- test/kubeclient_test.rb
-- test/namespace_test.rb
-- test/node_test.rb
-- test/pod_test.rb
-- test/replication_controller_test.rb
-- test/service_test.rb
-- test/watch_test.rb
+- test/test_helper.rb
+- test/test_kubeclient.rb
+- test/test_namespace.rb
+- test/test_node.rb
+- test/test_pod.rb
+- test/test_replication_controller.rb
+- test/test_service.rb
+- test/test_watch.rb
 homepage: https://github.com/abonas/kubeclient
 licenses:
 - MIT
@@ -208,6 +210,7 @@ signing_key:
 specification_version: 4
 summary: A client for Kubernetes REST api
 test_files:
+- test/json/empty_pod_list_b3.json
 - test/json/endpoint_list_b3.json
 - test/json/entity_list_b1.json
 - test/json/event_list_b3.json
@@ -227,10 +230,11 @@ test_files:
 - test/json/service_b3.json
 - test/json/service_exception_b1.json
 - test/json/watch_stream_b3.json
-- test/kubeclient_test.rb
-- test/namespace_test.rb
-- test/node_test.rb
-- test/pod_test.rb
-- test/replication_controller_test.rb
-- test/service_test.rb
-- test/watch_test.rb
+- test/test_helper.rb
+- test/test_kubeclient.rb
+- test/test_namespace.rb
+- test/test_node.rb
+- test/test_pod.rb
+- test/test_replication_controller.rb
+- test/test_service.rb
+- test/test_watch.rb