Bumpp to 0.34.1-1

Remove patch applying on build(), which is no longer required

3 files changed, 8 insertions, 175 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c86aff7ff705..15710f564e12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
 pkgbase = mkr
 	pkgdesc = Command Line Tool for Mackerel
-	pkgver = 0.33.0
-	pkgrel = 3
+	pkgver = 0.34.1
+	pkgrel = 1
 	url = https://github.com/mackerelio/mkr
 	arch = i686
 	arch = x86_64
 	license = APACHE
 	makedepends = go
 	makedepends = git
-	source = mkr-0.33.0.tar.gz::https://github.com/mackerelio/mkr/archive/v0.33.0.tar.gz
-	source = alerts.go.patch
-	sha512sums = 9dcd299e3bb5640a78b221c303a419a00f9e3203a8f607ee536a74fd37632a6d89e312d1725651e8157936b07d7e5509922b7920a8da65fff8a2c82669aa09a8
-	sha512sums = ea4cd9f4a93bbe633e80dd63e2e43f44ca0f7e172cdebf99fbecae369f5fa26937034429dd77ea466cb281bb34450234dac1b9b01466ac364eefe98c36e28958
+	source = mkr-0.34.1.tar.gz::https://github.com/mackerelio/mkr/archive/v0.34.1.tar.gz
+	sha512sums = da0e7dbf392614fee787c25e3ada7f2169bcb6947431f52d59578bd753a71d3564f0aca1491b3a200494362d9ba20c6a1f76d5c4879720a9f1cf487070fe28cf
 
 pkgname = mkr
 
diff --git a/PKGBUILD b/PKGBUILD
index a0cb7ccff991..b31920684a1b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,19 @@
 # Maintainer: NOGISAKA Sadata <ngsksdt@gmail.com>
 
 pkgname=mkr
-pkgver=0.33.0
-pkgrel=3
+pkgver=0.34.1
+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"
-        "alerts.go.patch")
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/mackerelio/mkr/archive/v${pkgver}.tar.gz")
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   export GOPATH="$srcdir/build"
   export PATH="$PATH:$GOPATH/bin"
-
-  # Apply changes for alerts.go:
-  # - https://github.com/mackerelio/mkr/pull/178
-  # - https://github.com/mackerelio/mkr/pull/179
-  patch -p0 < ../alerts.go.patch
-
   make build
 }
 
@@ -36,7 +29,6 @@ package() {
   install -Dm 755 mkr "$pkgdir/usr/bin/mkr"
 }
 
-sha512sums=('9dcd299e3bb5640a78b221c303a419a00f9e3203a8f607ee536a74fd37632a6d89e312d1725651e8157936b07d7e5509922b7920a8da65fff8a2c82669aa09a8'
-            'ea4cd9f4a93bbe633e80dd63e2e43f44ca0f7e172cdebf99fbecae369f5fa26937034429dd77ea466cb281bb34450234dac1b9b01466ac364eefe98c36e28958')
+sha512sums=('da0e7dbf392614fee787c25e3ada7f2169bcb6947431f52d59578bd753a71d3564f0aca1491b3a200494362d9ba20c6a1f76d5c4879720a9f1cf487070fe28cf')
 
 # vim: set et sw=2 sts=2:
