vagrant-pe_build 0.1.0 → 0.2.0

data/CHANGELOG

@@ -0,0 +1,12 @@
+vagrant-pe_build
+================
+
+0.2.0
+-----
+
+2013-08-01
+
+  * #20 Default `relocate_manifests` option to false on master
+  * Lazy load/interpolate `filename` config value
+  * Safely load global_config from pe_bootstrap
+  * Add license to .gemspec

data/lib/pe_build/config/global.rb

@@ -21,8 +21,19 @@ class 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_accessor :filename
+  attr_writer :filename
 
   def initialize
     @download_root = UNSET_VALUE
@@ -36,7 +47,6 @@ class Global < Vagrant.plugin('2', :config)
   def finalize!
     set_default :@suffix,   'all'
     #set_default :@version,  DEFAULT_PE_VERSION
-    set_default :@filename, "puppet-enterprise-:version-#{suffix}.tar.gz"
 
     set_default :@download_root, nil
   end

data/lib/pe_build/config/pe_bootstrap.rb

@@ -65,7 +65,7 @@ class PEBootstrap < PEBuild::Config::Global
     set_default :@master,      'master'
     set_default :@answer_file, nil
 
-    set_default :@relocate_manifests, (@role == :master)
+    set_default :@relocate_manifests, false
   end
 
   def add_step(name, script_path)
@@ -78,7 +78,7 @@ class PEBootstrap < PEBuild::Config::Global
     h = super
 
     errors = []
-    if @version == UNSET_VALUE and machine.config.pe_build.version == UNSET_VALUE
+    if @version == UNSET_VALUE and global_config_from(machine).pe_build.version == UNSET_VALUE
       errors << "Version must be set on provisioner when unset globally"
     end
 
@@ -105,6 +105,17 @@ class PEBootstrap < PEBuild::Config::Global
     errors |= h.values.flatten
     {"PE Bootstrap" => errors}
   end
+
+  private
+
+  # 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
+  end
 end
 end
 end

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/vagrant-pe_build.gemspec

@@ -18,4 +18,6 @@ Gem::Specification.new do |gem|
 
   gem.files        = %x{git ls-files -z}.split("\0")
   gem.require_path = 'lib'
+
+  gem.license = 'Apache 2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
@@ -49,6 +49,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG
 - Gemfile
 - LICENSE
 - README.markdown
@@ -84,7 +85,8 @@ files:
 - templates/scripts/relocate_installation.sh
 - vagrant-pe_build.gemspec
 homepage: https://github.com/adrienthebo/vagrant-pe_build
-licenses: []
+licenses:
+- Apache 2.0
 post_install_message: 
 rdoc_options: []
 require_paths: