vagrant-pe_build 0.4.3 → 0.5.0

data/CHANGELOG

@@ -1,7 +1,38 @@
 vagrant-pe_build
 ================
 
+0.5.0
+-----
+
+2013-09-17
+
+This is a backwards compatible bugfix and feature release.
+
+### User notes:
+
+  * Added detect_installer capability for SLES
+  * (GH-32) Added detect_installer capability for Solaris
+  * (GH-32) run_install capability uses posix compliant `at` command syntax
+  * (GH-33) Added detect_installer and run_install capabilities for Windows
+
+### Developer notes:
+
+  * All StandardError exceptions emitted from transfer/open_uri are now rescued,
+    so errors generated during downloads won't cause Vagrant to die with a
+    stacktrace.
+  * cap/detect_installer exceptions now subclass Vagrant::Errors::VagrantErrors
+    so that detection errors don't cause stacktraces.
+  * Archive unpacking logic has been generalized to support multiple implementations
+    like 'pe_build/transfer'
+
+Thanks to Reid Vandewiele for implementing the Windows and Solaris fixes and
+extracting the 'unpack' logic.
+
+Thanks to Charlie Sharpsteen for validating the new platform support and
+correcting the issues around open_uri error handling.
+
 0.4.3
+-----
 
 2013-09-09
 

data/lib/pe_build/archive.rb

@@ -3,8 +3,7 @@ require 'pe_build/idempotent'
 require 'pe_build/archive_collection'
 
 require 'pe_build/transfer'
-
-require 'pe_build/unpack/tar'
+require 'pe_build/unpack'
 
 module PEBuild
 
@@ -66,11 +65,9 @@ class Archive
       raise "Tried to unpack #{@filename} but it was not downloaded!"
     end
 
-    tar  = PEBuild::Unpack::Tar.new(archive_path, fs_dir)
-    path = File.join(fs_dir, tar.dirname)
-
-    idempotent(path, "Unpacked archive #{versioned_path filename}") do
-      tar.unpack
+    archive = PEBuild::Unpack.generate(archive_path, fs_dir)
+    idempotent(archive.creates, "Unpacked archive #{versioned_path filename}") do
+      archive.unpack
     end
   end
 

data/lib/pe_build/cap.rb

@@ -1,17 +1,25 @@
 module PEBuild
   module Cap
     module DetectInstaller
+
+      class DetectFailed < Vagrant::Errors::VagrantError
+        error_key(:detect_failed, 'pebuild.cap.detect_installer')
+      end
+
       require 'pe_build/cap/detect_installer/base'
       require 'pe_build/cap/detect_installer/posix'
+      require 'pe_build/cap/detect_installer/windows'
 
       require 'pe_build/cap/detect_installer/redhat'
       require 'pe_build/cap/detect_installer/debian'
       require 'pe_build/cap/detect_installer/ubuntu'
-      #require 'pe_build/cap/detect_installer/suse'
+      require 'pe_build/cap/detect_installer/sles'
+      require 'pe_build/cap/detect_installer/solaris'
     end
 
     module RunInstall
       require 'pe_build/cap/run_install/posix'
+      require 'pe_build/cap/run_install/windows'
     end
   end
 end

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

@@ -21,24 +21,29 @@ class PEBuild::Cap::DetectInstaller::POSIX < PEBuild::Cap::DetectInstaller::Base
   #   @abstract
   #   @return [Array<String>] All supported releases for the distribution
 
-
   def detect
     dist_version = parse_release_file
 
     unless supported_releases.include? dist_version
-      raise "#{self.class.name} release #{dist_version} not supported"
+      raise PEBuild::Cap::DetectInstaller::DetectFailed,
+        :name  => @machine.name,
+        :error => "#{self.class.name} release #{dist_version} not supported"
     end
 
     "puppet-enterprise-#{@version}-#{name}-#{dist_version}-#{arch}.#{ext}"
   end
 
   def arch
-    content = ""
-    @machine.communicate.execute("uname -m") do |type, data|
-      raise "Could not run 'uname -m' on #{@machine}: got #{data}" if type == :stderr
-      content << data.chomp
+    results = execute_command("uname -m")
+
+    unless results[:retval] == 0
+      raise PEBuild::Cap::DetectInstaller::DetectFailed,
+        :name  => @machine.name,
+        :error => "Could not run 'uname -m' on #{@machine.name}: got #{results[:stderr]}"
     end
 
+    content = results[:stdout]
+
     content = 'i386' if content.match /i\d86/
 
     content
@@ -51,23 +56,41 @@ class PEBuild::Cap::DetectInstaller::POSIX < PEBuild::Cap::DetectInstaller::Base
   private
 
   def release_content
-    content = ""
+    results = execute_command("cat #{release_file}")
 
-    @machine.communicate.execute("cat #{release_file}") do |type, data|
-      raise "Could not read #{release_file} on #{@machine}: got #{data}" if type == :stderr
-      content << data
+    unless results[:retval] == 0
+      raise PEBuild::Cap::DetectInstaller::DetectFailed,
+        :name  => @machine.name,
+        :error => "Could not read #{release_file} on #{@machine.name}: got #{results[:stderr]}"
     end
 
-    content
+    results[:stdout]
   end
 
   def parse_release_file
     matchdata = release_content.match(release_file_format)
 
     if matchdata.nil? or matchdata[1].nil?
-      raise "#{self.class.name} could not determine release value: content #{release_content.inspect} did not match #{release_file_format}"
+      raise PEBuild::Cap::DetectInstaller::DetectFailed,
+        :name  => @machine.name,
+        :error => "#{self.class.name} could not determine release value: content #{release_content.inspect} did not match #{release_file_format}"
     end
 
     matchdata[1]
   end
+
+  def execute_command(cmd)
+    stdout = ''
+    stderr = ''
+
+    retval = @machine.communicate.execute(cmd, :error_check => false) do |type, data|
+      if type == :stderr
+        stderr << data
+      else
+        stdout << data
+      end
+    end
+
+    {:stdout => stdout.chomp, :stderr => stderr.chomp, :retval => retval}
+  end
 end

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

@@ -0,0 +1,19 @@
+class PEBuild::Cap::DetectInstaller::SLES < PEBuild::Cap::DetectInstaller::POSIX
+
+  def name
+    'sles'
+  end
+
+  def release_file
+    '/etc/SuSE-release'
+  end
+
+  def release_file_format
+    %r[^SUSE Linux Enterprise Server (\d+)]
+  end
+
+  def supported_releases
+    %w[11]
+  end
+end
+

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

@@ -0,0 +1,24 @@
+class PEBuild::Cap::DetectInstaller::Solaris < PEBuild::Cap::DetectInstaller::POSIX
+
+  def name
+    'solaris'
+  end
+
+  def release_file
+    '/etc/release'
+  end
+
+  def release_file_format
+    %r[^(?:\s)*(?:Oracle )?Solaris (\d+)]
+  end
+
+  def supported_releases
+    %w[10]
+  end
+
+  def arch
+    retval = super
+    (retval == 'i86pc') ? 'i386' : retval
+  end
+
+end

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

@@ -0,0 +1,13 @@
+# Provide an abstract base class for detecting the installer name on
+# POSIX systems.
+#
+# @abstract
+# @protected
+class PEBuild::Cap::DetectInstaller::Windows < PEBuild::Cap::DetectInstaller::Base
+
+  def detect
+    # Yes, it really is this simple. For Windows anyway.
+    "puppet-enterprise-#{@version}.msi"
+  end
+
+end

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

@@ -29,7 +29,7 @@ class PEBuild::Cap::RunInstall::POSIX
 
     if machine.communicate.test('which at')
       machine.ui.info I18n.t('pebuild.cap.run_install.scheduling_run')
-      machine.communicate.sudo("echo '/opt/puppet/bin/puppet agent -t --waitforcert 10' | at next minute")
+      machine.communicate.sudo("echo '/opt/puppet/bin/puppet agent -t --waitforcert 10' | at now '+ 1min'")
     end
   end
 end

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

