vagrant-parallels 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c554494202e2c1a84d300f15a096202837c82dca
-  data.tar.gz: 02f21dfce1b2911c09d16a775cd55fb4e71cd420
+  metadata.gz: f733216d1fb00b3fb1b57306e793948845e77c85
+  data.tar.gz: 00a71db6979da474580c398aa1ca4c07c18175c5
 SHA512:
-  metadata.gz: d46a3ea4ffc68f3cc93dbcdf80b2c5d61c11ae3db067c851b4fdfd3828b85b1ed4902388d3b52bb270ac7d2837a448ff7da609fa443f5e081efffa4aeb8db1e6
-  data.tar.gz: 7f137247396772bc9c5f42fa6bf412adf420ac041b126103f9f935abed99cbd914850e8c6e50289685656285fdcdcd589d18ef68438c35fd2c1a6726cedd0204
+  metadata.gz: 7ee1b240e58e12d5f289ce83a6c0e5f3b008281e204450d7bda03078dcbca59a2e76b5de0632daab49cd03e4e2b911ccccb59413251173e3522656f9b19b9637
+  data.tar.gz: 01f7add1fbe46e5e3732fd3e15a2574ce762712c10bd3d1f6f989ccc12de1f2becea53a93089af3126e0443accc997e9b56f45bc19f440730d3fac738bac945e

data/lib/vagrant-parallels/driver/base.rb

@@ -454,8 +454,8 @@ module VagrantPlugins
         # @return [<String => String>]
         def read_vms
           args = %w(list --all --no-header --json -o name,uuid)
-          vms_arr = json([]) { execute_prlctl(*args) }
-          templates_arr = json([]) { execute_prlctl(*args, '--template') }
+          vms_arr = json { execute_prlctl(*args) }
+          templates_arr = json { execute_prlctl(*args, '--template') }
 
           vms = vms_arr | templates_arr
           Hash[vms.map { |i| [i.fetch('name'), i.fetch('uuid')] }]
@@ -466,8 +466,8 @@ module VagrantPlugins
         # @return [Array <String => String>]
         def read_vms_info
           args = %w(list --all --info --no-header --json)
-          vms_arr = json([]) { execute_prlctl(*args) }
-          templates_arr = json([]) { execute_prlctl(*args, '--template') }
+          vms_arr = json { execute_prlctl(*args) }
+          templates_arr = json { execute_prlctl(*args, '--template') }
 
           vms_arr | templates_arr
         end
@@ -670,14 +670,26 @@ module VagrantPlugins
         end
 
         # Parses given block (JSON string) to object
-        def json(default=nil)
+        def json
           data = yield
+          raise_error = false
+
           begin
             JSON.parse(data)
-          rescue JSON::ParserError
-            # Try to cleanup the data and parse it again [GH-204]
+          rescue JSON::JSONError
+            # We retried already, raise the issue and be done
+            if raise_error
+              raise VagrantPlugins::Parallels::Errors::JSONParseError, data: data
+            end
+
+            # Remove garbage before/after json string[GH-204]
             data = data[/(\{.*\}|\[.*\])/m]
-            JSON.parse(data) rescue default
+
+            # Remove all control characters unsupported by JSON [GH-219]
+            data.tr!("\u0000-\u001f", '')
+
+            raise_error = true
+            retry
           end
         end
 

data/lib/vagrant-parallels/driver/meta.rb

@@ -117,7 +117,7 @@ module VagrantPlugins
         #
         # @return [String]
         def read_edition
-          lic_info = json({}) do
+          lic_info = json do
             execute(@prlsrvctl_path, 'info', '--license', '--json')
           end
           lic_info['edition']

data/lib/vagrant-parallels/errors.rb

@@ -11,6 +11,10 @@ module VagrantPlugins
         error_key(:dhcp_leases_file_not_accessible)
       end
 
+      class JSONParseError < VagrantParallelsError
+        error_key(:json_parse_error)
+      end
+
       class LinuxMountFailed < VagrantParallelsError
         error_key(:linux_mount_failed)
       end

data/lib/vagrant-parallels/synced_folder.rb

@@ -105,7 +105,7 @@ module VagrantPlugins
       end
 
       def os_friendly_id(id)
-        id.gsub(/[\/]/,'_').sub(/^_/, '')
+        id.gsub(/[\/:]/,'_').sub(/^_/, '')
       end
     end
   end

data/lib/vagrant-parallels/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Parallels
-    VERSION = '1.5.0'
+    VERSION = '1.5.1'
   end
 end

data/locales/en.yml

@@ -20,6 +20,12 @@ en:
 
         Stderr: %{stderr}
 
+      json_parse_error: |-
+        Failed to parse the JSON string! Please report this as a bug of Parallels
+        provider: https://github.com/Parallels/vagrant-parallels/issues
+        JSON string is shown below:
+
+        %{data}
       linux_mount_failed: |-
         Failed to mount folders in Linux guest. This is usually because
         the "prl_fs" file system is not available. Please verify that

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-parallels
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Mikhail Zholobov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler