vagrant-simple_cloud 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a33381b990d89d45eda36e792104361a0dce2d44
-  data.tar.gz: eaa07dedf3a06b82807aa79b567e85ee91302bad
+  metadata.gz: 8a7d78ed54133136da872b844667b7fcc467dd29
+  data.tar.gz: 681b214db5489b0cf7a29d184c69515d421a7ae2
 SHA512:
-  metadata.gz: 80f4aa04ab3ec746b70c1444b6fb0d037b97d915fa9c65d340ff99dd8784bfbaba231d20da11962eb769bfc524d8e03865839cb980f7059242be4c7cb53b41e4
-  data.tar.gz: f477765aca21eedb60ba993e4c24e4e5ef23a4eca36c6407403b99e00ae3a8259f16cd7a55dfb09b00dfc85d1cb1bdf583fcb89a82049297521d63a76a355692
+  metadata.gz: 11727a7ef7fced94e56406dc3174340e6410084dcc575021f80d31e52a1722b9a79ea159f52707d77a70b7e4701b15ccaefad0bc5b6400e88b9b4993cde49227
+  data.tar.gz: 410db43bd08c0c73845cc4c8258b59d6795fca7e7ac06b8df04efd3b93223151ccf350e3849ad35f967ee4c421137625ad9db648eb22256a06a1c8591cc83b14

data/build.sh

@@ -3,12 +3,13 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PROVIDER="simple_cloud"
 PLUGIN_NAME="vagrant-simple_cloud"
+LABEL="${PLUGIN_NAME}-build"
 PLUGIN_VERSION=$(cat ${DIR}/lib/${PLUGIN_NAME}/version.rb | grep VERSION | awk -F= '{gsub(" ","");gsub("'\''","");print $2}')
 
-docker stop $(docker ps -a -q --filter label=${PLUGIN_NAME})
+docker stop $(docker ps -a -q --filter label=${LABEL})
 
 docker pull docker.avtodoria.dev:5043/test/vagrant
-BUILDER_ID=$(docker run -it -d --rm --label ${PLUGIN_NAME} docker.avtodoria.dev:5043/test/vagrant)
+BUILDER_ID=$(docker run -it -d --rm --label ${LABEL} docker.avtodoria.dev:5043/test/vagrant)
 
 docker cp ${DIR}/../${PLUGIN_NAME} ${BUILDER_ID}:/tmp/
 
@@ -23,10 +24,10 @@ docker exec -i ${BUILDER_ID} bash -c "cd /tmp/${PLUGIN_NAME} && \
                                       gem push pkg/${PLUGIN_NAME}-${PLUGIN_VERSION}.gem"
 if [ $? -ne 0 ]; then
     echo "${PLUGIN_NAME} plugin was not built and released successfully!"
-    docker stop $(docker ps -a -q --filter label=${PLUGIN_NAME})
+    docker stop $(docker ps -a -q --filter label=${LABEL})
     exit 1
 fi
 
 echo "${PLUGIN_NAME} plugin was built and released successfully."
-docker stop $(docker ps -a -q --filter label=${PLUGIN_NAME})
+docker stop $(docker ps -a -q --filter label=${LABEL})
 exit 0

data/lib/vagrant-simple_cloud/config.rb

@@ -9,6 +9,7 @@ module VagrantPlugins
       attr_accessor :ipv6
       attr_accessor :backups_enabled
       attr_accessor :ca_path
+      attr_accessor :api_url
       attr_accessor :serviceaddr
       attr_accessor :ssh_key_name
       attr_accessor :setup
@@ -25,6 +26,7 @@ module VagrantPlugins
         @ipv6               = UNSET_VALUE
         @backups_enable     = UNSET_VALUE
         @ca_path            = UNSET_VALUE
+        @api_url            = UNSET_VALUE
         @serviceaddr        = UNSET_VALUE
         @ssh_key_name       = UNSET_VALUE
         @setup              = UNSET_VALUE
@@ -40,6 +42,7 @@ module VagrantPlugins
         @ipv6               = false if @ipv6 == UNSET_VALUE
         @backups_enabled    = false if @backups_enabled == UNSET_VALUE
         @ca_path            = nil if @ca_path == UNSET_VALUE
+        @api_url            = 'https://api.simplecloud.ru/' if @api_url == UNSET_VALUE
         @serviceaddr        = nil if @serviceaddr == UNSET_VALUE
         @ssh_key_name       = 'Vagrant' if @ssh_key_name == UNSET_VALUE
         @setup              = true if @setup == UNSET_VALUE

data/lib/vagrant-simple_cloud/helpers/client.rb

@@ -18,7 +18,7 @@ module VagrantPlugins
           @logger = Log4r::Logger.new('vagrant::simple_cloud::apiclient')
           @config = machine.provider_config
           @client = Faraday.new({
-            :url => 'https://api.simplecloud.ru/',
+            :url => @config.api_url,
             :ssl => {
               :ca_file => @config.ca_path
             }

data/lib/vagrant-simple_cloud/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module SimpleCloud
-    VERSION = '1.0.8'
+    VERSION = '1.0.9'
   end
 end

data/test.sh

@@ -3,12 +3,13 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 PROVIDER="simple_cloud"
 PLUGIN_NAME="vagrant-simple_cloud"
+LABEL="${PLUGIN_NAME}-test"
 PLUGIN_VERSION=$(cat ${DIR}/lib/${PLUGIN_NAME}/version.rb | grep VERSION | awk -F= '{gsub(" ","");gsub("'\''","");print $2}')
 
-docker stop $(docker ps -a -q --filter label=${PLUGIN_NAME})
+docker stop $(docker ps -a -q --filter label=${LABEL})
 
 docker pull docker.avtodoria.dev:5043/test/vagrant
-BUILDER_ID=$(docker run -it -d --rm --label ${PLUGIN_NAME} docker.avtodoria.dev:5043/test/vagrant)
+BUILDER_ID=$(docker run -it -d --rm --label ${LABEL} docker.avtodoria.dev:5043/test/vagrant)
 
 sleep 60
 
@@ -18,7 +19,7 @@ while [ "${RESULT}" != "0" ]; do
     ((COUNT++))
     if [ ${COUNT} -eq 10 ]; then
         echo "${PLUGIN_NAME} plugin was not installed successfully!"
-        docker stop $(docker ps -a -q --filter label=${PLUGIN_NAME})
+        docker stop $(docker ps -a -q --filter label=${LABEL})
         exit 1
     fi
     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/
 RESULT=$(docker exec -i ${BUILDER_ID} bash -c "cd /tmp/ && vagrant up --provider=${PROVIDER}" 2>&1)
 if [[ ! ${RESULT} =~ "The response status from the API" ]]; then
     echo "${PLUGIN_NAME} plugin does not work correctly!"
-    docker stop $(docker ps -a -q --filter label=${PLUGIN_NAME})
+    docker stop $(docker ps -a -q --filter label=${LABEL})
     exit 2
 fi
 
 echo "${PLUGIN_NAME} plugin was tested successfully."
-docker stop $(docker ps -a -q --filter label=${PLUGIN_NAME})
+docker stop $(docker ps -a -q --filter label=${LABEL})
 exit 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-simple_cloud
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - John Bender
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-09 00:00:00.000000000 Z
+date: 2018-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday