Fix #80 - global refactor

.gitignore

@@ -1,12 +1,13 @@
 # builds
 /scaleway-cli
 /scw
-scwversion/version.go
+pkg/scwversion/version.go
 dist/
 
 # junk
 *~
 *#
 .#*
 profile.cov
+profile.out
 .vendor

Makefile

@@ -23,8 +23,8 @@ FPM_ARGS ?=	\
 
 
 NAME = scw
-SRC = .
-PACKAGES = api commands utils
+SRC = cmd/scw
+PACKAGES = pkg/api pkg/commands pkg/utils pkg/cli
 REV = $(shell git rev-parse HEAD || echo "nogit")
 TAG = $(shell git describe --tags --always || echo "nogit")
 BUILDER = scaleway-cli-builder
@@ -43,7 +43,7 @@ COVER_LIST = $(foreach int, $(PACKAGES), $(int)_cover)
 
 
 all: build
-build: scwversion/version.go $(BUILD_LIST)
+build: pkg/scwversion/version.go $(BUILD_LIST)
 clean: $(CLEAN_LIST)
 install: $(INSTALL_LIST)
 test: $(TEST_LIST)
@@ -59,8 +59,8 @@ cover:
 	touch $@
 
 
-scwversion/version.go: .git
-	@sed 's/\(.*GITCOMMIT.* = \).*/\1"$(REV)"/;s/\(.*VERSION.* = \).*/\1"$(TAG)"/' scwversion/version.tpl > $@.tmp
+pkg/scwversion/version.go: .git
+	@sed 's/\(.*GITCOMMIT.* = \).*/\1"$(REV)"/;s/\(.*VERSION.* = \).*/\1"$(TAG)"/' pkg/scwversion/version.tpl > $@.tmp
 	@if [ "$$(diff $@.tmp $@ 2>&1)" != "" ]; then mv $@.tmp $@; fi
 	@rm -f $@.tmp
 
@@ -72,7 +72,7 @@ $(CLEAN_LIST): %_clean:
 	$(GOCLEAN) ./$*
 $(INSTALL_LIST): %_install:
 	$(GOINSTALL) ./$*
-$(IREF_LIST): %_iref: scwversion/version.go
+$(IREF_LIST): %_iref: pkg/scwversion/version.go
 	$(GOTEST) -i ./$*
 $(TEST_LIST): %_test:
 	$(GOTEST) ./$*
@@ -83,7 +83,7 @@ $(FMT_LIST): %_fmt:
 	$(GOFMT) ./$*
 
 
-cross: scwversion/version.go
+cross: pkg/scwversion/version.go
 	docker build -t $(BUILDER) .
 	@docker rm scaleway-cli-builer 2>/dev/null || true
 	mkdir -p dist

README.md

@@ -75,7 +75,7 @@ chmod +x /usr/local/bin/scw
 To install Scaleway CLI master git, run the following command:
 
 ```bash
-go get github.com/scaleway/scaleway-cli
+go get github.com/scaleway/scaleway-cli/...
 ```
 
 ### Requirements
@@ -106,7 +106,7 @@ $ docker run -it --rm --volume=$HOME/.scwrc:/.scwrc scaleway/cli ps
 2. Ensure you have `$GOPATH` and `$PATH` well configured, something like:
   * `export GOPATH=$HOME/go`
   * `export PATH=$PATH:$GOPATH/bin`
-3. Install the project: `go get github.com/scaleway/scaleway-cli`
+3. Install the project: `go get github.com/scaleway/scaleway-cli/...`
 4. Run: `scaleway-cli`
 
 ## Usage
@@ -1050,6 +1050,8 @@ $ scw inspect myserver | jq '.[0].public_ip.address'
 
 #### Fixes
 
+* Global refactor to improve Golang library usage, allow chaining of commands and ease the writing of unit tests ([#80](https://github.com/scaleway/scaleway-cli/issues/80))
+* `scw search TERM` was not restricting results based on `TERM`
 * Bumped dependencies
 * Hiding more sensitive data ([#77](https://github.com/scaleway/scaleway-cli/issues/77))
 * Fixed "Run in Docker" usage ([#90](https://github.com/scaleway/scaleway-cli/issues/90))
@@ -1230,7 +1232,7 @@ Feel free to contribute :smiley::beers:
 2. Ensure you have `$GOPATH` and `$PATH` well configured, something like:
   * `export GOPATH=$HOME/go`
   * `export PATH=$PATH:$GOPATH/bin`
-3. Fetch the project: `go get -d github.com/scaleway/scaleway-cli`
+3. Fetch the project: `go get -d github.com/scaleway/scaleway-cli/...`
 4. Go to scaleway-cli directory: `cd $GOPATH/src/github.com/scaleway/scaleway-cli`
 5. Hack: `emacs`
 6. Build: `make`

main.go → cmd/scw/main.go

@@ -14,10 +14,10 @@ import (
 	log "github.com/scaleway/scaleway-cli/vendor/github.com/Sirupsen/logrus"
 	flag "github.com/scaleway/scaleway-cli/vendor/github.com/docker/docker/pkg/mflag"
 
-	"github.com/scaleway/scaleway-cli/api"
-	cmds "github.com/scaleway/scaleway-cli/commands"
-	"github.com/scaleway/scaleway-cli/scwversion"
-	"github.com/scaleway/scaleway-cli/utils"
+	"github.com/scaleway/scaleway-cli/pkg/api"
+	cmds "github.com/scaleway/scaleway-cli/pkg/cli"
+	"github.com/scaleway/scaleway-cli/pkg/scwversion"
+	"github.com/scaleway/scaleway-cli/pkg/utils"
 )
 
 // CommandListOpts holds a list of parameters