@@ -0,0 +1,35 @@
+require 'pe_build/on_machine'
+class PEBuild::Cap::RunInstall::Windows
+
+  extend PEBuild::OnMachine
+
+  def self.run_install(machine, config, archive)
+
+    gt_win2k3_path = '${Env:ALLUSERSPROFILE}\\PuppetLabs'
+    le_win2k3_path = '${Env:ALLUSERSPROFILE}\\Application Data\\PuppetLabs'
+    testpath = "(Test-Path \"#{gt_win2k3_path}\") -or (Test-Path \"#{le_win2k3_path}\")"
+
+    if machine.communicate.test("If (#{testpath}) { Exit 0 } Else { Exit 1 }")
+      machine.ui.warn I18n.t('pebuild.cap.run_install.already_installed'),
+        :name => machine.name
+      return
+    end
+
+    root = File.join('\\\\VBOXSVR\\vagrant', PEBuild::WORK_DIR)
+
+    # The installer will be fed to msiexec. That means the File.join() method
+    # is of limited use since it won't execute on the Windows system
+    installer = File.join(root, archive.to_s).gsub('/', '\\')
+
+    cmd = []
+    cmd << 'msiexec' << '/qn' << '/i' << installer
+
+    cmd << "PUPPET_MASTER_SERVER=#{config.master}"
+    cmd << "PUPPET_AGENT_CERTNAME=#{machine.name}"
+
+    argv = cmd.join(' ')
+
+    on_machine(machine, argv)
+
+  end
+end

data/lib/pe_build/plugin.rb

@@ -39,6 +39,8 @@ module PEBuild
 
     # Guest capabilities for installing PE
 
+    ## Detect installer
+
     guest_capability('debian', 'detect_installer') do
       require_relative 'cap'
       PEBuild::Cap::DetectInstaller::Debian
@@ -54,6 +56,23 @@ module PEBuild
       PEBuild::Cap::DetectInstaller::Ubuntu
     end
 
+    guest_capability('suse', 'detect_installer') do
+      require_relative 'cap'
+      PEBuild::Cap::DetectInstaller::SLES
+    end
+
+    guest_capability('solaris', 'detect_installer') do
+      require_relative 'cap'
+      PEBuild::Cap::DetectInstaller::Solaris
+    end
+
+    guest_capability('windows', 'detect_installer') do
+      require_relative 'cap'
+      PEBuild::Cap::DetectInstaller::Windows
+    end
+
+    ## Run install
+
     guest_capability('linux', 'run_install') do
       require_relative 'cap'
       PEBuild::Cap::RunInstall::POSIX
@@ -64,6 +83,11 @@ module PEBuild
       PEBuild::Cap::RunInstall::POSIX
     end
 
+    guest_capability('windows', 'run_install') do
+      require_relative 'cap'
+      PEBuild::Cap::RunInstall::Windows
+    end
+
     # internal action hooks
 
     action_hook('PE Build: initialize build dir') do |hook|

data/lib/pe_build/release.rb

@@ -1,3 +1,5 @@
+require 'pe_build'
+
 module PEBuild
   module Release
 

data/lib/pe_build/release/2_0.rb

@@ -1,3 +1,5 @@
+require 'pe_build/release'
+
 module PEBuild::Release
 
   two_oh_x = newrelease do

data/lib/pe_build/release/2_5.rb

@@ -1,3 +1,5 @@
+require 'pe_build/release'
+
 module PEBuild::Release
 
   two_five_x = newrelease do

data/lib/pe_build/release/2_6.rb

@@ -1,3 +1,5 @@
+require 'pe_build/release'
+
 module PEBuild::Release
 
   two_six_x = newrelease do

data/lib/pe_build/release/2_7.rb

@@ -1,3 +1,5 @@
+require 'pe_build/release'
+
 module PEBuild::Release
 
   two_seven_x = newrelease do

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

@@ -1,3 +1,5 @@
+require 'pe_build/release'
+
 module PEBuild::Release
 
   two_eight_x = newrelease do

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

@@ -1,3 +1,5 @@
+require 'pe_build/release'
+
 module PEBuild::Release
 
   three_oh_oh = newrelease do

data/lib/pe_build/transfer/open_uri.rb

@@ -25,7 +25,7 @@ class PEBuild::Transfer::OpenURI
       tmpfile = download_file
       FileUtils.mv(tmpfile, @dst)
     end
-  rescue ::OpenURI::HTTPError, ::OpenSSL::SSL::SSLError, ::SocketError => e
+  rescue StandardError => e
     raise DownloadFailed, :uri => @uri, :msg => e.message
   end
 

data/lib/pe_build/unpack.rb

@@ -0,0 +1,28 @@
+module PEBuild
+  module Unpack
+
+    class UnknownInstallerType < Vagrant::Errors::VagrantError
+      error_key(:unknown_installer_type, "pebuild.unpack")
+    end
+
+    require 'pe_build/unpack/tar'
+    require 'pe_build/unpack/copy'
+
+    IMPLEMENTATIONS = {
+      '.tar.gz' => PEBuild::Unpack::Tar,
+      '.msi'    => PEBuild::Unpack::Copy,
+    }
+
+    # @param src [String]
+    # @param dst [String]
+    def self.generate(src, dst)
+      klass = IMPLEMENTATIONS.find do |key,v|
+        src.end_with?(key)
+      end.last
+
+      raise UnknownInstallerType, :src => src unless klass
+      klass.new(src, dst)
+    end
+
+  end
+end

data/lib/pe_build/unpack/copy.rb

@@ -0,0 +1,25 @@
+require 'fileutils'
+
+module PEBuild
+module Unpack
+class Copy
+
+  # @param src [String]
+  # @param dst [String]
+  def initialize(src, dst)
+    @src, @dst = src, dst
+  end
+
+  def unpack
+    FileUtils.cp(@src, creates)
+  end
+
+  # @return [String] The file/dir that will be created as a result of unpack
+  def creates
+    basename = File.basename(@src)
+    deploy_path = File.join(@dst, basename)
+  end
+
+end
+end
+end

data/lib/pe_build/unpack/tar.rb

@@ -15,6 +15,11 @@ class Tar
     ::Archive::Tar::Minitar.unpack(zip, @dst)
   end
 
+  # @return [String] The file/dir that will be created as a result of unpack
+  def creates
+    File.join(@dst, dirname)
+  end
+
   # @return [String] The base directory contained in the tar archive
   def dirname
     input = ::Archive::Tar::Minitar::Input.new(zip)

data/lib/pe_build/version.rb

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

data/templates/locales/en.yml

@@ -19,6 +19,10 @@ en:
       unhandled_uri_scheme: |-
         The URI scheme "%{scheme}" cannot be handled by any file transferrers.
         Supported URI schemes: %{supported}
+    unpack:
+      unknown_installer_type: |-
+        PEBuild does not know how to unpack the installer archive file type.
+        The installer file is %{src}.
     config:
       global:
         errors:
@@ -53,3 +57,8 @@ en:
           Puppet Enterprise is already installed, skipping installation.
         scheduling_run: |-
           Scheduling Puppet run to kickstart node classification.
+      detect_installer:
+        detect_failed: |-
+          The VM "%{name}" could not detect the version of Puppet Enterprise and failed with
+          the following error:
+          "%{error}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-pe_build
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: progressbar
@@ -70,8 +70,12 @@ files:
 - lib/pe_build/cap/detect_installer/debian.rb
 - lib/pe_build/cap/detect_installer/posix.rb
 - lib/pe_build/cap/detect_installer/redhat.rb
+- lib/pe_build/cap/detect_installer/sles.rb
+- lib/pe_build/cap/detect_installer/solaris.rb
 - lib/pe_build/cap/detect_installer/ubuntu.rb
+- lib/pe_build/cap/detect_installer/windows.rb
 - lib/pe_build/cap/run_install/posix.rb
+- lib/pe_build/cap/run_install/windows.rb
 - lib/pe_build/command.rb
 - lib/pe_build/command/base.rb
 - lib/pe_build/command/copy.rb
@@ -101,6 +105,8 @@ files:
 - lib/pe_build/transfer.rb
 - lib/pe_build/transfer/file.rb
 - lib/pe_build/transfer/open_uri.rb
+- lib/pe_build/unpack.rb
+- lib/pe_build/unpack/copy.rb
 - lib/pe_build/unpack/tar.rb
 - lib/pe_build/util/config.rb
 - lib/pe_build/version.rb