mackerel-client 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 4d420580a522e80698166f2b7d3ccce50c5df7b0
-  data.tar.gz: cd9032028a01755fa2fbb7e79b6590375bd0aa6f
+SHA256:
+  metadata.gz: 0f043c163694280f7233b26cf625bdba0caa646ba55d3c2cba6002772468c7b9
+  data.tar.gz: 7b1c11e80e5126cc8312b3d4695e0bc980f8a9c83ce3f629431a5625e89e5624
 SHA512:
-  metadata.gz: fbc6a2762fdbabad4fcfd8a4631b4d89f6b69158eec3e79e47c4542df2fe2bf9248f733ab97dad0b31280af1887f9c229239dea6080e0c14b8be0ed2d2644837
-  data.tar.gz: 9f71cb13cf0442de1a74e0e759794bacb9a47bd8f39d87530643f135b9d5127d5d8ac6030c1b7e3e2215d6daef0c8ad31319f156d85cda60619ce33a3425aeb9
+  metadata.gz: 18f19702d70fa6718924102398852f947f24d11721aa839af55c141819b0e4cb184b0ccf0ebaca5af3fd75c192fb1e77f2e0e72939aaa396c2a262dd9a207a24
+  data.tar.gz: a364791a0b00a4695f654f6fae03002a4e11cfa9e2ba5ff55265e0bffd98fa518970315f80672dfbc21108c17997777a2c744c6950b9a8cfa84e0cc91345a56c

data/README.md

@@ -1,6 +1,6 @@
 # mackerel-client [![Build Status](https://travis-ci.org/mackerelio/mackerel-client-ruby.svg?branch=master)](https://travis-ci.org/mackerelio/mackerel-client-ruby) [![Gem Version](https://badge.fury.io/rb/mackerel-client.png)](http://badge.fury.io/rb/mackerel-client)
 
-mackerel-client is a ruby library to access Mackerel (https://mackerel.io/). CLI tool `mkr.rb` is also provided.
+mackerel-client is a ruby library to access Mackerel (https://mackerel.io/).
 
 ## Usage
 
@@ -30,35 +30,3 @@ Or install it yourself as:
 ```sh
 gem install mackerel-client
 ```
-
-# CLI
-
-## Host
-
-* Get host(s) information from hostname or service, role.
-```
-mkr.rb host info [--name foo] [--service service] [--role role]
-```
-
-* Set status of a host
-```
-mkr.rb host status --host-id foo --status working
-```
-
-* Retire a host
-```
-mkr.rb host retire --host-id foo
-```
-
-* Get status of a host (not implemented yet)
-```
-mkr.rb host status --host-id foo
-```
-
-Note: CLI command has been renamed to `mkr.rb` from 0.0.7.
-Primary CLI `mkr` is implemented in Go (https://github.com/mackerelio/mkr).
-
-## Authentication
-```
-export MACKEREL_APIKEY=foobar
-```

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/lib/mackerel.rb

@@ -1,3 +1,2 @@
 require 'mackerel/client'
-require 'mackerel/runner'
 require 'mackerel/version'

data/lib/mackerel/client.rb

@@ -46,7 +46,7 @@ module Mackerel
     end
 
     private
-    ERROR_MESSAGE_FOR_API_KEY_ABSENCE = "API key is absent. Set your API key in a environment variable called MACKEREL_APIKEY."
+    ERROR_MESSAGE_FOR_API_KEY_ABSENCE = "API key is absent."
 
     def client
       @client ||= http_client

data/lib/mackerel/host.rb

@@ -45,20 +45,20 @@ module Mackerel
       def post_host(host)
         command = ApiCommand.new(:post, "/api/v0/hosts", @api_key)
         command.body = host.to_json
-        data = command.execute(client)
+        command.execute(client)
       end
 
       def update_host(host_id, host)
         command = ApiCommand.new(:put, "/api/v0/hosts/#{host_id}", @api_key)
         command.body = host.to_json
-        data = command.execute(client)
+        command.execute(client)
       end
 
       def update_host_roles(host_id, roles)
         roles = [roles] if roles.is_a?(String)
         command = ApiCommand.new(:put, "/api/v0/hosts/#{host_id}/role-fullnames", @api_key)
         command.body = { "roleFullnames" => roles }.to_json
-        data = command.execute(client)
+        command.execute(client)
       end
 
       def get_host(host_id)
@@ -71,16 +71,16 @@ module Mackerel
         unless [:standby, :working, :maintenance, :poweroff].include?(status.to_sym)
           raise "no such status: #{status}"
         end
-  
+
         command = ApiCommand.new(:post, "/api/v0/hosts/#{host_id}/status", @api_key)
         command.body = { "status" => status }.to_json
-        data = command.execute(client)
+        command.execute(client)
       end
 
       def retire_host(host_id)
         command = ApiCommand.new(:post, "/api/v0/hosts/#{host_id}/retire", @api_key)
         command.body = { }.to_json
-        data = command.execute(client)
+        command.execute(client)
       end
 
       def get_hosts(opts = {})

data/lib/mackerel/invitation.rb

@@ -3,17 +3,17 @@ module Mackerel
     module Invitation
       def post_invitation(email, authority)
         command = ApiCommand.new(:post, '/api/v0/invitations', @api_key)
-        command.body = { 
+        command.body = {
           email: email.to_s,
           authority: authority.to_s
         }.to_json
-        data = command.execute(client)
+        command.execute(client)
       end
 
       def revoke_invitation(email)
         command = ApiCommand.new(:post, '/api/v0/invitations/revoke', @api_key)
         command.body = { email: email.to_s }.to_json
-        data = command.execute(client)
+        command.execute(client)
       end
     end
   end

data/lib/mackerel/metadata.rb

@@ -3,23 +3,23 @@ module Mackerel
     module Metadata
       def get_metadata(host_id, namespace)
         command = ApiCommand.new(:get, "/api/v0/hosts/#{host_id}/metadata/#{namespace}", @api_key)
-        data = command.execute(client)
+        command.execute(client)
       end
 
       def list_metadata(host_id)
         command = ApiCommand.new(:get, "/api/v0/hosts/#{host_id}/metadata", @api_key)
-        data = command.execute(client)
+        command.execute(client)
       end
 
       def update_metadata(host_id, namespace, metadata)
         command = ApiCommand.new(:put, "/api/v0/hosts/#{host_id}/metadata/#{namespace}", @api_key)
         command.body = metadata.to_json
-        data = command.execute(client)
+        command.execute(client)
       end
 
       def delete_metadata(host_id, namespace)
         command = ApiCommand.new(:delete, "/api/v0/hosts/#{host_id}/metadata/#{namespace}", @api_key)
-        data = command.execute(client)
+        command.execute(client)
       end
     end
   end

data/lib/mackerel/metric.rb

@@ -4,7 +4,7 @@ module Mackerel
       def post_metrics(metrics)
         command = ApiCommand.new(:post, '/api/v0/tsdb', @api_key)
         command.body = metrics.to_json
-        data = command.execute(client)
+        command.execute(client)
       end
 
       def get_host_metrics(host_id, name, from, to)
@@ -27,7 +27,7 @@ module Mackerel
       def post_service_metrics(service_name, metrics)
         command = ApiCommand.new(:post, "/api/v0/services/#{service_name}/tsdb", @api_key)
         command.body = metrics.to_json
-        data = command.execute(client)
+        command.execute(client)
       end
 
       def get_service_metrics(service_name, name, from, to)
@@ -42,7 +42,7 @@ module Mackerel
       def define_graphs(graph_defs)
         command = ApiCommand.new(:post, '/api/v0/graph-defs/create', @api_key)
         command.body = graph_defs.to_json
-        data = command.execute(client)
+        command.execute(client)
       end
     end
   end

data/lib/mackerel/monitoring.rb

@@ -5,7 +5,7 @@ module Mackerel
       def post_monitoring_check_report(reports)
         command = ApiCommand.new(:post,'/api/v0/monitoring/checks/report', @api_key)
         command.body = reports.to_json
-        data = command.execute(client)
+        command.execute(client)
       end
 
     end

data/lib/mackerel/version.rb

@@ -1,3 +1,3 @@
 module Mackerel
-  VERSION = "0.4.1"
+    VERSION = "0.5.0"
 end

data/mackerel-client.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Mackerel developer team"]
   spec.email         = ["developers@mackerel.io"]
   spec.summary       = 'Mackerel client implemented by Ruby.'
-  spec.description   = 'Mackerel client is a library to access Mackerel (https://mackerel.io/). CLI tool `mkr` is also provided.'
+  spec.description   = 'Mackerel client is a library to access Mackerel (https://mackerel.io/).'
   spec.homepage      = "https://mackerel.io/"
   spec.license       = "Apache 2"
   spec.files         = `git ls-files -z`.split("\x0")

data/spec/mackerel/client_spec.rb

@@ -8,7 +8,7 @@ describe Mackerel::Client do
 
   describe 'initialization' do
     it 'display an error message when api_key is absent' do
-      expected_message = "API key is absent. Set your API key in a environment variable called MACKEREL_APIKEY."
+      expected_message = "API key is absent."
       expect { Mackerel::Client.new() }.to raise_error(expected_message)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mackerel-client
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Mackerel developer team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-01 00:00:00.000000000 Z
+date: 2018-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -67,11 +67,9 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 description: Mackerel client is a library to access Mackerel (https://mackerel.io/).
-  CLI tool `mkr` is also provided.
 email:
 - developers@mackerel.io
-executables:
-- mkr.rb
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -84,7 +82,6 @@ files:
 - RELEASE.md
 - Rakefile
 - VERSION
-- bin/mkr.rb
 - example/01_invitation.rb
 - example/02_dashboard.rb
 - example/03_host.rb
@@ -112,7 +109,6 @@ files:
 - lib/mackerel/notification_group.rb
 - lib/mackerel/organization.rb
 - lib/mackerel/role.rb
-- lib/mackerel/runner.rb
 - lib/mackerel/service.rb
 - lib/mackerel/user.rb
 - lib/mackerel/version.rb
@@ -152,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Mackerel client implemented by Ruby.

data/bin/mkr.rb

@@ -1,7 +0,0 @@
-#! /usr/bin/env ruby
-
-# mkr(1)
-
-require 'mackerel'
-Mackerel::Runner.execute(ARGV)
-

data/lib/mackerel/runner.rb

@@ -1,115 +0,0 @@
-require 'optparse'
-require 'json' unless defined? ::JSON
-
-module Mackerel
-
-  class Runner
-    attr_reader :args
-
-    def initialize(args)
-
-      args.unshift 'help' if args.empty?
-
-      @args = args
-      cmd = args.shift
-
-      if Runner.method_defined?(cmd) and cmd != 'run'
-        send(cmd, args)
-      else
-        puts "Error: `#{cmd}` command not found.\n\n"
-        send('help', args)
-        abort
-      end
-    end
-
-    # Shortcut
-    def self.execute(args)
-      new(args)
-    end
-
-    def help(args)
-      puts <<-EOS
-#{$0}: Command line interface for Mackerel (https://mackerel.io/).
-  Get host(s) information from hostname or service, role.
-    mkr host info [--name foo] [--service service] [--role role]
-
-  Set status of a host
-    mkr host status --host-id foo --status working
-
-  Retire a host
-    mkr host retire --host-id foo
-
-  Authentication
-    API key must be set to the environment variable as follows.
-      export MACKEREL_APIKEY=foobar
-
-      EOS
-    end
-
-    # mkr host status --host-id foo
-    def host(args)
-      mc = Mackerel::Client.new(:mackerel_api_key => ENV['MACKEREL_APIKEY'])
-      params = {}
-      opt = OptionParser.new
-      opt.on('--host-id HOSTID'){|v| params[:hostid] = v }
-
-      cmd = args.shift
-      case cmd
-      when 'status'
-          opt.on('--status STATUS'){|v| params[:status] = v }
-          opt.parse!(args)
-          if params[:status]
-            begin
-              res = mc.update_host_status(params[:hostid], params[:status])
-              puts "Updated to '#{params[:status]}'"
-            rescue => msg
-              abort "Error: #{msg}"
-            end
-          else
-            begin
-              res = mc.get_hosts(:hostid => params[:hostid])[0]
-              puts "#{res.status}"
-            rescue => msg
-              abort "Error: #{msg}"
-            end
-
-          end
-
-      when 'retire'
-        opt.parse!(args)
-        begin
-          res = mc.retire_host(params[:hostid])
-        rescue => msg
-          abort "Error: #{msg}"
-        end
-
-      when 'info'
-        opt.on('--service SERVICE'){|v| params[:service] = v }
-        opt.on('--role ROLE')      {|v| params[:roles] = v }
-        opt.on('--name NAME')      {|v| params[:name] = v }
-        opt.on('--host-id HOSTID') {|v| params[:hostId] = v }
-        opt.on('--custom-identifier IDENTIFIER') {|v| params[:customIdentifier] = v }
-        opt.parse!(args)
-        begin
-          if params[:hostid]
-            res = [ mc.get_host(params[:hostId]) ]
-          else
-            res = mc.get_hosts(params)
-          end
-        rescue => msg
-          abort "Error: #{msg}"
-        end
-        res.each do |res|
-          puts <<-EOS
-name: #{res.name}, status: #{res.status}, id: #{res.id}, roles: #{res.roles}
-          EOS
-        end
-      else
-        abort "Error: `#{command}` command not found for host."
-      end
-    end
-
-  end
-
-end
-