mackerel-client 0.6.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31730bc25cb0a0b6def2d537096f4bbcc46af1de869df74a56115f91184c5126
-  data.tar.gz: e96b732c979574df0b1f60721578e199decd2bb1f3fbb17b1d83006286d5a49d
+  metadata.gz: 68b096795c66861001227bf41e3cb6a7b940306dc404b555691a239031fd8fd6
+  data.tar.gz: e6516bd4b135f946b3198e5971fca264cfb3e66d8d35e695d5c49773252bb4b9
 SHA512:
-  metadata.gz: bc4578bed917dbd28c5d866ca443b6390e157c38f63f9430217e6b657898f986378e86c0f91f5a1d557bbcc6e98adf68a8d3201974012d6fb61ae7bb81d356c7
-  data.tar.gz: c45d14fe4d0225c5c8d3968aef9caa79ecc275a91ece1c24ae6230b9d133817046c1bd649a2c06b568b0831cdc29159aa801bdafa80005fa0c72249740873587
+  metadata.gz: dd58f6dae6a96848018b4cdd5ba2686bb0ce96f4c521465f782dd45a016c6def438e90b7646a357bc5f93a5905f3e561bcf504124956205c54d9f03543495146
+  data.tar.gz: 1640a65f29e6641551769642cac689a3e7c1b9d497bb5ee0b33da1c6081c1083bed6c6dc4b225727f95c2ca4d74de6ea66bdf9eade658fb692c43fe6896ac3ee

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/CHANGELOG.md

@@ -0,0 +1,35 @@
+# Changelog
+
+## v0.11.0 (2021-03-24)
+
+* Implements downtime API #61 (myoan)
+
+## 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

@@ -3,6 +3,7 @@ RELEASE
 
 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.

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.11.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'
@@ -20,6 +21,7 @@ require 'mackerel/metric'
 require 'mackerel/metadata'
 require 'mackerel/notification_group'
 require 'mackerel/channel'
+require 'mackerel/downtime'
 
 module Mackerel
   class Client
@@ -37,6 +39,7 @@ module Mackerel
     include Mackerel::REST::Metadata
     include Mackerel::REST::Channel
     include Mackerel::REST::NotificationGroup
+    include Mackerel::REST::Downtime
 
     def initialize(args = {})
       @origin       = args[:mackerel_origin]  || 'https://api.mackerelio.com'
@@ -54,6 +57,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/downtime.rb

@@ -0,0 +1,27 @@
+module Mackerel
+  module REST
+    module Downtime
+      def post_downtime(downtime)
+        command = ApiCommand.new(:post, "/api/v0/downtimes", @api_key)
+        command.body = downtime.to_json
+        command.execute(client)
+      end
+
+      def get_downtimes()
+        command = ApiCommand.new(:get, "/api/v0/downtimes", @api_key)
+        command.execute(client)
+      end
+
+      def update_downtime(downtime_id, downtime)
+        command = ApiCommand.new(:put, "/api/v0/downtimes/#{downtime_id}", @api_key)
+        command.body = downtime.to_json
+        command.execute(client)
+      end
+
+      def delete_downtime(downtime_id)
+        command = ApiCommand.new(:delete, "/api/v0/downtimes/#{downtime_id}", @api_key)
+        command.execute(client)
+      end
+    end
+  end
+end

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.6.0"
+    VERSION = "0.11.0"
 end

data/mackerel-client.gemspec

@@ -16,7 +16,7 @@ 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"
   spec.add_development_dependency "bundler"

data/spec/mackerel/alert_spec.rb

@@ -13,6 +13,7 @@ RSpec.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
@@ -62,6 +63,7 @@ RSpec.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

@@ -13,6 +13,7 @@ RSpec.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
@@ -58,6 +59,7 @@ RSpec.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
@@ -118,6 +120,7 @@ RSpec.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
@@ -165,6 +168,7 @@ RSpec.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

@@ -15,6 +15,7 @@ RSpec.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_spec.rb

@@ -20,6 +20,7 @@ RSpec.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 +63,7 @@ RSpec.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
@@ -104,6 +106,7 @@ RSpec.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,7 +125,7 @@ RSpec.describe Mackerel::Client do
           'agent-revision' => 'bc2f9f6',
           'agent-version'  => '0.6.1',
         },
-        'type' => 'unknown',
+        'size' => 'standard',
         'status' => 'working',
         'memo' => 'test host',
         'isRetired' => false,
@@ -159,6 +162,7 @@ RSpec.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
@@ -194,6 +198,7 @@ RSpec.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
@@ -236,6 +241,7 @@ RSpec.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
@@ -270,6 +276,7 @@ RSpec.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
@@ -327,6 +334,7 @@ RSpec.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
@@ -346,7 +354,7 @@ RSpec.describe Mackerel::Client do
             'agent-revision' => 'bc2f9f6',
             'agent-version'  => '0.6.1',
           },
-          'type' => 'unknown',
+          'size' => 'standard',
           'status' => 'working',
           'memo' => 'test host',
           'isRetired' => false,
@@ -388,6 +396,7 @@ RSpec.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
@@ -433,6 +442,7 @@ RSpec.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
@@ -466,6 +476,7 @@ RSpec.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
@@ -501,6 +512,7 @@ RSpec.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
@@ -540,6 +552,7 @@ RSpec.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

@@ -13,6 +13,7 @@ RSpec.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
@@ -61,6 +62,7 @@ RSpec.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
@@ -110,6 +112,7 @@ RSpec.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
@@ -160,6 +163,7 @@ RSpec.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
@@ -208,6 +212,7 @@ RSpec.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/downtime_spec.rb

@@ -0,0 +1,192 @@
+RSpec.describe Mackerel::Client do
+  let(:api_key) { 'xxxxxxxx' }
+  let(:client) { Mackerel::Client.new(:mackerel_api_key => api_key) }
+
+  describe '#post_downtime' do
+    let(:stubbed_response) {
+      [
+        200,
+        {},
+        JSON.dump(response_object)
+      ]
+    }
+
+    let(:test_client) {
+      Faraday.new do |builder|
+        builder.response :raise_error
+        builder.adapter :test do |stubs|
+          stubs.post(api_path) { stubbed_response }
+        end
+      end
+    }
+
+    let(:api_path) { '/api/v0/downtimes' }
+    let(:downtime_id) { 'abcxyz' }
+    let(:name) { 'HogeHoge' }
+    let(:start) { 1234567890 }
+    let(:duration) { 10 }
+
+    let(:response_object) {
+      {
+        'id' => downtime_id,
+        'name' => name,
+        'start' => start,
+        'duration' => duration
+      }
+    }
+
+    let(:downtime) {
+      {
+        'name' => name,
+        'start' => start,
+        'duration' => duration
+      }
+    }
+
+    before do
+      allow(client).to receive(:http_client).and_return(test_client)
+    end
+
+    it "successfully post downtime" do
+      expect(client.post_downtime(downtime).to_h).to eq(response_object)
+    end
+  end
+
+  describe '#get_downtimes' do
+    let(:stubbed_response) {
+      [
+        200,
+        {},
+        JSON.dump(response_object)
+      ]
+    }
+
+    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(:api_path) { '/api/v0/downtimes' }
+    let(:downtime_id) { 'abcxyz' }
+    let(:name) { 'HogeHoge' }
+    let(:start) { 1234567890 }
+    let(:duration) { 10 }
+
+    let(:response_object) {
+      {
+        'downtimes' => [
+          {
+            'id' => downtime_id,
+            'name' => name,
+            'start' => start,
+            'duration' => duration
+          }
+        ]
+      }
+    }
+
+    before do
+      allow(client).to receive(:http_client).and_return(test_client)
+    end
+
+    it "successfully get downtimes" do
+      expect(client.get_downtimes.to_h).to eq(response_object)
+    end
+  end
+
+  describe '#update_downtime' do
+    let(:stubbed_response) {
+      [
+        200,
+        {},
+        JSON.dump(response_object)
+      ]
+    }
+
+    let(:test_client) {
+      Faraday.new do |builder|
+        builder.response :raise_error
+        builder.adapter :test do |stubs|
+          stubs.put(api_path) { stubbed_response }
+        end
+      end
+    }
+
+    let(:api_path) { "/api/v0/downtimes/#{downtime_id}" }
+    let(:downtime_id) { 'abcxyz' }
+    let(:name) { 'HogeHoge' }
+    let(:start) { 1234567890 }
+    let(:duration) { 10 }
+
+    let(:response_object) {
+      {
+        'id' => downtime_id,
+        'name' => name,
+        'start' => start,
+        'duration' => duration
+      }
+    }
+
+    let(:downtime) {
+      {
+        'name' => name,
+        'start' => start,
+        'duration' => duration
+      }
+    }
+
+    before do
+      allow(client).to receive(:http_client).and_return(test_client)
+    end
+
+    it "successfully update downtime" do
+      expect(client.update_downtime(downtime_id, downtime).to_h).to eq(response_object)
+    end
+  end
+
+  describe '#delete_downtime' do
+    let(:stubbed_response) {
+      [
+        200,
+        {},
+        JSON.dump(response_object)
+      ]
+    }
+
+    let(:test_client) {
+      Faraday.new do |builder|
+        builder.response :raise_error
+        builder.adapter :test do |stubs|
+          stubs.delete(api_path) { stubbed_response }
+        end
+      end
+    }
+
+    let(:api_path) { "/api/v0/downtimes/#{downtime_id}" }
+    let(:downtime_id) { 'abcxyz' }
+    let(:name) { 'HogeHoge' }
+    let(:start) { 1234567890 }
+    let(:duration) { 10 }
+
+    let(:response_object) {
+      {
+        'id' => downtime_id,
+        'name' => name,
+        'start' => start,
+        'duration' => duration
+      }
+    }
+
+    before do
+      allow(client).to receive(:http_client).and_return(test_client)
+    end
+
+    it "successfully delete downtime" do
+      expect(client.delete_downtime(downtime_id).to_h).to eq(response_object)
+    end
+  end
+end

