vagrant-simple_cloud 1.0.8 → 1.0.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/build.sh +5 -4
- data/lib/vagrant-simple_cloud/config.rb +3 -0
- data/lib/vagrant-simple_cloud/helpers/client.rb +1 -1
- data/lib/vagrant-simple_cloud/version.rb +1 -1
- data/test.sh +6 -5
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8a7d78ed54133136da872b844667b7fcc467dd29
|
4
|
+
data.tar.gz: 681b214db5489b0cf7a29d184c69515d421a7ae2
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 11727a7ef7fced94e56406dc3174340e6410084dcc575021f80d31e52a1722b9a79ea159f52707d77a70b7e4701b15ccaefad0bc5b6400e88b9b4993cde49227
|
7
|
+
data.tar.gz: 410db43bd08c0c73845cc4c8258b59d6795fca7e7ac06b8df04efd3b93223151ccf350e3849ad35f967ee4c421137625ad9db648eb22256a06a1c8591cc83b14
|
data/build.sh
CHANGED
@@ -3,12 +3,13 @@
|
|
3
3
|
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
4
4
|
PROVIDER="simple_cloud"
|
5
5
|
PLUGIN_NAME="vagrant-simple_cloud"
|
6
|
+
LABEL="${PLUGIN_NAME}-build"
|
6
7
|
PLUGIN_VERSION=$(cat ${DIR}/lib/${PLUGIN_NAME}/version.rb | grep VERSION | awk -F= '{gsub(" ","");gsub("'\''","");print $2}')
|
7
8
|
|
8
|
-
docker stop $(docker ps -a -q --filter label=${
|
9
|
+
docker stop $(docker ps -a -q --filter label=${LABEL})
|
9
10
|
|
10
11
|
docker pull docker.avtodoria.dev:5043/test/vagrant
|
11
|
-
BUILDER_ID=$(docker run -it -d --rm --label ${
|
12
|
+
BUILDER_ID=$(docker run -it -d --rm --label ${LABEL} docker.avtodoria.dev:5043/test/vagrant)
|
12
13
|
|
13
14
|
docker cp ${DIR}/../${PLUGIN_NAME} ${BUILDER_ID}:/tmp/
|
14
15
|
|
@@ -23,10 +24,10 @@ docker exec -i ${BUILDER_ID} bash -c "cd /tmp/${PLUGIN_NAME} && \
|
|
23
24
|
gem push pkg/${PLUGIN_NAME}-${PLUGIN_VERSION}.gem"
|
24
25
|
if [ $? -ne 0 ]; then
|
25
26
|
echo "${PLUGIN_NAME} plugin was not built and released successfully!"
|
26
|
-
docker stop $(docker ps -a -q --filter label=${
|
27
|
+
docker stop $(docker ps -a -q --filter label=${LABEL})
|
27
28
|
exit 1
|
28
29
|
fi
|
29
30
|
|
30
31
|
echo "${PLUGIN_NAME} plugin was built and released successfully."
|
31
|
-
docker stop $(docker ps -a -q --filter label=${
|
32
|
+
docker stop $(docker ps -a -q --filter label=${LABEL})
|
32
33
|
exit 0
|
@@ -9,6 +9,7 @@ module VagrantPlugins
|
|
9
9
|
attr_accessor :ipv6
|
10
10
|
attr_accessor :backups_enabled
|
11
11
|
attr_accessor :ca_path
|
12
|
+
attr_accessor :api_url
|
12
13
|
attr_accessor :serviceaddr
|
13
14
|
attr_accessor :ssh_key_name
|
14
15
|
attr_accessor :setup
|
@@ -25,6 +26,7 @@ module VagrantPlugins
|
|
25
26
|
@ipv6 = UNSET_VALUE
|
26
27
|
@backups_enable = UNSET_VALUE
|
27
28
|
@ca_path = UNSET_VALUE
|
29
|
+
@api_url = UNSET_VALUE
|
28
30
|
@serviceaddr = UNSET_VALUE
|
29
31
|
@ssh_key_name = UNSET_VALUE
|
30
32
|
@setup = UNSET_VALUE
|
@@ -40,6 +42,7 @@ module VagrantPlugins
|
|
40
42
|
@ipv6 = false if @ipv6 == UNSET_VALUE
|
41
43
|
@backups_enabled = false if @backups_enabled == UNSET_VALUE
|
42
44
|
@ca_path = nil if @ca_path == UNSET_VALUE
|
45
|
+
@api_url = 'https://api.simplecloud.ru/' if @api_url == UNSET_VALUE
|
43
46
|
@serviceaddr = nil if @serviceaddr == UNSET_VALUE
|
44
47
|
@ssh_key_name = 'Vagrant' if @ssh_key_name == UNSET_VALUE
|
45
48
|
@setup = true if @setup == UNSET_VALUE
|
@@ -18,7 +18,7 @@ module VagrantPlugins
|
|
18
18
|
@logger = Log4r::Logger.new('vagrant::simple_cloud::apiclient')
|
19
19
|
@config = machine.provider_config
|
20
20
|
@client = Faraday.new({
|
21
|
-
:url =>
|
21
|
+
:url => @config.api_url,
|
22
22
|
:ssl => {
|
23
23
|
:ca_file => @config.ca_path
|
24
24
|
}
|
data/test.sh
CHANGED
@@ -3,12 +3,13 @@
|
|
3
3
|
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
4
4
|
PROVIDER="simple_cloud"
|
5
5
|
PLUGIN_NAME="vagrant-simple_cloud"
|
6
|
+
LABEL="${PLUGIN_NAME}-test"
|
6
7
|
PLUGIN_VERSION=$(cat ${DIR}/lib/${PLUGIN_NAME}/version.rb | grep VERSION | awk -F= '{gsub(" ","");gsub("'\''","");print $2}')
|
7
8
|
|
8
|
-
docker stop $(docker ps -a -q --filter label=${
|
9
|
+
docker stop $(docker ps -a -q --filter label=${LABEL})
|
9
10
|
|
10
11
|
docker pull docker.avtodoria.dev:5043/test/vagrant
|
11
|
-
BUILDER_ID=$(docker run -it -d --rm --label ${
|
12
|
+
BUILDER_ID=$(docker run -it -d --rm --label ${LABEL} docker.avtodoria.dev:5043/test/vagrant)
|
12
13
|
|
13
14
|
sleep 60
|
14
15
|
|
@@ -18,7 +19,7 @@ while [ "${RESULT}" != "0" ]; do
|
|
18
19
|
((COUNT++))
|
19
20
|
if [ ${COUNT} -eq 10 ]; then
|
20
21
|
echo "${PLUGIN_NAME} plugin was not installed successfully!"
|
21
|
-
docker stop $(docker ps -a -q --filter label=${
|
22
|
+
docker stop $(docker ps -a -q --filter label=${LABEL})
|
22
23
|
exit 1
|
23
24
|
fi
|
24
25
|
docker exec -i ${BUILDER_ID} bash -c "vagrant plugin install ${PLUGIN_NAME} --plugin-version ${PLUGIN_VERSION}"
|
@@ -29,10 +30,10 @@ docker cp ${DIR}/test/Vagrantfile ${BUILDER_ID}:/tmp/
|
|
29
30
|
RESULT=$(docker exec -i ${BUILDER_ID} bash -c "cd /tmp/ && vagrant up --provider=${PROVIDER}" 2>&1)
|
30
31
|
if [[ ! ${RESULT} =~ "The response status from the API" ]]; then
|
31
32
|
echo "${PLUGIN_NAME} plugin does not work correctly!"
|
32
|
-
docker stop $(docker ps -a -q --filter label=${
|
33
|
+
docker stop $(docker ps -a -q --filter label=${LABEL})
|
33
34
|
exit 2
|
34
35
|
fi
|
35
36
|
|
36
37
|
echo "${PLUGIN_NAME} plugin was tested successfully."
|
37
|
-
docker stop $(docker ps -a -q --filter label=${
|
38
|
+
docker stop $(docker ps -a -q --filter label=${LABEL})
|
38
39
|
exit 0
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vagrant-simple_cloud
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.9
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- John Bender
|
@@ -10,7 +10,7 @@ authors:
|
|
10
10
|
autorequire:
|
11
11
|
bindir: bin
|
12
12
|
cert_chain: []
|
13
|
-
date: 2018-11-
|
13
|
+
date: 2018-11-13 00:00:00.000000000 Z
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: faraday
|