vagrant-dotvm 0.35.1 → 0.36.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 336e192619e99879601a32c6b2418cde622d5c82
-  data.tar.gz: 9578adb1b4a083e3836b5b47680391c85758e541
+  metadata.gz: 8778abd0fffaad0ecf7e19bd9f0161bf4e936d06
+  data.tar.gz: 7e108b5794e48293442d5368f77ea5c5356bb0d8
 SHA512:
-  metadata.gz: 34a78839690fe2454f18283c2dccdb8ca12eee9bc182735568b59a01679875ee431681ad879707c3371643177aa09d2dc6c9ac76ac36fea3769c637198e4ab38
-  data.tar.gz: 6cbb28e95b70cde53d685151181ec2a65c8941229d08612c893ae51edc08975d307d72c7d3b7916b30d44fba5f2c0b5013696019e9b160cc35da26e4d8e51356
+  metadata.gz: b4039d0bd6379ec0a7ad09897e9284cd91227f8d0f0892e8c78160cd8ffe66a454d32e3d466b9f057b1c2447f429d3c16e34b8d893b75be3bcd10beffe3d859a
+  data.tar.gz: 694570ceb77c4e7a80645f7c7c4351350d23ce79efb37b9498a8a49a4b3c301ee9b11790c1f367f5510fa4c78bd3cd859f54a1a5e66a29a78b87ff29a9d9017b

data/lib/vagrant-dotvm/config/invalidconfigerror.rb

@@ -3,6 +3,7 @@ module VagrantPlugins
     module Config
       # Exception signaling error in configuration
       class InvalidConfigError < ArgumentError
+        attr_accessor :file
       end
     end
   end

data/lib/vagrant-dotvm/dotvm.rb

@@ -7,10 +7,16 @@ module VagrantPlugins
       end
 
       def inject(vc)
-        init_instance
-        load_options
-        load_projects
-        Injector::Instance.inject @instance, vc
+        begin
+          init_instance
+          load_options
+          load_projects
+          Injector::Instance.inject @instance, vc
+        rescue VagrantPlugins::Dotvm::Config::InvalidConfigError => e
+          raise Vagrant::Errors::VagrantError.new, "DotVM: #{e.file}: #{e.message}"
+        rescue Psych::SyntaxError => e
+          raise Vagrant::Errors::VagrantError.new, "DotVM: #{e.file}: Syntax error, line #{e.line}, #{e.problem}"
+        end
       end
 
       private
@@ -19,7 +25,7 @@ module VagrantPlugins
         result = {}
 
         Dir[path].each do |fname|
-          yaml = YAML.load(File.read(fname)) || {}
+          yaml = YAML.load_file(fname) || {}
           yaml.each do |name, value|
             fail "Variable #{name} already exists." if result.key? name
             result[name] = value
@@ -38,7 +44,7 @@ module VagrantPlugins
       def load_options
         Dir["#{@path}/options/*.yaml"].each do |file|
           @instance.options = Replacer.new
-            .on(YAML.load(File.read(file)) || {})
+            .on(YAML.load_file(file) || {})
             .using(@instance.variables)
             .result
         end
@@ -64,18 +70,21 @@ module VagrantPlugins
           )
 
           Dir["#{dir}/machines/*.yaml"].each do |file|
-            begin
-              yaml = Replacer.new
-                     .on(YAML.load(File.read(file)) || [])
-                     .using(@instance.variables.merge(project.variables))
-                     .result
+            yaml = Replacer.new
+                   .on(YAML.load_file(file) || [])
+                   .using(@instance.variables.merge(project.variables))
+                   .result
 
+            begin
               yaml.each do |machine_yaml|
                 machine = project.new_machine
                 machine.populate machine_yaml
               end
             rescue VagrantPlugins::Dotvm::Config::InvalidConfigError => e
-              raise Vagrant::Errors::VagrantError.new, "DotVM: #{file}: #{e.message}"
+              # add filename to exception so we can display
+              # nice error message later.
+              e.file = file
+              raise e
             end
           end
         end

data/lib/vagrant-dotvm/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Dotvm
-    VERSION = '0.35.1'
+    VERSION = '0.36.0.pre'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dotvm
 version: !ruby/object:Gem::Version
-  version: 0.35.1
+  version: 0.36.0.pre
 platform: ruby
 authors:
 - Krzysztof Magosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,9 +103,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1