data/spec/mackerel/invitation_spec.rb

@@ -15,6 +15,7 @@ RSpec.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 +57,7 @@ RSpec.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

@@ -13,6 +13,7 @@ RSpec.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
@@ -52,6 +53,7 @@ RSpec.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
@@ -98,6 +100,7 @@ RSpec.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
@@ -141,6 +144,7 @@ RSpec.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
@@ -181,6 +185,7 @@ RSpec.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
@@ -222,6 +227,7 @@ RSpec.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

@@ -13,6 +13,7 @@ RSpec.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
@@ -59,6 +60,7 @@ RSpec.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
@@ -125,6 +127,7 @@ RSpec.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
@@ -173,6 +176,7 @@ RSpec.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

@@ -13,6 +13,7 @@ RSpec.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

@@ -13,6 +13,7 @@ RSpec.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
@@ -76,6 +77,7 @@ RSpec.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
@@ -159,6 +161,7 @@ RSpec.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
@@ -219,6 +222,7 @@ RSpec.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

@@ -15,6 +15,7 @@ RSpec.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

@@ -15,6 +15,7 @@ RSpec.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
@@ -71,6 +72,7 @@ RSpec.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
@@ -120,6 +122,7 @@ RSpec.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

@@ -15,6 +15,7 @@ RSpec.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
@@ -64,6 +65,7 @@ RSpec.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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mackerel-client
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Mackerel developer team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-04 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,14 @@ 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
@@ -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,8 @@ files:
 - lib/mackerel/client.rb
 - lib/mackerel/client/helper.rb
 - lib/mackerel/dashboard.rb
+- lib/mackerel/downtime.rb
+- lib/mackerel/error.rb
 - lib/mackerel/host.rb
 - lib/mackerel/invitation.rb
 - lib/mackerel/metadata.rb
@@ -115,10 +119,12 @@ 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
 - spec/mackerel/dashboard_spec.rb
+- spec/mackerel/downtime_spec.rb
 - spec/mackerel/invitation_spec.rb
 - spec/mackerel/metric_spec.rb
 - spec/mackerel/monitor_spec.rb
@@ -147,18 +153,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 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
 - spec/mackerel/dashboard_spec.rb
+- spec/mackerel/downtime_spec.rb
 - spec/mackerel/invitation_spec.rb
 - spec/mackerel/metric_spec.rb
 - spec/mackerel/monitor_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"