From 70f86c481203142682e69c4f6ccc238c18c334af Mon Sep 17 00:00:00 2001
From: Bradley Cicenas <bradley@vektor.nyc>
Date: Thu, 23 Feb 2017 02:03:55 +0000
Subject: [PATCH] rename collector subpackage

---
 container.go                     | 6 +++---
 containermap.go                  | 8 ++++----
 {collector => metrics}/docker.go | 2 +-
 {collector => metrics}/main.go   | 2 +-
 {collector => metrics}/mock.go   | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename {collector => metrics}/docker.go (99%)
 rename {collector => metrics}/main.go (94%)
 rename {collector => metrics}/mock.go (97%)

diff --git a/container.go b/container.go
index e2ae50b..cf60ad9 100644
--- a/container.go
+++ b/container.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/bcicen/ctop/collector"
+	"github.com/bcicen/ctop/metrics"
 	"github.com/bcicen/ctop/widgets"
 )
 
@@ -9,7 +9,7 @@ type Container struct {
 	id      string
 	name    string
 	state   string
-	metrics collector.Metrics
+	metrics metrics.Metrics
 	widgets widgets.ContainerWidgets
 }
 
@@ -27,7 +27,7 @@ func (c *Container) SetState(s string) {
 }
 
 // Read metric stream, updating widgets
-func (c *Container) Read(stream chan collector.Metrics) {
+func (c *Container) Read(stream chan metrics.Metrics) {
 	log.Infof("starting reader for container: %s", c.id)
 	go func() {
 		for metrics := range stream {
diff --git a/containermap.go b/containermap.go
index 4c01485..be5935d 100644
--- a/containermap.go
+++ b/containermap.go
@@ -4,8 +4,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/bcicen/ctop/collector"
 	"github.com/bcicen/ctop/config"
+	"github.com/bcicen/ctop/metrics"
 	"github.com/bcicen/ctop/widgets"
 	"github.com/fsouza/go-dockerclient"
 )
@@ -13,7 +13,7 @@ import (
 type ContainerMap struct {
 	client     *docker.Client
 	containers map[string]*Container
-	collectors map[string]collector.Collector
+	collectors map[string]metrics.Collector
 }
 
 func NewContainerMap() *ContainerMap {
@@ -25,7 +25,7 @@ func NewContainerMap() *ContainerMap {
 	cm := &ContainerMap{
 		client:     client,
 		containers: make(map[string]*Container),
-		collectors: make(map[string]collector.Collector),
+		collectors: make(map[string]metrics.Collector),
 	}
 	cm.Refresh()
 	return cm
@@ -69,7 +69,7 @@ func (cm *ContainerMap) Refresh() {
 		if c.state == "running" {
 			if _, ok := cm.collectors[id]; ok == false {
 				log.Infof("starting collector for container: %s", id)
-				cm.collectors[id] = collector.NewDocker(cm.client, id)
+				cm.collectors[id] = metrics.NewDocker(cm.client, id)
 				cm.collectors[id].Start()
 				c.Read(cm.collectors[id].Stream())
 			}
diff --git a/collector/docker.go b/metrics/docker.go
similarity index 99%
rename from collector/docker.go
rename to metrics/docker.go
index 5cb1ccc..5298662 100644
--- a/collector/docker.go
+++ b/metrics/docker.go
@@ -1,4 +1,4 @@
-package collector
+package metrics
 
 import (
 	api "github.com/fsouza/go-dockerclient"
diff --git a/collector/main.go b/metrics/main.go
similarity index 94%
rename from collector/main.go
rename to metrics/main.go
index 8c3ea25..a6c1e1e 100644
--- a/collector/main.go
+++ b/metrics/main.go
@@ -1,4 +1,4 @@
-package collector
+package metrics
 
 import (
 	"math"
diff --git a/collector/mock.go b/metrics/mock.go
similarity index 97%
rename from collector/mock.go
rename to metrics/mock.go
index 817cce6..5d6b02e 100644
--- a/collector/mock.go
+++ b/metrics/mock.go
@@ -1,4 +1,4 @@
-package collector
+package metrics
 
 import (
 	"math/rand"