Merge pull request #16 from nanliu/pluginsync

Update from Intelsdi-x pluginsync 0.1.6

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,34 @@
+<!--
+Thanks for filing an issue! Before hitting the button, give this a read.
+
+If you are reporting a new issue, make sure that we do not have any duplicates already open. You can ensure this by searching the issue list for this repository. If there is a duplicate, please close your issue and add a comment to the existing issue instead.
+
+If you suspect your issue is a bug, please add as much context as you can using the template below. If it is not a bug, remove any sections you don't need and explain how we can help.
+
+As a basic rule, if you cannot provide enough information to continue addressing the issue within 7 days, a maintainer will close it. We will, however, reopen it if you later provide the information. Thanks again.
+-->
+
+**Snap version** (use `snapctl -v`):
+
+**Environment**:
+- **Cloud provider or hardware configuration**:
+- **OS** (e.g. from /etc/os-release):
+- **Kernel** (e.g. `uname -a`):
+- **Relevant tools** (e.g. plugins used with Snap):
+- **Others** (e.g. deploying with Ansible):
+
+
+**What happened**:
+
+
+**What you expected to happen**:
+
+
+**Steps to reproduce it** (as minimally and precisely as possible):
+
+1. 
+2. 
+3. 
+
+
+**Anything else do we need to know** (e.g. issue happens only occasionally):

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,21 @@
+<!--
+If this is a bug fix, make sure your description includes "fixes #xxxx", or
+"closes #xxxx"
+
+Please provide the following information:
+-->
+Fixes #
+
+Summary of changes:
+-
+-
+-
+
+How to verify it:
+-
+
+Testing done:
+-
+
+A picture of a snapping turtle (not required but encouraged):
+-

.gitignore

@@ -1,3 +1,9 @@
+# File managed by pluginsync
+#
+# NOTE: please commit OS/Editor specific settings in your .gitignore_global
+# .idea
+# .DS_Store
+#
 # Compiled Object files, Static and Dynamic libs (Shared Objects)
 *.o
 *.a
@@ -21,17 +27,15 @@ _testmain.go
 
 *.exe
 *.test
-.idea
-tmp/
-*.tmp
-scratch/
-build/
-*.swp
+*.prof
+
+# Output of the go coverage tool
+*.out
 profile.cov
-gin-bin
 
 # we don't vendor godep _workspace
 **/Godeps/_workspace/**
+vendor/
 
-# OSX stuff
-.DS_Store
+# ignore build artifacts
+build/

.pluginsync.yml

@@ -0,0 +1,17 @@
+pluginsync_config: '0.1.6'
+managed_files:
+- .github
+- .github/ISSUE_TEMPLATE.md
+- .github/PULL_REQUEST_TEMPLATE.md
+- .gitignore
+- .pluginsync.yml
+- .travis.yml
+- CONTRIBUTING.md
+- LICENSE
+- Makefile
+- scripts
+- scripts/build.sh
+- scripts/common.sh
+- scripts/deps.sh
+- scripts/pre_deploy.sh
+- scripts/test.sh

.sync.yml

@@ -0,0 +1,11 @@
+.travis.yml:
+  deploy:
+    access_key_id: AKIAINMB43VSSPFZISAA
+    secret_access_key:
+      secure: Ll0RxhWGQC60kcxZBX3GpgXB4ywlZ/xtQL5KNpmiihE5Mj0SqzKTF0UKHUaNQygHJCff94tqpvT4vGmRz+uYT4s7Dgoz+OU0vd7y1jH3uweypZrGg5NkjKMNRIHdWsflcSUec9boDGdTGFoAz0M8Af2ea869QCK130BZh3USMVwt+gSwA8/kBzrj5XuCtV97fcwO7kg7LovTzussS+3ttKAJJQ04Wn8gL+1X0ayE04AvWhtocVrD//2RsVUMq2+fIj0qihKuMu/17Vu+dS+NSYUQKrBZTnYZoTxyhnjD+knPmZcCZcABAx6FWnRy2tLfp9ZM+n5ultXJJ2ilqP8WdUHN7GCZyUrrnH+y8gxeUCLIj2WJ1HCEoFZ4fonsUU3RSc41x1gXpGw0oppvzccJbkwDP/C+uLFdCvHvVcU9EZ74T5djNuZybKzB9bFVfpByN3dDQEKkw2tNMIsN1IYnNTBF2LG7vXjKFkojH5cZmzpuHAR0dTppdX4EVDfZZ7b9r5cLGkGwbMT1e54MWvR1szBT7a4cHqJoeo/HMBgyTkzZQvRmZP4lFiZ3dbvD7qw68izm5k9d5GsXdVAftWSHG4POFiDzOthm1QvB83NWsslzGeyeWaZKWzqW4t+YLfWtZ9oxAihMxkT/KNWJX/09pUKI/0t8e+oq1LcbsRTade0=
+    api_key:
+      secure: vRyK2BWRRX48FMTP2Jyb0/da5S+ABc8CisX45xtwpSBUlPZkFjJ4+iZvkgbqYt5oZ+WalDAF40zPdr7v+JxNJ/HczCRjitS9S5f5+Nx75kj6ZaWPDESKi4UchVdwq4gS76b0yd1VxBz55j2uHQ2gPILDtVzq+rfDykipgVGqZ3SfbK+0zxN7oObfyB3Zo4WkXTl563SuRMtx5DsokraawN7BlPYuCAcE6BHf3QGCD3J+7Sbn9VUeWjYknpjZceAy/fPTXuSkvdFfU0Vm1GW9Ywsx0CX9BfRMNZjVL+0hC+e+NZN/+F5pDIxZCzZcqKpGPL7f5YZU5fgqn6nyBCHY5Ka5HInJT2EsSzpFVJTtPuuyNV/3+iIGZFrjbM3jLd5abW5C/G3E+8irrAoOgf4vYUKFN1/RE5UiwjRG69eH5aTgAXqRZfULDxgr1aZsIz7xjjXGd34RuQhxN390gVKy+Kubyq62A8J3W0d99FMs2p+EVxblCb6tHWpfDbI2cUzLffw4PNUhTsu7QpTD2kUPf57qzFWn7Wse2v38zLqoMFrWdizSIgNgnauB08ZkFSIBwHSjMi8/WZBC4SGOX63U+6rerJRFOzbODkWrqJQD+ghIvMIcmL1od8cM8/pCXHJbJIMmzN2Ay1PyyzBDsRSRlgXnmZ9I39632jySzDVHg2w=
+scripts/deps.sh:
+  packages:
+    - github.com/smartystreets/goconvey # NOTE: this should be moved to godep/glide
+    - github.com/stretchr/testify/mock

.travis.yml

@@ -1,23 +1,69 @@
-sudo: required
+# File managed by pluginsync
+sudo: false
 language: go
 go:
-- 1.5.3
-- 1.6
+- 1.6.3
+- 1.7.1
 env:
   global:
-    - SNAP_PLUGIN_SOURCE=/home/travis/gopath/src/github.com/intelsdi-x/snap-plugin-collector-iostat
+  - ORG_PATH=/home/travis/gopath/src/github.com/intelsdi-x
+  - SNAP_PLUGIN_SOURCE=/home/travis/gopath/src/github.com/${TRAVIS_REPO_SLUG}
   matrix:
-    - TEST=unit
+  - TEST_TYPE=small
+  - TEST_TYPE=build
+matrix:
+  exclude:
+  - go: 1.6.3
+    env: TEST_TYPE=build
 before_install:
-- go get github.com/tools/godep
-- if [ ! -d $SNAP_PLUGIN_SOURCE ]; then mkdir -p $HOME/gopath/src/github.com/intelsdi-x; ln -s $TRAVIS_BUILD_DIR $SNAP_PLUGIN_SOURCE; fi # CI for forks not from intelsdi-x
+- "[[ -d $SNAP_PLUGIN_SOURCE ]] || mkdir -p $ORG_PATH && ln -s $TRAVIS_BUILD_DIR $SNAP_PLUGIN_SOURCE"
 install:
-- export TMPDIR=$HOME/tmp
-- mkdir -p $TMPDIR
-- cd $SNAP_PLUGIN_SOURCE # change dir into source
+- cd $SNAP_PLUGIN_SOURCE
 - make deps
 script:
-- make check TEST=$TEST 2>&1 # Run test suite
+- make check 2>&1
 notifications:
+  email: false
   slack:
     secure: VkbZLIc2RH8yf3PtIAxUNPdAu3rQQ7yQx0GcK124JhbEnZGaHyK615V0rbG7HcVmYKGPdB0cXqZiLBDKGqGKb2zR1NepOe1nF03jxGSpPq8jIFeEXSJGEYGL34ScDzZZGuG6qwbjFcXiW5lqn6t8igzp7v2+URYBaZo5ktCS2xY=
+before_deploy:
+- "./scripts/pre_deploy.sh"
+deploy:
+- provider: s3
+  access_key_id: AKIAINMB43VSSPFZISAA
+  secret_access_key:
+    secure: Ll0RxhWGQC60kcxZBX3GpgXB4ywlZ/xtQL5KNpmiihE5Mj0SqzKTF0UKHUaNQygHJCff94tqpvT4vGmRz+uYT4s7Dgoz+OU0vd7y1jH3uweypZrGg5NkjKMNRIHdWsflcSUec9boDGdTGFoAz0M8Af2ea869QCK130BZh3USMVwt+gSwA8/kBzrj5XuCtV97fcwO7kg7LovTzussS+3ttKAJJQ04Wn8gL+1X0ayE04AvWhtocVrD//2RsVUMq2+fIj0qihKuMu/17Vu+dS+NSYUQKrBZTnYZoTxyhnjD+knPmZcCZcABAx6FWnRy2tLfp9ZM+n5ultXJJ2ilqP8WdUHN7GCZyUrrnH+y8gxeUCLIj2WJ1HCEoFZ4fonsUU3RSc41x1gXpGw0oppvzccJbkwDP/C+uLFdCvHvVcU9EZ74T5djNuZybKzB9bFVfpByN3dDQEKkw2tNMIsN1IYnNTBF2LG7vXjKFkojH5cZmzpuHAR0dTppdX4EVDfZZ7b9r5cLGkGwbMT1e54MWvR1szBT7a4cHqJoeo/HMBgyTkzZQvRmZP4lFiZ3dbvD7qw68izm5k9d5GsXdVAftWSHG4POFiDzOthm1QvB83NWsslzGeyeWaZKWzqW4t+YLfWtZ9oxAihMxkT/KNWJX/09pUKI/0t8e+oq1LcbsRTade0=
+  bucket: snap.ci.snap-telemetry.io
+  region: us-west-2
+  skip_cleanup: true
+  local-dir: s3
+  upload-dir: plugins
+  acl: public_read
+  on:
+    repo: intelsdi-x/snap-plugin-collector-iostat
+    branch: master
+    condition: $TEST_TYPE = "build" && $TRAVIS_GO_VERSION = "1.7.1"
+- provider: s3
+  access_key_id: AKIAINMB43VSSPFZISAA
+  secret_access_key:
+    secure: Ll0RxhWGQC60kcxZBX3GpgXB4ywlZ/xtQL5KNpmiihE5Mj0SqzKTF0UKHUaNQygHJCff94tqpvT4vGmRz+uYT4s7Dgoz+OU0vd7y1jH3uweypZrGg5NkjKMNRIHdWsflcSUec9boDGdTGFoAz0M8Af2ea869QCK130BZh3USMVwt+gSwA8/kBzrj5XuCtV97fcwO7kg7LovTzussS+3ttKAJJQ04Wn8gL+1X0ayE04AvWhtocVrD//2RsVUMq2+fIj0qihKuMu/17Vu+dS+NSYUQKrBZTnYZoTxyhnjD+knPmZcCZcABAx6FWnRy2tLfp9ZM+n5ultXJJ2ilqP8WdUHN7GCZyUrrnH+y8gxeUCLIj2WJ1HCEoFZ4fonsUU3RSc41x1gXpGw0oppvzccJbkwDP/C+uLFdCvHvVcU9EZ74T5djNuZybKzB9bFVfpByN3dDQEKkw2tNMIsN1IYnNTBF2LG7vXjKFkojH5cZmzpuHAR0dTppdX4EVDfZZ7b9r5cLGkGwbMT1e54MWvR1szBT7a4cHqJoeo/HMBgyTkzZQvRmZP4lFiZ3dbvD7qw68izm5k9d5GsXdVAftWSHG4POFiDzOthm1QvB83NWsslzGeyeWaZKWzqW4t+YLfWtZ9oxAihMxkT/KNWJX/09pUKI/0t8e+oq1LcbsRTade0=
+  bucket: snap.ci.snap-telemetry.io
+  region: us-west-2
+  skip_cleanup: true
+  local-dir: s3
+  upload-dir: plugins
+  acl: public_read
+  on:
+    repo: intelsdi-x/snap-plugin-collector-iostat
+    tags: true
+    condition: $TEST_TYPE = "build" && $TRAVIS_GO_VERSION = "1.7.1"
+- provider: releases
+  api_key:
+    secure: vRyK2BWRRX48FMTP2Jyb0/da5S+ABc8CisX45xtwpSBUlPZkFjJ4+iZvkgbqYt5oZ+WalDAF40zPdr7v+JxNJ/HczCRjitS9S5f5+Nx75kj6ZaWPDESKi4UchVdwq4gS76b0yd1VxBz55j2uHQ2gPILDtVzq+rfDykipgVGqZ3SfbK+0zxN7oObfyB3Zo4WkXTl563SuRMtx5DsokraawN7BlPYuCAcE6BHf3QGCD3J+7Sbn9VUeWjYknpjZceAy/fPTXuSkvdFfU0Vm1GW9Ywsx0CX9BfRMNZjVL+0hC+e+NZN/+F5pDIxZCzZcqKpGPL7f5YZU5fgqn6nyBCHY5Ka5HInJT2EsSzpFVJTtPuuyNV/3+iIGZFrjbM3jLd5abW5C/G3E+8irrAoOgf4vYUKFN1/RE5UiwjRG69eH5aTgAXqRZfULDxgr1aZsIz7xjjXGd34RuQhxN390gVKy+Kubyq62A8J3W0d99FMs2p+EVxblCb6tHWpfDbI2cUzLffw4PNUhTsu7QpTD2kUPf57qzFWn7Wse2v38zLqoMFrWdizSIgNgnauB08ZkFSIBwHSjMi8/WZBC4SGOX63U+6rerJRFOzbODkWrqJQD+ghIvMIcmL1od8cM8/pCXHJbJIMmzN2Ay1PyyzBDsRSRlgXnmZ9I39632jySzDVHg2w=
+  file:
+    - release/snap-plugin-collector-iostat_linux_x86_64
+  skip_cleanup: true
+  on:
+    repo: intelsdi-x/snap-plugin-collector-iostat
+    tags: true
+    condition: $TEST_TYPE = "build" && $TRAVIS_GO_VERSION = "1.7.1"

CONTRIBUTING.md

@@ -1,52 +1,46 @@
-# snap collector plugin - iostat
+# snap plugin collector iostat
 
 1. [Contributing Code](#contributing-code)
 2. [Contributing Examples](#contributing-examples)
 3. [Contribute Elsewhere](#contribute-elsewhere)
 4. [Thank You](#thank-you)
 
-This repository is primarily **community supported**. We both appreciate and need your contribution to keep it stable.
-
-Thank you for being part of the community! We love you for it.
+This repository has dedicated developers from Intel working on updates. The most helpful way to contribute is by reporting your experience through issues. Issues may not be updated while we review internally, but they're still incredibly appreciated.
 
 ## Contributing Code
 **_IMPORTANT_**: We encourage contributions to the project from the community. We ask that you keep the following guidelines in mind when planning your contribution.
 
-* Whether your contribution is for a bug fix or a feature request, **create an [Issue](https://github.com/intelsdi-x/snap-plugin-collector-iostat/issues)** and let us know what you are thinking
-* **For bugs**, if you have already found a fix, feel free to submit a Pull Request referencing the Issue you created
-* **For feature requests**, we want to improve upon the library incrementally which means small changes at a time. In order ensure your PR can be reviewed in a timely manner, please keep PRs small, e.g. <10 files and <500 lines changed. If you think this is unrealistic, then mention that within the issue and we can discuss it
+* Whether your contribution is for a bug fix or a feature request, **create an [Issue](https://github.com/intelsdi-x/snap-plugin-collector-iostat/issues)** and let us know what you are thinking.
+* **For bugs**, if you have already found a fix, feel free to submit a Pull Request referencing the Issue you created. Include the `Fixes #` syntax to link it to the issue you're addressing.
+* **For feature requests**, we want to improve upon the library incrementally which means small changes at a time. In order to ensure your PR can be reviewed in a timely manner, please keep PRs small, e.g. <10 files and <500 lines changed. If you think this is unrealistic, then mention that within the issue and we can discuss it.
 
 Once you're ready to contribute code back to this repo, start with these steps:
 
-* Fork the appropriate sub-projects that are affected by your change
-* Create a topic branch for your change and checkout that branch  
-     ```
-     $ git checkout -b some-topic-branch
-     ```
-* Clone the fork to `$GOPATH/src/github.com/intelsdi-x/`  
-	```
-	$ git clone https://github.com/<yourGithubID>/<project>.git
-	```
-* Create a topic branch for your change and checkout that branch
-	```
-	$ git checkout -b some-topic-branch
-	```
-* Make your changes and run the test suite if one is provided (see below)
-* Commit your changes and push them to your fork
-* Open a pull request for the appropriate project
-* Contributors will review your pull request, suggest changes, and merge it when i's ready and/or offer feedback
-* To report a bug or issue, please open a new issue against this repository
-
-If you have questions feel free to contact the [maintainers](https://github.com/intelsdi-x/snap/blob/master/README.md#maintainers).
+* Fork the appropriate sub-projects that are affected by your change.
+* Clone the fork to `$GOPATH/src/github.com/intelsdi-x/`:
+
+    ```
+$ git clone https://github.com/<yourGithubID>/<project>.git
+    ```
+* Create a topic branch for your change and checkout that branch:
+
+    ```
+    $ git checkout -b some-topic-branch
+    ```
+* Make your changes and run the test suite if one is provided.
+* Commit your changes and push them to your fork.
+* Open a pull request for the appropriate project.
+* Contributors will review your pull request, suggest changes, and merge it when it’s ready and/or offer feedback.
+
+If you have questions feel free to contact the [maintainers](https://github.com/intelsdi-x/snap/blob/master/README.md#maintainers) by tagging them: @intelsdi-x/plugin-maintainers.
 
 ## Contributing Examples
 The most immediately helpful way you can benefit this project is by cloning the repository, adding some further examples and submitting a pull request.
 
-Have you written a blog post about how you use [snap](http://github.com/intelsdi-x/snap) and/or this plugin? Send it to us!
-
+Have you written a blog post about how you use [Snap](http://github.com/intelsdi-x/snap) and/or this plugin? Send it to us [on Slack](http://slack.snap-telemetry.io)!
 
 ## Contribute Elsewhere
-This repository is one of **many** plugins in **snap**, a powerful telemetry framework. See the full project at http://github.com/intelsdi-x/snap
+This repository is one of **many** plugins in **Snap**, a powerful telemetry framework. See the full project at http://snap-telemetry.io
 
 ## Thank You
 And **thank you!** Your contribution, through code and participation, is incredibly important to us.

LICENSE

@@ -199,4 +199,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

Makefile

@@ -1,10 +1,36 @@
+# File managed by pluginsync
+# http://www.apache.org/licenses/LICENSE-2.0.txt
+#
+#
+# Copyright 2015 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 default:
 	$(MAKE) deps
 	$(MAKE) all
 deps:
-	bash -c "godep restore"
+	bash -c "./scripts/deps.sh"
 test:
-	bash -c "./scripts/test.sh $(TEST)"
+	bash -c "./scripts/test.sh $(TEST_TYPE)"
+test-legacy:
+	bash -c "./scripts/test.sh legacy"
+test-small:
+	bash -c "./scripts/test.sh small"
+test-medium:
+	bash -c "./scripts/test.sh medium"
+test-large:
+	bash -c "./scripts/test.sh large"
 check:
 	$(MAKE) test
 all: