beaker-puppet 0.4.0 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjgzZGZhY2JiYmM4NjY2Zjc0YjRiMzQ1YzQxNzE4MmIzNDU5MGRmYw==
+    MTY2MTE4NTMxZTBmZjRjMmM2ZmJjMGE0N2NmZjUyZTIxMzU2ZmEyZQ==
   data.tar.gz: !binary |-
-    ZTgxMWY1OWYyNWI5ODg3MWRjOTQ2MTcwZDUyM2RhYjg1Njg1ZGZkZg==
+    MGJhNmFmZmRlMmE2YzM0NTM0MmY5NWY1MTYyYTk4NjM0NmYyY2M4Mw==
 SHA512:
   metadata.gz: !binary |-
-    NDA0YWRiZjE0MTYzODFiNTRjY2EwY2MwY2IyOWQ4ZjRmYTIwZjVkZjcxZWM1
-    ZjVmZmE5ZDcwYzI1ZjdmYmIwNzJlMzY1N2JmZTk3MmI4ODAyZWQxZDc2M2Mw
-    N2M0MjFhOWYwMDliYWJkMmYzODg1NTdiMThlOGEyZDNmODEzMWE=
+    YzYzMTgxMWU1NTUxNDZkN2FiNjA0MTU0ZTVhYjFiMmQyYmM3MDY1ZTY0OWQw
+    ZDAxNjQ4ZTJjN2Y5MjE3MjRkNzU3N2IwOTJjODYwM2Y5MWY5ZmM1NjQ5NzNm
+    OTVjMGRjNTQ4NmEwYjIyODc3OTJkOTdhOGY3NGQzMWVhZDhlNmI=
   data.tar.gz: !binary |-
-    Zjg1NDA2Y2E5Yzg5ZWViYTllNTYzZjJjNGU0YTM1ZGQ3MTIwNjZmMjcyZmZh
-    NDM4ZDJjNjc0OGU2ZTE3N2Q4ZWZmYjU2ZWIxNDZlNjZhMTU2ZWU2OTIwMzYx
-    MmM3NzA2OWMyMzkxMGVhZDFmYjc3NDk4ZGM0ZTc0MTQwOTMwNzI=
+    MmYyYTZjZTk1MTZkNTU4MjMxNDI2MmFmNzg0NGFhMzlkYmY0ZDY4MmI4ZTU3
+    ZWRhNzBjMGQ4ODc3MWFkMzY2YzgyNWFmODUyODRkYWNhODEyMjZhZGVlNzg2
+    MmVjM2VjNDgzZmMzYjI0MTU3YmI5ODRhMzNhZWE5MjViMTZlMmM=

data/beaker-puppet.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
   # Run time dependencies
   s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
   s.add_runtime_dependency 'in-parallel', '~> 0.1'
+  s.add_runtime_dependency 'oga'
 
 end
 

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

@@ -744,17 +744,26 @@ module Beaker
         #                             Empty string if none found.
         # @api private
         def get_latest_puppet_agent_build_from_url(url)
-          require 'nokogiri'
-          require 'open-uri'
-          page = Nokogiri::HTML(open("#{url}/?C=M;O=A"))
-          agents = page.css('a').children.select{ |link| link.to_s.include? 'puppet-agent' }
-          re =  /puppet-agent-(.*)-1/
-          latest_match = agents[-1].to_s.match re
+          require 'oga'
+          require 'net/http'
+          body = Net::HTTP.get(URI.parse("#{url}/index_by_lastModified_reverse.html"))
+          document = Oga.parse_html(body)
+          agents = document.xpath('//a[contains(@href, "puppet-agent")]')
+
+          latest_match = agents.shift.attributes[0].value
+          while (latest_match =~ /puppet-agent-\d(.*)/).nil?
+            latest_match = agents.shift.attributes[0].value
+          end
+
+          re  =  /puppet-agent-(.*)-/
+          latest_match = latest_match.match re
+
           if latest_match
             latest = latest_match[1]
           else
             latest = ''
           end
+          return latest
         end
 
         # Installs Puppet and dependencies from OpenBSD packages
@@ -997,11 +1006,6 @@ module Beaker
         #                                  pushing them to the given host.
         # @param [Hash{Symbol=>String}] opts Options to alter execution.
         # @option opts [String] :dev_builds_url The URL to look for dev builds.
-        # @option opts [String, Array<String>] :dev_builds_repos The repo(s)
-        #                                       to check for dev builds in.
-        #
-        # @note puppet-agent requires :dev_builds_repos to be set to the
-        #   puppet collection(s) to set the build server URL appropriately.
         #
         # @note This method only works on redhat-like and debian-like hosts.
         #
@@ -1121,7 +1125,6 @@ module Beaker
               if arch== 's390x' || host['hypervisor'] == 'ec2'
                 logger.trace("#install_puppet_agent_dev_repo_on: unsupported host #{host} for repo detected. using dev package")
               else
-                opts[:dev_builds_repos] ||= [ opts[:puppet_collection] ]
                 install_puppetlabs_dev_repo( host, 'puppet-agent', puppet_agent_version, nil, opts )
                 host.install_package('puppet-agent')
                 logger.trace("#install_puppet_agent_dev_repo_on: install_puppetlabs_dev_repo finished")

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/spec/beaker-puppet/install_utils/foss_utils_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 
 class ClassMixedWithDSLInstallUtils
   include Beaker::DSL::InstallUtils
+  include Beaker::DSL::InstallUtils::FOSSUtils
   include Beaker::DSL::Wrappers
   include Beaker::DSL::Helpers
   include Beaker::DSL::Structure
@@ -27,7 +28,7 @@ describe ClassMixedWithDSLInstallUtils do
                         basic_hosts[3][:platform] = 'eos'
                         basic_hosts  }
   let(:hosts_sorted)  { [ hosts[1], hosts[0], hosts[2], hosts[3] ] }
-  let(:winhost)       { make_host( 'winhost', { :platform => 'windows',
+  let(:winhost)       { make_host( 'winhost', { :platform => Beaker::Platform.new('windows-2008r2-64'),
                                                 :pe_ver => '3.0',
                                                 :working_dir => '/tmp',
                                                 :type => 'foss',
@@ -305,9 +306,9 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'installs puppet on cygwin windows' do
       allow(subject).to receive(:link_exists?).and_return( true )
-      expect(subject).to receive(:on).with(winhost, "curl -o \"#{win_temp}\\puppet-3.7.1.msi\" -O http://downloads.puppetlabs.com/windows/puppet-3.7.1.msi")
+      expect(subject).to receive(:on).with(winhost, "curl -o \"#{win_temp}\\puppet-3.7.1-x64.msi\" -O http://downloads.puppetlabs.com/windows/puppet-3.7.1-x64.msi")
       expect(subject).to receive(:on).with(winhost, " echo 'export PATH=$PATH:\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\"' > /etc/bash.bashrc ")
-      expect(subject).to receive(:install_msi_on).with(winhost, "#{win_temp}\\puppet-3.7.1.msi", {}, {:debug => nil})
+      expect(subject).to receive(:install_msi_on).with(winhost, "#{win_temp}\\puppet-3.7.1-x64.msi", {}, {:debug => nil})
 
       subject.install_puppet_from_msi( winhost, {:version => '3.7.1', :win_download_url => 'http://downloads.puppetlabs.com/windows'}  )
     end
@@ -1043,20 +1044,17 @@ describe ClassMixedWithDSLInstallUtils do
     end
 
     it 'runs the correct install for windows platforms' do
-      platform = Object.new()
-      allow(platform).to receive(:to_array) { ['windows', '5', 'x64']}
       host = winhost
       external_copy_base = 'tmp_install_windows_copy_base_1325'
       allow( host ).to receive( :external_copy_base ).and_return( external_copy_base )
-      host['platform'] = platform
       opts = { :version => '0.1.0' }
       allow( subject ).to receive( :options ).and_return( {} )
-      copied_path = "#{win_temp}\\puppet-agent-0.1.0-x86.msi"
+      copied_path = "#{win_temp}\\puppet-agent-0.1.0-x64.msi"
       mock_echo = Object.new()
       allow( mock_echo ).to receive( :raw_output ).and_return( copied_path )
 
-      expect(subject).to receive(:fetch_http_file).once.with(/\/windows$/, 'puppet-agent-0.1.0-x86.msi', /\/windows$/)
-      expect(subject).to receive(:scp_to).once.with(host, /\/puppet-agent-0.1.0-x86.msi$/, /#{external_copy_base}/)
+      expect(subject).to receive(:fetch_http_file).once.with(/\/windows$/, 'puppet-agent-0.1.0-x64.msi', /\/windows$/)
+      expect(subject).to receive(:scp_to).once.with(host, /\/puppet-agent-0.1.0-x64.msi$/, /#{external_copy_base}/)
       expect(subject).to receive(:install_msi_on).with(host, copied_path, {}, {:debug => nil}).once
       expect(subject).to receive(:on).ordered.with(host, /echo/).and_return(mock_echo)
 
@@ -1159,7 +1157,7 @@ describe ClassMixedWithDSLInstallUtils do
       expect( subject ).to receive( :install_msi_on ).with( any_args )
       copy_base = 'copy_base_cygwin'
       allow( host ).to receive( :external_copy_base ).and_return( copy_base )
-      expect( subject ).to receive( :scp_to ).with( host, /puppet-agent-1\.0\.0-x86\.msi/, /#{copy_base}/ )
+      expect( subject ).to receive( :scp_to ).with( host, /puppet-agent-1\.0\.0-x64\.msi/, /#{copy_base}/ )
       expect( subject ).to receive( :configure_type_defaults_on ).with(host)
       expect( subject ).to receive( :fetch_http_file ).with( /[^\/]\z/, anything, anything )
       subject.install_puppet_agent_dev_repo_on( host, opts.merge({ :puppet_agent_version => '1.0.0' }) )
@@ -1330,4 +1328,18 @@ describe ClassMixedWithDSLInstallUtils do
 
   end
 
+  describe '#get_latest_puppet_agent_build_from_url' do
+    let(:urls) {['https://downloads.puppetlabs.com/mac/10.9/PC1/x86_64',
+            'https://downloads.puppetlabs.com/mac/10.10/PC1/x86_64',
+            'https://downloads.puppetlabs.com/mac/10.11/PC1/x86_64',
+            'https://downloads.puppetlabs.com/mac/10.12/PC1/x86_64',
+            'https://downloads.puppetlabs.com/windows']}
+
+    it "gets the right version" do
+      urls.each do |url|
+        expect(subject.get_latest_puppet_agent_build_from_url(url)).to match(/\d*.\d*.\d*/)
+      end
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -164,6 +164,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: oga
+  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'
 description: For use for the Beaker acceptance testing tool
 email:
 - delivery@puppet.com