flucky
/
flucky
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

fix: rename packages

This commit is contained in:
Markus Pesch 2019-05-12 11:57:53 +02:00
parent d3c4ca2c72
commit c5233d578a
Signed by: volker.raschek
GPG Key ID: 852BCC170D81A982
33 changed files with 59 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile
View File

@ -2,17 +2,10 @@
# UID or GID is the UNIX user ID or group ID of the user who executes
# make. If the UID or GID is not passed as a make variable, an attempt
# is made to determine it.
UID?=$(shell id -u)
GID?=$(shell id -g)
UID?=$(shell id --user)
GID?=$(shell id --group)
# VERSION
# UID/GID
# UID or GID is the UNIX user ID or group ID of the user who executes
# make. If the UID or GID is not passed as a make variable, an attempt
# is made to determine it.
UID?=$(shell id -u)
GID?=$(shell id -g)
# If no version is specified as a parameter of make, the last git hash
# value is taken.
VERSION:=$(or ${TRAVIS_TAG}, ${TRAVIS_TAG}, $(shell git rev-parse --short HEAD)-git)
@ -25,15 +18,10 @@ build:
GOOS=${GOOS} \
GOARCH=${GOARCH} \
go build -ldflags "-X main.version=${VERSION}"
chown -R ${UID}:${GID} *
docker-build:
docker run \
--volume ${PWD}:/workspace \
volkerraschek/build-image:1.0.0 \
make build VERSION=${VERSION} GOOS=${GOOS} GOARCH=${GOARCH}
docker-sanitized:
docker run \
--volume ${PWD}:/workspace \
volkerraschek/build-image:1.0.0 \
chown ${UID}:${GID} -R /workspace
make build UID=${UID} GID=${GID} VERSION=${VERSION} GOOS=${GOOS} GOARCH=${GOARCH}

14
cmd/cmd.go
View File

@ -5,16 +5,16 @@ import (
"os"
"time"
lg "git.cryptic.systems/fh-trier/go-flucky/cmd/logger"
"git.cryptic.systems/fh-trier/go-flucky/cmd/remote"
"git.cryptic.systems/fh-trier/go-flucky/cmd/sensor"
"git.cryptic.systems/fh-trier/go-flucky/cmd/temperature"
"git.cryptic.systems/fh-trier/go-flucky/pkg/logger"
"git.cryptic.systems/fh-trier/go-flucky/pkg/types"
lg "github.com/volker-raschek/flucky/cmd/logger"
"github.com/volker-raschek/flucky/cmd/remote"
"github.com/volker-raschek/flucky/cmd/sensor"
"github.com/volker-raschek/flucky/cmd/temperature"
"github.com/volker-raschek/flucky/pkg/logger"
"github.com/volker-raschek/flucky/pkg/types"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
uuid "github.com/satori/go.uuid"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/config"
)
var cfg string

2
cmd/humidity/get.go
View File

@ -3,8 +3,8 @@ package humidity
import (
"log"
"git.cryptic.systems/fh-trier/go-flucky/pkg/humidity"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/humidity"
)
var follow, push bool

4
cmd/logger/add.go
View File

@ -3,10 +3,10 @@ package logger
import (
"log"
"git.cryptic.systems/fh-trier/go-flucky/pkg/logger"
"github.com/volker-raschek/flucky/pkg/logger"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/config"
)
var enabled bool

4
cmd/logger/list.go
View File

@ -4,9 +4,9 @@ import (
"log"
"os"
"git.cryptic.systems/fh-trier/go-flucky/pkg/cli"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/cli"
"github.com/volker-raschek/flucky/pkg/config"
)
var quiet bool

2
cmd/logger/rm.go
View File

