beaker-puppet 1.29.0 → 2.0.0

data/lib/beaker-puppet/helpers/rake_helpers.rb

@@ -7,7 +7,7 @@ module Beaker
           def load_tasks(beaker_root = File.expand_path("#{__dir__}/../../.."))
             task_dir = File.join(beaker_root, 'tasks')
             tasks = [
-              'ci.rake'
+              'ci.rake',
             ]
 
             tasks.each do |task|

data/lib/beaker-puppet/helpers/tk_helpers.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 require 'hocon'
 require 'hocon/config_error'
 require 'inifile'
@@ -8,7 +7,6 @@ module Beaker
     module Helpers
       # Convenience methods for modifying and reading TrapperKeeper configs
       module TKHelpers
-
         # Modify the given TrapperKeeper config file.
         #
         # @param [Host] host  A host object
@@ -25,20 +23,17 @@ module Beaker
         # particularly care which of these the file named by `config_file_path` on
         # the SUT actually is, just that the contents can be parsed into a map.
         #
-        def modify_tk_config(host, config_file_path, options_hash, replace=false)
-          if options_hash.empty?
-            return nil
-          end
+        def modify_tk_config(host, config_file_path, options_hash, replace = false)
+          return nil if options_hash.empty?
 
           new_hash = Beaker::Options::OptionsHash.new
 
           if replace
             new_hash.merge!(options_hash)
           else
-            if not host.file_exist?( config_file_path )
-              raise "Error: #{config_file_path} does not exist on #{host}"
-            end
-            file_string = host.exec( Command.new( "cat #{config_file_path}" )).stdout
+            raise "Error: #{config_file_path} does not exist on #{host}" unless host.file_exist?(config_file_path)
+
+            file_string = host.exec(Command.new("cat #{config_file_path}")).stdout
 
             begin
               tk_conf_hash = read_tk_config_string(file_string)
@@ -61,29 +56,28 @@ module Beaker
         # a RuntimeException if none of the parsers succeed.
         #
         # @!visibility private
-        def read_tk_config_string( string )
-            begin
-              return Hocon.parse(string)
-            rescue Hocon::ConfigError
-              nil
-            end
+        def read_tk_config_string(string)
+          begin
+            return Hocon.parse(string)
+          rescue Hocon::ConfigError
+            nil
+          end
 
-            begin
-              return JSON.parse(string)
-            rescue JSON::JSONError
-              nil
-            end
+          begin
+            return JSON.parse(string)
+          rescue JSON::JSONError
+            nil
+          end
 
-            begin
-              return IniFile.new(content: string)
-            rescue IniFile::Error
-              nil
-            end
+          begin
+            return IniFile.new(content: string)
+          rescue IniFile::Error
+            nil
+          end
 
-            raise "Failed to read TrapperKeeper config!"
+          raise 'Failed to read TrapperKeeper config!'
         end
       end
-
     end
   end
 end

data/lib/beaker-puppet/install_utils/aio_defaults.rb

@@ -5,15 +5,14 @@ module Beaker
       # This module contains default values for aio paths and directorys per-platform
       #
       module AIODefaults
-
-        #Here be the pathing and default values for AIO installs
+        # Here be the pathing and default values for AIO installs
         #
         AIO_DEFAULTS = {
           'unix' => {
-            'puppetbindir'          => '/opt/puppetlabs/bin',
-            'privatebindir'         => '/opt/puppetlabs/puppet/bin',
-            'distmoduledir'         => '/etc/puppetlabs/code/modules',
-            'sitemoduledir'         => '/opt/puppetlabs/puppet/modules',
+            'puppetbindir' => '/opt/puppetlabs/bin',
+            'privatebindir' => '/opt/puppetlabs/puppet/bin',
+            'distmoduledir' => '/etc/puppetlabs/code/modules',
+            'sitemoduledir' => '/opt/puppetlabs/puppet/modules',
           },
           # sitemoduledir not included on Windows (check PUP-4049 for more info).
           #
@@ -23,20 +22,20 @@ module Beaker
           # include sys/ruby) and the newer versions, which have no custom ruby
           # directory
           'windows' => { # windows with cygwin
-            'puppetbindir'      => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin',
-            'privatebindir'     => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/puppet/bin:/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/sys/ruby/bin',
-            'distmoduledir'     => '`cygpath -smF 35`/PuppetLabs/code/modules',
+            'puppetbindir' => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin',
+            'privatebindir' => '/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/puppet/bin:/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/sys/ruby/bin',
+            'distmoduledir' => '`cygpath -smF 35`/PuppetLabs/code/modules',
           },
           'windows-64' => { # windows with cygwin
-            'puppetbindir'      => '/cygdrive/c/Program Files/Puppet Labs/Puppet/bin',
-            'privatebindir'     => '/cygdrive/c/Program Files/Puppet Labs/Puppet/puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/sys/ruby/bin',
-            'distmoduledir'     => '`cygpath -smF 35`/PuppetLabs/code/modules',
+            'puppetbindir' => '/cygdrive/c/Program Files/Puppet Labs/Puppet/bin',
+            'privatebindir' => '/cygdrive/c/Program Files/Puppet Labs/Puppet/puppet/bin:/cygdrive/c/Program Files/Puppet Labs/Puppet/sys/ruby/bin',
+            'distmoduledir' => '`cygpath -smF 35`/PuppetLabs/code/modules',
           },
           'pswindows' => { # pure windows
-            'puppetbindir'      => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\bin";"C:\\Program Files\\Puppet Labs\\Puppet\\bin"',
-            'privatebindir'     => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\puppet\\bin";"C:\\Program Files\\Puppet Labs\\Puppet\\puppet\\bin";"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\sys\\ruby\\bin";"C:\\Program Files\\Puppet Labs\\Puppet\\sys\\ruby\\bin"',
-            'distmoduledir'     => 'C:\\ProgramData\\PuppetLabs\\code\\modules',
-          }
+            'puppetbindir' => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\bin";"C:\\Program Files\\Puppet Labs\\Puppet\\bin"',
+            'privatebindir' => '"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\puppet\\bin";"C:\\Program Files\\Puppet Labs\\Puppet\\puppet\\bin";"C:\\Program Files (x86)\\Puppet Labs\\Puppet\\sys\\ruby\\bin";"C:\\Program Files\\Puppet Labs\\Puppet\\sys\\ruby\\bin"',
+            'distmoduledir' => 'C:\\ProgramData\\PuppetLabs\\code\\modules',
+          },
         }
 
         # Add the appropriate aio defaults to the host object so that they can be accessed using host[option], set host[:type] = aio
@@ -47,31 +46,31 @@ module Beaker
             host[key] = val
           end
           # add group and type here for backwards compatability
-          if host['platform'] =~ /windows/
-            host['group'] = 'Administrators'
-          else
-            host['group'] = 'puppet'
-          end
+          host['group'] = if host['platform'] =~ /windows/
+                            'Administrators'
+                          else
+                            'puppet'
+                          end
         end
 
         # Add the appropriate aio defaults to an array of hosts
         # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
         #                            or a role (String or Symbol) that identifies one or more hosts.
         def add_aio_defaults_on(hosts)
-          block_on hosts do | host |
+          block_on hosts do |host|
             if host.is_powershell?
               platform = 'pswindows'
             elsif host['platform'] =~ /windows/
-              if host[:ruby_arch] == 'x64'
-                ruby_arch = /-64/
-              else
-                ruby_arch = /-32/
-              end
-              if host['platform'] =~ ruby_arch
-                platform = 'windows-64'
-              else
-                platform = 'windows'
-              end
+              ruby_arch = if host[:ruby_arch] == 'x64'
+                            /-64/
+                          else
+                            /-32/
+                          end
+              platform = if host['platform'] =~ ruby_arch
+                           'windows-64'
+                         else
+                           'windows'
+                         end
             else
               platform = 'unix'
             end
@@ -93,21 +92,18 @@ module Beaker
         # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
         #                            or a role (String or Symbol) that identifies one or more hosts.
         def remove_aio_defaults_on(hosts)
-          block_on hosts do | host |
-            if host.is_powershell?
-              platform = 'pswindows'
-            elsif host['platform'] =~ /windows/
-              platform = 'windows'
-            else
-              platform = 'unix'
-            end
+          block_on hosts do |host|
+            platform = if host.is_powershell?
+                         'pswindows'
+                       elsif host['platform'] =~ /windows/
+                         'windows'
+                       else
+                         'unix'
+                       end
             remove_platform_aio_defaults(host, platform)
           end
         end
-
-
       end
     end
   end
 end
-

data/lib/beaker-puppet/install_utils/ezbake_utils.rb

@@ -7,29 +7,28 @@ module Beaker
       # that use ezbake for packaging.
       #
       module EZBakeUtils
-
         # @!group Public DSL Methods
 
         # Installs leiningen project with given name and version on remote host.
         #
         # @param [Host] host A single remote host on which to install the
         #   specified leiningen project.
-        def install_from_ezbake host
+        def install_from_ezbake(host)
           ezbake_validate_support host
           ezbake_tools_available?
           install_ezbake_tarball_on_host host
-          ezbake_installsh host, "service"
+          ezbake_installsh host, 'service'
         end
 
         # Installs termini with given name and version on remote host.
         #
         # @param [Host] host A single remote host on which to install the
         #   specified leiningen project.
-        def install_termini_from_ezbake host
+        def install_termini_from_ezbake(host)
           ezbake_validate_support host
           ezbake_tools_available?
           install_ezbake_tarball_on_host host
-          ezbake_installsh host, "termini"
+          ezbake_installsh host, 'termini'
         end
 
         # Install a development version of ezbake into the local m2 repository
@@ -42,15 +41,15 @@ module Beaker
         #
         # @param url [String] git url
         # @param branch [String] git branch
-        def ezbake_dev_build url = "git@github.com:puppetlabs/ezbake.git",
-                             branch = "master"
+        def ezbake_dev_build(url = 'git@github.com:puppetlabs/ezbake.git',
+                             branch = 'master')
           ezbake_dir = 'tmp/ezbake'
           conditionally_clone url, ezbake_dir, branch
           lp = ezbake_lein_prefix
 
           Dir.chdir(ezbake_dir) do
             ezbake_local_cmd "#{lp} install",
-                              :throw_on_failure => true
+                             throw_on_failure: true
           end
         end
 
@@ -67,25 +66,22 @@ module Beaker
         # @param [Host] host host to check for support
         # @raise [RuntimeError] if OS is not supported
         # @api private
-        def ezbake_validate_support host
-          variant, version, _, _ = host['platform'].to_array
-          unless variant =~ /^(fedora|el|redhat|centos|debian|ubuntu)$/
-            raise RuntimeError,
-                  "No support for #{variant} within ezbake_utils ..."
-          end
+        def ezbake_validate_support(host)
+          variant, version, = host['platform'].to_array
+          return if variant =~ /^(fedora|el|redhat|centos|debian|ubuntu)$/
+
+          raise "No support for #{variant} within ezbake_utils ..."
         end
 
         # Build, copy & unpack tarball on remote host
         #
         # @param [Host] host installation destination
         # @api private
-        def install_ezbake_tarball_on_host host
-          if not ezbake_config
-            ezbake_stage
-          end
+        def install_ezbake_tarball_on_host(host)
+          ezbake_stage unless ezbake_config
 
           # Skip installation if the remote directory exists
-          result = on host, "test -d #{ezbake_install_dir}", :acceptable_exit_codes => [0, 1]
+          result = on host, "test -d #{ezbake_install_dir}", acceptable_exit_codes: [0, 1]
           return if result.exit_code == 0
 
           ezbake_staging_dir = File.join('target', 'staging')
@@ -93,12 +89,12 @@ module Beaker
             ezbake_local_cmd 'rake package:tar'
           end
 
-          local_tarball = ezbake_staging_dir + "/pkg/" + ezbake_install_name + ".tar.gz"
-          remote_tarball = ezbake_install_dir + ".tar.gz"
+          local_tarball = ezbake_staging_dir + '/pkg/' + ezbake_install_name + '.tar.gz'
+          remote_tarball = ezbake_install_dir + '.tar.gz'
           scp_to host, local_tarball, remote_tarball
 
           # untar tarball on host
-          on host, "tar -xzf " + remote_tarball
+          on host, 'tar -xzf ' + remote_tarball
 
           # Check to ensure directory exists
           on host, "test -d #{ezbake_install_dir}"
@@ -107,7 +103,7 @@ module Beaker
         LOCAL_COMMANDS_REQUIRED = [
           ['leiningen', 'lein --version', nil],
           ['lein-pprint', 'lein with-profile ci pprint :version',
-            'Must have lein-pprint installed under the :ci profile.'],
+           'Must have lein-pprint installed under the :ci profile.',],
           ['java', 'java -version', nil],
           ['git', 'git --version', nil],
           ['rake', 'rake --version', nil],
@@ -120,13 +116,11 @@ module Beaker
         # @api private
         def ezbake_tools_available?
           LOCAL_COMMANDS_REQUIRED.each do |software_name, command, additional_error_message|
-            if not system command
-              error_message = "Must have #{software_name} installed on development system.\n"
-              if additional_error_message
-                error_message += additional_error_message
-              end
-              raise RuntimeError, error_message
-            end
+            next if system command
+
+            error_message = "Must have #{software_name} installed on development system.\n"
+            error_message += additional_error_message if additional_error_message
+            raise error_message
           end
         end
 
@@ -156,14 +150,14 @@ module Beaker
         def ezbake_stage
           # Install the PuppetDB jar into the local repository
           ezbake_local_cmd "#{ezbake_lein_prefix} install",
-                           :throw_on_failure => true
+                           throw_on_failure: true
 
           # Run ezbake stage
           ezbake_local_cmd "#{ezbake_lein_prefix} with-profile ezbake ezbake stage",
-                           :throw_on_failure => true
+                           throw_on_failure: true
 
           # Boostrap packaging, and grab configuration info from project
-          staging_dir = File.join('target','staging')
+          staging_dir = File.join('target', 'staging')
           Dir.chdir(staging_dir) do
             ezbake_local_cmd 'rake package:bootstrap'
 
@@ -184,16 +178,15 @@ module Beaker
         # @raise [RuntimeError] if :throw_on_failure is true and
         #   command fails
         # @api private
-        def ezbake_local_cmd cmd, opts={}
+        def ezbake_local_cmd(cmd, opts = {})
           opts = {
-            :throw_on_failure => false,
+            throw_on_failure: false,
           }.merge(opts)
 
           logger.notify "localhost $ #{cmd}"
           result = system cmd
-          if opts[:throw_on_failure] && result == false
-            raise RuntimeError, "Command failure #{cmd}"
-          end
+          raise "Command failure #{cmd}" if opts[:throw_on_failure] && result == false
+
           result
         end
 
@@ -207,7 +200,7 @@ module Beaker
           ezbake = ezbake_config
           project_package_version = ezbake[:package_version]
           project_name = ezbake[:project]
-          "%s-%s" % [ project_name, project_package_version ]
+          format('%s-%s', project_name, project_package_version)
         end
 
         # Returns the full path to the installed software on the remote host.
@@ -227,7 +220,7 @@ module Beaker
         # @param [Host] host Host to run install.sh on
         # @param [String] task Task to execute with install.sh
         # @api private
-        def ezbake_installsh host, task=""
+        def ezbake_installsh(host, task = '')
           on host, "cd #{ezbake_install_dir}; bash install.sh #{task}"
         end
 
@@ -238,7 +231,7 @@ module Beaker
         # @param [String] local_path path to conditionally install to
         # @param [String] branch to checkout
         # @api private
-        def conditionally_clone upstream_uri, local_path, branch="origin/HEAD"
+        def conditionally_clone(upstream_uri, local_path, branch = 'origin/HEAD')
           if ezbake_local_cmd "git --work-tree=#{local_path} --git-dir=#{local_path}/.git status"
             ezbake_local_cmd "git --work-tree=#{local_path} --git-dir=#{local_path}/.git fetch origin"
             ezbake_local_cmd "git --work-tree=#{local_path} --git-dir=#{local_path}/.git checkout #{branch}"
@@ -249,7 +242,6 @@ module Beaker
             ezbake_local_cmd "git --work-tree=#{local_path} --git-dir=#{local_path}/.git checkout #{branch}"
           end
         end
-
       end
     end
   end