Bump up to 0.36.0-1

4 files changed, 8 insertions, 474 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa594ee77c5d..2f2cc6f01dd5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,15 @@
 pkgbase = mkr
 	pkgdesc = Command Line Tool for Mackerel
-	pkgver = 0.35.1
-	pkgrel = 2
+	pkgver = 0.36.0
+	pkgrel = 1
 	url = https://github.com/mackerelio/mkr
 	arch = i686
 	arch = x86_64
 	license = APACHE
 	makedepends = go
 	makedepends = git
-	source = mkr-0.35.1.tar.gz::https://github.com/mackerelio/mkr/archive/v0.35.1.tar.gz
-	source = https://github.com/mackerelio/mkr/commit/48ed634eb7df7d3f89a8b6ea373caa051393bbe6.patch
-	source = https://github.com/mackerelio/mkr/commit/7f18436b3f94d78560eb1abe6f672715edc56d70.patch
-	sha512sums = dc4784d73db373399e27b74660132a70a867906d89c19471b76b335b8014a599260ea490b225a060570b054cd7f9a213e4fb87c13dd9fe94b9bca0797054e589
-	sha512sums = e19fa82d12123330912ca6c01cafb4286137089cc2a808104b9cb95b74b40bce1672c8677c3d9dc2777e58aa17eaee39e17cb1524cc6353d400df8b304cd9b32
-	sha512sums = 0d0ed3b1087214eff97b330010412dcaa18dc4a7285a40d1e52e241ca899f1dc7b4bf190f6c18eafa0b6453ac96e52e43c1b80a90aa594c4ab976d8478bb1158
+	source = mkr-0.36.0.tar.gz::https://github.com/mackerelio/mkr/archive/v0.36.0.tar.gz
+	sha512sums = 478b13c7b999ad687b11ddd003a6c2027c2d4cb5b267a35c4869729f793c14b9645a61f1981e9e254f06a1c50b578078ba7f88c7943da2414f74c849f7e1c870
 
 pkgname = mkr
 
