vagrant-pe_build 0.15.6 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f637c7f7f078263eabf2adf02ca977543dcd2c76
-  data.tar.gz: 63c05324c683579bf4811a964748a99e8afd4a39
+  metadata.gz: 359cc1db4c0d6f48ab89bb75ac482a28396c5541
+  data.tar.gz: 20f1e051e25ab86aa95d180bc6805ceb30adf3e7
 SHA512:
-  metadata.gz: a8a7f289f6b116692389a6824054361799d0bef1cd5bdc460cc6063eca9f01ffaa8f6b4ba37e5a1faa98cc9064557108991423888252cdab185ba15ebaa263c8
-  data.tar.gz: bafcb685655e6411c2b87dc1b1ee5ba8cc912bd6f0b68ab21c4ff7baca2296c39b97a46712c8bcb67eadd533092473bc3be4f04ea881914a1d644d6368aef1b0
+  metadata.gz: 04bdea5f191965c603da7927cd7ae23d3e9cbc5760b85ceb4ff9d01a2c3b43dfde9ffb7c69d1d306aba983415d0c2021afb0d8d4a6e86696173f5ffbff4f4746
+  data.tar.gz: aab8c4b15d77ef1fe81ad97fdbdc7e4f15e63f9e34139f66bc2aacc649eb9abcbd8805e1c60f8cfec5a32a817feb9658cacb8d554c9f284d4f840af1d50cc5c6

data/.travis.yml

@@ -20,6 +20,6 @@ matrix:
       env: TEST_VAGRANT_VERSION=v1.7.4 BUNDLER_VERSION=1.10.5
 
     - rvm: 2.2.3
-      env: TEST_VAGRANT_VERSION=v1.8.5 BUNDLER_VERSION=1.12.5
+      env: TEST_VAGRANT_VERSION=v1.8.6 BUNDLER_VERSION=1.12.5
     - rvm: 2.2.3
       env: TEST_VAGRANT_VERSION=HEAD BUNDLER_VERSION=1.12.5

data/CHANGELOG

@@ -1,6 +1,17 @@
 vagrant-pe_build
 ================
 
+0.16.0
+------
+
+2016-10-20
+
+This is a backwards compatible feature release.
+
+  * Add support for PE 2016.4.0.
+
+  * (GH-127) Switch download progressbars to the ruby-progressbar library.
+
 0.15.6
 ------
 

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-ENV['TEST_VAGRANT_VERSION'] ||= 'v1.8.5'
+ENV['TEST_VAGRANT_VERSION'] ||= 'v1.8.6'
 
 # Wrapping gemspec in the :plugins group causes Vagrant 1.5 and newer to
 # automagically load this plugin during acceptance tests.

data/README.markdown

@@ -22,6 +22,8 @@ optional and can be overridden in a VM's individual provisioner config.
 
   * `config.pe_build.version`
     * Description: The version of Puppet Enterprise to install.
+  * `config.pe_build.series`
+    * Description: An arbitrary string that can be interpolated into URLs.
   * `config.pe_build.version_file`
     * 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.
   * `config.pe_build.suffix` - Suffix of the Puppet Enterprise installer to use.
@@ -47,6 +49,8 @@ optional and can be overridden in a VM's individual provisioner config.
       be downloaded remotely from `download_root`
       to the home directory of whichever user account Vagrant is using. Defaults to `true`.
 
+**NOTE:** Any occurrence of the string `:version` or `:series` in the the strings set as `version_file` or `download_root` will be replaced by the corresponding `version` and `series` configuration values.
+
 ### `pe_bootstrap` Provisioner Settings
 
 These settings are on a per provisioner basis. They configure the individual

data/lib/pe_build/release.rb

@@ -41,7 +41,8 @@ module PEBuild
     require 'pe_build/release/2015_3'
     require 'pe_build/release/2016_1'
     require 'pe_build/release/2016_2'
+    require 'pe_build/release/2016_4'
 
-    LATEST_VERSION = '2016.2.1'
+    LATEST_VERSION = '2016.4.0'
   end
 end

data/lib/pe_build/release/2016_4.rb

@@ -0,0 +1,30 @@
+require 'pe_build/release'
+
+module PEBuild::Release
+
+  twentysixteen_four_x = newrelease do
+
+    add_release :el, '6'
+    add_release :el, '7'
+
+    add_release :sles, '11'
+    add_release :sles, '12'
+
+    add_release :ubuntu, '12.04'
+    add_release :ubuntu, '14.04'
+    add_release :ubuntu, '16.04'
+
+    add_release :windows, '2008'
+    add_release :windows, '2008R2'
+    add_release :windows, '2012'
+    add_release :windows, '2012R2'
+    add_release :windows, '7'
+    add_release :windows, '8'
+    add_release :windows, '8.1'
+    add_release :windows, '10'
+
+    set_answer_file :master, File.join(PEBuild.template_dir, 'answers', 'master-2016.2.x.conf.erb')
+  end
+
+  @releases['2016.4.0'] = twentysixteen_four_x
+end

data/lib/pe_build/transfer/open_uri.rb

@@ -2,7 +2,7 @@ require 'pe_build/version'
 require 'pe_build/idempotent'
 
 require 'open-uri'
-require 'progressbar'
+require 'ruby-progressbar'
 
 # @api private
 module PEBuild::Transfer::OpenURI
@@ -45,17 +45,24 @@ module PEBuild::Transfer::OpenURI
   # @return [IO]
   def self.download_file(uri)
     progress = nil
+    downloaded = 0
 
     content_length_proc = lambda do |length|
       if length and length > 0
         STDERR.puts "Fetching: #{uri}"
-        progress = ProgressBar.new("Fetching file", length, STDERR)
-        progress.file_transfer_mode
+        progress = ProgressBar.create(
+          :title => "Fetching file",
+          :total => length,
+          :output => STDERR,
+          :format => '%t: %p%% |%b>%i| %e')
       end
     end
 
     progress_proc = lambda do |size|
-      progress.set(size) if progress
+      unless progress.nil?
+        progress.progress += (size - downloaded)
+        downloaded = size
+      end
     end
 
     options = HEADERS.merge({
@@ -64,5 +71,7 @@ module PEBuild::Transfer::OpenURI
     })
 
     uri.open(options)
+  ensure
+    progress.stop unless progress.nil?
   end
 end

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.15.6'
+  VERSION = '0.16.0'
 end

data/vagrant-pe_build.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
 
   gem.license = 'Apache 2.0'
 
-  gem.add_runtime_dependency 'progressbar', '~> 0.21.0'
+  gem.add_runtime_dependency 'ruby-progressbar', '~> 1.8.0'
   gem.add_runtime_dependency 'minitar', '~> 0.5.4'
 
   gem.add_development_dependency 'rake', '~> 10.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.15.6
+  version: 0.16.0
 platform: ruby
 authors:
 - Adrien Thebo
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: progressbar
+  name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -156,6 +156,7 @@ files:
 - lib/pe_build/release/2015_3.rb
 - lib/pe_build/release/2016_1.rb
 - lib/pe_build/release/2016_2.rb
+- lib/pe_build/release/2016_4.rb
 - lib/pe_build/release/2_0.rb
 - lib/pe_build/release/2_5.rb
 - lib/pe_build/release/2_6.rb