facter 3.11.0.cfacter.20180319 → 3.11.2.cfacter.20180606

data/ext/facter/leatherman/locale/CMakeLists.txt

@@ -1,5 +1,8 @@
 if (LEATHERMAN_USE_LOCALES)
     find_package(Boost 1.54 REQUIRED COMPONENTS locale system)
+    if (BOOST_STATIC AND LEATHERMAN_USE_ICU)
+        find_package(ICU COMPONENTS i18n uc)
+    endif()
 else()
     find_package(Boost 1.54 REQUIRED regex)
 endif()
@@ -7,6 +10,10 @@ endif()
 add_leatherman_includes(${Boost_INCLUDE_DIRS})
 add_leatherman_deps(${Boost_LIBRARIES})
 
+if (ICU_LIBRARIES)
+    add_leatherman_deps(${ICU_LIBRARIES})
+endif()
+
 if (LEATHERMAN_USE_LOCALES AND BOOST_STATIC AND APPLE)
     # Boost.Locale relies on libiconv; if not using shared boost libraries
     # we need to include the dependency ourselves. So far this is only a

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 3.11.0.cfacter.20180319
+  version: 3.11.2.cfacter.20180606
 platform: ruby
 authors:
 - Puppet
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-06-06 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: info@puppet.com
@@ -202,12 +202,6 @@ files:
 - ext/facter/facter/acceptance/lib/puppet/acceptance/common_utils.rb
 - ext/facter/facter/acceptance/lib/puppet/acceptance/git_utils.rb
 - ext/facter/facter/acceptance/lib/puppet/acceptance/install_utils.rb
-- ext/facter/facter/acceptance/setup/aio/pre-suite/010_Install.rb
-- ext/facter/facter/acceptance/setup/aio/pre-suite/021_InstallAristaModule.rb
-- ext/facter/facter/acceptance/setup/aio/pre-suite/022_Remove_LD_PRELOAD.rb
-- ext/facter/facter/acceptance/setup/common/00_EnvSetup.rb
-- ext/facter/facter/acceptance/setup/common/pre-suite/000-delete-puppet-when-none.rb
-- ext/facter/facter/acceptance/setup/git/pre-suite/01_TestSetup.rb
 - ext/facter/facter/acceptance/tests/custom_facts/custom_fact_with_10001_weight_overrides_external_fact.rb
 - ext/facter/facter/acceptance/tests/custom_facts/having_multiple_facts_in_one_file.rb
 - ext/facter/facter/acceptance/tests/custom_facts/using_win32ole_should_not_hang.rb
@@ -851,6 +845,7 @@ files:
 - ext/facter/leatherman/README.md
 - ext/facter/leatherman/appveyor.yml
 - ext/facter/leatherman/catch/CMakeLists.txt
+- ext/facter/leatherman/cmake/FindICU.cmake
 - ext/facter/leatherman/cmake/GetGitRevisionDescription.cmake
 - ext/facter/leatherman/cmake/GetGitRevisionDescription.cmake.in
 - ext/facter/leatherman/cmake/cflags.cmake
@@ -1081,7 +1076,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Facter gem wrapper

data/ext/facter/facter/acceptance/setup/aio/pre-suite/010_Install.rb

@@ -1,22 +0,0 @@
-require 'puppet/acceptance/common_utils'
-require 'beaker/dsl/install_utils'
-extend Beaker::DSL::InstallUtils
-
-test_name "Install Packages"
-
-step "Install puppet-agent..." do
-  opts = {
-    :puppet_collection    => 'PC1',
-    :puppet_agent_sha     => ENV['SHA'],
-    :puppet_agent_version => ENV['SUITE_VERSION'] || ENV['SHA']
-  }
-  install_puppet_agent_dev_repo_on(hosts, opts)
-end
-
-# make sure install is sane, beaker has already added puppet and ruby
-# to PATH in ~/.ssh/environment
-agents.each do |agent|
-  on agent, puppet('--version')
-  ruby = Puppet::Acceptance::CommandUtils.ruby_command(agent)
-  on agent, "#{ruby} --version"
-end

data/ext/facter/facter/acceptance/setup/aio/pre-suite/021_InstallAristaModule.rb

@@ -1,12 +0,0 @@
-platforms = hosts.map{|val| val[:platform]}
-skip_test "No arista hosts present" unless platforms.any? { |val| /^eos-/ =~ val }
-test_name 'Arista Switch Pre-suite' do
-  switchs = select_hosts({:platform => ['eos-4-i386']})
-
-  step 'add puppet user to switch' do
-    switchs.each do |switch|
-      on(switch, "/opt/puppetlabs/bin/puppet config --confdir /etc/puppetlabs/puppet set user root")
-      on(switch, "/opt/puppetlabs/bin/puppet config --confdir /etc/puppetlabs/puppet set group root")
-    end
-  end
-end