diff --git a/48ed634eb7df7d3f89a8b6ea373caa051393bbe6.patch b/48ed634eb7df7d3f89a8b6ea373caa051393bbe6.patch
deleted file mode 100644
index ad853d7a6aae..000000000000
--- a/48ed634eb7df7d3f89a8b6ea373caa051393bbe6.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From 44fd6dceddb086f04e10ebd12821515181ef62fc Mon Sep 17 00:00:00 2001
-From: itchyny <itchyny@hatena.ne.jp>
-Date: Fri, 8 Mar 2019 15:41:23 +0900
-Subject: [PATCH] add out stream argument to format.PrettyPrintJSON
-
----
- alerts.go        |  4 ++--
- annotations.go   | 10 ++++++----
- commands.go      | 12 ++++++------
- format/format.go |  6 +++---
- hosts/app.go     |  4 ++--
- monitors.go      |  4 ++--
- org.go           |  4 +++-
- 7 files changed, 24 insertions(+), 20 deletions(-)
-
-diff --git a/alerts.go b/alerts.go
-index 0814179..db5a81d 100644
---- a/alerts.go
-+++ b/alerts.go
-@@ -249,7 +249,7 @@ func doAlertsRetrieve(c *cli.Context) error {
- 	withClosed := c.Bool("with-closed")
- 	alerts, err := fetchAlerts(client, withClosed, getAlertsLimit(c, withClosed))
- 	logger.DieIf(err)
--	format.PrettyPrintJSON(alerts)
-+	format.PrettyPrintJSON(os.Stdout, alerts)
- 	return nil
- }
- 
-@@ -383,7 +383,7 @@ func doAlertsClose(c *cli.Context) error {
- 
- 		logger.Log("Alert closed", alertID)
- 		if isVerbose == true {
--			format.PrettyPrintJSON(alert)
-+			format.PrettyPrintJSON(os.Stdout, alert)
- 		}
- 	}
- 	return nil
-diff --git a/annotations.go b/annotations.go
-index 6dfedd9..214e552 100644
---- a/annotations.go
-+++ b/annotations.go
-@@ -1,6 +1,8 @@
- package main
- 
- import (
-+	"os"
-+
- 	mkr "github.com/mackerelio/mackerel-client-go"
- 	"github.com/mackerelio/mkr/format"
- 	"github.com/mackerelio/mkr/logger"
-@@ -126,7 +128,7 @@ func doAnnotationsCreate(c *cli.Context) error {
- 		Roles:       roles,
- 	})
- 	logger.DieIf(err)
--	format.PrettyPrintJSON(annotation)
-+	format.PrettyPrintJSON(os.Stdout, annotation)
- 	return nil
- }
- 
-@@ -153,7 +155,7 @@ func doAnnotationsList(c *cli.Context) error {
- 	client := mackerelclient.NewFromContext(c)
- 	annotations, err := client.FindGraphAnnotations(service, from, to)
- 	logger.DieIf(err)
--	format.PrettyPrintJSON(annotations)
-+	format.PrettyPrintJSON(os.Stdout, annotations)
- 	return nil
- }
- 
-@@ -196,7 +198,7 @@ func doAnnotationsUpdate(c *cli.Context) error {
- 		Roles:       roles,
- 	})
- 	logger.DieIf(err)
--	format.PrettyPrintJSON(annotation)
-+	format.PrettyPrintJSON(os.Stdout, annotation)
- 	return nil
- }
- 
-@@ -211,6 +213,6 @@ func doAnnotationsDelete(c *cli.Context) error {
- 	client := mackerelclient.NewFromContext(c)
- 	annotation, err := client.DeleteGraphAnnotation(annotationID)
- 	logger.DieIf(err)
--	format.PrettyPrintJSON(annotation)
-+	format.PrettyPrintJSON(os.Stdout, annotation)
- 	return nil
- }
-diff --git a/commands.go b/commands.go
-index 52fe3e9..c44c976 100644
---- a/commands.go
-+++ b/commands.go
-@@ -174,9 +174,9 @@ func doStatus(c *cli.Context) error {
- 	logger.DieIf(err)
- 
- 	if isVerbose {
--		format.PrettyPrintJSON(host)
-+		format.PrettyPrintJSON(os.Stdout, host)
- 	} else {
--		format.PrettyPrintJSON(&format.Host{
-+		format.PrettyPrintJSON(os.Stdout, &format.Host{
- 			ID:            host.ID,
- 			Name:          host.Name,
- 			DisplayName:   host.DisplayName,
-@@ -321,12 +321,12 @@ func doMetrics(c *cli.Context) error {
- 		metricValue, err := client.FetchHostMetricValues(optHostID, optMetricName, from, to)
- 		logger.DieIf(err)
- 
--		format.PrettyPrintJSON(metricValue)
-+		format.PrettyPrintJSON(os.Stdout, metricValue)
- 	} else if optService != "" {
- 		metricValue, err := client.FetchServiceMetricValues(optService, optMetricName, from, to)
- 		logger.DieIf(err)
- 
--		format.PrettyPrintJSON(metricValue)
-+		format.PrettyPrintJSON(os.Stdout, metricValue)
- 	} else {
- 		cli.ShowCommandHelp(c, "metrics")
- 		os.Exit(1)
-@@ -353,7 +353,7 @@ func doFetch(c *cli.Context) error {
- 		}
- 	}
- 
--	format.PrettyPrintJSON(allMetricValues)
-+	format.PrettyPrintJSON(os.Stdout, allMetricValues)
- 	return nil
- }
- 
-@@ -389,6 +389,6 @@ func doRetire(c *cli.Context) error {
- func doServices(c *cli.Context) error {
- 	services, err := mackerelclient.NewFromContext(c).FindServices()
- 	logger.DieIf(err)
--	format.PrettyPrintJSON(services)
-+	format.PrettyPrintJSON(os.Stdout, services)
- 	return nil
- }
-diff --git a/format/format.go b/format/format.go
-index e125d84..f4416f2 100644
---- a/format/format.go
-+++ b/format/format.go
-@@ -3,7 +3,7 @@ package format
- import (
- 	"encoding/json"
- 	"fmt"
--	"os"
-+	"io"
- 	"strings"
- 	"time"
- 
-@@ -24,8 +24,8 @@ type Host struct {
- }
- 
- // PrettyPrintJSON output indented json via stdout.
--func PrettyPrintJSON(src interface{}) error {
--	_, err := fmt.Fprintln(os.Stdout, JSONMarshalIndent(src, "", "    "))
-+func PrettyPrintJSON(outStream io.Writer, src interface{}) error {
-+	_, err := fmt.Fprintln(outStream, JSONMarshalIndent(src, "", "    "))
- 	return err
- }
- 
-diff --git a/hosts/app.go b/hosts/app.go
-index ac537c3..37f8f73 100644
---- a/hosts/app.go
-+++ b/hosts/app.go
-@@ -40,7 +40,7 @@ func (ha *hostApp) run() error {
- 		}
- 		return t.Execute(os.Stdout, hosts)
- 	case ha.verbose:
--		return format.PrettyPrintJSON(hosts)
-+		return format.PrettyPrintJSON(os.Stdout, hosts)
- 	default:
- 		var hostsFormat []*format.Host
- 		for _, host := range hosts {
-@@ -55,6 +55,6 @@ func (ha *hostApp) run() error {
- 				IPAddresses:   host.IPAddresses(),
- 			})
- 		}
--		return format.PrettyPrintJSON(hostsFormat)
-+		return format.PrettyPrintJSON(os.Stdout, hostsFormat)
- 	}
- }
-diff --git a/monitors.go b/monitors.go
-index 2829553..995457e 100644
---- a/monitors.go
-+++ b/monitors.go
-@@ -159,7 +159,7 @@ func doMonitorsList(c *cli.Context) error {
- 	monitors, err := mackerelclient.NewFromContext(c).FindMonitors()
- 	logger.DieIf(err)
- 
--	format.PrettyPrintJSON(monitors)
-+	format.PrettyPrintJSON(os.Stdout, monitors)
- 	return nil
- }
- 
-@@ -173,7 +173,7 @@ func doMonitorsPull(c *cli.Context) error {
- 	monitorSaveRules(monitors, filePath)
- 
- 	if isVerbose {
--		format.PrettyPrintJSON(monitors)
-+		format.PrettyPrintJSON(os.Stdout, monitors)
- 	}
- 
- 	if filePath == "" {
-diff --git a/org.go b/org.go
-index fcffed6..5223e92 100644
---- a/org.go
-+++ b/org.go
-@@ -1,6 +1,8 @@
- package main
- 
- import (
-+	"os"
-+
- 	"github.com/mackerelio/mkr/format"
- 	"github.com/mackerelio/mkr/logger"
- 	"github.com/mackerelio/mkr/mackerelclient"
-@@ -22,6 +24,6 @@ func doOrgRetrieve(c *cli.Context) error {
- 
- 	org, err := client.GetOrg()
- 	logger.DieIf(err)
--	format.PrettyPrintJSON(org)
-+	format.PrettyPrintJSON(os.Stdout, org)
- 	return nil
- }
diff --git a/7f18436b3f94d78560eb1abe6f672715edc56d70.patch b/7f18436b3f94d78560eb1abe6f672715edc56d70.patch
deleted file mode 100644
index 72dce9584d5d..000000000000
--- a/7f18436b3f94d78560eb1abe6f672715edc56d70.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From d887d9c2d6428e01b7ada43ddba56b2389d7cabd Mon Sep 17 00:00:00 2001
-From: itchyny <itchyny@hatena.ne.jp>
-Date: Fri, 8 Mar 2019 15:57:59 +0900
-Subject: [PATCH 1/5] add a interface to represent the client of Mackerel API
-
----
- mackerelclient/client.go | 8 ++++++++
- 1 file changed, 8 insertions(+)
- create mode 100644 mackerelclient/client.go
-
-diff --git a/mackerelclient/client.go b/mackerelclient/client.go
-new file mode 100644
-index 0000000..6611eed
---- /dev/null
-+++ b/mackerelclient/client.go
-@@ -0,0 +1,8 @@
-+package mackerelclient
-+
-+import mackerel "github.com/mackerelio/mackerel-client-go"
-+
-+// Client represents a client of Mackerel API
-+type Client interface {
-+	FindHosts(param *mackerel.FindHostsParam) ([]*mackerel.Host, error)
-+}
-
-From 861275ef04548a2b4369fff8bc80a6f59224f568 Mon Sep 17 00:00:00 2001
-From: itchyny <itchyny@hatena.ne.jp>
-Date: Fri, 8 Mar 2019 15:58:27 +0900
-Subject: [PATCH 2/5] change mackerelclient.New to return interface
-
----
- mackerelclient/new.go | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mackerelclient/new.go b/mackerelclient/new.go
-index d8dfb7b..4d7501e 100644
---- a/mackerelclient/new.go
-+++ b/mackerelclient/new.go
-@@ -11,7 +11,7 @@ import (
- )
- 
- // New returns new mackerel client
--func New(conffile, apibase string) (*mkr.Client, error) {
-+func New(conffile, apibase string) (Client, error) {
- 	apikey := os.Getenv("MACKEREL_APIKEY")
- 	var conf *config.Config
- 	if apikey == "" {
-
-From 4f5fb2b2111e3802157a0dbb1699147faa03d871 Mon Sep 17 00:00:00 2001
-From: itchyny <itchyny@hatena.ne.jp>
-Date: Fri, 8 Mar 2019 15:58:45 +0900
-Subject: [PATCH 3/5] change the client in hostApp to the client interface
-
----
- hosts/app.go     | 3 ++-
- hosts/command.go | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/hosts/app.go b/hosts/app.go
-index 37f8f73..24918ac 100644
---- a/hosts/app.go
-+++ b/hosts/app.go
-@@ -6,10 +6,11 @@ import (
- 
- 	mkr "github.com/mackerelio/mackerel-client-go"
- 	"github.com/mackerelio/mkr/format"
-+	"github.com/mackerelio/mkr/mackerelclient"
- )
- 
- type hostApp struct {
--	cli *mkr.Client
-+	cli mackerelclient.Client
- 
- 	verbose bool
- 
-diff --git a/hosts/command.go b/hosts/command.go
-index 559f091..b448f72 100644
---- a/hosts/command.go
-+++ b/hosts/command.go
-@@ -1,8 +1,9 @@
- package hosts
- 
- import (
--	"github.com/mackerelio/mkr/mackerelclient"
- 	cli "gopkg.in/urfave/cli.v1"
-+
-+	"github.com/mackerelio/mkr/mackerelclient"
- )
- 
- // Command is definition of mkr hosts subcommand
-
-From 3fb0a0e6daeb531d5a08becc962add8f309b6677 Mon Sep 17 00:00:00 2001
-From: itchyny <itchyny@hatena.ne.jp>
-Date: Fri, 8 Mar 2019 16:02:26 +0900
-Subject: [PATCH 4/5] change alias of mackerel-client-go to mackerel
-
----
- hosts/app.go          |  5 +++--
- mackerelclient/new.go | 14 ++++++++------
- 2 files changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/hosts/app.go b/hosts/app.go
-index 24918ac..68e3196 100644
---- a/hosts/app.go
-+++ b/hosts/app.go
-@@ -4,7 +4,8 @@ import (
- 	"os"
- 	"text/template"
- 
--	mkr "github.com/mackerelio/mackerel-client-go"
-+	mackerel "github.com/mackerelio/mackerel-client-go"
-+
- 	"github.com/mackerelio/mkr/format"
- 	"github.com/mackerelio/mkr/mackerelclient"
- )
-@@ -23,7 +24,7 @@ type hostApp struct {
- }
- 
- func (ha *hostApp) run() error {
--	hosts, err := ha.cli.FindHosts(&mkr.FindHostsParam{
-+	hosts, err := ha.cli.FindHosts(&mackerel.FindHostsParam{
- 		Name:     ha.name,
- 		Service:  ha.service,
- 		Roles:    ha.roles,
-diff --git a/mackerelclient/new.go b/mackerelclient/new.go
-index 4d7501e..fc7a068 100644
---- a/mackerelclient/new.go
-+++ b/mackerelclient/new.go
-@@ -4,10 +4,12 @@ import (
- 	"fmt"
- 	"os"
- 
-+	cli "gopkg.in/urfave/cli.v1"
-+
- 	"github.com/mackerelio/mackerel-agent/config"
--	mkr "github.com/mackerelio/mackerel-client-go"
-+	mackerel "github.com/mackerelio/mackerel-client-go"
-+
- 	"github.com/mackerelio/mkr/logger"
--	cli "gopkg.in/urfave/cli.v1"
- )
- 
- // New returns new mackerel client
-@@ -34,11 +36,11 @@ func New(conffile, apibase string) (Client, error) {
- 		}
- 		apibase = conf.Apibase
- 	}
--	return mkr.NewClientWithOptions(apikey, apibase, os.Getenv("DEBUG") != "")
-+	return mackerel.NewClientWithOptions(apikey, apibase, os.Getenv("DEBUG") != "")
- }
- 
- // NewFromContext returns mackerel client from cli.Context
--func NewFromContext(c *cli.Context) *mkr.Client {
-+func NewFromContext(c *cli.Context) *mackerel.Client {
- 	confFile := c.GlobalString("conf")
- 	apiBase := c.GlobalString("apibase")
- 	apiKey := LoadApikeyFromEnvOrConfig(confFile)
-@@ -53,8 +55,8 @@ func NewFromContext(c *cli.Context) *mkr.Client {
- 		apiBase = LoadApibaseFromConfigWithFallback(confFile)
- 	}
- 
--	mackerel, err := mkr.NewClientWithOptions(apiKey, apiBase, os.Getenv("DEBUG") != "")
-+	client, err := mackerel.NewClientWithOptions(apiKey, apiBase, os.Getenv("DEBUG") != "")
- 	logger.DieIf(err)
- 
--	return mackerel
-+	return client
- }
-
-From f088011fa747dda892d4f989b2e9180928dac17d Mon Sep 17 00:00:00 2001
-From: itchyny <itchyny@hatena.ne.jp>
-Date: Fri, 8 Mar 2019 16:09:56 +0900
-Subject: [PATCH 5/5] implement mock client for Mackerel API
-
----
- mackerelclient/mock_client.go | 46 +++++++++++++++++++++++++++++++++++
- 1 file changed, 46 insertions(+)
- create mode 100644 mackerelclient/mock_client.go
-
-diff --git a/mackerelclient/mock_client.go b/mackerelclient/mock_client.go
-new file mode 100644
-index 0000000..d9a9fd3
---- /dev/null
-+++ b/mackerelclient/mock_client.go
-@@ -0,0 +1,46 @@
-+package mackerelclient
-+
-+import mackerel "github.com/mackerelio/mackerel-client-go"
-+
-+// MockClient represents a mock client of Mackerel API
-+type MockClient struct {
-+	findHostsCallback func(param *mackerel.FindHostsParam) ([]*mackerel.Host, error)
-+}
-+
-+// MockClientOption represents an option of mock client of Mackerel API
-+type MockClientOption func(*MockClient)
-+
-+// NewMockClient creates a new mock client of Mackerel API
-+func NewMockClient(opts ...MockClientOption) *MockClient {
-+	client := &MockClient{}
-+	for _, opt := range opts {
-+		client.ApplyOption(opt)
-+	}
-+	return client
-+}
-+
-+// ApplyOption applies a mock client option
-+func (c *MockClient) ApplyOption(opt MockClientOption) {
-+	opt(c)
-+}
-+
-+type errCallbackNotFound string
-+
-+func (err errCallbackNotFound) Error() string {
-+	return string(err) + " callback not found"
-+}
-+
-+// FindHosts ...
-+func (c *MockClient) FindHosts(param *mackerel.FindHostsParam) ([]*mackerel.Host, error) {
-+	if c.findHostsCallback != nil {
-+		return c.findHostsCallback(param)
-+	}
-+	return nil, errCallbackNotFound("FindHosts")
-+}
-+
-+// MockFindHosts returns an option to set the callback of FindHosts
-+func MockFindHosts(callback func(param *mackerel.FindHostsParam) ([]*mackerel.Host, error)) MockClientOption {
-+	return func(c *MockClient) {
-+		c.findHostsCallback = callback
-+	}
-+}
diff --git a/PKGBUILD b/PKGBUILD
index 76934b8a05a3..f6ba1c516270 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,25 +1,17 @@
 # Maintainer: NOGISAKA Sadata <ngsksdt@gmail.com>
 
 pkgname=mkr
-pkgver=0.35.1
-pkgrel=2
+pkgver=0.36.0
+pkgrel=1
 pkgdesc="Command Line Tool for Mackerel"
 arch=('i686' 'x86_64')
 url="https://github.com/mackerelio/mkr"
 license=('APACHE')
 makedepends=('go' 'git')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/mackerelio/mkr/archive/v${pkgver}.tar.gz"
-        "https://github.com/mackerelio/mkr/commit/48ed634eb7df7d3f89a8b6ea373caa051393bbe6.patch"
-        "https://github.com/mackerelio/mkr/commit/7f18436b3f94d78560eb1abe6f672715edc56d70.patch")
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/mackerelio/mkr/archive/v${pkgver}.tar.gz")
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
-  # See https://github.com/mackerelio/mkr/pull/193 in detail about this patch
-  patch -p1 < ../48ed634eb7df7d3f89a8b6ea373caa051393bbe6.patch
-  # See https://github.com/mackerelio/mkr/pull/194 in ditto
-  patch -p1 < ../7f18436b3f94d78560eb1abe6f672715edc56d70.patch
-
   export GOPATH="$srcdir/build"
   export PATH="$PATH:$GOPATH/bin"
   make build
@@ -37,8 +29,6 @@ package() {
   install -Dm 755 mkr "$pkgdir/usr/bin/mkr"
 }
 
-sha512sums=('dc4784d73db373399e27b74660132a70a867906d89c19471b76b335b8014a599260ea490b225a060570b054cd7f9a213e4fb87c13dd9fe94b9bca0797054e589'
-            'e19fa82d12123330912ca6c01cafb4286137089cc2a808104b9cb95b74b40bce1672c8677c3d9dc2777e58aa17eaee39e17cb1524cc6353d400df8b304cd9b32'
-            '0d0ed3b1087214eff97b330010412dcaa18dc4a7285a40d1e52e241ca899f1dc7b4bf190f6c18eafa0b6453ac96e52e43c1b80a90aa594c4ab976d8478bb1158')
+sha512sums=('478b13c7b999ad687b11ddd003a6c2027c2d4cb5b267a35c4869729f793c14b9645a61f1981e9e254f06a1c50b578078ba7f88c7943da2414f74c849f7e1c870')
 
 # vim: set et sw=2 sts=2: