beaker-pe 0.7.0 → 0.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mzg4ZWI5NTMwZmY5OGM5MTAxMjIzOGQxMTgxMzM2MmQzZDk5ODBlNQ==
+    OTQ3NDUxZjBkYmY5YjU1ZTA3YjkxYzgwYjY5MjgwZWE4ZjkxNTA2ZQ==
   data.tar.gz: !binary |-
-    OGM3NjNlM2I2NjJhNmY4NDQ0YjI1ODEzNWQ0ODI4MGZmZmM2ODQzMA==
+    Y2E2M2I1YjYzMzY2YzIwM2IxNDg1MjhiNTQ5YmRmMjEwYjRjOGY4Mg==
 SHA512:
   metadata.gz: !binary |-
-    Y2ExZWVmMzZiZmQ5Yzg3NGZlNzI3MmRmZjY1MDY4NDMyOWRmNDIyNWIxMWVi
-    ODQzZGFiNGMwMTI3M2Y0ZmEyNDg5MTEyNDQwOGZjZDFjYjBmMzg0OWM2ODI3
-    YjYzZGMyNmNhYjkwNzkyODQzOGU4ZDhkYTg2MDRmYzliOGYyOTc=
+    NTVmZjQxYjcyZjIyNDU3ZTFhMGIzNDUxZTRmZTUwMTcwYmFjZDI3MGM3ZjA1
+    NzZkOTNmMTEwMGY3OTllZGFjMDAzNTA4NzVmYWVkYjg0MTFiMjZjYzIxNzdi
+    ZjU4ZmY5NDVlYTY0MjkxZGM3NzJmYzQ3ZTU5MWFhMTJhZTRkZWU=
   data.tar.gz: !binary |-
