malsh 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bc1c3a356c2adcf0d6fe93e26215d5ec733b762
-  data.tar.gz: 3f647317f7a914ce6c0409972c22effa21ff8a69
+  metadata.gz: 0fa06d731f4c92e454a03334fa7c3964ca767371
+  data.tar.gz: b44f30a0dbaac3f827206cb03065b87b176aca18
 SHA512:
-  metadata.gz: 5d09534b84899e65215a60a6a3fbf977c5e21988b1187157c3812b7435b6c6da62cdf37e0be6c5b5240551139a289d9b5fdb96a60f2306e75e28488bbf606198
-  data.tar.gz: 486cb75698d3d3a2e17321275c03977cdd014b3c33bec5b11ad16d792401cb0aa49a2e5c2f48b1dff161fea30f0a776b2d0e5fcebc93df7ce5c9ef17eef3f011
+  metadata.gz: e82b0c6a6924df2d1b3905ae08d01c50814cf8f031560571aac52e67786ce7cd5724a74d094f356cab1a76de75ecdfe4d7ae897eac6fe1725a430d1201698a3a
+  data.tar.gz: 9cf7bb1593c2edf7489e44ce0d20e476225b71eb48fa490faed22fb69f4a8fe2b69bdca7976439c2ead7f28186fcaad120b8cfdd0502a81b501a2590f2c054f0

data/lib/malsh/version.rb

@@ -1,3 +1,3 @@
 module Malsh
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/malsh.rb

@@ -32,12 +32,16 @@ module Malsh
 
     def hosts(options = {})
       @_hosts ||= Mackerel.hosts(options).reject do |h|
-        Malsh.options[:invert_match] && Malsh.options[:invert_match].find {|v| h.name.match(/#{v}/) }
+        Malsh.options[:invert_match] && Malsh.options[:invert_match].find {|v| host_name(h).match(/#{v}/) }
       end.reject do |h|
-        Malsh.options[:regexp] && Malsh.options[:regexp].all? {|r| !h.name.match(/#{r}/)}
+        Malsh.options[:regexp] && Malsh.options[:regexp].all? {|r| !host_name(h).match(/#{r}/)}
       end
     end
 
+    def host_name(host)
+      host.displayName || host.name
+    end
+
     def host_by_id(id)
       Mackerel.host(id)
     end
@@ -59,5 +63,3 @@ module Malsh
     end
   end
 end
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malsh
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - kazuhiko yamahsita
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-25 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor