malsh 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac84ac7dfd01868083d18c3e6be4fecba347d7a748e96033bc49e6b2d0b25c35
-  data.tar.gz: 88e91d32de344e8416c57d0e86bb8983a67db9c46d9e4639ff6402648694f238
+  metadata.gz: 496b75cce4bfa94893f699050d52c6eb43b56cf3863fd9f0bfe0e07748961b8d
+  data.tar.gz: 84f4216c6c2e56b81332d2a777b6953413f43a09a5216ad0a5aaed1a14421271
 SHA512:
-  metadata.gz: 11cab119d65d791bfa156646c3891795af92125f62095694e9edbcfd53efc16a403505876d6941aaa1228d310cecdb888a437f904e879a4ea36f3e1760c8ee03
-  data.tar.gz: 15b728424b65bb9080773210f4737e45416a7b00f6cc2c3036060df061115d6ee489801f79859788f87fcbec8007566a920d3b8103637fafdad2ed6bfbe63b98
+  metadata.gz: bf1876097f304d5a5a6736f24c474de58beab2609f70c5ba4a9d955fb6e2183a53f48f86aaf8e067979cac67f495fbce2147d3b110bec460aa5f920ffc874df3
+  data.tar.gz: cf51581d01a034a937bd46fa5b80336d247713185e05806b5444e0137fee4d485af18f2171bf4038c94bd678b013461a3a582db89865343fe0c591af2e7cc79d

data/lib/malsh/version.rb

@@ -1,3 +1,3 @@
 module Malsh
-  VERSION = "0.3.5"
+  VERSION = '0.3.6'
 end

data/lib/malsh.rb

@@ -1,9 +1,9 @@
-require "malsh/version"
+require 'malsh/version'
 require 'thor'
 require 'mackerel-rb'
-require "malsh/cli"
-require "malsh/notification"
-require "malsh/host_metrics"
+require 'malsh/cli'
+require 'malsh/notification'
+require 'malsh/host_metrics'
 
 module Malsh
   class << self
@@ -19,7 +19,7 @@ module Malsh
       end
     end
 
-    def options(ops=nil)
+    def options(ops = nil)
       @_options = ops if ops
       @_options
     end
@@ -38,9 +38,9 @@ module Malsh
 
     def hosts(options = {})
       @_hosts ||= Mackerel.hosts(options).reject do |h|
-        Malsh.options[:invert_match] && Malsh.options[:invert_match].find {|v| host_name(h).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| !host_name(h).match(/#{r}/)}
+        Malsh.options[:regexp] && Malsh.options[:regexp].all? { |r| !host_name(h).match(/#{r}/) }
       end.reject do |h|
         Malsh.options[:invert_role] && Malsh.options[:invert_role].find do |r|
           service, role = r.split(/:/)
@@ -49,7 +49,7 @@ module Malsh
       end
     end
 
-    def alerts()
+    def alerts
       @_alerts ||= Mackerel.alerts.map do |alert|
         if alert_has_host?(alert)
           alert['host'] = Malsh.host_by_id(alert.hostId)
@@ -71,30 +71,27 @@ module Malsh
     def metrics(name)
       hash = {}
       hosts.map(&:id).each_slice(200) do |ids|
-        hash.merge!(Mackerel.latest_tsdb({hostId: ids, name: name}))
+        hash.merge!(Mackerel.latest_tsdb({ hostId: ids, name: name }))
       end
       hash
     end
 
     def host_metrics(id, name, from, to)
-      begin
-        Mackerel.host_metrics(id, name: name, from: from, to: to)
-      rescue => e
-        puts e
-      end
+      Mackerel.host_metrics(id, name: name, from: from, to: to)
+    rescue StandardError => e
+      puts e
     end
 
     def host_metric_names(id)
-      begin
-        Mackerel.host_metric_names(id)
-      rescue => e
-        puts e
-      end
+      Mackerel.host_metric_names(id)
+    rescue StandardError => e
+      puts e
     end
 
     def alert_has_host?(alert)
-      exclude_types = ['external', 'service']
+      exclude_types = %w[external service expression]
       return false if exclude_types.include?(alert.type)
+
       true
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: malsh
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - kazuhiko yamahsita
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2022-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: mackerel tools.