vagrant-pe_build 0.5.0 → 0.6.0

data/CHANGELOG

@@ -1,6 +1,24 @@
 vagrant-pe_build
 ================
 
+0.6.0
+-----
+
+2013-10-03
+
+This is a backwards compatible bugfix and feature release.
+
+### User notes:
+
+  * The tar archive unpacker has been split into a true tar unpacker and a
+    tar.gz unpacker. Archives with either '.tar' and '.tar.gz' will be
+    extracted with the correct unpacker.
+  * If a version of PE is requested but there's no definition for it, release
+    information for the latest version of PE will be used. This means that the
+    new versions of PE that aren't yet supported should work without having to
+    specify an explicit answer file.
+  * PE versions with trailing version information can now be used.
+
 0.5.0
 -----
 

data/lib/pe_build/archive.rb

@@ -80,7 +80,7 @@ class Archive
   end
 
   def installer_dir
-    versioned_path(@filename).gsub('.tar.gz', '')
+    versioned_path(@filename).gsub(/.tar(?:\.gz)?/, '')
   end
 
   private

data/lib/pe_build/config/global.rb

@@ -5,10 +5,6 @@ require 'uri'
 
 class PEBuild::Config::Global < Vagrant.plugin('2', :config)
 
-  # @todo This value should be discovered based on what versions of the
-  #       installer are cached.
-  #DEFAULT_PE_VERSION = '2.7.2'
-
   # @!attribute download_root
   attr_accessor :download_root
 
@@ -18,19 +14,8 @@ class PEBuild::Config::Global < Vagrant.plugin('2', :config)
   # @!attribute suffix
   attr_accessor :suffix
 
-  # Allow our filename default to use @version and @suffix variables. This
-  # approach will not break the merging mechanism since the merging directly
-  # accesses the instance variables of the configuration objects.
-  def filename
-    if @filename == UNSET_VALUE
-      "puppet-enterprise-#{version}-#{suffix}.tar.gz"
-    else
-      @filename
-    end
-  end
-
   # @!attribute filename
-  attr_writer :filename
+  attr_accessor :filename
 
   def initialize
     @download_root = UNSET_VALUE
@@ -43,25 +28,25 @@ class PEBuild::Config::Global < Vagrant.plugin('2', :config)
 
   def finalize!
     set_default :@suffix, :detect
-
-    #set_default :@version,  DEFAULT_PE_VERSION
-
     set_default :@download_root, nil
+    set_default :@filename, nil
   end
 
   # @todo Convert error strings to I18n
   def validate(machine)
     errors = []
 
-    validate_version(errors)
-    validate_download_root(errors)
+    validate_version(errors, machine)
+    validate_download_root(errors, machine)
 
     {"PE build global config" => errors}
   end
 
   private
 
-  def validate_version(version)
+  PE_VERSION_REGEX = %r[\d+\.\d+\.\d+[\w-]*]
+
+  def validate_version(errors, machine)
 
     errmsg = I18n.t(
       'pebuild.config.global.errors.malformed_version',
@@ -72,14 +57,16 @@ class PEBuild::Config::Global < Vagrant.plugin('2', :config)
     # Allow Global version to be unset, rendering it essentially optional. If it is
     # discovered to be unset by a configuration on the next level up who cannot provide a
     # value, it is that configuration's job to take action.
-    if @version.kind_of? String and !(@version.match /\d+\.\d+(\.\d+)?/)
-      errors << errmsg
+    if @version.kind_of? String
+      if !(@version.match PE_VERSION_REGEX)
+        errors << errmsg
+      end
     elsif @version != UNSET_VALUE
       errors << errmsg
     end
   end
 
-  def validate_download_root(errors)
+  def validate_download_root(errors, machine)
     if @download_root and @download_root != UNSET_VALUE
       begin
         uri = URI.parse(@download_root)

data/lib/pe_build/config/pe_bootstrap.rb

@@ -103,13 +103,12 @@ class PEBuild::Config::PEBootstrap < PEBuild::Config::Global
 
     errors = []
 
-    validate_version(errors)
-    validate_role(errors)
-    validate_verbose(errors)
-    validate_master(errors)
-    validate_answer_file(errors)
-    validate_relocate_manifests(errors)
-    validate_autosign(errors)
+    validate_role(errors, machine)
+    validate_verbose(errors, machine)
+    validate_master(errors, machine)
+    validate_answer_file(errors, machine)
+    validate_relocate_manifests(errors, machine)
+    validate_autosign(errors, machine)
 
     errors |= h.values.flatten
     {"PE Bootstrap" => errors}
@@ -117,13 +116,13 @@ class PEBuild::Config::PEBootstrap < PEBuild::Config::Global
 
   private
 
-  def validate_version(errors)
+  def validate_version(errors, machine)
     if @version == UNSET_VALUE and global_config_from(machine).pe_build.version == UNSET_VALUE
       errors << I18n.t('pebuild.config.pe_bootstrap.errors.unset_version')
     end
   end
 
-  def validate_role(errors)
+  def validate_role(errors, machine)
     unless VALID_ROLES.any? {|sym| @role == sym}
       errors << I18n.t(
         'pebuild.config.pe_bootstrap.errors.unhandled_role',
@@ -133,7 +132,7 @@ class PEBuild::Config::PEBootstrap < PEBuild::Config::Global
     end
   end
 
-  def validate_verbose(errors)
+  def validate_verbose(errors, machine)
     unless @verbose == !!@verbose
       errors << I18n.t(
         'pebuild.config.pe_bootstrap.errors.malformed_verbose',
@@ -142,25 +141,25 @@ class PEBuild::Config::PEBootstrap < PEBuild::Config::Global
     end
   end
 
-  def validate_master(errors)
+  def validate_master(errors, machine)
     unless @master.is_a? String
       errors << "'master' must be a string containing the address of the master, got a #{@master.class}"
     end
   end
 
-  def validate_answer_file(errors)
+  def validate_answer_file(errors, machine)
     if @answer_file and !File.readable? @answer_file
       errors << "'answers_file' must be a readable file"
     end
   end
 
-  def validate_relocate_manifests(errors)
+  def validate_relocate_manifests(errors, machine)
     if @relocate_manifests and not @role == :master
       errors << "'relocate_manifests' can only be applied to a master"
     end
   end
 
-  def validate_autosign(errors)
+  def validate_autosign(errors, machine)
     if (@autosign and @role != :master)
       errors << I18n.t(
         'pebuild.config.pe_bootstrap.errors.invalid_autosign_role',

data/lib/pe_build/provisioner/pe_bootstrap.rb

@@ -71,8 +71,8 @@ module PEBuild
         # is being used for default values and was never directly touched then it
         # may have bad values, so we re-finalize everything. This may not be
         # generally safe but inside of this plugin it should be ok.
-        provision.finalize!
         global.finalize!
+        provision.finalize!
 
         merged = PEBuild::Util::Config.local_merge(provision, global)
 
@@ -85,7 +85,7 @@ module PEBuild
       end
 
       def load_archive
-        if @config.suffix == :detect
+        if @config.suffix == :detect and @config.filename.nil?
           filename = @machine.guest.capability('detect_installer', @config.version)
         else
           filename = @config.filename

data/lib/pe_build/release.rb

@@ -8,7 +8,17 @@ module PEBuild
     @releases = {}
 
     def self.[](ver)
-      @releases[ver]
+      release = @releases[ver]
+
+      if release.nil?
+        logger = Log4r::Logger.new('vagrant::pe_build::release')
+        logger.warn I18n.t 'pebuild.release.unknown_version',
+          :missing_version => ver,
+          :latest_version  => LATEST_VERSION
+        release = @releases[LATEST_VERSION]
+      end
+
+      release
     end
 
     def self.newrelease(&blk)

data/lib/pe_build/unpack.rb

@@ -6,10 +6,12 @@ module PEBuild
     end
 
     require 'pe_build/unpack/tar'
+    require 'pe_build/unpack/tar_gz'
     require 'pe_build/unpack/copy'
 
     IMPLEMENTATIONS = {
-      '.tar.gz' => PEBuild::Unpack::Tar,
+      '.tar'    => PEBuild::Unpack::Tar,
+      '.tar.gz' => PEBuild::Unpack::TarGZ,
       '.msi'    => PEBuild::Unpack::Copy,
     }
 

data/lib/pe_build/unpack/tar.rb

@@ -1,5 +1,4 @@
 require 'archive/tar/minitar'
-require 'zlib'
 
 module PEBuild
 module Unpack
@@ -12,7 +11,7 @@ class Tar
   end
 
   def unpack
-    ::Archive::Tar::Minitar.unpack(zip, @dst)
+    ::Archive::Tar::Minitar.unpack(file_stream, @dst)
   end
 
   # @return [String] The file/dir that will be created as a result of unpack
@@ -22,7 +21,7 @@ class Tar
 
   # @return [String] The base directory contained in the tar archive
   def dirname
-    input = ::Archive::Tar::Minitar::Input.new(zip)
+    input = ::Archive::Tar::Minitar::Input.new(file_stream)
 
     base = nil
     input.each do |entry|
@@ -35,8 +34,8 @@ class Tar
 
   private
 
-  def zip
-    Zlib::GzipReader.new(File.open(@src, 'rb'))
+  def file_stream
+    File.open(@src, 'rb')
   end
 end
 end

data/lib/pe_build/unpack/tar_gz.rb

@@ -0,0 +1,17 @@
+require 'pe_build/unpack'
+require 'pe_build/unpack/tar'
+
+require 'zlib'
+
+module PEBuild
+module Unpack
+class TarGZ < PEBuild::Unpack::Tar
+
+  private
+
+  def file_stream
+    Zlib::GzipReader.new(super)
+  end
+end
+end
+end

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/templates/locales/en.yml

@@ -62,3 +62,7 @@ en:
           The VM "%{name}" could not detect the version of Puppet Enterprise and failed with
           the following error:
           "%{error}"
+    release:
+      unknown_version: |-
+        Release information for PE version %{missing_version} could not be found. Falling back
+        Falling back to %{latest_version}.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-17 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
@@ -108,6 +108,7 @@ files:
 - lib/pe_build/unpack.rb
 - lib/pe_build/unpack/copy.rb
 - lib/pe_build/unpack/tar.rb
+- lib/pe_build/unpack/tar_gz.rb
 - lib/pe_build/util/config.rb
 - lib/pe_build/version.rb
 - lib/vagrant-pe_build.rb