vagrant-pe_build 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 269bf2fbb29c95381a0977397d40d4035c4a51e0
-  data.tar.gz: e50cff262ba84a0782fe50dedf575a3afc783574
+  metadata.gz: ed761a6748d23da37d5d7d4b4553ea593cc42ce7
+  data.tar.gz: a2cf2b6f6c026deb984bb63cffa7c9c846be57c8
 SHA512:
-  metadata.gz: b25346e8a16ddd1005c5e6bcec8e86a585b255227fff9b5266a732013d9d7dddee4a9c229867010af66fb7b1868b53bbea2236eab4522e5b8a814b5d23ed0809
-  data.tar.gz: 8064eaebceb1ec8e12d11bf9c9d4ad5e22e0cc1b3b4db9524f2d390e9953abf5013791042e440c104940e05c1e5629d1ea5b5f6c2aca0f3f90d15509ddfbe867
+  metadata.gz: 778c5360d02d13b047c51d4e6d30baee9227c28c9ca3fab1fbf86d6644c790ee3f929d939b833f2bf80ce010bf8b2f999b273713716d2c71d9238ad7c949acce
+  data.tar.gz: 0e7cafc6a00894024bc6601b6a9df11ecfaee0ef4a065cb2e60a48a915accfbe2e1ae17ec7c85eb1b2b519d4103df5cf2cfce42a5cb013279cb3a572279b3596

data/CHANGELOG

@@ -1,6 +1,15 @@
 vagrant-pe_build
 ================
 
+0.9.1
+-----
+
+2014-07-13
+
+This is a backwards compatible bugfix release.
+
+  * (GH-68) Fix a regression in merging version numbers set in global config.
+
 0.9.0
 -----
 

data/README.markdown

@@ -20,6 +20,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.version_file`
+    * 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.
   * `config.pe_build.suffix` - Suffix of the Puppet Enterprise installer to use.
     * Description: The distribution specifix suffix of the Puppet Enterprise
       installer to use.

data/lib/pe_build/archive.rb

@@ -49,7 +49,7 @@ module PEBuild
       @logger = Log4r::Logger.new('vagrant::pe_build::archive')
     end
 
-    # @param base_uri [String] A string representation of the download source URI
+    # @param str [String] A string representation of the download source URI
     def fetch(str)
       return if self.exist?
 

data/lib/pe_build/cap/detect_installer/posix.rb

@@ -2,7 +2,7 @@
 # POSIX systems.
 #
 # @abstract
-# @protected
+# @api protected
 class PEBuild::Cap::DetectInstaller::POSIX < PEBuild::Cap::DetectInstaller::Base
 
   # @!method name

data/lib/pe_build/cap/detect_installer/windows.rb

@@ -2,7 +2,7 @@
 # POSIX systems.
 #
 # @abstract
-# @protected
+# @api protected
 class PEBuild::Cap::DetectInstaller::Windows < PEBuild::Cap::DetectInstaller::Base
 
   def detect

data/lib/pe_build/config/global.rb

@@ -14,20 +14,20 @@ class PEBuild::Config::Global < Vagrant.plugin('2', :config)
   # @!attribute version
   #   @return [String] The version of PE to install. Must conform to
   #     `x.y.x[-optional-arbitrary-stuff]`. Used to determine the name of the
-  #     PE installer archive if {#filename} is unset.
+  #     PE installer archive if `filename` is unset.
   #   @since 0.1.0
   attr_accessor :version
 
   # @!attribute version_file
-  #   @return [String] The path to a file relative to {#download_root}. The
-  #     contents of this file will be read and used to specify {#version}.
+  #   @return [String] The path to a file relative to `download_root`. The
+  #     contents of this file will be read and used to specify `version`.
   #   @since 0.9.0
   attr_accessor :version_file
 
   # @!attribute series
   #   @return [String] The release series of PE. Completely optional and
   #     currently has no effect other than being an interpolation token
-  #     available for use in {#download_root}.
+  #     available for use in `download_root`.
   #
   #   @since 0.9.0
   attr_accessor :series
@@ -92,7 +92,8 @@ class PEBuild::Config::Global < Vagrant.plugin('2', :config)
       if !(@version.match PE_VERSION_REGEX)
         errors << errmsg
       end
-    elsif @version != nil
+    # Allow the version to be either unset or nil. Anything else is an error.
+    elsif ![nil, UNSET_VALUE].include? @version
       errors << errmsg
     end
   end

data/lib/pe_build/config/pe_bootstrap.rb

@@ -67,11 +67,6 @@ class PEBuild::Config::PEBootstrap < PEBuild::Config::Global
   #   global configuration; it's assumed that the late configuration merging in
   #   the provisioner will handle that.
   def finalize!
-
-    # NOTE: The version default is copied from Config::Global. Can't call
-    # `super` here as it does weird things to `download_root`.
-    set_default :@version,     nil
-
     set_default :@role,        :agent
     set_default :@verbose,     true
     set_default :@master,      'master'

data/lib/pe_build/release/instance.rb

@@ -17,7 +17,7 @@ class PEBuild::Release::Instance
   # Determine if Puppet Enterprise supports the specific release
   #
   # @param distro [String] The distribution to check
-  # @param dist_version [String] The version release to check
+  # @param dist_release [String] The version release to check
   #
   # @return [true, false]
   def supports?(distro, dist_release)
@@ -41,7 +41,7 @@ class PEBuild::Release::Instance
   # Define a distribution release as supported.
   #
   # @param distro [String] The distribution to add
-  # @param dist_version [String] The version release to add
+  # @param dist_release [String] The version release to add
   #
   # @return [void]
   def add_release(distro, dist_release)

data/lib/pe_build/transfer.rb

@@ -32,7 +32,7 @@ module PEBuild
     # Return the contents of a local or remote file.
     #
     # @param src [URI] The URI of the source file.
-    # @raises [UnhandledURIScheme] If the URI uses an unsupported scheme.
+    # @raise [UnhandledURIScheme] If the URI uses an unsupported scheme.
     # @return [String] The contents of the source file.
     #
     # @since 0.9.0

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

data/spec/unit/util/config_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+require 'pe_build/config'
+require 'pe_build/util/config'
+
+
+describe PEBuild::Util::Config do
+  let(:global) { PEBuild::Config::Global.new }
+  let(:local)  { PEBuild::Config::PEBootstrap.new }
+
+  before(:each) do
+    global.finalize!
+    local.finalize!
+  end
+
+  describe 'when merging global and local configs' do
+
+    describe 'merged version' do
+      it 'is inherited from global if local is unset' do
+        global.version = '3.0.0'
+
+        result = subject.local_merge(local, global)
+
+        expect(result.version).to eq('3.0.0')
+      end
+
+      it 'is equal to local if set' do
+        global.version = '3.0.0'
+        local.version = '2.7.0'
+
+        result = subject.local_merge(local, global)
+
+        expect(result.version).to eq('2.7.0')
+      end
+
+      it 'is nil if neither global nor local is set' do
+        result = subject.local_merge(local, global)
+
+        expect(result.version).to be_nil
+      end
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-09 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
@@ -150,6 +150,7 @@ files:
 - spec/unit/config/global_spec.rb
 - spec/unit/config/pe_bootstrap_spec.rb
 - spec/unit/provisioner/pe_bootstrap_spec.rb
+- spec/unit/util/config_spec.rb
 - tasks/acceptance.rake
 - tasks/spec.rake
 - templates/answers/agent-1.x.txt.erb