vagrant-vmpooler 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 766ebbfbed3493e94abc066db94fade8d6f816b0
-  data.tar.gz: 8ef29b706b2d49732d8f68ad9bd5b0f04c334bac
+  metadata.gz: 8fadbd4b695dd48472c8158d877bd654b238ad6e
+  data.tar.gz: 3d0710a90a35748e61eb80e3ddfeeb75b54b2f88
 SHA512:
-  metadata.gz: 89bef257749da59cfeac0e2ed5022c2001567a692aa5cc46e45bc61d27d83755e1758fa1e6c92cb192eb80e97cafd42f10c39a0e62d7648cc993c0d7cfa46a91
-  data.tar.gz: 93b72c6b115612165e2fb2998df6b0f0369706441d3b549560ca34c3608ee101eebbfb1eb368910f44f99d1f84979a8f711911eea2cf47f2adf406a361e7d9ba
+  metadata.gz: 5f5fa0ff65dab5bfc82280cf317c026cd613140105a361f94301339946c51f54230ed18fe3f298da3b10e2222eb711701cac3378ff670b851b27b109a6aaf775
+  data.tar.gz: 19519bcbc87b9b4c86b54a8fa229c545c8fc69bd9712ab5a1b4f75833494244a8e960f842570f0a91ab7dc460ff360d970ef441ef166a14fcfff228ee729d705

data/lib/vagrant-vmpooler/action/delete_server.rb

@@ -33,10 +33,14 @@ module VagrantPlugins
             response_body = Pooler.delete(verbose, url, os, token)
 
             if response_body[id]['ok'] == false
-              # the only way this can happen is if the vm existed at one point
+              # This could potentially happen if the vm was created
+              # but later on the vmfloaty settings changed or were
+              # incorrect
+
+              # Otherwise, the only way this can happen is if the vm existed at one point
               # but got deleted from vmpoolers redis db. We should probably
               # still delete it from vagrants internal state if this is true
-              env[:ui].info(I18n.t("vagrant_vmpooler.not_deleted"))
+              env[:ui].warn(I18n.t("vagrant_vmpooler.not_deleted"))
             else
               env[:ui].info(I18n.t("vagrant_vmpooler.deleted"))
               env[:machine].id = nil

data/lib/vagrant-vmpooler/config.rb

@@ -63,23 +63,29 @@ module VagrantPlugins
       def finalize!
         conf_file = read_config
 
-        if conf_file['token']
-          @token = conf_file['token']
-        else
-          @token = nil
-        end
-
-        if conf_file['url']
-          @url = conf_file['url']
-        else
-          @url = nil
+        # if conf_file is false the file
+        # exists but there are no keys inside it
+        if conf_file != false
+          if conf_file['token']
+            @token = conf_file['token']
+          else
+            @token = nil
+          end
+
+          if conf_file['url']
+            @url = conf_file['url']
+          else
+            @url = nil
+          end
         end
 
+        @url = nil if @url == UNSET_VALUE
         @verbose = false if @verbose == UNSET_VALUE
         @os = nil if @os == UNSET_VALUE
         @ttl = nil if @ttl == UNSET_VALUE
         @disk = nil if @disk == UNSET_VALUE
         @password = nil if @password == UNSET_VALUE
+        @token = nil if @token == UNSET_VALUE
       end
 
       # ----------------

data/lib/vagrant-vmpooler/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Vmpooler
-    VERSION = '0.1.7'
+    VERSION = '0.1.8'
   end
 end

data/locales/en.yml

@@ -94,7 +94,7 @@ en:
       failed_disk_extend: |-
         Could not extend size of disk on vm.
       vmpooler_url_error: |-
-        No user was provided to connect to vmpooler.
+        No url was provided to connect to vmpooler.
       no_os_error: |-
         No operatingsystem flavor was set.
       bad_request: |-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmpooler
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Brian Cain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vmfloaty