app-rb 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df3695db6a49667960edd6677455a28c49d6c803
-  data.tar.gz: 3113a43cbd378bf35dcaf5e5640e1e5605c5ca55
+  metadata.gz: e7742e8a1fcec586fb33ee44414d89ea7ecee87f
+  data.tar.gz: c9d97cf47d41a5e9b2b22a464b78d3311da7471e
 SHA512:
-  metadata.gz: 0766be8fdd83373ed5a38a137b953cbcdfa7b0c2d882e5430a9788bd1249df82947f9566c97ea75889a220fd25aa5c2c5d8b0fa93f1c1b7d49a8596912253ca4
-  data.tar.gz: eacc4ce1b574080c81371277c422a678e5e0ad0db3ce43813ef0cad6809f36a9e74613499397d3bbe189bebbf1d6a49616c85e49ac71a15ca66045bc59832e55
+  metadata.gz: 7430044a5e2f07f3a3ef65a4a98561579b0904ae7e842bf686162da33195dd5ab67004a8f4a70c392f48dce721d7a63175e4ce0cc3555f3cf1ddfc81e2343e1c
+  data.tar.gz: 15c8870993c265004ad98696f9812915e3d7af01a9605ee447354db3efe85598fbf29fa0730c5a5a52192c5f4647ff9e9589399816d4bd3d0851a0fc78b9b073

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## App-rb 0.4.0 (April 8, 2017) ##
+
+* [breaking change] Remove node role support.
+* Support array for `name` in `constraint`.
+
 ## App-rb 0.3.0 (March 29, 2017) ##
 
 * Add debug info in `Registry#tags_list`

data/lib/app-rb/command.rb

@@ -66,7 +66,6 @@ module AppRb
       nodes = @config.nodes.select { |n| ips.index(n.ip) }
       max_name_len = nodes.map { |n| n.name.length }.max
       max_ip_len = nodes.map { |n| n.ip.length }.max
-      max_roles_len = nodes.map { |n| n.roles.inspect.length }.max
       current_base = AppRb::Util::Consul.kv_get(@config.consul, @config.app, "base")
       current_hash = AppRb::Util::Consul.kv_get(@config.consul, @config.app, "hash")
       current_dockers = nodes.map { |n| 
@@ -83,7 +82,6 @@ module AppRb
         puts(
           " "*5 + n.name.rjust(max_name_len) + 
           " "*2 + n.ip.ljust(max_ip_len) + 
-          " "*2 + n.roles.inspect.ljust(max_roles_len) +
           " "*2 + AppRb::Util.green(current_dockers[i]) + " / " + (dockers[i] - current_dockers[i] == 0 ? "0" : AppRb::Util.red(dockers[i] - current_dockers[i]))
         )
         end

data/lib/app-rb/config.rb

@@ -16,23 +16,20 @@ class AppRb::Config
   def nodes(constraint = nil)
     constraint ||= {}
     out = __nodes
-    if constraint["role"]
-      out = out.select { |n| n.roles.index(constraint["role"]) }
-    end
     if constraint["name"]
-      out = out.select { |n| n.name == constraint["name"] }
+      out = out.select { |n| Array(constraint["name"]).index(n.name) }
     end
-    out
+    out.shuffle
   end
 
 private
 
-  Node = Struct.new(:name, :ip, :roles)
+  Node = Struct.new(:name, :ip)
   def __nodes
     @__nodes ||= JSON.load(AppRb::Util.just_cmd("curl -s #{@body["consul"]}/v1/catalog/nodes")).sort_by { |n| 
       n["Node"]
     }.map { |n|
-      Node.new(n["Node"], n["Address"], (n["Meta"] || {})["roles"].to_s.split(",").reject{ |s| s.to_s.empty? })
+      Node.new(n["Node"], n["Address"])
     }
   end
 end

data/lib/app-rb/version.rb

@@ -1,3 +1,3 @@
 module AppRb
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app-rb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Alexey Vakhov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler