vagrant-pe_build 0.10.4 → 0.11.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzllM2JjYzY0MjI1ODMxMGQ0YTg1NGYzOTFkZjNiNTdmN2RhNWU5OA==
-  data.tar.gz: !binary |-
-    YmM1YTYyZDMyOWYwZGZiYzQyYWM5NGQ2ZWZiODU5NzcxNzRmYjM3Nw==
+SHA1:
+  metadata.gz: 60203f10382b8165bd7ed0cb6719bfa64e26f72d
+  data.tar.gz: 523aae2be9317ea18ab6169ba68a098be1f17c65
 SHA512:
-  metadata.gz: !binary |-
-    Yzk4NzA3N2NjYzkzZDQ3MjdhOTg4MWU5YWFlYjhkN2EyMDQyZTNlMDk2Mjk3
-    MGM2YzA3YjVhZTM4Yjc3Y2I4OTNkYWI3NDc4ZGMzNzljNjIwN2QxMmQ1ODY3
-    OGVkZmRhMTI2MWM2MDI5OWQwYTc1MDFkZDg2Mzk1YjhkM2U1YmY=
-  data.tar.gz: !binary |-
-    MjZmZmZlNTdmMzA1ZDg1NzQwZTY0Y2NjM2ZjOWRlNWM1ZjM4NDRkNzVjZDhi
-    NTJlZmUyYWVhOGMwNDQ4NDQ3NTBhY2NkODA3MWI3NDdlM2MxZWY4YWNjMWE5
-    ZjY3ZTMzNTdkYWQ0NGIwODRhOTEzZDJjNzc1MzYzYWZlYmRjN2E=
+  metadata.gz: 4b695d95bde3f22905e42215aff2b049c258adbfbd0d42fe5c5fa7e2dea13cb18bef4da860dcf165f301b1794c0537ba1587ef5331c0bc32755d5d004bb5d06e
+  data.tar.gz: 190db868e4a29c6e438fcdc3d8977f44e49b458a4499942451e8375936850ea6d3c4e6c6eea7c26ef4d8dbae4ddeb72b8463c9ea2647d8bc9a31e1f5f13ee9c8

data/.travis.yml

@@ -1,5 +1,6 @@
 ---
 language: ruby
+sudo: false
 before_install:
   - gem install bundler --version $BUNDLER_VERSION
 install: bundle _${BUNDLER_VERSION}_ install --without development
@@ -14,5 +15,5 @@ env:
   matrix:
     - TEST_VAGRANT_VERSION=v1.5.4 BUNDLER_VERSION=1.5.3
     - TEST_VAGRANT_VERSION=v1.6.5 BUNDLER_VERSION=1.6.9
-    - TEST_VAGRANT_VERSION=v1.7.2 BUNDLER_VERSION=1.7.9
-    - TEST_VAGRANT_VERSION=HEAD   BUNDLER_VERSION=1.7.9
+    - TEST_VAGRANT_VERSION=v1.7.4 BUNDLER_VERSION=1.10.5
+    - TEST_VAGRANT_VERSION=HEAD   BUNDLER_VERSION=1.10.5

data/CHANGELOG

@@ -1,6 +1,24 @@
 vagrant-pe_build
 ================
 
+0.11.0
+------
+
+2015-09-08
+
+This is a feature release that also removes one deprecated command.
+
+  * (GH-66) The `pe_bootstrap` provisioner now has a `answers_extra`
+    configuration option. This option can be set to a list of strings which
+    will be appended to the answer file, one entry per line.
+
+  * (GH-44) Vagrant 1.3.0 prevented any plugin from declaring a command that
+    uses a `--version` flag. The `vagrant pe-build copy` command now uses a
+    flag called `--release` to specify which PE version to download.
+
+  * (GH-35) The deprecated `vagrant pe-build download` command has been
+    removed. Use `vagrant pe-build copy` instead.
+
 0.10.4
 ------
 

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 ruby '2.0.0' # Required by Vagrant 1.4 and newer.
 
-ENV['TEST_VAGRANT_VERSION'] ||= 'v1.7.2'
+ENV['TEST_VAGRANT_VERSION'] ||= 'v1.7.4'
 
 # Wrapping gemspec in the :plugins group causes Vagrant 1.5 and newer to
 # automagically load this plugin during acceptance tests.

data/README.markdown

@@ -3,7 +3,7 @@ Vagrant PE build
 
 Download and install Puppet Enterprise with Vagrant.
 
-[![Build Status](https://travis-ci.org/adrienthebo/vagrant-pe_build.svg?branch=master)](https://travis-ci.org/adrienthebo/vagrant-pe_build)
+[![Build Status](https://travis-ci.org/oscar-stack/vagrant-pe_build.svg?branch=master)](https://travis-ci.org/oscar-stack/vagrant-pe_build)
 
 Synopsis
 --------
@@ -65,6 +65,11 @@ overridden at this point.
       Values can be paths relative to the Vagrantfile's project directory.
     * Default: The default answer file for the Puppet Enterprise version and
       role.
+  * `answer_extras`
+    * Description: An array of strings that will be appended to the answer file
+      template, one string per line. This can be used to supply additional
+      answers and override default answers.
+    * Default: An empty array.
   * `relocate_manifests`
     * Description: Whether or not to change the PE master to use a config of
       `manifestdir=/manifests` and `modulepath=/modules`. This is meant to be

data/acceptance/pe_build/pe_build_cli_spec.rb

@@ -0,0 +1,46 @@
+require 'vagrant-spec/acceptance/output'
+
+module Vagrant
+  module Spec
+    OutputTester[:no_archives] = lambda do |text|
+      text =~ /No PE versions available/
+    end
+
+    OutputTester[:pe_available] = lambda do |text|
+      text =~ /puppet-enterprise-\d+\.\d\.\d-el-6-x86_64\.tar\.gz/
+    end
+  end
+end
+
+
+describe 'vagrant CLI: pe-build', component: 'cli/pe-build' do
+  include_context 'acceptance'
+
+  let(:options) { config.providers.values.first }
+
+  let(:webserver_port) { 3838 }
+  let(:webserver_path) { options[:archive_path] }
+  let(:download_url) { "http://localhost:#{webserver_port}" }
+
+  include_context 'webserver'
+
+  before(:each) do
+    environment.skeleton('pe_build')
+  end
+
+  it 'can download archives from remote servers' do
+    result = execute('vagrant', 'pe-build', 'list')
+    expect(result).to exit_with(0)
+    expect(result.stdout).to match_output(:no_archives)
+
+    result = execute('vagrant', 'pe-build', 'copy',
+      "--release=#{options[:pe_latest]}",
+      "#{download_url}/puppet-enterprise-:version-el-6-x86_64.tar.gz")
+    expect(result).to exit_with(0)
+
+    result = execute('vagrant', 'pe-build', 'list')
+    expect(result).to exit_with(0)
+    expect(result.stdout).to match_output(:pe_available)
+  end
+
+end

data/acceptance/skeletons/pe_build/Vagrantfile

@@ -16,7 +16,7 @@ Vagrant.configure('2') do |config|
     set_resources node, 4096, 1
 
     node.vm.provision :pe_bootstrap do |p|
-      p.version = '3.8.0'
+      p.version = '3.8.2'
       p.role = :master
     end
   end

data/lib/pe_build/command.rb

@@ -6,6 +6,5 @@ module PEBuild
     require 'pe_build/command/base'
     require 'pe_build/command/copy'
     require 'pe_build/command/list'
-    require 'pe_build/command/download'
   end
 end

data/lib/pe_build/command/base.rb

@@ -2,13 +2,16 @@ require 'vagrant'
 
 class PEBuild::Command::Base < Vagrant.plugin(2, :command)
 
+  def self.synopsis
+    'list and download PE installers'
+  end
+
   def initialize(argv, env)
     super
     split_argv
 
     @subcommands = {
       'list'     => PEBuild::Command::List,
-      'download' => PEBuild::Command::Download,
       'copy'     => PEBuild::Command::Copy,
     }
   end

data/lib/pe_build/command/copy.rb

@@ -39,7 +39,7 @@ class PEBuild::Command::Copy < Vagrant.plugin(2, :command)
 
       o.separator ''
 
-      o.on('-v', '--version=val', String, "The version of PE to fetch") do |val|
+      o.on('-r', '--release=val', String, "The release of PE to fetch") do |val|
         @options[:version] = val
       end
 

data/lib/pe_build/config/pe_bootstrap.rb

@@ -12,6 +12,12 @@ class PEBuild::Config::PEBootstrap < PEBuild::Config::Global
   #   @since 0.1.0
   attr_accessor :answer_file
 
+  # @!attribute answer_extras
+  #   @return [Array<String>] An array of additional answer strings that will
+  #     be appended to the answer file. (Optional)
+  #   @since 0.11.0
+  attr_accessor :answer_extras
+
   # @!attribute verbose
   #   @return [TrueClass, FalseClass] if stdout will be displayed when installing
   #   @since 0.1.0
@@ -53,6 +59,7 @@ class PEBuild::Config::PEBootstrap < PEBuild::Config::Global
     @verbose     = UNSET_VALUE
     @master      = UNSET_VALUE
     @answer_file = UNSET_VALUE
+    @answer_extras = UNSET_VALUE
 
     @relocate_manifests = UNSET_VALUE
 
@@ -71,6 +78,7 @@ class PEBuild::Config::PEBootstrap < PEBuild::Config::Global
     set_default :@verbose,     true
     set_default :@master,      'master'
     set_default :@answer_file, nil
+    set_default :@answer_extras, []
     set_default :@autosign,    (@role == :master)
 
     set_default :@relocate_manifests, false
@@ -94,6 +102,7 @@ class PEBuild::Config::PEBootstrap < PEBuild::Config::Global
     validate_verbose(errors, machine)
     validate_master(errors, machine)
     validate_answer_file(errors, machine)
+    validate_answer_extras(errors, machine)
     validate_relocate_manifests(errors, machine)
     validate_autosign(errors, machine)
 
@@ -134,6 +143,15 @@ class PEBuild::Config::PEBootstrap < PEBuild::Config::Global
     end
   end
 
+  def validate_answer_extras(errors, machine)
+    unless @answer_extras.is_a? Array
+      errors << I18n.t(
+        'pebuild.config.pe_bootstrap.errors.invalid_answer_extras',
+        :class => @answer_extras.class
+      )
+    end
+  end
+
   def validate_relocate_manifests(errors, machine)
     if @relocate_manifests and not @role == :master
       errors << "'relocate_manifests' can only be applied to a master"

data/lib/pe_build/config_builder/pe_bootstrap.rb

@@ -21,6 +21,12 @@ class PEBuild::ConfigBuilder::PEBootstrap < ::PEBuild::ConfigBuilder::Global
   #     directory.
   def_model_attribute :answer_file
 
+  # @!attribute answer_extras
+  #   @return [Array<String>] An array of additional answer strings that will
+  #     be appended to the answer file. (Optional)
+  #   @since 0.11.0
+  def_model_attribute :answer_extras
+
   # @!attribute [rw] relocate_manifests
   #   @return [Boolean] Whether or not to change the PE master to use a config
   #     of manifestdir=/manifests and modulepath=/modules. This is meant to be
@@ -55,6 +61,7 @@ class PEBuild::ConfigBuilder::PEBootstrap < ::PEBuild::ConfigBuilder::Global
         with_attr(:verbose)            { |val| pe.verbose            = val }
         with_attr(:master)             { |val| pe.master             = val }
         with_attr(:answer_file)        { |val| pe.answer_file        = val }
+        with_attr(:answer_extras)      { |val| pe.answer_extras      = val }
         with_attr(:relocate_manifests) { |val| pe.relocate_manifests = val }
         with_attr(:autosign)           { |val| pe.autosign           = val }
       end

data/lib/pe_build/provisioner/pe_bootstrap/answers_file.rb

@@ -2,6 +2,12 @@ require 'pe_build/release'
 
 require 'erb'
 
+# A sub-provisioner which generates answer file content.
+#
+# This is an internal provisioner which is invoked by
+# `PEBuild::Provisioner::PEBootstrap`.
+#
+# @api private
 class PEBuild::Provisioner::PEBootstrap::AnswersFile
 
   # @param machine [Vagrant::Machine]
@@ -26,6 +32,15 @@ class PEBuild::Provisioner::PEBootstrap::AnswersFile
     @output_file.open('w') { |fh| fh.write(render_answers) }
   end
 
+  def render_answers
+    answer_template = template_data
+    unless @config.answer_extras.empty?
+      answer_template += ("\n" + @config.answer_extras.map {|e| e.to_s}.join("\n") + "\n")
+    end
+
+    ERB.new(answer_template).result(binding)
+  end
+
   private
 
   def set_template_path
@@ -42,9 +57,9 @@ class PEBuild::Provisioner::PEBootstrap::AnswersFile
     @logger.info "Using #{mode} answers file template #{@template} for #{@machine.inspect}"
   end
 
-  def render_answers
-    template_data = File.read(@template)
-    ERB.new(template_data).result(binding)
+  # Separated for easy stubbing in spec tests.
+  def template_data
+    File.read(@template)
   end
 
   def machine_hostname

data/lib/pe_build/provisioner/pe_bootstrap/post_install.rb

@@ -1,6 +1,12 @@
 require 'pe_build/on_machine'
 require 'pe_build/util/version_string'
 
+# A sub-provisioner which applies post-install configuration.
+#
+# This is an internal provisioner which is invoked by
+# `PEBuild::Provisioner::PEBootstrap`.
+#
+# @api private
 class PEBuild::Provisioner::PEBootstrap::PostInstall
 
   def initialize(machine, config, work_dir)

data/lib/pe_build/release.rb

@@ -38,6 +38,6 @@ module PEBuild
     require 'pe_build/release/3_7'
     require 'pe_build/release/3_8'
 
-    LATEST_VERSION = '3.8.1'
+    LATEST_VERSION = '3.8.2'
   end
 end

data/lib/pe_build/release/3_8.rb

@@ -57,5 +57,6 @@ module PEBuild::Release
 
   @releases['3.8.0'] = three_eight_x
   @releases['3.8.1'] = three_eight_x
+  @releases['3.8.2'] = three_eight_x
 end
 

data/lib/pe_build/version.rb

@@ -1,3 +1,3 @@
 module PEBuild
-  VERSION = '0.10.4'
+  VERSION = '0.11.0'
 end

data/spec/unit/config/pe_bootstrap_spec.rb

@@ -15,6 +15,25 @@ describe PEBuild::Config::PEBootstrap do
     end
   end
 
+  describe 'answer_extras' do
+    it 'defaults to an empty Array' do
+      subject.finalize!
+
+      expect(subject.answer_extras).to be_a(Array)
+    end
+
+    context 'when validated with a non-array value' do
+      it 'records an error' do
+        subject.answer_extras = {'' => ''}
+
+        subject.finalize!
+        errors = subject.validate(machine)
+
+        expect(errors['PE Bootstrap'].to_s).to match(/Answer_extras.*got a Hash/)
+      end
+    end
+  end
+
   # TODO: Spec test the validation functions. Not critical right now since it
   # is pretty much testing tests. But, having specs is a good way for people to
   # see precisely _what_ is allowed.

data/spec/unit/provisioner/pe_bootstrap_answers_spec.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+require 'pe_build/provisioner/pe_bootstrap'
+
+describe PEBuild::Provisioner::PEBootstrap::AnswersFile do
+  include_context 'vagrant-unit'
+
+  let(:test_env) do
+    test_env = isolated_environment
+    test_env.vagrantfile <<-EOF
+Vagrant.configure('2') do |config|
+  config.vm.define :test
+end
+EOF
+
+    test_env
+  end
+  let(:env)              { test_env.create_vagrant_env }
+  let(:machine)          { env.machine(:test, :dummy) }
+  let(:bootstrap_config) { PEBuild::Config::PEBootstrap.new }
+
+  # Mock the communicator to prevent SSH commands from being executed.
+  let(:communicator)     { double('communicator') }
+  # Mock the guest operating system.
+  let(:guest)            { double('guest') }
+
+  before (:each) do
+    machine.stub(:guest => guest)
+    machine.stub(:communicator => communicator)
+  end
+
+  after(:each) { test_env.close }
+
+  subject do
+    provisioner = described_class.new(machine, bootstrap_config, env.root_path.join(PEBuild::WORK_DIR))
+    provisioner.stub(:template_data) { "original template" }
+
+    provisioner
+  end
+
+
+  context 'when answer_extras is not configured' do
+    before(:each) do
+      bootstrap_config.version = '3.8.2'
+
+      bootstrap_config.finalize!
+    end
+
+    it 'does not modify the template' do
+      expect(subject.render_answers).to eq("original template")
+    end
+  end
+
+  context 'when answer_extras is configured' do
+    before(:each) do
+      bootstrap_config.version = '3.8.2'
+      bootstrap_config.answer_extras = ['q_foo=bar', 'q_baz=bim']
+
+      bootstrap_config.finalize!
+    end
+
+    it 'appends answers to the template' do
+      expect(subject.render_answers.lines.last).to eq("q_baz=bim\n")
+    end
+  end
+end

data/templates/locales/en.yml

@@ -58,6 +58,8 @@ en:
             Autosign can only be specified if the pe_bootstrap role is 'master', not %{role}.
           invalid_autosign_class: |-
             Autosign must be one of %{autosign_classes}, but was of type %{autosign}.
+          invalid_answer_extras: |-
+            Answer_extras must be an Array, got a %{class}.
     cap:
       run_install:
         already_installed: |-

data/vagrant-spec.config.example.rb

@@ -13,6 +13,7 @@ Vagrant::Spec::Acceptance.configure do |c|
     box: (acceptance_dir + 'artifacts' + 'virtualbox.box').to_s,
     # This folder should be filled with PE tarballs for CentOS.
     archive_path: (acceptance_dir + 'artifacts' + 'pe_archives').to_s,
+    pe_latest: '2015.2.0',
     env_vars: {
       'VBOX_USER_HOME' => '{{homedir}}',
     }

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.11.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-12 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -83,8 +83,8 @@ files:
 - Rakefile
 - acceptance/pe_build/pe_bootstrap_3x_spec.rb
 - acceptance/pe_build/pe_bootstrap_latest_spec.rb
+- acceptance/pe_build/pe_build_cli_spec.rb
 - acceptance/skeletons/pe_build/Vagrantfile
-- acceptance/skeletons/pe_build/agent-3.x.txt.erb
 - doc/answers/README.markdown
 - doc/answers/agent.txt
 - doc/answers/master-1.1.txt
@@ -110,7 +110,6 @@ files:
 - lib/pe_build/command.rb
 - lib/pe_build/command/base.rb
 - lib/pe_build/command/copy.rb
-- lib/pe_build/command/download.rb
 - lib/pe_build/command/list.rb
 - lib/pe_build/config.rb
 - lib/pe_build/config/global.rb
@@ -155,7 +154,7 @@ files:
 - spec/spec_helper.rb
 - spec/unit/config/global_spec.rb
 - spec/unit/config/pe_bootstrap_spec.rb
-- spec/unit/provisioner/pe_bootstrap_spec.rb
+- spec/unit/provisioner/pe_bootstrap_answers_spec.rb
 - spec/unit/util/config_spec.rb
 - tasks/acceptance.rake
 - tasks/spec.rake
@@ -180,17 +179,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Vagrant provisioner for installing Puppet Enterprise

data/acceptance/skeletons/pe_build/agent-3.x.txt.erb

@@ -1,17 +0,0 @@
-q_fail_on_unsuccessful_master_lookup=y
-q_install=y
-q_puppet_cloud_install=n
-q_puppet_enterpriseconsole_install=n
-q_puppet_symlinks_install=y
-q_puppetagent_certname=<%= machine_hostname %>
-q_puppetagent_install=y
-q_puppetagent_server=<%= @config.master %>
-q_puppetca_install=n
-q_puppetdb_hostname=
-q_puppetdb_install=n
-q_puppetdb_port=
-q_puppetmaster_install=n
-q_vendor_packages_install=y
-q_continue_or_reenter_master_hostname=c
-q_verify_packages=y
-q_fail_on_unsuccessful_master_lookup=n

data/lib/pe_build/command/download.rb

@@ -1,10 +0,0 @@
-require 'pe_build/archive'
-require 'pe_build/command/copy'
-
-class PEBuild::Command::Download < Vagrant.plugin(2, :command)
-
-  def execute
-    @env.ui.warn "vagrant pe-build download is deprecated, use vagrant pe-build copy", :prefix => true
-    PEBuild::Command::Copy.new(@argv, @env).execute
-  end
-end

data/spec/unit/provisioner/pe_bootstrap_spec.rb

@@ -1,47 +0,0 @@
-require 'spec_helper'
-
-require 'pe_build/provisioner/pe_bootstrap'
-
-describe PEBuild::Provisioner::PEBootstrap do
-  include_context 'vagrant-unit'
-
-  let(:test_env) do
-    test_env = isolated_environment
-    test_env.vagrantfile <<-EOF
-Vagrant.configure('2') do |config|
-  config.vm.define :test
-end
-EOF
-
-    test_env
-  end
-  let(:env)              { test_env.create_vagrant_env }
-  let(:machine)          { env.machine(:test, :dummy) }
-  let(:bootstrap_config) { PEBuild::Config::PEBootstrap.new }
-
-  # Mock the communicator to prevent SSH commands for being executed.
-  let(:communicator)     { double('communicator') }
-  # Mock the guest operating system.
-  let(:guest)            { double('guest') }
-
-  before (:each) do
-    machine.stub(:guest => guest)
-    machine.stub(:communicator => communicator)
-  end
-
-  after(:each) { test_env.close }
-
-  subject(:provisioner) { described_class.new(machine, bootstrap_config) }
-
-
-  describe 'when configured' do
-    context 'and no version is set' do
-      it 'raises an error' do
-        pending 'This is now done in the `provision` method which is difficult to isolate for a test'
-        expect { subject.configure(machine.config) }.to raise_error(
-          PEBuild::Provisioner::PEBootstrap::UnsetVersionError,
-          /version must be set/ )
-      end
-    end
-  end
-end