rancher-metadata 0.0.5 → 0.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45c146716bebd39e8085ec217f2327b28d405dc6
-  data.tar.gz: 420604a2e4f53f90f25dc5ca168c0a025a403f5d
+  metadata.gz: 2c5907bb0d7228b6b278cd1fd3b70ed34dcc0811
+  data.tar.gz: 284bcdacc796db2e940eda27a2b31c1826420572
 SHA512:
-  metadata.gz: b428e244f6e0996afb28b9632b67eb11468fe481efbf916fe431254293f2f0c7631a7881060a3808189b9b6d5460bb0bc31017f1974a1a85aa89479f7a752a8e
-  data.tar.gz: 6656c0758e9e818d55f390e911a03667a5e1abb4179b98bf90db10a7c5ec25f15334c26e6b372316e6e055d3bb5fae589c60d5d4f0b77d83a3cfb367e1b5d8b7
+  metadata.gz: 24c0a5d8cc6209297608271608ed772eeaabc34aa3729afd9a2763273ac20973f6d78ff2235c730744afd845105f24b71b08b790d58a326a42a1ac3fb3da2043
+  data.tar.gz: 1e7ffc14ffac4d05de9abcc755a382c1447cb4b39ad09ec06ebc1ceecfbf4b06161f63d94af276ee6de4b7410d6b514d96df7b6930f8084f57859a475fdd31e7

data/README.md

@@ -13,7 +13,7 @@ gem install rancher-metadata
 ## Usage
 ```
 require 'rancher-metadata'
-api = RancherMetadata::API.new({:api_url => "http://rancher-metadata/2015-07-25"})
+api = RancherMetadata::API.new({:api_url => "http://rancher-metadata/2015-12-19"})
 
 puts("Container ID: #{api.get_container_id}")
 puts("Container Service ID: #{api.get_container_service_id}")
@@ -22,8 +22,8 @@ puts("Container Name: #{api.get_container_name}")
 puts("Container Service Name: #{api.get_container_service_name}")
 puts("Container Hostname: #{api.get_container_hostname}")
 
-api.wait_service_containers() do |container|
-  puts("Container #{container} is up (IP: #{api.get_container_ip(container)}, Index: #{api.get_container_id})")
+api.wait_service_containers() do |name, container|
+  puts("Container #{name} is up (IP: #{container['primary_ip']}, Index: #{container['create_index']})")
 end
 
 metadata = api.get_service_metadata()

data/lib/rancher-metadata/api.rb

@@ -13,7 +13,7 @@ module RancherMetadata
 
     def initialize(config)
       defaults = {
-        :api_url => ["http://rancher-metadata/2015-07-25"],
+        :api_url => ["http://rancher-metadata/2015-12-19"],
         :max_attempts => 3
       }
 
@@ -74,11 +74,9 @@ module RancherMetadata
         raise("Missing rancher service name") unless service.has_key?(:service_name)
 
         unless service.has_key?(:stack_name)
-          return self.api_get("/services/#{service[:service_name]}")
+          return self.api_get("/self/stack/services/#{service[:service_name]}")
         else
-          self.get_services().each do |s|
-            return s if s['stack_name'] == service[:stack_name] and s['name'] == service[:service_name]
-          end
+          return self.api_get("/stacks/#{service[:stack_name]}/services/#{service[:service_name]}")
         end
       end
     end
@@ -87,17 +85,12 @@ module RancherMetadata
       if service.empty?
         return self.api_get("/self/service/#{field}")
       else
-        raise("Missing rancher service name") unless service.has_key?(:service_name)
+        raise("Must provide service name") unless service.has_key?(:service_name)
 
         unless service.has_key?(:stack_name)
-          return self.api_get("/services/#{service[:service_name]}/#{field}")
+          return self.api_get("/self/stack/services/#{service[:service_name]}/#{field}")
         else
-          s = self.get_service(service)
-          if s.has_key?(field)
-            return s[field]
-          else
-            return nil
-          end
+          return self.api_get("/stacks/#{service[:stack_name]}/services/#{service[:service_name]}/#{field}")
         end
       end
     end
@@ -121,18 +114,18 @@ module RancherMetadata
     def wait_service_containers(service = {})
       scale = self.get_service_scale_size(service)
 
-      containers = []
-
+      old = []
       loop do
-        c = self.get_service_containers(service)
+        containers = self.get_service_containers(service)
+        new = containers.keys()
 
-        (c - containers).each do |n|
-          yield(n)
+        (new - old).each do |n|
+          yield(n, containers[n])
         end
 
-        containers = c
+        old = new
 
-        break if containers.size >= scale
+        break if new.size >= scale
 
         sleep(0.5)
       end
@@ -146,6 +139,10 @@ module RancherMetadata
       stack_name ? self.api_get("/stacks/#{stack_name}") : self.api_get("/self/stack")
     end
 
+    def get_stack_services(stack_name = nil)
+      stack_name ? self.api_get("/stacks/#{stack_name}/services") : self.api_get("/self/stack/services")
+    end
+
     def get_containers
       self.api_get("/containers")
     end

data/lib/rancher-metadata/version.rb

@@ -5,7 +5,7 @@
 #
 
 module RancherMetadata
-  VERSION = "0.0.5"
+  VERSION = "0.17.1"
 
   def self.version
     VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rancher-metadata
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.17.1
 platform: ruby
 authors:
 - Matteo Cerutti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json