-    NWM5N2I5ZmNhMWI3MmVmYWRlNWE4ZDkxYzNiYTFjMWI1NTRjMWEzMmM5ZTc4
-    ZTExYjE0NmNlN2YwMmE2ZjQxNjA4NjAyMjMwMzYzZTgwODE4MTljZWZiNGUz
-    MmJhNDE5ZmJlNTViZjkzYTgzZDQwYjRiYzZhM2E2NWE3MGZlMGY=
+    NTQ5NWE3NjIyOWRhOTJkZDQ1MjU0YzdjOTc3YTY4MTE3ZDE2ODY1ZmJhNGQ5
+    M2MxM2NkODgyMGFkMThjMzNmMmIyYjA5NzA4MGVkODBkOGJhYzczNzJiODU0
+    NGQyMTU1MTNlMjM1YTRjYjgzYTAzMTFmYWMxN2MxMTkxY2VmMzM=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 19 Jul, 2016 (f31dbe09)](#LATEST)
+* [LATEST - 2 Aug, 2016 (f4d290f2)](#LATEST)
+* [0.7.0 - 19 Jul, 2016 (8256c0ac)](#0.7.0)
 * [0.6.0 - 11 Jul, 2016 (e974e7f8)](#0.6.0)
 * [0.5.0 - 15 Jun, 2016 (8f2874fe)](#0.5.0)
 * [0.4.0 - 1 Jun, 2016 (f5ad1884)](#0.4.0)
@@ -11,7 +12,90 @@
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 19 Jul, 2016 (f31dbe09)
+### <a name = "LATEST">LATEST - 2 Aug, 2016 (f4d290f2)
+
+* (GEM) update beaker-pe version to 0.8.0 (f4d290f2)
+
+* (QA-2514) PE-client-tools helpers (#15) (32d70efe)
+
+
+```
+(QA-2514) PE-client-tools helpers (#15)
+
+* (QA-2514) PE-client-tools helpers
+
+* (maint) Add install helpers for pe-client-tools
+
+This commit adds three helper methods to install pe-client-tools on Windows.
+
+The first is a general  method that is designed to abstract
+away the installation of pe-client-tools on supported operating systems.
+Currently, it only accommodates development builds of the tools based on the
+provided SHA and SUITE_VERSION environment variables available.
+
+The second is a generic method to install an msi package on a target host.
+Beaker's built in method of this name assumes that msi installed involves the
+installation of puppet, so this method overrides that one without such an
+assumption.
+
+The this is a generic method to install a dmg package on a target host.
+Beaker's built in `install_package` method for osx does not accommodate for an
+installer `pkg` file that is named differently from the containing `dmg`. This
+method forces the user to supply both names explicitly.
+
+* (maint) Remove install helpers for pe-client-tools
+
+This commit removes the dmg and msi helper methods instroduced earlier.
+
+These two methods have bee moved into beaker.
+
+* basic spec tests for ExecutableHelper & ConfigFileHelper
+```
+* Merge pull request #18 from demophoon/fix/master/pe-16886-pe-console-service-wait (949852c8)
+
+
+```
+Merge pull request #18 from demophoon/fix/master/pe-16886-pe-console-service-wait
+
+(PE-16886) Add wait for console to be functional before continuing with puppet agent runs
+```
+* Merge pull request #17 from johnduarte/fix-install-pe_utils_spec (187a413a)
+
+
+```
+Merge pull request #17 from johnduarte/fix-install-pe_utils_spec
+
+(MAINT) Fix install/pe_utils spec test
+```
+* (PE-16886) Add wait for console to be functional (eef0f254)
+
+
+```
+(PE-16886) Add wait for console to be functional
+
+Before this commit the console may or may not be functional by the time
+the next puppet agent run occurs on the following node. This can cause
+puppetserver to return with an error from the classifier when it is
+attempting to evaluate the classes which should be applied to the node.
+
+This commit adds in a sleep and service check to the final agent run
+step on the console node which will hopefully work around this issue
+until it is fixed in SERVER-1237.
+```
+* (MAINT) Fix install/pe_utils spec test (5ca075ca)
+
+
+```
+(MAINT) Fix install/pe_utils spec test
+
+Changes introduced at commit 33cdfef caused the install/pe_utils
+spec test to fail. This commit updates the spec test to introduce
+the `opts[:HOSTS]` data that the implementation code expects to have
+available.
+```
+### <a name = "0.7.0">0.7.0 - 19 Jul, 2016 (8256c0ac)
+
+* (HISTORY) update beaker-pe history for gem release 0.7.0 (8256c0ac)
 
 * (GEM) update beaker-pe version to 0.7.0 (f31dbe09)
 

data/lib/beaker-pe.rb

@@ -2,12 +2,18 @@ require 'stringify-hash'
 require 'beaker-pe/version'
 require 'beaker-pe/install/pe_utils'
 require 'beaker-pe/options/pe_version_scraper'
+require 'beaker-pe/pe-client-tools/config_file_helper'
+require 'beaker-pe/pe-client-tools/install_helper'
+require 'beaker-pe/pe-client-tools/executable_helper'
 
 module Beaker
   module DSL
     module PE
       include Beaker::DSL::InstallUtils::PEUtils
+      include Beaker::DSL::InstallUtils::PEClientTools
       include Beaker::Options::PEVersionScraper
+      include Beaker::DSL::PEClientTools::ConfigFileHelper
+      include Beaker::DSL::PEClientTools::ExecutableHelper
     end
   end
 end

data/lib/beaker-pe/install/pe_utils.rb

@@ -3,6 +3,7 @@
 end
 require "beaker-answers"
 require "timeout"
+require "json"
 module Beaker
   module DSL
     module InstallUtils
@@ -494,6 +495,9 @@ module Beaker
                   sleep_until_puppetdb_started(database)
                   check_puppetdb_status_endpoint(database)
                 end
+                if host == dashboard
+                  check_console_status_endpoint(host)
+                end
               end
             end
 
@@ -523,6 +527,9 @@ module Beaker
                   sleep_until_puppetdb_started(database)
                   check_puppetdb_status_endpoint(database)
                 end
+                if host == dashboard
+                  check_console_status_endpoint(host)
+                end
               end
             end
           end
@@ -695,6 +702,25 @@ module Beaker
           fail_test "PuppetDB took too long to start"
         end
 
+        def check_console_status_endpoint(host)
+          if version_is_less(host['pe_ver'], '2015.2.0')
+            return true
+          end
+          Timeout.timeout(60) do
+            match = nil
+            while not match
+              output = on(host, "curl -s -k https://localhost:4433/status/v1/services --cert /etc/puppetlabs/puppet/ssl/certs/#{host}.pem --key /etc/puppetlabs/puppet/ssl/private_keys/#{host}.pem --cacert /etc/puppetlabs/puppet/ssl/certs/ca.pem", :accept_all_exit_codes => true)
+              output = JSON.parse(output.stdout)
+              match = output['classifier-service']['state'] == 'running'
+              match = match && output['rbac-service']['state'] == 'running'
+              match = match && output['activity-service']['state'] == 'running'
+              sleep 1
+            end
+          end
+        rescue Timeout::Error
+          fail_test "Console services took too long to start"
+        end
+
         #Install PE based upon host configuration and options
         #
         # @param [Host, Array<Host>] install_hosts    One or more hosts to act upon

data/lib/beaker-pe/pe-client-tools/config_file_helper.rb

@@ -0,0 +1,93 @@
+require "beaker/dsl/patterns"
+
+module Beaker
+  module DSL
+    module PEClientTools
+      module ConfigFileHelper
+
+        # Helper method to write config files for pe-client-tools
+        # @param [Beaker::Host] host The beaker host that gets the config file
+        # @param [String] config_level 'user' or 'global'
+        # @param [String] tool 'access', 'code', 'db', 'query', 'orchestrator', 'job', 'app'
+        # @param [String] contents The contents of the config file
+        def write_client_tool_config_on(host, config_level, tool, contents)
+
+          # TODO take a hash and parse file or take literal string
+
+          file = "#{Private.config_path(host, config_level)}/#{Private.file_name(tool)}"
+          create_remote_file(host, file, contents)
+        end
+
+
+        class Private
+
+          require 'beaker/dsl/patterns'
+
+          extend Beaker::DSL
+          extend Beaker::DSL::Patterns
+
+          def self.file_name(tool)
+            if tool =~ /orchestrator|job|app/i
+              'puppet-orchestrator.conf'
+            elsif tool =~ /code/i
+              'puppet-code.conf'
+            elsif tool =~ /access/i
+              'puppet-access.conf'
+            elsif tool =~ /db|query/i
+              'puppetdb.conf'
+            else
+              raise ArgumentError.new("Unknown pe-client-tool type '#{tool}'")
+            end
+          end
+
+          def self.config_path(host, config_level)
+
+            puppetlabs_dir = 'puppetlabs'
+            puppetlabs_dir.prepend('.') if config_level == 'user'
+            client_tools_path_array = [puppetlabs_dir, 'client-tools']
+
+            case config_level
+
+              when /global/
+                @base_path = global_base_path(host)
+              when /user/
+                @base_path = home_dir(host)
+              else
+                raise ArgumentError.new("Unknown config level #{config_level}")
+            end
+
+            client_tools_dir = client_tools_path_array.unshift(@base_path).join(path_separator(host))
+            opts = {:cmdexe => true}
+
+            if host.platform =~ /win/
+              host.exec(Beaker::Command.new('MD', [client_tools_dir.gsub('\\', '\\\\\\')], opts), :accept_all_exit_codes => true)
+            else
+              host.exec(Beaker::Command.new("mkdir -p #{client_tools_dir}", [], opts), :accept_all_exit_codes => true)
+            end
+            client_tools_dir
+          end
+
+          def self.home_dir(host)
+
+            if (host.platform =~ /win/) then
+              @cmd = Beaker::Command.new('echo', ['%userprofile%'], :cmdexe => true)
+            else
+              @cmd = Beaker::Command.new('echo', ['$HOME'])
+            end
+            host.exec(@cmd).stdout.chomp
+          end
+
+          def self.global_base_path(host)
+
+            (host.platform =~ /win/) ?host.exec(Beaker::Command.new('echo', ['%PROGRAMDATA%'], :cmdexe => true)).stdout.chomp : '/etc//'
+          end
+
+          def self.path_separator(host)
+
+            (host.platform =~ /win/) ? '\\' : '/'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/beaker-pe/pe-client-tools/executable_helper.rb

@@ -0,0 +1,157 @@
+require "beaker/dsl/patterns"
+require "beaker/dsl/helpers"
+require "beaker/dsl/wrappers"
+
+module Beaker
+  module DSL
+    module PEClientTools
+      module ExecutableHelper
+
+        # puppet-access helper win/lin/osx
+        # @param [BEAKER::Host] host The SUT that should run the puppet-access command
+        # @param [String] args The arguments to puppet-access
+        # @param [Hash] opts options hash to the Beaker Command
+        # @param [Block] &block optional block
+        def puppet_access_on(*args, &block)
+          Private.new.tool(:access, *args, &block)
+        end
+
+        # puppet-code helper win/lin/osx
+        # @param [BEAKER::Host] host The SUT that should run the puppet-code command
+        # @param [String] args The arguments to puppet-code
+        # @param [Hash] opts options hash to the Beaker Command
+        # @param [Block] &block optional block
+        def puppet_code_on(*args, &block)
+          Private.new.tool(:code, *args, &block)
+        end
+
+        # puppet-job helper win/lin/osx
+        # @param [BEAKER::Host] host The SUT that should run the puppet-job command
+        # @param [String] args The arguments to puppet-job
+        # @param [Hash] opts options hash to the Beaker Command
+        # @param [Block] &block optional block
+        def puppet_job_on(*args, &block)
+          Private.new.tool(:job, *args, &block)
+        end
+
+        # puppet-app helper win/lin/osx
+        # @param [BEAKER::Host] host The SUT that should run the puppet-app command
+        # @param [String] args The arguments to puppet-app
+        # @param [Hash] opts options hash to the Beaker Command
+        # @param [Block] &block optional block
+        def puppet_app_on(*args, &block)
+          Private.new.tool(:app, *args, &block)
+        end
+
+        # puppet-db helper win/lin/osx
+        # @param [BEAKER::Host] host The SUT that should run the puppet-db command
+        # @param [String] args The arguments to puppet-db
+        # @param [Hash] opts options hash to the Beaker Command
+        # @param [Block] &block optional block
+        def puppet_db_on(*args, &block)
+          Private.new.tool(:db, *args, &block)
+        end
+
+        # puppet-query helper win/lin/osx
+        # @param [BEAKER::Host] host The SUT that should run the puppet-query command
+        # @param [String] args The arguments to puppet-query
+        # @param [Hash] opts options hash to the Beaker Command
+        # @param [Block] &block optional block
+        def puppet_query_on(*args, &block)
+          Private.new.tool(:query, *args, &block)
+        end
+
+        # Logs a user in on a SUT with puppet-access/RBAC API (windows)
+        # @param [Beaker::Host] host The SUT to perform the login on
+        # @param [Scooter::HttpDispatchers::ConsoleDispatcher] credentialed_dispatcher A Scooter dispatcher that has credentials for the user
+        # @option attribute_hash [String] :name The environment variable
+        # @option attribute_hash [String] :default The default value for the environment variable
+        # @option attribute_hash [String] :message A message describing the use of this variable
+        # @option attribute_hash [Boolean] :required Used internally by CommandFlag, ignored for a standalone EnvVar
+        def login_with_puppet_access_on(host, credentialed_dispatcher, opts={})
+
+          lifetime = opts[:lifetime] || nil
+          unless host.platform =~ /win/
+
+            user = credentialed_dispatcher.credentials.login
+            password = credentialed_dispatcher.credentials.password
+            puppet_access_on(host, 'login', {:stdin => "#{user}\n#{password}\n"})
+          else
+
+            # this is a hack
+            # puppet-access needs to support alternative to interactive login
+            # create .puppetlabs dir
+            cmd = Beaker::Command.new('echo', ['%userprofile%'], :cmdexe => true)
+            user_home_dir = host.exec(cmd).stdout.chomp
+            win_token_path =  "#{user_home_dir}\\.puppetlabs\\"
+            host.exec(Beaker::Command.new('MD', [win_token_path.gsub('\\', '\\\\\\')], :cmdexe => true), :accept_all_exit_codes => true)
+
+            token = credentialed_dispatcher.acquire_token_with_credentials(lifetime)
+            create_remote_file(host, "#{win_token_path}\\token", token)
+          end
+        end
+
+        class Private
+
+          include Beaker::DSL
+          include Beaker::DSL::Wrappers
+          include Beaker::DSL::Helpers::HostHelpers
+          include Beaker::DSL::Patterns
+
+          attr_accessor :logger
+
+          def tool(tool, *args, &block)
+
+            host = args.shift
+            @logger = host.logger
+            options = {}
+            options.merge!(args.pop) if args.last.is_a?(Hash)
+
+            if host.platform =~ /win/i
+
+              program_files = host.exec(Beaker::Command.new('echo', ['%PROGRAMFILES%'], :cmdexe => true)).stdout.chomp
+              client_tools_dir = "#{program_files}\\#{['Puppet Labs', 'Client', 'tools', 'bin'].join('\\')}\\"
+              tool_executable = "\"#{client_tools_dir}puppet-#{tool.to_s}.exe\""
+
+              #TODO does this need to be more detailed to pass exit codes????
+              # TODO make batch file direct output to separate file
+              batch_contents =<<-EOS
+call #{tool_executable} #{args.join(' ')}
+              EOS
+
+              @command = build_win_batch_command( host, batch_contents, {:cmdexe => true})
+            else
+
+              tool_executable = '/opt/puppetlabs/client-tools/bin/' << "puppet-#{tool.to_s}"
+              @command = Beaker::Command.new(tool_executable, args, {:cmdexe => true})
+            end
+
+            result = host.exec(@command, options)
+
+            # Also, let additional checking be performed by the caller.
+            if block_given?
+              case block.arity
+                #block with arity of 0, just hand back yourself
+                when 0
+                  yield self
+                #block with arity of 1 or greater, hand back the result object
+                else
+                  yield result
+              end
+            end
+            result
+          end
+
+          def build_win_batch_command( host, batch_contents, command_options)
+            timestamp = Time.new.strftime('%Y-%m-%d_%H.%M.%S')
+            # Create Temp file
+            # make file fully qualified
+            batch_file = "#{host.system_temp_path}\\#{timestamp}.bat"
+            create_remote_file(host, batch_file, batch_contents)
+            Beaker::Command.new("\"#{batch_file}\"", [], command_options)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/beaker-pe/pe-client-tools/install_helper.rb

@@ -0,0 +1,74 @@
+module Beaker
+  module DSL
+    module InstallUtils
+      module PEClientTools
+
+        def install_pe_client_tools_on(hosts, opts = {})
+          # FIXME: accomodate production released location(s)
+          #{{{
+          product = 'pe-client-tools'
+          required_keys = [:puppet_collection, :pe_client_tools_sha, :pe_client_tools_version]
+
+          unless required_keys.all? { |opt| opts.keys.include?(opt) }
+            raise ArgumentError, "The keys #{required_keys.to_s} are required in the opts hash"
+          end
+          urls = { :dev_builds_url   => "http://builds.delivery.puppetlabs.net",
+          }
+
+          opts = urls.merge(opts)
+
+          block_on hosts do |host|
+            package_name = nil
+            variant, version, arch, codename = host['platform'].to_array
+            case host['platform']
+            when /el-|fedora|sles|centos|cisco_/
+              release_path = "#{opts[:dev_builds_url]}/#{product}/#{ opts[:pe_client_tools_sha] }/artifacts/#{variant}/#{version}/#{opts[:puppet_collection]}/#{arch}"
+              package_name = product.dup
+              package_name << "-#{opts[:pe_client_tools_version]}-1.#{variant}#{version}.#{arch}.rpm" if opts[:pe_client_tools_version]
+            when /debian|ubuntu|cumulus|huaweios/
+              release_path = "#{opts[:dev_builds_url]}/#{product}/#{ opts[:pe_client_tools_sha] }/artifacts/deb/#{codename}/#{opts[:puppet_collection]}"
+              package_name = product.dup
+              package_name << "_#{opts[:pe_client_tools_version]}-1#{host['platform'].codename}_#{arch}.deb" if opts[:pe_client_tools_version]
+            when /windows/
+              release_path = "#{opts[:dev_builds_url]}/#{product}/#{ opts[:pe_client_tools_sha] }/artifacts/#{variant}/#{opts[:puppet_collection]}/x#{arch}"
+              package_name = product.dup
+              package_name << "-#{opts[:pe_client_tools_version]}.1-x#{arch}_VANAGON.msi" if opts[:pe_client_tools_version]
+            when /osx/
+              release_path = "#{opts[:dev_builds_url]}/#{product}/#{ opts[:pe_client_tools_sha] }/artifacts/apple/#{version}/#{opts[:puppet_collection]}/#{arch}"
+              package_base = product.dup
+              package_base << "-#{opts[:pe_client_tools_version]}" if opts[:pe_client_tools_version]
+              package_name = package_base.dup
+              package_name << '-1' if opts[:pe_client_tools_version]
+              installer    = package_name + '-installer.pkg'
+              package_name << ".#{variant}#{version}.dmg" if opts[:pe_client_tools_version]
+            else
+              raise "install_puppet_agent_on() called for unsupported " +
+                "platform '#{host['platform']}' on '#{host.name}'"
+            end
+
+            if package_name
+              case host['platform']
+              when /windows/
+                generic_install_msi_on(host, File.join(release_path, package_name), {}, {:debug => true})
+              else
+                copy_dir_local = File.join('tmp', 'repo_configs')
+                fetch_http_file(release_path, package_name, copy_dir_local)
+                scp_to host, File.join(copy_dir_local, package_name), host.external_copy_base
+
+                if host['platform'] =~ /debian|ubuntu|cumulus|huaweios/
+                  on host, "dpkg -i #{package_name}"
+                elsif host['platform'] =~ /osx/
+                  host.generic_install_dmg(package_name, package_base, installer)
+                else
+                  host.install_package( package_name )
+                end
+              end
+            end
+          end
+          #}}}
+        end
+
+      end
+    end
+  end
+end

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '0.7.0'
+        STRING = '0.8.0'
       end
 
     end

data/spec/beaker-pe/install/pe_utils_spec.rb

@@ -866,6 +866,10 @@ describe ClassMixedWithDSLInstallUtils do
                          }, 2)
       hosts[0][:roles] = ['master', 'database', 'dashboard']
       hosts[1][:platform] = Beaker::Platform.new('el-6-x86_64')
+      opts[:HOSTS] = {}
+      hosts.each do |host|
+        opts[:HOSTS][host.name] = host
+      end
 
       allow( subject ).to receive( :hosts ).and_return( hosts )
       allow( subject ).to receive( :options ).and_return(Beaker::Options::Presets.new.presets)

data/spec/beaker-pe/pe-client-tools/config_file_helper_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'beaker'
+
+class MixedWithConfigFileHelper
+  include Beaker::DSL::PEClientTools::ConfigFileHelper
+end
+
+describe MixedWithConfigFileHelper do
+
+  it 'has a method to write a config file' do
+    expect(subject.respond_to?('write_client_tool_config_on')).not_to be(false)
+  end
+end

data/spec/beaker-pe/pe-client-tools/executable_helper_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+require 'beaker'
+
+class MixedWithExecutableHelper
+  include Beaker::DSL::PEClientTools::ExecutableHelper
+end
+
+describe MixedWithExecutableHelper do
+
+  let(:method_name)   { "puppet_#{tool}_on"}
+
+  shared_examples 'pe-client-tool'do
+
+    it 'has a method to execute the tool' do
+      expect(subject.respond_to?(method_name)).not_to be(false)
+    end
+  end
+
+  context 'puppet-code' do
+    let(:tool) {'code'}
+
+    it_behaves_like 'pe-client-tool'
+  end
+
+  context 'puppet-access' do
+    let(:tool) {'access'}
+
+    it_behaves_like 'pe-client-tool'
+  end
+
+  context 'puppet-job' do
+    let(:tool) {'job'}
+
+    it_behaves_like 'pe-client-tool'
+  end
+
+  context 'puppet-app' do
+    let(:tool) {'app'}
+
+    it_behaves_like 'pe-client-tool'
+  end
+
+  context 'puppet-db' do
+    let(:tool) {'db'}
+
+    it_behaves_like 'pe-client-tool'
+  end
+
+  context 'puppet-query' do
+    let(:tool) {'query'}
+
+    it_behaves_like 'pe-client-tool'
+  end
+
+  it 'has a method to login with puppet access' do
+    expect(subject.respond_to?('login_with_puppet_access_on')).not_to be(false)
+  end
+end

data/spec/beaker-pe/pe-client-tools/installer_helper_spec.rb

@@ -0,0 +1,75 @@
+require 'spec_helper'
+require 'beaker/host'
+class ClassPEClientToolsMixedWithPatterns
+  include Beaker::DSL::InstallUtils::PEClientTools
+  include Beaker::DSL::Patterns
+end
+describe ClassPEClientToolsMixedWithPatterns do
+  describe "#install_pe_client_tools_on" do
+    let(:hosts) do
+      make_hosts({:platform => platform })
+    end
+    opts = {
+        :puppet_collection => 'PC1',
+        :pe_client_tools_sha => '12345',
+        :pe_client_tools_version => '1.0.0-g12345'
+    }
+
+    before do
+      allow(subject). to receive(:scp_to)
+    end
+
+    context 'on el-6' do
+      let(:platform) { Beaker::Platform.new('el-6-x86_64') }
+      it 'installs' do
+        hosts.each do |host|
+          allow(subject). to receive(:fetch_http_file).with("http://builds.delivery.puppetlabs.net/pe-client-tools/#{opts[:pe_client_tools_sha]}/artifacts/el/6/PC1/x86_64", "pe-client-tools-#{opts[:pe_client_tools_version]}-1.el6.x86_64.rpm", "tmp/repo_configs")
+          allow(host). to receive(:external_copy_base)
+          expect(host).to receive(:install_package).with("pe-client-tools-#{opts[:pe_client_tools_version]}-1.el6.x86_64.rpm")
+          subject.install_pe_client_tools_on(host, opts)
+        end
+      end
+    end
+
+    context 'on ubuntu' do
+      let(:platform) { Beaker::Platform.new('ubuntu-1604-x86_64') }
+      it 'installs' do
+        hosts.each do |host|
+          allow(subject). to receive(:fetch_http_file).with("http://builds.delivery.puppetlabs.net/pe-client-tools/#{opts[:pe_client_tools_sha]}/artifacts/deb/xenial/PC1", "pe-client-tools_#{opts[:pe_client_tools_version]}-1xenial_x86_64.deb", "tmp/repo_configs")
+          allow(host). to receive(:external_copy_base)
+          expect(subject).to receive(:on).with(host, "dpkg -i pe-client-tools_#{opts[:pe_client_tools_version]}-1xenial_x86_64.deb")
+          subject.install_pe_client_tools_on(host, opts)
+        end
+      end
+    end
+
+    context 'on windows' do
+      let(:platform) { Beaker::Platform.new('windows-2012r2-x86_64') }
+      it 'installs' do
+        hosts.each do |host|
+          allow(subject). to receive(:fetch_http_file).with("http://builds.delivery.puppetlabs.net/pe-client-tools/#{opts[:pe_client_tools_sha]}/artifacts/deb/xenial/PC1", "pe-client-tools_#{opts[:pe_client_tools_version]}-1xenial_x86_64.deb", "tmp/repo_configs")
+          allow(host). to receive(:external_copy_base)
+          expect(subject).to receive(:generic_install_msi_on).with( host,
+                                                                   "http://builds.delivery.puppetlabs.net/pe-client-tools/#{opts[:pe_client_tools_sha]}/artifacts/windows/PC1/xx86_64/pe-client-tools-#{opts[:pe_client_tools_version]}.1-xx86_64_VANAGON.msi",
+                                                                   {},
+                                                                   { :debug => true }
+                                                                  )
+          subject.install_pe_client_tools_on(host, opts)
+        end
+      end
+    end
+
+    context 'on OS X' do
+      let(:platform) { Beaker::Platform.new('osx-1111-x86_64') }
+      it 'installs' do
+        hosts.each do |host|
+          allow(subject). to receive(:fetch_http_file).with("http://builds.delivery.puppetlabs.net/pe-client-tools/#{opts[:pe_client_tools_sha]}/artifacts/apple/1111/PC1/x86_64", "pe-client-tools-#{opts[:pe_client_tools_version]}-1.osx1111.dmg", "tmp/repo_configs")
+          allow(host). to receive(:external_copy_base)
+          expect(host).to receive(:generic_install_dmg).with("pe-client-tools-#{opts[:pe_client_tools_version]}-1.osx1111.dmg", "pe-client-tools-#{opts[:pe_client_tools_version]}", "pe-client-tools-#{opts[:pe_client_tools_version]}-1-installer.pkg")
+          subject.install_pe_client_tools_on(host, opts)
+        end
+      end
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -173,10 +173,16 @@ files:
 - lib/beaker-pe.rb
 - lib/beaker-pe/install/pe_utils.rb
 - lib/beaker-pe/options/pe_version_scraper.rb
+- lib/beaker-pe/pe-client-tools/config_file_helper.rb
+- lib/beaker-pe/pe-client-tools/executable_helper.rb
+- lib/beaker-pe/pe-client-tools/install_helper.rb
 - lib/beaker-pe/version.rb
 - spec/beaker-pe/helpers_spec.rb
 - spec/beaker-pe/install/pe_utils_spec.rb
 - spec/beaker-pe/options/pe_version_scaper_spec.rb
+- spec/beaker-pe/pe-client-tools/config_file_helper_spec.rb
+- spec/beaker-pe/pe-client-tools/executable_helper_spec.rb
+- spec/beaker-pe/pe-client-tools/installer_helper_spec.rb
 - spec/helpers.rb
 - spec/spec_helper.rb
 homepage: https://github.com/puppetlabs/beaker-pe
@@ -204,4 +210,3 @@ signing_key:
 specification_version: 4
 summary: Beaker PE DSL Helpers!
 test_files: []
-has_rdoc: