Merge branch 'support-glide' into dev-jxy

Author: jxyowen

.travis.yml

@@ -14,8 +14,8 @@ before_install:
   - sudo apt-get install -y jq
 
 install:
-  - make deps
-  - make testdeps
+  - make build
+  - sudo cp out/aliyun /usr/local/bin
 
 notifications:
     webhooks: https://oapi.dingtalk.com/robot/send?access_token=096ed387df243a6d60835aadeccc47165f3813bc7cb81cdd0cfeadfd28e3acc1
@@ -24,6 +24,4 @@ notifications:
     on_failure: always
 
 script:
-  - make build
-  - sudo cp out/aliyun /usr/local/bin
   - cd ./integration && ./test

Makefile

@@ -4,24 +4,10 @@ all: build
 publish: build build_mac build_linux build_windows
 
 deps:
-	-go get github.com/aliyun/aliyun-openapi-meta
-	go get gopkg.in/ini.v1
-	go get github.com/droundy/goopt
-	go get github.com/alyu/configparser
-	go get github.com/syndtr/goleveldb/leveldb
-	go get github.com/aliyun/aliyun-oss-go-sdk/oss
-	go get -u github.com/jteeuwen/go-bindata/...
-	go get github.com/jmespath/go-jmespath
-	go get github.com/aliyun/alibaba-cloud-sdk-go/sdk
-	go get github.com/posener/complete
-	go get github.com/aliyun/ossutil/lib
-	go get gopkg.in/yaml.v2
+	go get -u github.com/Masterminds/glide
+	glide install
 
 testdeps: deps
-	go get -v github.com/onsi/ginkgo/ginkgo
-	go get -v github.com/onsi/gomega
-	go install github.com/onsi/ginkgo/ginkgo
-	go get gopkg.in/check.v1
 
 metas: deps
 	go-bindata -o resource/metas.go -pkg resource -prefix ../aliyun-openapi-meta ../aliyun-openapi-meta/**/* ../aliyun-openapi-meta/products.json

glide.lock

@@ -0,0 +1,38 @@
+package: github.com/aliyun/aliyun-cli
+license: Apache-2.0
+import:
+- package: github.com/aliyun/aliyun-openapi-meta
+- package: gopkg.in/ini.v1
+- package: github.com/droundy/goopt
+- package: github.com/alyu/configparser
+- package: github.com/syndtr/goleveldb
+  subpackages:
+    - leveldb
+- package: github.com/aliyun/aliyun-oss-go-sdk
+  subpackages:
+    - oss
+- package: github.com/jteeuwen/go-bindata/
+  version: ^3.0.7
+- package: github.com/jmespath/go-jmespath
+  version: ^0.2.2
+- package: github.com/aliyun/alibaba-cloud-sdk-go
+  version: ^1.9.5
+  subpackages:
+      - sdk
+- package: github.com/posener/complete
+  version: ^1.1.1
+- package: github.com/aliyun/ossutil
+  version: ^1.4.0
+  subpackages:
+        - lib
+- package: gopkg.in/yaml.v2
+
+
+testImport:
+- package: github.com/onsi/ginkgo
+  version: ^1.4.0
+  subpackages:
+  - ginkgo
+- package: github.com/onsi/gomega
+  version: ^1.3.0
+- package: gopkg.in/check.v1