@ -3,8 +3,8 @@ package logger
import (
"log"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/config"
)
var rmLoggerCmd = &cobra.Command{

2
cmd/remote/add.go
View File

@ -3,8 +3,8 @@ package remote
import (
"log"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/config"
)
var enabled bool

2
cmd/remote/disable.go
View File

@ -3,8 +3,8 @@ package remote
import (
"log"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/config"
)
var disableRemoteCmd = &cobra.Command{

2
cmd/remote/enable.go
View File

@ -3,8 +3,8 @@ package remote
import (
"log"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/config"
)
var enableRemoteCmd = &cobra.Command{

4
cmd/remote/list.go
View File

@ -4,9 +4,9 @@ import (
"log"
"os"
"git.cryptic.systems/fh-trier/go-flucky/pkg/cli"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/cli"
"github.com/volker-raschek/flucky/pkg/config"
)
var quiet bool

2
cmd/remote/remove.go
View File

@ -3,8 +3,8 @@ package remote
import (
"log"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/config"
)
var rmRemoteCmd = &cobra.Command{

2
cmd/remote/rename.go
View File

@ -3,8 +3,8 @@ package remote
import (
"log"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/config"
)
var renameRemoteCmd = &cobra.Command{

4
cmd/sensor/add.go
View File

@ -4,9 +4,9 @@ import (
"fmt"
"log"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"git.cryptic.systems/fh-trier/go-flucky/pkg/types"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/config"
"github.com/volker-raschek/flucky/pkg/types"
)
var enabled bool

2
cmd/sensor/disable.go
View File

@ -3,8 +3,8 @@ package sensor
import (
"log"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/config"
)
var disableSensorCmd = &cobra.Command{

2
cmd/sensor/enable.go
View File

@ -3,8 +3,8 @@ package sensor
import (
"log"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/config"
)
var enableSensorCmd = &cobra.Command{

4
cmd/sensor/list.go
View File

@ -4,9 +4,9 @@ import (
"log"
"os"
"git.cryptic.systems/fh-trier/go-flucky/pkg/cli"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/cli"
"github.com/volker-raschek/flucky/pkg/config"
)
var listSensorCmd = &cobra.Command{

2
cmd/sensor/rename.go
View File

@ -4,8 +4,8 @@ import (
"fmt"
"log"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/config"
)
var renameSensorCmd = &cobra.Command{

2
cmd/sensor/rm.go
View File

@ -3,8 +3,8 @@ package sensor
import (
"log"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/config"
)
var rmSensorCmd = &cobra.Command{

4
cmd/temperature/log.go
View File

@ -5,9 +5,9 @@ import (
"log"
"os"
"git.cryptic.systems/fh-trier/go-flucky/pkg/cli"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/cli"
"github.com/volker-raschek/flucky/pkg/config"
)
var logTemperatureCmd = &cobra.Command{

6
cmd/temperature/read.go
View File

@ -5,10 +5,10 @@ import (
"log"
"os"
"git.cryptic.systems/fh-trier/go-flucky/pkg/cli"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"git.cryptic.systems/fh-trier/go-flucky/pkg/sensor"
"github.com/spf13/cobra"
"github.com/volker-raschek/flucky/pkg/cli"
"github.com/volker-raschek/flucky/pkg/config"
"github.com/volker-raschek/flucky/pkg/sensor"
)
var logs bool

2
go.mod
View File

@ -3,8 +3,6 @@ module github.com/volker-raschek/flucky
go 1.12
require (
git.cryptic.systems/fh-trier/go-flucky v0.0.0-20181207215028-500d1a5823bf
git.cryptic.systems/fh-trier/go-flucky-server v0.0.0-20181230151231-f6edecea614d // indirect
github.com/MichaelS11/go-dht v0.0.0-20181004212404-be44b9ee7fec
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/kr/pretty v0.1.0 // indirect

8
go.sum
View File

@ -1,12 +1,11 @@
git.cryptic.systems/fh-trier/go-flucky v0.0.0-20181207215028-500d1a5823bf h1:WM8TvicHgWrAn+CN0z5u2lkX0L4ejtK+rUckoucNad8=
git.cryptic.systems/fh-trier/go-flucky v0.0.0-20181207215028-500d1a5823bf/go.mod h1:yb5tRWqyFQ3CSgzOWTrvedu7QvpB+Z33+5xBR53ApHA=
git.cryptic.systems/fh-trier/go-flucky-server v0.0.0-20181230151231-f6edecea614d h1:F6PfcsO3KTND6nS+W1JIyQTZP0ELkpO4ZtsJLM1AkJk=
git.cryptic.systems/fh-trier/go-flucky-server v0.0.0-20181230151231-f6edecea614d/go.mod h1:WsdKW/cKXJboXNZduOxhD6y7NyhYN5E8eH6Jj5nDNNE=
github.com/MichaelS11/go-dht v0.0.0-20181004212404-be44b9ee7fec h1:xMo0OOokExQqY/MRsTz6azUwy0udvlqhkJwQ5jZ6eN4=
github.com/MichaelS11/go-dht v0.0.0-20181004212404-be44b9ee7fec/go.mod h1:NTx2rUi8kfs8Qk9Fotoyf/3lQnKBdc2mhyZqO4AhVLI=
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
@ -16,6 +15,7 @@ github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/yryz/ds18b20 v0.0.0-20180211073435-3cf383a40624 h1:bePzgtpuLSl+F9aacwuaquuoOyKfMKuJORq2CvPPJK4=
github.com/yryz/ds18b20 v0.0.0-20180211073435-3cf383a40624/go.mod h1:MqFju5qeLDFh+S9PqxYT7TEla8xeW7bgGr/69q3oki0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
periph.io/x/periph v3.4.0+incompatible h1:5gzxE4ryPq52cdqSw0mErR6pyJK8cBF2qdUAcOWh0bo=
periph.io/x/periph v3.4.0+incompatible/go.mod h1:EWr+FCIU2dBWz5/wSWeiIUJTriYv9v2j2ENBmgYyy7Y=

2
main.go
View File

@ -5,7 +5,7 @@ import (
"os"
"os/user"
"git.cryptic.systems/fh-trier/go-flucky/cmd"
"github.com/volker-raschek/flucky/cmd"
)
var version string

8
pkg/cli/cli.go
View File

@ -5,12 +5,12 @@ import (
"io"
"text/tabwriter"
"git.cryptic.systems/fh-trier/go-flucky/pkg/logger"
"github.com/volker-raschek/flucky/pkg/logger"
"git.cryptic.systems/fh-trier/go-flucky/pkg/internal/temperature"
"github.com/volker-raschek/flucky/pkg/internal/temperature"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"git.cryptic.systems/fh-trier/go-flucky/pkg/types"
"github.com/volker-raschek/flucky/pkg/config"
"github.com/volker-raschek/flucky/pkg/types"
)
// PrintHumidities displays a list of humidities

6
pkg/config/fluckyconfig.go
View File

@ -7,12 +7,12 @@ import (
"io"
"time"
"git.cryptic.systems/fh-trier/go-flucky/pkg/logger"
"github.com/volker-raschek/flucky/pkg/logger"
"git.cryptic.systems/fh-trier/go-flucky/pkg/sensor"
"github.com/volker-raschek/flucky/pkg/sensor"
"git.cryptic.systems/fh-trier/go-flucky/pkg/types"
uuid "github.com/satori/go.uuid"
"github.com/volker-raschek/flucky/pkg/types"
)
// FluckyConfig dasd

2
pkg/config/remote.go
View File

@ -1,6 +1,6 @@
package config
import "git.cryptic.systems/fh-trier/go-flucky/pkg/types"
import "github.com/volker-raschek/flucky/pkg/types"
// Remote ...
type Remote struct {

4
pkg/internal/temperature/temperature.go
View File

@ -4,8 +4,8 @@ import (
"fmt"
"time"
"git.cryptic.systems/fh-trier/go-flucky/pkg/config"
"git.cryptic.systems/fh-trier/go-flucky/pkg/types"
"github.com/volker-raschek/flucky/pkg/config"
"github.com/volker-raschek/flucky/pkg/types"
)
// GetSensorsByTemperatures returns commulated list of sensors by temperature values

2
pkg/logger/file_logger.go
View File

@ -7,7 +7,7 @@ import (
"os"
"time"
"git.cryptic.systems/fh-trier/go-flucky/pkg/types"
"github.com/volker-raschek/flucky/pkg/types"
)
type FileLogger struct {

2
pkg/logger/logger.go
View File

@ -4,7 +4,7 @@ import (
"fmt"
"time"
"git.cryptic.systems/fh-trier/go-flucky/pkg/types"
"github.com/volker-raschek/flucky/pkg/types"
)
type Logger interface {

2
pkg/sensor/dht11.go
View File

@ -4,9 +4,9 @@ import (
"fmt"
"time"
"git.cryptic.systems/fh-trier/go-flucky/pkg/types"
"github.com/MichaelS11/go-dht"
uuid "github.com/satori/go.uuid"
"github.com/volker-raschek/flucky/pkg/types"
)
type DHT11Sensor struct {

2
pkg/sensor/dht22.go
View File

@ -4,9 +4,9 @@ import (
"fmt"
"time"
"git.cryptic.systems/fh-trier/go-flucky/pkg/types"
"github.com/MichaelS11/go-dht"
uuid "github.com/satori/go.uuid"
"github.com/volker-raschek/flucky/pkg/types"
)
type DHT22Sensor struct {

2
pkg/sensor/ds18b20.go
View File

@ -4,8 +4,8 @@ import (
"fmt"
"time"
"git.cryptic.systems/fh-trier/go-flucky/pkg/types"
uuid "github.com/satori/go.uuid"
"github.com/volker-raschek/flucky/pkg/types"
"github.com/yryz/ds18b20"
)

4
pkg/sensor/sensor.go
View File

@ -3,9 +3,9 @@ package sensor
import (
"sync"
"git.cryptic.systems/fh-trier/go-flucky/pkg/internal/errutils"
"github.com/volker-raschek/flucky/pkg/internal/errutils"
"git.cryptic.systems/fh-trier/go-flucky/pkg/types"
"github.com/volker-raschek/flucky/pkg/types"
)
type HumiditySensor interface {