Merge pull request #107 from mackerelio/bump-version-0.6.0

Release version 0.6.0

Author: stanaka

.travis.yml

@@ -5,7 +5,7 @@ env:
   global:
   - PATH=~/gopath/bin:$PATH
   - DEBIAN_FRONTEND=noninteractive
-  - secure: eVK4VPUaQNF1a3CMUz/5jWaNY0+Wj10HnscPhcvmnH+IUJ+B6n2W4M5ht5WXEmx5EnKgLIZveL9CtPJTTsW4lE1RO03xfuVoe8+dElUSlKLJEHIDKm7koYgFEURWZXRcMAMqW2yj3y7D34fnwP4Evt/HuV8ZtWktMtJUzLr12oFxQDS0RC7II5nh8BiqSGCkKC8QJ6qQzbjZavBQ8M70Y4WWPArYHzwcSQjOLxhQmGCyx9JI7/nIqSosldFwqiFTh+UH3x7Pntt1Ji6Ra0rAuGFN28nQc8ISxfytwAgV4h7ubAWPUom2rXdUpHVvWZXoxDJr8YYq4rGRmyuLl/gBUfv72l/u8wIlMo5gRB2vJXHwKAaogSheGtdVwv7BwPSvjA6oOz5imqkhIm5kNgyrXaBglF7fornPiJNVgv2lMzuLB3GgqjYxhfipFahJT99x91/xd6kZ5OSSUVYkTx/0JwkEmGXyOJNzynC22VNHj6u1T41hkRHHSUjzrNBwNhMEcXDy75VaJukKMi9YyyHgehitWUFnGq0rakMz3tQxeO8K6YVQqjD7NWPiHh1vh4vWYRn2/T7ewTksW1h+/ETJR98YYsjpHnuQSJh6gGj6i4jKKy04hWagVciJ3Jr4i6ouA8ggKoEMzEB9KXd44yJoXk/ozk5VOXPithyp8NuA5BA=
+  - secure: "A7F4DYfPLjDwh/B0CWAX2y9cChZtGENRF9dJy5l35gK6pc0a4oVzm2GuzZFYubp1ByWIW+No+iXnw2CGYCS2jMdYMeNLjrfN4orEENVrsXIaq+itF7+Ub/O3WaM9ukpfeXZKzFS/EyxvyRYMPmpc2pwqA1HGQ5qTDVzlFE+zCnD4rAAQdCf5KbNuZEcXyOOWKUX8d0ZmmvVYjJM8CKqfxNwWXsVaNBzXww8isa9FaRMiWlei2ca1ORvzVg4xkvcd66xgdj6n07a8oMMaOdmqG4I3qAeh92ruEpWLT4uVzzobDpVUezJ3vH8IXoBizu0Xg9aijFHqlZ6PBDT+jISI2cpfzMgRHORvHk+Qha5AxWkVLinvo/FBGHYEZzkvNOSAqbi+RdesKnDKf4Lktx9LRSRr7Q4fhFUIY2ya33GHS4RjpNtYPrpSZ+QRAVkoRCkPJFhmfgaPYmyC94tTv2c8QDY2p1aXFC10wY5FF/Z2P0Mbcy/q92GSKxxHMM523UVBvgItAdEZEBqLSvFIuM5rf3UcOtJlgoIiiLJ9hskDEOw10Kl0uIuq/tlBp71SuFpYxFPB8lumTzaa8TQQO4pCoyq3zhe0PlbZk621pJRcxnF5pIEen6/7xmwr8+DASE/4yiV+vfhYz9/mUAbwR31k/5lVgvr/tBJLgvY9vyfM0eE="
 sudo: false
 addons:
   apt:
@@ -41,8 +41,7 @@ deploy:
   on:
     branch: master
 - provider: script
-  script: tool/releng --task=create-pullrequest --current-branch=$TRAVIS_BRANCH --package-name=mackerel-check-plugins
-    -v
+  script: tool/releng --task=create-pullrequest --current-branch=$TRAVIS_BRANCH --package-name=mackerel-check-plugins -v
   skip_cleanup: true
   on:
     all_branches: true

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 0.6.0 (2016-05-10)
+
+* supported gearman ascii protocol for check-tcp #89 (karupanerura)
+* added check-masterha command to check masterha status #90 (karupanerura)
+* Plugin for checking AWS SQS queue size #92 (hiroakis)
+* fix: rpm should not include dir #98 (stanaka)
+* added ssh checker #101 (karupanerura)
+* remove 'golang.org/x/tools/cmd/vet' #102 (y-kuno)
+* [uptime/procs] `--warn-over/under` is deprecated. use `--warning-over/under` instead #104 (Songmu)
+* add aws-sqs-queue-size, cert-file, masterha and ssh into package #105 (Songmu)
+* bump up go version to 1.6.2 #106 (stanaka)
+
+
 ## 0.5.2 (2016-03-25)
 
 * Revert "use /usr/bin/check-*" #95 (Songmu)

packaging/deb/debian/changelog

@@ -1,3 +1,26 @@
+mackerel-check-plugins (0.6.0-1) stable; urgency=low
+
+  * supported gearman ascii protocol for check-tcp (by karupanerura)
+    <https://github.com/mackerelio/go-check-plugins/pull/89>
+  * added check-masterha command to check masterha status (by karupanerura)
+    <https://github.com/mackerelio/go-check-plugins/pull/90>
+  * Plugin for checking AWS SQS queue size (by hiroakis)
+    <https://github.com/mackerelio/go-check-plugins/pull/92>
+  * fix: rpm should not include dir (by stanaka)
+    <https://github.com/mackerelio/go-check-plugins/pull/98>
+  * added ssh checker (by karupanerura)
+    <https://github.com/mackerelio/go-check-plugins/pull/101>
+  * remove 'golang.org/x/tools/cmd/vet' (by y-kuno)
+    <https://github.com/mackerelio/go-check-plugins/pull/102>
+  * [uptime/procs] `--warn-over/under` is deprecated. use `--warning-over/under` instead (by Songmu)
+    <https://github.com/mackerelio/go-check-plugins/pull/104>
+  * add aws-sqs-queue-size, cert-file, masterha and ssh into package (by Songmu)
+    <https://github.com/mackerelio/go-check-plugins/pull/105>
+  * bump up go version to 1.6.2 (by stanaka)
+    <https://github.com/mackerelio/go-check-plugins/pull/106>
+
+ -- mackerel <[email protected]>  Tue, 10 May 2016 08:02:46 +0000
+
 mackerel-check-plugins (0.5.2-1) stable; urgency=low
 
   * Revert "use /usr/bin/check-*" (by Songmu)

packaging/rpm/mackerel-check-plugins.spec

@@ -45,6 +45,17 @@ done
 %{__oldtargetdir}/*
 
 %changelog
+* Tue May 10 2016 <[email protected]> - 0.6.0-1
+- supported gearman ascii protocol for check-tcp (by karupanerura)
+- added check-masterha command to check masterha status (by karupanerura)
+- Plugin for checking AWS SQS queue size (by hiroakis)
+- fix: rpm should not include dir (by stanaka)
+- added ssh checker (by karupanerura)
+- remove 'golang.org/x/tools/cmd/vet' (by y-kuno)
+- [uptime/procs] `--warn-over/under` is deprecated. use `--warning-over/under` instead (by Songmu)
+- add aws-sqs-queue-size, cert-file, masterha and ssh into package (by Songmu)
+- bump up go version to 1.6.2 (by stanaka)
+
 * Fri Mar 25 2016 <[email protected]> - 0.5.2
 - Revert "use /usr/bin/check-*" (by Songmu)
 

tool/releng

@@ -129,7 +129,7 @@ sub github_release_with_exit_code {
 
 sub http_get {
     my $url = shift;
-    my ($ok, $err, undef, $stdout) = run(command => [qw{curl -sf}, $url]);
+    my ($ok, $err, undef, $stdout, $stderr) = run(command => [qw{curl -sf}, $url]);
     return {
         success => $ok,
         content => join('', @$stdout),
@@ -247,7 +247,7 @@ sub merged_prs {
     say "Pull Requests: " . join(", ", @pull_nums);
     my @releases;
     for my $pull_num (@pull_nums) {
-        my $url = sprintf "https://api.github.com/repos/%s/pulls/%d?state=closed", $REPO_NAME, $pull_num;
+        my $url = sprintf "https://api.github.com/repos/%s/pulls/%d", $REPO_NAME, $pull_num;
         my $res = http_get($url);
         unless ($res->{success}) {
             warnf "request to $url failed\n";
@@ -403,7 +403,7 @@ sub create_pull_request {
     }
 
     # return if last commit is updating specs and changelogs
-    my $last_commitlog = `git log -1 --oneline | cut -d ' ' -f2-`;
+    my $last_commitlog = `git log --oneline master..HEAD | cut -d ' ' -f2-`;
     if($last_commitlog =~ /update changelogs/){
         infof "skip to update changelogs because the last commit is 'update changelogs'.\n";
         return;
@@ -418,10 +418,10 @@ sub create_pull_request {
         infof "skip to update changelogs because no merged pull request is found after the last release.\n"
     }
     if($ret || git_with_exit_code qw/diff --exit-code/){
-        git qw/commit -am/, "update changelogs";
         git qw/config --global push.default matching/;
         git qw/config user.email/, '[email protected]';
         git qw/config user.name/, 'mackerel';
+        git qw/commit -am/, "update changelogs";
         git qw/push -u/, "https://$ENV{GITHUB_TOKEN}\@github.com/$REPO_NAME.git";
         infof "Difference is pushed to GitHub.\n";
     }