vagrant-pe_build 0.8.4 → 0.8.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmQ1MTliZTc2ZWQ1NzY5YmViYWEzMWQyNzUwYzhiN2MzNDU2YWFmZg==
+    ZjU1NmRiNmI1MTA4ZmRlNWM4NWZiMGMzNzE0NTQwYzYxZjI0YjJlMA==
   data.tar.gz: !binary |-
-    MzgzNWZkYmJmMTdiMzJiOWQ4MjdjYjcyYjJmZjc2NDVlYzY0NjVmNA==
+    Y2RhNDRhNzJiMzMwYTYxMTFlZWNiNGZlZWQxMzMzZjIzMGFhNGI1Zg==
 SHA512:
   metadata.gz: !binary |-
-    MDA5NzIxNWIyYTg4OGU4ZjE5ODU3ZDIzY2Y1OTg3ODNkZDkxZTMzODNlMzk4
-    YmQ1ZDY4ZmQ3OTYxN2JmOGVmOTA3ZWUxYTJhYTJjNWVlMTFkOWUxYzA2M2U0
-    NDg5YmY3OTI1MjY2OWU5NjIyMzhjNjUzODgwMDJhYzIxNDRlMzY=
+    ZjkzNTAxYTUyZjBmNTViZGFkNjk3YzljN2EwZDYwMzE2OGYxYzZlMmU5YjM4
+    NzU2Yzg3NjhmOGZmODFiZjM0NjcxYjg5MjFkY2ZmMjM2ZTlmZWM2MjQyNjI4
+    ZTcwYTQ5MDhmMzk0OTQyNzEyYTM0NDE0ZmNiYzA3NTAzNTQxZTY=
   data.tar.gz: !binary |-
-    ZWMzNTU1MjMxYjFlNzg0NGE1MmUzMDIxYTgxNGI3ZGY1ZDYyZDcyNGY4YWY3
-    NDNhYzlmYTkwYTYyOGZiYTRjNTZmZjE1ZjAwMzExNTA4Nzg4MzNjNzA4OWJl
-    YjM1NzQ0NzFiMzE4MWVkODhiZjI3NWZlYjhiNzExMTk1ODMwZWM=
+    ODg5MzZiNmI3ZjRiOTliODM0N2VjYzhkMzNhM2RmNTAxNTVkZDk4ZmQ3OWZi
+    MmM5OTQwNGQ4NGJjODdlZDE2YjdlYjI5MzI4NzE1ZjJkODEwODA1NTVjYzc4
+    N2RmYzJiYTA2OTI4NjgwMDY2MWE4MmZlM2Y2MWY0NWUwYmM1Yzg=

data/CHANGELOG

@@ -1,10 +1,21 @@
 vagrant-pe_build
 ================
 
+0.8.5
+-----
+
+This is a backwards compatible maintenance release.
+
+  * (GH-56) Add support for Vagrant 1.5.
+
+### Thanks
+
+Thanks to Reid Vandewiele for his work on this release.
+
 0.8.4
 -----
 
-This is a backwards compatibility maintenance release.
+This is a backwards compatible maintenance release.
 
   * Support for Puppet Enterprise for 2.8.5
   * Support for Puppet Enterprise for 3.1.2

data/lib/pe_build/config/pe_bootstrap.rb

@@ -166,11 +166,19 @@ class PEBuild::Config::PEBootstrap < PEBuild::Config::Global
   end
 
   # Safely access the global config
-  #
-  # If we try to access the global config object directly from a validating
-  # machine, horrible things happen. To avoid this we access the environment's
-  # global config which should already be finalized.
   def global_config_from(machine)
-    env = machine.env.config_global
+    case Vagrant::VERSION
+    when /^1\.[1234]/
+      # If we try to access the global config object directly from a validating
+      # machine, horrible things happen. To avoid this we access the environment's
+      # global config which should already be finalized.
+      env = machine.env.config_global
+    else # Vagrant 1.5.x and above
+      # This kinda seemed like the most direct replacement for config_global,
+      # but turned out not to really work. Returned a dummy object of some
+      # kind.
+      #env = vagrantfile.config
+      env = machine.config
+    end
   end
 end

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.8.4'
+  VERSION = '0.8.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar