simp-beaker-helpers 1.0.10 → 1.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTBmNTc3N2ZjYWQ2MzliZDEwNjk1YzJhNGRkYjQ3NzQ5OTA5YjdmNw==
+    OTBhZjRkNWY5MGMxNmE4ZTRkNDI2YmQyYThmNTU3NWY1Y2U5ZDM5Yg==
   data.tar.gz: !binary |-
-    MjhkNmEwYTAyNDU3OTc1OWI4ODVmZjJjZmU1YTI3NjNiNjMwYzI1Yg==
+    MDc0YmJlOTZkYjZkNWJjNmUxNWRjNmE1YTEyNjUzOTEyMWU2MTg0Nw==
 SHA512:
   metadata.gz: !binary |-
-    Zjc2NzE3OTMxZjYwMjAzMjQ5NzQyODQ3MGVjMzkyYjE4MDI0NTIwODQ0YTQ4
-    Nzg3Yjc5ZTA4MzE1MDY0NWU1YTg1ODZlZmUxZWRiMDhmOGQwMmZkYzY5MjM0
-    N2NmYjU2YWMwY2M2ZjFiMWEwZjRhOGQ2ZDQyYTdjOTc2MDhlOWY=
+    NTA1YjIyMTA2ZmRlMDQ5ZDMyZGFmNWRiMTdmZWQwZGJjZmZkYzQ5MWI5MWYw
+    NWRkMzNmOTVkNTMwOTJlMDg4NjUxMDNlNGYwYjNiOGYyNWQ4NDEyYWViZDNh
+    NDA5N2RiM2UxODQwN2U5MDE5NzA3OGQzOGEzNWE3Y2I2OWYxODU=
   data.tar.gz: !binary |-
-    MTkwMWU3MzFiMDVjYTdiNmU4YWZjNWZlYTZlMmI3NDQ5Nzg4NmZkZWE4ZWM4
-    NmRkZDAwMjVmMTQ3MjA1ZGMzMjViNjFiZTFjYmEyMzZlOTIwYzk2NGQ2ZWZm
-    N2MyOThlNzIwMjc5MGRhMGViYjczMGJmMTMxYzg2ZjQ4NGNkZDU=
+    ZjI5MmE3YTc4MDAzMGEwMjYzOGQxMjBhMTAzOTJjZWEyMzcyMGIxOWQwNjk4
+    ZTM4YTU2NGM0MTRjYmViMzk0M2RlN2Q1YjY2ZDAwMWQyZGQxMmRkOThjZjRi
+    Yjk5YjUwNjYyZDRhNDFkZjk2ZGVhNTM5OWYzYzhlZDY1MTk0ZDI=

data/.gitignore

@@ -3,3 +3,5 @@
 Gemfile.lock
 .bundle/
 *.old
+.vagrant
+/log

data/.travis.yml

@@ -2,12 +2,6 @@
 language: ruby
 cache: bundler
 
-# to provide the cracklib-check
-sudo: required
-before_install:
-    - sudo apt-get update -qq
-    - sudo apt-get install -y libcrack2
-
 rvm:
   - 1.9.3
   - 2.0.0

data/Gemfile

@@ -1,9 +1,10 @@
-# Allow a comma or space-delimited list of gem servers
-if simp_gem_server =  ENV.fetch( 'SIMP_GEM_SERVERS', 'https://rubygems.org' )
-  simp_gem_server.split( / |,/ ).each{ |gem_server|
-    source gem_server
-  }
-end
+# Variables:
+#
+# SIMP_GEM_SERVERS | a space/comma delimited list of rubygem servers
+# PUPPET_VERSION   | specifies the version of the puppet gem to load
+puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : ['~>3']
+gem_sources   = ENV.key?('SIMP_GEM_SERVERS') ? ENV['SIMP_GEM_SERVERS'].split(/[, ]+/) : ['https://rubygems.org']
+gem_sources.each { |gem_source| source gem_source }
 
 # read dependencies in from the gemspec
 gemspec
@@ -11,9 +12,6 @@ gemspec
 # mandatory gems
 gem 'bundler'
 gem 'rake'
-gem 'puppetlabs_spec_helper'
-gem 'puppet'
-
 
 group :system_tests do
   gem 'pry'
@@ -22,4 +20,7 @@ group :system_tests do
   # NOTE: Workaround because net-ssh 2.10 is busting beaker
   # lib/ruby/1.9.1/socket.rb:251:in `tcp': wrong number of arguments (5 for 4) (ArgumentError)
   gem 'net-ssh', '~> 2.9.0'
+  gem 'puppetlabs_spec_helper'
+  gem 'puppet', puppetversion
+
 end

data/README.md

@@ -9,12 +9,16 @@ Methods to assist beaker acceptance tests for SIMP.
 3. [Methods](#methods)
     * [`copy_fixture_modules_to`](#copy_fixture_modules_to)
     * [`fix_errata_on`](#fix_errata_on)
-    * [`run_fake_pki_ca_on`](#run_fake_pki_ca_on)
-    * [`copy_pki_to`](#copy_pki_to)
-    * [`copy_keydist_to`](#copy_keydist_to)
-    * [`pluginsync_on`](#pluginsync_on)
-    * [`set_hieradata_on`](#set_hieradata_on)
-    * [`clear_temp_hieradata`](#clear_temp_hieradata)
+    * PKI
+      * [`run_fake_pki_ca_on`](#run_fake_pki_ca_on)
+      * [`copy_pki_to`](#copy_pki_to)
+      * [`copy_keydist_to`](#copy_keydist_to)
+    * Custom facts
+      * [`pfact_on`](#pfact_on)
+      * [`pluginsync_on`](#pluginsync_on)
+    * Hiera
+      * [`set_hieradata_on`](#set_hieradata_on)
+      * [`clear_temp_hieradata`](#clear_temp_hieradata)
 4. [Environment variables](#environment-variables)
     * [`BEAKER_fips`](#beaker_fips)
     * [`BEAKER_spec_prep`](#beaker_spec_prep)
@@ -50,6 +54,7 @@ Copies the local fixture modules (under `spec/fixtures/modules`) onto a list of
 `copy_fixture_modules_to( suts = hosts )`
 
 
+
 #### `fix_errata_on`
 
 Apply any OS fixes we need on each SUT
@@ -96,6 +101,13 @@ This simulates the output of FakeCA's `gencerts_nopass.sh` into `keydist/` and i
 `copy_keydist_to( ca_sut = master )`
 
 
+#### `pfact_on`
+
+Look up a face on a given SUT's using the `puppet fact` face.  This honors whatever facter-related settings the SUT's Puppet has been configured to use (i.e., `factpath`, `stringify_facts`, etc).
+
+`pfact_on( sut, fact_name )`
+
+
 #### `pluginsync_on`
 
 Simulates a custom fact pluginsync on given SUTs

data/Rakefile

@@ -46,12 +46,6 @@ SIMP_RPM_BUILD     when set, alters the gem produced by pkg:gem to be RPM-safe.
   }
 end
 
-#desc 'run all RSpec tests'
-#task :spec do
-#  Dir.chdir @rakefile_dir
-#  sh 'bundle exec rspec spec'
-#end
-
 desc %q{run all RSpec tests (alias of 'spec')}
 task :test => :spec
 

data/lib/simp/beaker_helpers.rb

@@ -1,7 +1,15 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.0.10'
+  VERSION = '1.0.11'
+
+  # use the `puppet fact` face to look up facts on an SUT
+  def pfact_on(sut, fact_name)
+    facts_json = on(sut,'puppet facts find xxx').output
+    facts      = JSON.parse(facts_json).fetch( 'values' )
+    facts.fetch(fact_name)
+  end
+
 
   # Locates .fixture.yml in or above this directory.
   def fixtures_yml_path
@@ -67,18 +75,20 @@ module Simp::BeakerHelpers
     STDERR.puts '  ** copy_fixture_modules_to' if ENV['BEAKER_helpers_verbose']
     ensure_fixture_modules
 
-    suts.each do |sut|
-      STDERR.puts "  ** copy_fixture_modules_to: '#{sut}'" if ENV['BEAKER_helpers_verbose']
-      # allow spec_prep to provide modules (to support isolated networks)
-      unless ENV['BEAKER_use_fixtures_dir_for_modules'] == 'no'
-        pupmods_in_fixtures_yml.each do |pupmod|
-          STDERR.puts "  ** copy_fixture_modules_to: '#{sut}': '#{pupmod}'" if ENV['BEAKER_helpers_verbose']
-          mod_root = File.expand_path( "spec/fixtures/modules/#{pupmod}", File.dirname( fixtures_yml_path ))
-          copy_module_to( sut, {:source => mod_root, :module_name => pupmod} )
+    unless ENV['BEAKER_copy_fixtures'] == 'no'
+      suts.each do |sut|
+        STDERR.puts "  ** copy_fixture_modules_to: '#{sut}'" if ENV['BEAKER_helpers_verbose']
+        # allow spec_prep to provide modules (to support isolated networks)
+        unless ENV['BEAKER_use_fixtures_dir_for_modules'] == 'no'
+          pupmods_in_fixtures_yml.each do |pupmod|
+            STDERR.puts "  ** copy_fixture_modules_to: '#{sut}': '#{pupmod}'" if ENV['BEAKER_helpers_verbose']
+            mod_root = File.expand_path( "spec/fixtures/modules/#{pupmod}", File.dirname( fixtures_yml_path ))
+            copy_module_to( sut, {:source => mod_root, :module_name => pupmod} )
+          end
         end
       end
-      STDERR.puts '  ** copy_fixture_modules_to: finished' if ENV['BEAKER_helpers_verbose']
     end
+    STDERR.puts '  ** copy_fixture_modules_to: finished' if ENV['BEAKER_helpers_verbose']
 
     # sync custom facts from the new modules to each SUT's factpath
     pluginsync_on(suts) if pluginsync
@@ -147,12 +157,21 @@ DEFAULT_KERNEL_TITLE=`/sbin/grubby --info=\\\${DEFAULT_KERNEL_INFO} | grep -m1 t
 
   # Apply known OS fixes we need to run Beaker on each SUT
   def fix_errata_on( suts = hosts )
-    # SIMP uses structured facts, therefore stringify_facts must be disabled
-    unless ENV['BEAKER_stringify_facts'] == 'yes'
-      on suts, 'puppet config set stringify_facts false'
-    end
 
     suts.each do |sut|
+      # SIMP uses structured facts, therefore stringify_facts must be disabled
+      unless ENV['BEAKER_stringify_facts'] == 'yes'
+        on sut, 'puppet config set stringify_facts false'
+      end
+
+      # Occasionally we run across something similar to BKR-561, so to ensure we
+      # at least have the host defaults:
+      #
+      # :hieradatadir is used as a canary here; it isn't the only missing key
+      unless sut.host_hash.key? :hieradatadir 
+        configure_type_defaults_on(sut)
+      end
+
       if fact_on(sut, 'osfamily') == 'RedHat'
         # net-tools required for netstat utility being used by be_listening
         if fact_on(sut, 'operatingsystemmajrelease') == '7'
@@ -162,6 +181,7 @@ DEFAULT_KERNEL_TITLE=`/sbin/grubby --info=\\\${DEFAULT_KERNEL_INFO} | grep -m1 t
           apply_manifest_on(sut, pp, :catch_failures => false)
         end
       end
+
     end
 
     # Configure and reboot SUTs into FIPS mode
@@ -169,10 +189,8 @@ DEFAULT_KERNEL_TITLE=`/sbin/grubby --info=\\\${DEFAULT_KERNEL_INFO} | grep -m1 t
       enable_fips_mode_on(suts)
     end
 
-    suts.each do |sut|
-      # Clean up YUM prior to starting our test runs.
-      on( sut, 'yum clean all' )
-    end
+    # Clean up YUM prior to starting our test runs.
+    on(suts, 'yum clean all')
   end
 
 
@@ -273,17 +291,17 @@ DEFAULT_KERNEL_TITLE=`/sbin/grubby --info=\\\${DEFAULT_KERNEL_INFO} | grep -m1 t
   #
   # Note: This is authoritative, you cannot mix this with other hieradata copies
   #
-  # @param[Host, Array<Host>, String, Symbol] One or more hosts to act upon.
+  # @param[sut, Array<Host>, String, Symbol] One or more hosts to act upon.
   #
-  # @param[Hieradata, Hash] The full hiera data structure to write to the system.
+  # @param[heradata, Hash || String] The full hiera data structure to write to the system.
   #
-  # @param[Data_file, String] The filename (not path) of the hiera data
+  # @param[data_file, String] The filename (not path) of the hiera data
   #                           YAML file to write to the system.
   #
-  # @param[Hiera_config, Array<String>] The hiera config array to write
+  # @param[hiera_config, Array<String>] The hiera config array to write
   #                                     to the system. Must contain the
   #                                     Data_file name as one element.
-  def set_hieradata_on(host, hieradata, data_file='default')
+  def set_hieradata_on(sut, hieradata, data_file='default')
     # Keep a record of all temporary directories that are created
     #
     # Should be cleaned by calling `clear_temp_hiera data` in after(:all)
@@ -296,19 +314,24 @@ DEFAULT_KERNEL_TITLE=`/sbin/grubby --info=\\\${DEFAULT_KERNEL_INFO} | grep -m1 t
     @temp_hieradata_dirs << data_dir
 
     fh = File.open(File.join(data_dir,"#{data_file}.yaml"),'w')
-    fh.puts(hieradata.to_yaml)
+    if hieradata.kind_of? String
+      fh.puts(hieradata)
+    else
+      fh.puts(hieradata.to_yaml)
+    end
+
     fh.close
 
     # If there is already a directory on the system, the SCP below will
     # add the local directory to the existing directory instead of
     # replacing the contents.
     apply_manifest_on(
-      host,
-      "file { '#{hiera_datadir(host)}': ensure => 'absent', force => true, recurse => true }"
+      sut,
+      "file { '#{hiera_datadir(sut)}': ensure => 'absent', force => true, recurse => true }"
     )
 
-    copy_hiera_data_to(host, data_dir)
-    write_hiera_config_on(host, Array(data_file))
+    copy_hiera_data_to(sut, data_dir)
+    write_hiera_config_on(sut, Array(data_file))
   end
 
 

data/spec/acceptance/pfacter_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper_acceptance'
+
+context 'pfact_on operations' do
+  before(:all) do
+    copy_fixture_modules_to( hosts )
+    pluginsync_on( [master] )
+  end
+
+  describe "pfact_on(master,'root_home')" do
+    it 'should return value of root_home' do
+      expect( pfact_on(master, 'root_home')).to_not be_nil
+    end
+  end
+end

data/spec/acceptance/pki_tests_spec.rb

@@ -3,8 +3,6 @@ require 'tmpdir'
 
 
 context 'PKI operations' do
-#test_name 'SIMP beaker helper PKI operations'
-begin
 
   context 'after run_fake_pki_ca_on(master,hosts)' do
     before(:all) do
@@ -64,7 +62,4 @@ begin
     end
   end
 
-rescue Exception => e
-  require 'pry'; binding.pry
-end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -52,6 +52,7 @@ files:
 - spec/acceptance/nodesets/centos-7-x64.yml
 - spec/acceptance/nodesets/centos-combined-x64.yaml
 - spec/acceptance/nodesets/default.yml
+- spec/acceptance/pfacter_spec.rb
 - spec/acceptance/pki_tests_spec.rb
 - spec/spec_helper_acceptance.rb
 homepage: https://github.com/simp/rubygem-simp-beaker-helpers
@@ -84,5 +85,7 @@ test_files:
 - spec/acceptance/nodesets/centos-7-x64.yml
 - spec/acceptance/nodesets/centos-combined-x64.yaml
 - spec/acceptance/nodesets/default.yml
+- spec/acceptance/pfacter_spec.rb
 - spec/acceptance/pki_tests_spec.rb
 - spec/spec_helper_acceptance.rb
+has_rdoc: