mackerel-client 0.5.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f043c163694280f7233b26cf625bdba0caa646ba55d3c2cba6002772468c7b9
-  data.tar.gz: 7b1c11e80e5126cc8312b3d4695e0bc980f8a9c83ce3f629431a5625e89e5624
+  metadata.gz: defff3c3d0b9980e41b4fc6d9cc38c89a28f0093617a3f9bc32b5dc02307b7c3
+  data.tar.gz: 8d72678528c3f43c2c9772b7583fccc40abbe021afb67a89d14214f895542a40
 SHA512:
-  metadata.gz: 18f19702d70fa6718924102398852f947f24d11721aa839af55c141819b0e4cb184b0ccf0ebaca5af3fd75c192fb1e77f2e0e72939aaa396c2a262dd9a207a24
-  data.tar.gz: a364791a0b00a4695f654f6fae03002a4e11cfa9e2ba5ff55265e0bffd98fa518970315f80672dfbc21108c17997777a2c744c6950b9a8cfa84e0cc91345a56c
+  metadata.gz: '08d0ea5a016ae5cdda43fddfbf57fa9868f05fb42b1ab8cd0f3f630fd4b2eb80e94d19856b4746c215b26784e95e90fcca320fcae7a092b625534319c781f8a0'
+  data.tar.gz: b2e3ca3de0d0e95dfc302a808d4648ed0ded2ebe2445980b4aa6f20007bcb359e6d8d0fcc372e403471892d9ae9481a2448e9ada6e97c8a2da3a3b600db0cd5d

data/.github/dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: weekly
+    time: "01:00"
+    timezone: Asia/Tokyo
+  open-pull-requests-limit: 10

data/.github/workflows/ci.yml

@@ -0,0 +1,22 @@
+name: CI
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ['ubuntu-20.04', 'macOS-10.15']
+        # See https://github.com/actions/runner/issues/849 for quoting '3.0'
+        ruby: [2.6, 2.7, '3.0']
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - run: bundle exec rake

data/.rspec

@@ -1,2 +1,3 @@
 --format documentation
 --color
+--require spec_helper

data/CHANGELOG.md

@@ -0,0 +1,31 @@
+# Changelog
+
+## v0.10.0 (2021-03-15)
+
+## Breaking change
+
+Previously `Host` has `type` attribute, but it is removed.
+
+* Drop `type` attribute from `Host` and introduce `size` instead #58 (astj)
+
+## v0.9.0 (2020-01-23)
+
+* Use Faraday v1.0 #54 (onk)
+
+## v0.8.0 (2019-06-26)
+
+### Breaking change
+
+Now mackerel-client raises `Mackerel::Error` when HTTP requests failed.
+Previously various exceptions (mainly `RuntimeError` or `NoMethodError`) happened in such cases.
+
+* Use Faraday::Response::RaiseError middleware #49 (onk)
+
+## v0.7.0 (2018-10-22)
+
+* fix unintended initializing http headers #47 (y_uuki)
+
+## v0.6.0 (2018-07-04)
+
+* Use Rspec v3.x #43 (onk)
+

data/README.md

@@ -1,4 +1,4 @@
-# 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 [![CI](https://github.com/mackerelio/mackerel-client-ruby/actions/workflows/ci.yml/badge.svg)](https://github.com/mackerelio/mackerel-client-ruby/actions/workflows/ci.yml) [![Gem Version](https://badge.fury.io/rb/mackerel-client.svg)](https://badge.fury.io/rb/mackerel-client)
 
 mackerel-client is a ruby library to access Mackerel (https://mackerel.io/).
 

data/RELEASE.md

@@ -1,7 +1,10 @@
 RELEASE
 =======
 
-1. Update VERSION file.
-1. git push
-1. `gem build mackerel-client.gemspec`
-1. `gem push mackerel-client-$VERSION.gem`
+1. Create release branch. (`git checkout -b version-<VERSION>`)
+1. Bump version `VERSION` and `lib/mackerel/version.rb` files.
+1. Write changes in CHANGELOG.md
+1. Push release branch to upstream(GitHub). (`git push -u origin version-<VERSION>`)
+1. Create Pull-Request on Github.
+1. Merge Pull-Request to master branch on Github.
+1. Tagging and Release. (`rake release`)

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.10.0

data/example/03_host.rb

@@ -14,11 +14,7 @@ pp mc.post_host({
     'agent-revision' => 'bc2f9f6',
     'agent-version'  => '0.6.1',
   },
-  'type' => 'unknown',
-  'status' => 'working',
   'memo' => 'test web host',
-  'isRetired' => false,
-  'createdAt' => '1401291970',
   'roleFullnames' => [
     'mackerel:web'
   ],
@@ -35,11 +31,7 @@ pp mc.post_host({
     'agent-revision' => 'bc2f9f6',
     'agent-version'  => '0.6.1',
   },
-  'type' => 'unknown',
-  'status' => 'working',
   'memo' => 'test db host',
-  'isRetired' => false,
-  'createdAt' => '1401291976',
   'roleFullnames' => [
     'mackerel:db'
   ],
@@ -75,12 +67,7 @@ pp mc.update_host(target_host.id,{
     'agent-revision' => 'bc2f9f6',
     'agent-version'  => '0.6.1',
   },
-  'type' => 'unknown',
-  'status' => 'working',
   'memo' => 'test host',
-  'isRetired' => false,
-  'createdAt' => '1401291976',
-  'id' => target_host.id,
   'roleFullnames' => [
     'mackerel:db'
   ],
@@ -93,5 +80,3 @@ pp mc.update_host(target_host.id,{
 
 # retire the host
 pp mc.retire_host(target_host.id)
-
-

data/lib/mackerel/api_command.rb

@@ -27,38 +27,26 @@ module Mackerel
 
       client_method = client.method(@method)
       response = client_method.call(request_path) do |req|
-        req.headers = @headers
+        req.headers.update @headers
         req.headers['x-api-key'] = @api_key
         req.headers['Content-Type'] ||= JSON_CONTENT_TYPE
         req.params = @params
         req.body = @body
       end
-      check_status(response.status)
-
       JSON.parse(response.body)
+    rescue Faraday::ClientError, Faraday::ServerError => e
+      begin
+        body = JSON.parse(e.response[:body])
+        message = body["error"].is_a?(Hash) ? body["error"]["message"] : body["error"]
+        raise Mackerel::Error, "#{@method.upcase} #{@path} failed: #{e.response[:status]} #{message}"
+      rescue JSON::ParserError
+        # raise Mackerel::Error with original response body
+        raise Mackerel::Error, "#{@method.upcase} #{@path} failed: #{e.response[:status]} #{e.response[:body]}"
+      end
     end
 
     private
 
-    def check_status(status)
-      case status
-      when 200...300
-        nil
-      when 400
-        message ="Invalid parameter"
-        raise "#{@method.upcase} #{@path} failed: #{status} #{message}"
-      when 403
-        message ="Not authorized"
-        raise "#{@method.upcase} #{@path} failed: #{status} #{message}"
-      when 404
-        message ="Resource not found"
-        raise "#{@method.upcase} #{@path} failed: #{status} #{message}"
-      when 409
-        message ="Already exists"
-        raise "#{@method.upcase} #{@path} failed: #{status} #{message}"
-      end
-    end
-
     def make_escaped_query
       @query.map{|k,v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}"}.join("&")
     end

data/lib/mackerel/client.rb

@@ -4,6 +4,7 @@ require 'uri'
 require 'json' unless defined? ::JSON
 
 require 'mackerel/api_command'
+require 'mackerel/error'
 
 require 'mackerel/role'
 require 'mackerel/host'
@@ -54,6 +55,7 @@ module Mackerel
 
     def http_client
       Faraday.new(:url => @origin) do |faraday|
+        faraday.response :raise_error
         faraday.response :logger if ENV['DEBUG']
         faraday.adapter Faraday.default_adapter
         faraday.options.params_encoder = Faraday::FlatParamsEncoder

data/lib/mackerel/error.rb

@@ -0,0 +1,4 @@
+module Mackerel
+  class Error < StandardError
+  end
+end

data/lib/mackerel/host.rb

@@ -3,13 +3,13 @@ module Mackerel
   class Host
 
     MACKEREL_INTERFACE_NAME_PATTERN = /^eth\d/
-    attr_accessor :name, :type, :status, :memo, :isRetired, :id, :createdAt, :roles, :interfaces, :customIdentifier
+    attr_accessor :name, :size, :status, :memo, :isRetired, :id, :createdAt, :roles, :interfaces, :customIdentifier
 
     def initialize(args = {})
       @hash             = args
       @name             = args["name"]
       @meta             = args["meta"]
-      @type             = args["type"]
+      @size             = args["size"]
       @status           = args["status"]
       @memo             = args["memo"]
       @isRetired        = args["isRetired"]

data/lib/mackerel/version.rb

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

data/mackerel-client.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'faraday', '~> 0.9'
+  spec.add_dependency 'faraday', '~> 1.0'
 
-  spec.add_development_dependency "rake", '~> 0'
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rspec", '~> 2'
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rspec"
 end

data/spec/mackerel/alert_spec.rb

@@ -1,8 +1,4 @@
-require 'mackerel'
-require 'mackerel/host'
-require 'json'
-
-describe Mackerel::Client do
+RSpec.describe Mackerel::Client do
   let(:api_key) { 'xxxxxxxx' }
   let(:client) { Mackerel::Client.new(:mackerel_api_key => api_key) }
 
@@ -17,6 +13,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end
@@ -66,6 +63,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.post(api_path) { stubbed_response }
         end

data/spec/mackerel/annotation_spec.rb

@@ -1,8 +1,4 @@
-require 'mackerel'
-require 'mackerel/host'
-require 'json'
-
-describe Mackerel::Client do
+RSpec.describe Mackerel::Client do
   let(:api_key) { 'xxxxxxxx' }
   let(:client) { Mackerel::Client.new(:mackerel_api_key => api_key) }
 
@@ -17,6 +13,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.post(api_path) { stubbed_response }
         end
@@ -62,6 +59,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end
@@ -122,6 +120,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.put(api_path) { stubbed_response }
         end
@@ -169,6 +168,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.delete(api_path) { stubbed_response }
         end

data/spec/mackerel/api_commend_spec.rb

@@ -0,0 +1,82 @@
+RSpec.describe Mackerel::ApiCommand do
+  let(:api_key) { "xxxxxxxx" }
+  let(:command) { Mackerel::ApiCommand.new(:get, "/api/v0/services", api_key) }
+
+  describe "#execute" do
+    let(:api_path) { "/api/v0/services" }
+
+    let(:test_client) {
+      Faraday.new do |builder|
+        builder.response :raise_error
+        builder.adapter :test do |stubs|
+          stubs.get(api_path) { stubbed_response }
+        end
+      end
+    }
+
+    let(:services) {
+      {
+        "services" => [
+          {
+            "name" => "Web",
+            "memo" => "store",
+            "roles" => [
+              "normal role",
+              "special role"
+            ]
+          },
+          {
+             "name" => "Web",
+             "memo" => "store",
+             "roles" => [
+               "a role",
+               "the role"
+             ]
+          }
+        ]
+      }
+    }
+
+    context "when success" do
+      let(:stubbed_response) {
+        [
+          200,
+          {},
+          JSON.dump(services)
+        ]
+      }
+
+      it {
+        expect(command.execute(test_client)).to eq(services)
+      }
+    end
+
+    context "when 404 Not Found" do
+      let(:stubbed_response) {
+        [
+          404,
+          {},
+          JSON.dump({"error" => { "message" => "Host Not Found."} })
+        ]
+      }
+
+      it {
+        expect { command.execute(test_client) }.to raise_error Mackerel::Error, "GET /api/v0/services failed: 404 Host Not Found."
+      }
+    end
+
+    context "when 401 Unauthorized" do
+      let(:stubbed_response) {
+        [
+          401,
+          {},
+          JSON.dump({ "error" => "Authentication failed. Please try with valid Api Key." })
+        ]
+      }
+
+      it {
+        expect { command.execute(test_client) }.to raise_error Mackerel::Error, "GET /api/v0/services failed: 401 Authentication failed. Please try with valid Api Key."
+      }
+    end
+  end
+end

data/spec/mackerel/channel_spec.rb

@@ -1,8 +1,4 @@
-require 'mackerel'
-require 'mackerel/host'
-require 'json'
-
-describe Mackerel::Client do
+RSpec.describe Mackerel::Client do
   let(:api_key) { 'xxxxxxxx' }
   let(:client) { Mackerel::Client.new(:mackerel_api_key => api_key) }
 
@@ -19,6 +15,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end

data/spec/mackerel/client/helper_spec.rb

@@ -1,6 +1,6 @@
 require 'mackerel/client/helper'
 
-describe Mackerel::Client::Helper do
+RSpec.describe Mackerel::Client::Helper do
   describe '.as_safe_metric_name' do
     it 'translates characters that cannot be used as a metric name to safe characters' do
       name = 'readme.md'

data/spec/mackerel/client_spec.rb

@@ -1,8 +1,4 @@
-require 'mackerel'
-require 'mackerel/host'
-require 'json'
-
-describe Mackerel::Client do
+RSpec.describe Mackerel::Client do
   let(:api_key) { 'xxxxxxxx' }
   let(:client) { Mackerel::Client.new(:mackerel_api_key => api_key) }
 
@@ -24,6 +20,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.post(api_path) { stubbed_response }
         end
@@ -66,6 +63,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.put(api_path) { stubbed_response }
         end
@@ -108,6 +106,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end
@@ -126,7 +125,7 @@ describe Mackerel::Client do
           'agent-revision' => 'bc2f9f6',
           'agent-version'  => '0.6.1',
         },
-        'type' => 'unknown',
+        'size' => 'standard',
         'status' => 'working',
         'memo' => 'test host',
         'isRetired' => false,
@@ -163,6 +162,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.post(api_path) { stubbed_response }
         end
@@ -198,6 +198,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.put(api_path) { stubbed_response }
         end
@@ -240,6 +241,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.post(api_path) { stubbed_response }
         end
@@ -274,6 +276,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.post(api_path) { stubbed_response }
         end
@@ -331,6 +334,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end
@@ -350,7 +354,7 @@ describe Mackerel::Client do
             'agent-revision' => 'bc2f9f6',
             'agent-version'  => '0.6.1',
           },
-          'type' => 'unknown',
+          'size' => 'standard',
           'status' => 'working',
           'memo' => 'test host',
           'isRetired' => false,
@@ -392,6 +396,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.post(api_path) { stubbed_response }
         end
@@ -437,6 +442,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end
@@ -470,6 +476,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end
@@ -505,6 +512,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.put(api_path) { stubbed_response }
         end
@@ -544,6 +552,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.delete(api_path) { stubbed_response }
         end

data/spec/mackerel/dashboard_spec.rb

@@ -1,8 +1,4 @@
-require 'mackerel'
-require 'mackerel/host'
-require 'json'
-
-describe Mackerel::Client do
+RSpec.describe Mackerel::Client do
   let(:api_key) { 'xxxxxxxx' }
   let(:client) { Mackerel::Client.new(:mackerel_api_key => api_key) }
 
@@ -17,6 +13,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.post(api_path) { stubbed_response }
         end
@@ -65,6 +62,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.put(api_path) { stubbed_response }
         end
@@ -114,6 +112,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end
@@ -164,6 +163,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end
@@ -212,6 +212,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.delete(api_path) { stubbed_response }
         end

data/spec/mackerel/invitation_spec.rb

@@ -1,8 +1,4 @@
-require 'mackerel'
-require 'mackerel/host'
-require 'json'
-
-describe Mackerel::Client do
+RSpec.describe Mackerel::Client do
   let(:api_key) { 'xxxxxxxx' }
   let(:client) { Mackerel::Client.new(:mackerel_api_key => api_key) }
 
@@ -19,6 +15,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.post(api_path) { stubbed_response }
         end
@@ -60,6 +57,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.post(api_path) { stubbed_response }
         end

data/spec/mackerel/metric_spec.rb

@@ -1,8 +1,4 @@
-require 'mackerel'
-require 'mackerel/host'
-require 'json'
-
-describe Mackerel::Client do
+RSpec.describe Mackerel::Client do
   let(:api_key) { 'xxxxxxxx' }
   let(:client) { Mackerel::Client.new(:mackerel_api_key => api_key) }
 
@@ -17,6 +13,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.post(api_path) { stubbed_response }
         end
@@ -56,6 +53,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end
@@ -102,6 +100,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end
@@ -145,6 +144,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.post(api_path) { stubbed_response }
         end
@@ -185,6 +185,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end
@@ -226,6 +227,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.post(api_path) { stubbed_response }
         end

data/spec/mackerel/monitor_spec.rb

@@ -1,8 +1,4 @@
-require 'mackerel'
-require 'mackerel/host'
-require 'json'
-
-describe Mackerel::Client do
+RSpec.describe Mackerel::Client do
   let(:api_key) { 'xxxxxxxx' }
   let(:client) { Mackerel::Client.new(:mackerel_api_key => api_key) }
 
@@ -17,6 +13,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.post(api_path) { stubbed_response }
         end
@@ -63,6 +60,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end
@@ -129,6 +127,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.put(api_path) { stubbed_response }
         end
@@ -177,6 +176,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.delete(api_path) { stubbed_response }
         end

data/spec/mackerel/monitoring_spec.rb

@@ -1,8 +1,4 @@
-require 'mackerel'
-require 'mackerel/host'
-require 'json'
-
-describe Mackerel::Client do
+RSpec.describe Mackerel::Client do
   let(:api_key) { 'xxxxxxxx' }
   let(:client) { Mackerel::Client.new(:mackerel_api_key => api_key) }
 
@@ -17,6 +13,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.post(api_path) { stubbed_response }
         end

data/spec/mackerel/notification_group_spec.rb

@@ -1,8 +1,4 @@
-require 'mackerel'
-require 'mackerel/host'
-require 'json'
-
-describe Mackerel::Client do
+RSpec.describe Mackerel::Client do
   let(:api_key) { 'xxxxxxxx' }
   let(:client) { Mackerel::Client.new(:mackerel_api_key => api_key) }
 
@@ -17,6 +13,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.post(api_path) { stubbed_response }
         end
@@ -80,6 +77,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end
@@ -163,6 +161,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.put(api_path) { stubbed_response }
         end
@@ -223,6 +222,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.delete(api_path) { stubbed_response }
         end

data/spec/mackerel/organization_spec.rb

@@ -1,8 +1,4 @@
-require 'mackerel'
-require 'mackerel/host'
-require 'json'
-
-describe Mackerel::Client do
+RSpec.describe Mackerel::Client do
   let(:api_key) { 'xxxxxxxx' }
   let(:client) { Mackerel::Client.new(:mackerel_api_key => api_key) }
 
@@ -19,6 +15,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end

data/spec/mackerel/service_spec.rb

@@ -1,8 +1,4 @@
-require 'mackerel'
-require 'mackerel/host'
-require 'json'
-
-describe Mackerel::Client do
+RSpec.describe Mackerel::Client do
   let(:api_key) { 'xxxxxxxx' }
   let(:client) { Mackerel::Client.new(:mackerel_api_key => api_key) }
 
@@ -19,6 +15,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end
@@ -75,6 +72,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end
@@ -124,6 +122,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end

data/spec/mackerel/user_spec.rb

@@ -1,8 +1,4 @@
-require 'mackerel'
-require 'mackerel/host'
-require 'json'
-
-describe Mackerel::Client do
+RSpec.describe Mackerel::Client do
   let(:api_key) { 'xxxxxxxx' }
   let(:client) { Mackerel::Client.new(:mackerel_api_key => api_key) }
 
@@ -19,6 +15,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.get(api_path) { stubbed_response }
         end
@@ -68,6 +65,7 @@ describe Mackerel::Client do
 
     let(:test_client) {
       Faraday.new do |builder|
+        builder.response :raise_error
         builder.adapter :test do |stubs|
           stubs.delete(api_path) { stubbed_response }
         end

data/spec/spec_helper.rb

@@ -1,2 +1,10 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'mackerel'
+
+RSpec.configure do |config|
+  config.disable_monkey_patching!
+  config.filter_run_when_matching :focus
+
+  config.order = :random
+  Kernel.srand config.seed
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mackerel-client
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Mackerel developer team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 description: Mackerel client is a library to access Mackerel (https://mackerel.io/).
 email:
 - developers@mackerel.io
@@ -73,9 +73,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -100,6 +102,7 @@ files:
 - lib/mackerel/client.rb
 - lib/mackerel/client/helper.rb
 - lib/mackerel/dashboard.rb
+- lib/mackerel/error.rb
 - lib/mackerel/host.rb
 - lib/mackerel/invitation.rb
 - lib/mackerel/metadata.rb
@@ -115,6 +118,7 @@ files:
 - mackerel-client.gemspec
 - spec/mackerel/alert_spec.rb
 - spec/mackerel/annotation_spec.rb
+- spec/mackerel/api_commend_spec.rb
 - spec/mackerel/channel_spec.rb
 - spec/mackerel/client/helper_spec.rb
 - spec/mackerel/client_spec.rb
@@ -132,7 +136,7 @@ homepage: https://mackerel.io/
 licenses:
 - Apache 2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,14 +151,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.10
+signing_key:
 specification_version: 4
 summary: Mackerel client implemented by Ruby.
 test_files:
 - spec/mackerel/alert_spec.rb
 - spec/mackerel/annotation_spec.rb
+- spec/mackerel/api_commend_spec.rb
 - spec/mackerel/channel_spec.rb
 - spec/mackerel/client/helper_spec.rb
 - spec/mackerel/client_spec.rb

data/.travis.yml

@@ -1,9 +0,0 @@
-language: ruby
-before_install:
-  # https://github.com/travis-ci/travis-ci/issues/3531
-  - gem install bundler # -v 1.7.14 if a specific version is needed
-rvm:
-  - "2.2"
-  - "2.1.1"
-  - "2.0.0"
-  - "1.9.3"