Merge branch 'master' of github.com:hfm/mackerel-plugin-mogilefs

Author: hfm

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 go:
-- 1.5.3
+- 1.6
 - tip
 env: PATH=/home/travis/gopath/bin:$PATH
 install: go get github.com/mitchellh/gox
@@ -17,7 +17,7 @@ deploy:
   skip_cleanup: true
   on:
     repo: hfm/mackerel-plugin-mogilefs
-    condition: "$TRAVIS_GO_VERSION = 1.5.3"
+    condition: "$TRAVIS_GO_VERSION = 1.6"
     tags: true
 notifications:
   slack:

CHANGELOG.md

@@ -1,14 +1,22 @@
-CHANGELOG
-===
+0.4.0 (2016-02-22)
+---
+
+### Summary
+
+Built by go 1.6
 
 0.3.2 (2016-01-14)
 ---
 
+### Summary
+
 Built by go 1.5.3
 
 0.3.1 (2016-01-11)
 ---
 
+### Summary
+
 Fix label name (typo)
 
 ### Fixed
@@ -18,6 +26,8 @@ Fix label name (typo)
 0.3.0 (2016-01-10)
 ---
 
+### Summary
+
 Change the repository of mflag
 
 ### Fixed
@@ -27,6 +37,8 @@ Change the repository of mflag
 0.2.1 (2015-12-30)
 ---
 
+### Summary
+
 Fix label names
 
 ### Fixed
@@ -38,6 +50,8 @@ Fix label names
 0.2.0 (2015-12-30)
 ---
 
+### Summary
+
 Add new graphs
 
 ### Added
@@ -49,6 +63,8 @@ Add new graphs
 0.1.0 (2015-12-30)
 ---
 
+### Summary
+
 Initial release
 
 ### Added

mogilefs.go renamed to cli.go

@@ -1,21 +1,19 @@
 package main
 
 import (
-	"bufio"
 	"fmt"
 	"io"
 	"net"
-	"os"
-	"strings"
 
-	mp "github.com/mackerelio/go-mackerel-plugin-helper"
 	flag "github.com/docker/docker/pkg/mflag"
+	mp "github.com/mackerelio/go-mackerel-plugin-helper"
 )
 
 // Exit codes are int values that represent an exit code for a particular error.
 const (
 	ExitCodeOK    int = 0
-	ExitCodeError int = 1 + iota
+	ExitCodeParseFlagError int = 1 + iota
+	ExitCodeError
 )
 
 /* graphdef is Graph definition for mackerelplugin.
@@ -109,35 +107,18 @@ func (m MogilefsPlugin) FetchMetrics() (map[string]interface{}, error) {
 	return m.parseStats(conn)
 }
 
-func (m MogilefsPlugin) parseStats(conn io.Reader) (map[string]interface{}, error) {
-	scanner := bufio.NewScanner(conn)
-	stats := make(map[string]interface{})
-
-	for scanner.Scan() {
-		line := scanner.Text()
-		s := string(line)
-		if s == "." {
-			return stats, nil
-		}
-
-		res := strings.Split(s, " ")
-		stats[res[0]] = res[1]
-	}
-
-	if err := scanner.Err(); err != nil {
-		return stats, err
-	}
-
-	return nil, nil
-}
-
 // GraphDefinition interface for mackerelplugin.
 func (m MogilefsPlugin) GraphDefinition() map[string](mp.Graphs) {
 	return graphdef
 }
 
-// Parse flags and Run helper (MackerelPlugin) with the given arguments.
-func main() {
+// CLI is the object for command line interface.
+type CLI struct {
+	outStream, errStream io.Writer
+}
+
+// Run is to parse flags and Run helper (MackerelPlugin) with the given arguments.
+func (c *CLI) Run(args []string) int {
 	// Flags
 	var (
 		host     string
@@ -155,14 +136,14 @@ func main() {
 	flags.BoolVar(&version, []string{"v", "version"}, false, "Print version information and quit.")
 
 	// Parse commandline flag
-	if err := flags.Parse(os.Args[1:]); err != nil {
-		os.Exit(ExitCodeError)
+	if err := flags.Parse(args[1:]); err != nil {
+		return ExitCodeError
 	}
 
 	// Show version
 	if version {
-		fmt.Fprintf(os.Stderr, "%s version %s\n", Name, Version)
-		os.Exit(ExitCodeOK)
+		fmt.Fprintf(c.errStream, "%s version %s\n", Name, Version)
+		return ExitCodeOK
 	}
 
 	// Create MackerelPlugin for MogileFS
@@ -172,4 +153,6 @@ func main() {
 	helper.Tempfile = tempfile
 
 	helper.Run()
+
+	return ExitCodeOK
 }

cli_test.go

@@ -0,0 +1,34 @@
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"strings"
+	"testing"
+)
+
+func TestGraphDefinition(t *testing.T) {
+	var mogilefs MogilefsPlugin
+
+	graphdef := mogilefs.GraphDefinition()
+	if len(graphdef) != 5 {
+		t.Errorf("GetTempfilename: %d should be 5", len(graphdef))
+	}
+}
+
+func TestCLI_Run(t *testing.T) {
+	outStream, errStream := new(bytes.Buffer), new(bytes.Buffer)
+	cli := &CLI{outStream: outStream, errStream: errStream}
+	args := strings.Split("mackerel-plugin-mogilefs -version", " ")
+
+	status := cli.Run(args)
+	if status != ExitCodeOK {
+		t.Errorf("ExitStatus=%d, want %d", status, ExitCodeOK)
+	}
+
+	expected := fmt.Sprintf("mackerel-plugin-mogilefs version %s", Version)
+	if !strings.Contains(errStream.String(), expected) {
+		t.Errorf("Output=%q, want %q", errStream.String(), expected)
+	}
+
+}

main.go

@@ -0,0 +1,10 @@
+package main
+
+import (
+	"os"
+)
+
+func main() {
+	cli := &CLI{outStream: os.Stdout, errStream: os.Stderr}
+	os.Exit(cli.Run(os.Args))
+}

stats.go

@@ -0,0 +1,29 @@
+package main
+
+import (
+	"bufio"
+	"io"
+	"strings"
+)
+
+func (m MogilefsPlugin) parseStats(conn io.Reader) (map[string]interface{}, error) {
+	scanner := bufio.NewScanner(conn)
+	stats := make(map[string]interface{})
+
+	for scanner.Scan() {
+		line := scanner.Text()
+		s := string(line)
+		if s == "." {
+			return stats, nil
+		}
+
+		res := strings.Split(s, " ")
+		stats[res[0]] = res[1]
+	}
+
+	if err := scanner.Err(); err != nil {
+		return stats, err
+	}
+
+	return nil, nil
+}

mogilefs_test.go renamed to stats_test.go

@@ -6,15 +6,6 @@ import (
 	"testing"
 )
 
-func TestGraphDefinition(t *testing.T) {
-	var mogilefs MogilefsPlugin
-
-	graphdef := mogilefs.GraphDefinition()
-	if len(graphdef) != 5 {
-		t.Errorf("GetTempfilename: %d should be 5", len(graphdef))
-	}
-}
-
 func TestParse(t *testing.T) {
 	var mogilefs MogilefsPlugin
 	stub := `uptime 35235

version.go

@@ -4,4 +4,4 @@ package main
 const Name string = "mackerel-plugin-mogilefs"
 
 // Version is version string of this application.
-const Version string = "0.3.2"
+const Version string = "0.4.1"