diff --git a/alerts.go.patch b/alerts.go.patch
deleted file mode 100644
index 5d7feac265c0..000000000000
--- a/alerts.go.patch
+++ /dev/null
@@ -1,157 +0,0 @@
---- alerts.go.orig	2018-11-12 04:12:41.000000000 +0000
-+++ alerts.go	2018-11-25 13:27:58.023329243 +0000
-@@ -14,18 +14,23 @@
- )
- 
- var commandAlerts = cli.Command{
--	Name:  "alerts",
--	Usage: "Retrieve/Close alerts",
-+	Name:      "alerts",
-+	Usage:     "Retrieve/Close alerts",
-+	ArgsUsage: "[--with-closed | -w] [--limit | -l]",
- 	Description: `
-     Retrieve/Close alerts. With no subcommand specified, this will show all alerts.
-     Requests APIs under "/api/v0/alerts". See https://mackerel.io/api-docs/entry/alerts .
- `,
- 	Action: doAlertsRetrieve,
-+	Flags: []cli.Flag{
-+		cli.BoolFlag{Name: "with-closed, w", Usage: "Display open alert including close alert. default: false"},
-+		cli.IntFlag{Name: "limit, l", Value: 100, Usage: "Set the number of alerts to display at once when withClosed is active. default: 100"},
-+	},
- 	Subcommands: []cli.Command{
- 		{
- 			Name:      "list",
- 			Usage:     "list alerts",
--			ArgsUsage: "[--service | -s <service>] [--host-status | -S <file>] [--color | -c]",
-+			ArgsUsage: "[--service | -s <service>] [--host-status | -S <file>] [--color | -c] [--with-closed | -w] [--limit | -l]",
- 			Description: `
-     Shows alerts in human-readable format.
- `,
-@@ -42,6 +47,8 @@
- 					Usage: "Filters alerts by status of each host. Multiple choices are allowed.",
- 				},
- 				cli.BoolTFlag{Name: "color, c", Usage: "Colorize output. default: true"},
-+				cli.BoolFlag{Name: "with-closed, w", Usage: "Display open alert including close alert. default: false"},
-+				cli.IntFlag{Name: "limit, l", Value: 100, Usage: "Set the number of alerts to display at once when withClosed is active. default: 100"},
- 			},
- 		},
- 		{
-@@ -196,9 +203,11 @@
- 	if colorize {
- 		switch alert.Status {
- 		case "CRITICAL":
--			statusMsg = color.RedString("CRITICAL")
-+			statusMsg = color.RedString("CRITICAL ")
- 		case "WARNING":
- 			statusMsg = color.YellowString("WARNING ")
-+		case "OK":
-+			statusMsg = color.GreenString("OK ")
- 		case "UNKNOWN":
- 			statusMsg = "UNKNOWN "
- 		}
-@@ -231,10 +240,48 @@
- 
- func doAlertsRetrieve(c *cli.Context) error {
- 	client := newMackerelFromContext(c)
-+	withClosed := c.Bool("with-closed")
-+	limit := c.Int("limit")
- 
--	alerts, err := client.FindAlerts()
--	logger.DieIf(err)
--	PrettyPrintJSON(alerts)
-+	if withClosed {
-+		alerts, err := client.FindWithClosedAlerts()
-+		logger.DieIf(err)
-+		if alerts.NextID != "" {
-+			for {
-+				if limit > len(alerts.Alerts) {
-+					nextAlerts, err := client.FindWithClosedAlertsByNextID(alerts.NextID)
-+					logger.DieIf(err)
-+					alerts.Alerts = append(alerts.Alerts, nextAlerts.Alerts...)
-+					alerts.NextID = nextAlerts.NextID
-+					if alerts.NextID == "" {
-+						break
-+					}
-+					time.Sleep(1 * time.Second)
-+				} else {
-+					break
-+				}
-+			}
-+		}
-+
-+		PrettyPrintJSON(alerts.Alerts[:limit])
-+	} else {
-+		alerts, err := client.FindAlerts()
-+		logger.DieIf(err)
-+		if alerts.NextID != "" {
-+			for {
-+				nextAlerts, err := client.FindAlertsByNextID(alerts.NextID)
-+				logger.DieIf(err)
-+				alerts.Alerts = append(alerts.Alerts, nextAlerts.Alerts...)
-+				alerts.NextID = nextAlerts.NextID
-+				if alerts.NextID == "" {
-+					break
-+				}
-+				time.Sleep(1 * time.Second)
-+			}
-+		}
-+
-+		PrettyPrintJSON(alerts.Alerts[:limit])
-+	}
- 	return nil
- }
- 
-@@ -242,11 +289,48 @@
- 	filterServices := c.StringSlice("service")
- 	filterStatuses := c.StringSlice("host-status")
- 	client := newMackerelFromContext(c)
--
--	alerts, err := client.FindAlerts()
--	logger.DieIf(err)
--	joinedAlerts := joinMonitorsAndHosts(client, alerts)
--
-+	withClosed := c.Bool("with-closed")
-+	limit := c.Int("limit")
-+	var alert []*mkr.Alert
-+
-+	if withClosed {
-+		alerts, err := client.FindWithClosedAlerts()
-+		logger.DieIf(err)
-+		if alerts.NextID != "" {
-+			for {
-+				if limit > len(alerts.Alerts) {
-+					nextAlerts, err := client.FindWithClosedAlertsByNextID(alerts.NextID)
-+					logger.DieIf(err)
-+					alerts.Alerts = append(alerts.Alerts, nextAlerts.Alerts...)
-+					alerts.NextID = nextAlerts.NextID
-+					if alerts.NextID == "" {
-+						break
-+					}
-+					time.Sleep(1 * time.Second)
-+				} else {
-+					break
-+				}
-+			}
-+		}
-+		alert = alerts.Alerts[:limit]
-+	} else {
-+		alerts, err := client.FindAlerts()
-+		logger.DieIf(err)
-+		if alerts.NextID != "" {
-+			for {
-+				nextAlerts, err := client.FindAlertsByNextID(alerts.NextID)
-+				logger.DieIf(err)
-+				alerts.Alerts = append(alerts.Alerts, nextAlerts.Alerts...)
-+				alerts.NextID = nextAlerts.NextID
-+				if alerts.NextID == "" {
-+					break
-+				}
-+				time.Sleep(1 * time.Second)
-+			}
-+		}
-+		alert = alerts.Alerts[:limit]
-+	}
-+	joinedAlerts := joinMonitorsAndHosts(client, alert)
- 	for _, joinAlert := range joinedAlerts {
- 		if len(filterServices) > 0 {
- 			found := false