data/ext/facter/facter/acceptance/setup/aio/pre-suite/022_Remove_LD_PRELOAD.rb

@@ -1,11 +0,0 @@
-platforms = hosts.map{|val| val[:platform]}
-skip_test "No Cisco XR hosts present" unless platforms.any? { |val| /^cisco_ios_xr-/ =~ val }
-test_name 'Cisco XR Switch Pre-suite' do
-  switchs = select_hosts({:platform => ['cisco_ios_xr-6-x86_64']})
-
-  step 'remove LD_PRELOAD setting from switch' do
-    switchs.each do |switch|
-      on(switch, "echo 'unset LD_PRELOAD' >> /etc/profile")
-    end
-  end
-end

data/ext/facter/facter/acceptance/setup/common/00_EnvSetup.rb

@@ -1,64 +0,0 @@
-test_name "Setup environment"
-
-step "Ensure Git and Ruby"
-
-require 'puppet/acceptance/install_utils'
-extend Puppet::Acceptance::InstallUtils
-require 'puppet/acceptance/git_utils'
-extend Puppet::Acceptance::GitUtils
-require 'beaker/dsl/install_utils'
-extend Beaker::DSL::InstallUtils
-
-PACKAGES = {
-  :redhat => [
-    'git',
-    'ruby',
-    'rubygem-json',
-  ],
-  :debian => [
-    ['git', 'git-core'],
-    'ruby',
-  ],
-  :debian_ruby18 => [
-    'libjson-ruby',
-  ],
-  :solaris => [
-    ['git', 'developer/versioning/git'],
-    ['ruby', 'runtime/ruby-18'],
-    # there isn't a package for json, so it is installed later via gems
-  ],
-  :windows => [
-    'git',
-    # there isn't a need for json on windows because it is bundled in ruby 1.9
-  ],
-}
-
-install_packages_on(hosts, PACKAGES, :check_if_exists => true)
-
-hosts.each do |host|
-  case host['platform']
-  when /windows/
-    step "#{host} Install ruby from git"
-    ruby_arch = host[:ruby_arch] || 'x86'
-    revision = if ruby_arch == 'x64'
-                 '2.0.0-x64'
-               else
-                 '1.9.3-x86'
-               end
-
-    install_from_git(host, "/opt/puppet-git-repos",
-                    :name => 'puppet-win32-ruby',
-                    :path => build_giturl('puppet-win32-ruby'),
-                    :rev  => revision)
-    on host, 'cd /opt/puppet-git-repos/puppet-win32-ruby; cp -r ruby/* /'
-    on host, 'cd /lib; icacls ruby /grant "Everyone:(OI)(CI)(RX)"'
-    on host, 'cd /lib; icacls ruby /reset /T'
-    on host, 'cd /; icacls bin /grant "Everyone:(OI)(CI)(RX)"'
-    on host, 'cd /; icacls bin /reset /T'
-    on host, 'ruby --version'
-    on host, 'cmd /c gem list'
-  when /solaris/
-    step "#{host} Install json from rubygems"
-    on host, 'gem install json'
-  end
-end

data/ext/facter/facter/acceptance/setup/common/pre-suite/000-delete-puppet-when-none.rb

@@ -1,11 +0,0 @@
-test_name "Expunge puppet bits if hypervisor is none"
-
-# Ensure that the any previous installations of puppet
-# are removed from the host if it is not managed by a
-# provisioning hypervisor.
-
-hosts.each do |host|
-  if host[:hypervisor] == "none"
-    remove_puppet_on(host)
-  end
-end

data/ext/facter/facter/acceptance/setup/git/pre-suite/01_TestSetup.rb

@@ -1,31 +0,0 @@
-test_name "Install packages and repositories on target machines..." do
-  extend Beaker::DSL::InstallUtils
-
-  SourcePath  = Beaker::DSL::InstallUtils::SourcePath
-  GitURI      = Beaker::DSL::InstallUtils::GitURI
-  GitHubSig   = Beaker::DSL::InstallUtils::GitHubSig
-
-  tmp_repositories = []
-  options[:install].each do |uri|
-    raise(ArgumentError, "#{uri} is not recognized.") unless(uri =~ GitURI)
-    tmp_repositories << extract_repo_info_from(uri)
-  end
-
-  repositories = order_packages(tmp_repositories)
-
-  versions = {}
-  hosts.each_with_index do |host, index|
-    on host, "echo #{GitHubSig} >> $HOME/.ssh/known_hosts"
-
-    repositories.each do |repository|
-      step "Install #{repository[:name]}"
-      install_from_git host, SourcePath, repository
-
-      if index == 1
-        versions[repository[:name]] = find_git_repo_versions(host,
-                                                             SourcePath,
-                                                             repository)
-      end
-    end
-  end
-end