vagrant-pe_build 0.9.7 → 0.10.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1763e34973eeb35cad669532a020c3c15514e3fb
4
- data.tar.gz: c93b5c85986753724b951fd6784878099faede40
3
+ metadata.gz: 5c587c4624707e0a6c69f5d0f9b32bfa91786088
4
+ data.tar.gz: 768f75b00fe4bb802d3db7174d6bf3ea9e4529e5
5
5
  SHA512:
6
- metadata.gz: a2abde23051fb1004de4f22efe64df5d7993a1e45046a28233fca8cd6006ff57fd67b70cc12fe104a00b80b6891bab71b3310848923c3e25419d6af104dacf39
7
- data.tar.gz: b595d9791820b164680bcf06f610f84222ac4bbd91cd865ea3974cb33116342a0c5711ac08307c43bdb39dfb7219fa6fc8f5ef3e96a1504d8d44aff346b4a44f
6
+ metadata.gz: 4db812d6510460b4627964f80164ac2eb5653150fa7616501ae266d1c6723cdb28581514b515dd6a82a4bfa2efa3a148e7327a2b834fd0a2082617d66f158c2c
7
+ data.tar.gz: 9d6cd5f34ef3dd1f5504520edade53879ccc171761df3dc9d0cde1ed637d3c339698baf4071ec4270ad9d471e6733a8d6aa2ee84eaa94f2c2b5f943e8adcf92d
data/CHANGELOG CHANGED
@@ -1,6 +1,16 @@
1
1
  vagrant-pe_build
2
2
  ================
3
3
 
4
+ 0.10.0
5
+ ------
6
+
7
+ 2015-04-08
8
+
9
+ This is a backwards compatible feature release.
10
+
11
+ * Allow `version_file` to be a URI. This allows an external service to
12
+ determine the version of PE to install on a machine.
13
+
4
14
  0.9.7
5
15
  -----
6
16
 
data/README.markdown CHANGED
@@ -23,7 +23,7 @@ optional and can be overridden in a VM's individual provisioner config.
23
23
  * `config.pe_build.version`
24
24
  * Description: The version of Puppet Enterprise to install.
25
25
  * `config.pe_build.version_file`
26
- * Description: The path to a file relative to `download_root`. The contents of this file will be read and used to set `version` --- overriding any value that may already be set.
26
+ * Description: A fully-qualified URI or a path relative to `download_root`. The contents of this file will be read and used to set `version` --- overriding any value that may already be set.
27
27
  * `config.pe_build.suffix` - Suffix of the Puppet Enterprise installer to use.
28
28
  * Description: The distribution specifix suffix of the Puppet Enterprise
29
29
  installer to use.
@@ -19,8 +19,9 @@ class PEBuild::Config::Global < Vagrant.plugin('2', :config)
19
19
  attr_accessor :version
20
20
 
21
21
  # @!attribute version_file
22
- # @return [String] The path to a file relative to `download_root`. The
23
- # contents of this file will be read and used to specify `version`.
22
+ # @return [String, URI] A fully-qualified URI or a path relative to
23
+ # `download_root`. The contents of this file will be read and used to
24
+ # Specify `version`.
24
25
  # @since 0.9.0
25
26
  attr_accessor :version_file
26
27
 
@@ -7,6 +7,8 @@ require 'pe_build/util/versioned_path'
7
7
  require 'log4r'
8
8
  require 'fileutils'
9
9
 
10
+ require 'uri'
11
+
10
12
  module PEBuild
11
13
  module Provisioner
12
14
  class PEBootstrap < Vagrant.plugin('2', :provisioner)
@@ -88,7 +90,12 @@ module PEBuild
88
90
  def load_archive
89
91
  # If a version file is set, use its contents to specify the PE version.
90
92
  unless @config.version_file.nil?
91
- path = "#{@config.download_root}/#{@config.version_file}"
93
+ if URI.parse(@config.version_file).scheme.nil?
94
+ # Non-URI paths are joined to the download root.
95
+ path = "#{@config.download_root}/#{@config.version_file}"
96
+ else
97
+ path = @config.version_file
98
+ end
92
99
  path = PEBuild::Util::VersionedPath.versioned_path(path, @config.version, @config.series)
93
100
  @config.version = PEBuild::Transfer.read(URI.parse(path))
94
101
  end
@@ -1,3 +1,3 @@
1
1
  module PEBuild
2
- VERSION = '0.9.7'
2
+ VERSION = '0.10.0'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-pe_build
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.7
4
+ version: 0.10.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adrien Thebo
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-26 00:00:00.000000000 Z
11
+ date: 2015-04-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: progressbar