simp-beaker-helpers 1.10.8 → 1.10.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 203f131bf48ef1e75d99c5e856f454abb1eeff54934caae0e776ba3c0e6ad5d5
-  data.tar.gz: 9494a7808631eeb917fa7c898621aa6c4e1e761c719cf9738dd340107c03529c
+  metadata.gz: 223492b0f5036b559a0c04da80157c2b2700388c0d7680472a451784f7d01831
+  data.tar.gz: b2e4c80cba2b8e5cc0d96c3458eeb2b4f950951c49f54e6eaf70df1841c6476d
 SHA512:
-  metadata.gz: 78fd7c23dec2661905180b85f5bcb3342be28216285519108ee12a43b0812424b57969252dcc8837b11f2825e33dfecce9fb89a2b6c46de3d910be60c11f8584
-  data.tar.gz: c7dd37b296aeaafc44004cb6621b22a36c92e4b601ea619a926a203fb302f3000d45188d9fa106a4cf726bb144873616d309129b3b103a9c30d95fb9d5c7cb0a
+  metadata.gz: bc1f0e774cd4757bd0c5e830ab37b464cf25a5f6c7302c339f2e64b5253580eb1cd7c64c5d10640e860f307b732a11299aea12ea08eadc1bd45d91cb996c2300
+  data.tar.gz: 33397590133eba25fcb848dbf01f0c7573d8d0bb4483340877349969cb3e41fcf506c3d94d08cc99a7db694b330540cd12554d4fbc72ddae3e91f0abfe98257b

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+
+### 1.10.9 /2018-06-22
+* Ensure that the SSG is built from the latest tag instead of master
+* Provide the option to pass a specific branch to the SSG builds
+* Pin the suite base directory off of the global base directory instead of
+  local to wherever the system happenes to be at the time.
+
 ### 1.10.8 / 2018-05-18
 * New env var BEAKER_no_fix_interfaces, set to skip the fix that brings up all
   vagrant interfaces

data/lib/simp/beaker_helpers/ssg.rb

@@ -8,6 +8,13 @@ module Simp::BeakerHelpers
       GIT_REPO = 'https://github.com/OpenSCAP/scap-security-guide.git'
     end
 
+    # If this is not set, the closest tag to the default branch will be used
+    GIT_BRANCH = nil
+
+    if ENV['BEAKER_ssg_branch']
+      GIT_BRANCH = ENV['BEAKER_ssg_branch']
+    end
+
     EL_PACKAGES = [
       'PyYAML',
       'cmake',
@@ -139,6 +146,11 @@ module Simp::BeakerHelpers
         on(@sut, %(mkdir -p scap-security-guide && tar -xj -C scap-security-guide --strip-components 1 -f #{ssg_release} && cp scap-security-guide/*ds.xml #{@scap_working_dir}))
       else
         on(@sut, %(git clone #{GIT_REPO}))
+        if GIT_BRANCH
+          on(@sut, %(cd scap-security-guide; git checkout #{GIT_BRANCH}))
+        else
+          on(@sut, %(cd scap-security-guide; git checkout $(git describe --abbrev=0 --tags)))
+        end
         on(@sut, %(cd scap-security-guide/build; cmake ../; make -j4 #{OS_INFO[@os][@os_rel]['ssg']['build_target']}-content && cp *ds.xml #{@scap_working_dir}))
       end
     end

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.10.8'
+  VERSION = '1.10.9'
 end

data/lib/simp/rake/beaker.rb

@@ -111,7 +111,8 @@ module Simp::Rake
           # Need to figure out how to capture the errors
           failures = Hash.new
 
-          suite_basedir = 'spec/acceptance/suites'
+          suite_basedir = File.join(@base_dir, 'spec/acceptance/suites')
+
           if ENV['BEAKER_suite_basedir']
             suite_basedir = ENV['BEAKER_suite_basedir']
           end

data/simp-beaker-helpers.gemspec

@@ -23,6 +23,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'beaker-puppet_install_helper', '~> 0.6'
   s.add_runtime_dependency 'highline', '~> 1.6'
 
+  # Because fog-opensack dropped support for Ruby < 2.2.0
+  if RUBY_VERSION <= '2.2.0'
+    s.add_runtime_dependency 'fog-openstack', '0.1.25'
+  end
+
   ### s.files = Dir['Rakefile', '{bin,lib,spec}/**/*', 'README*', 'LICENSE*'] & `git ls-files -z .`.split("\0")
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.10.8
+  version: 1.10.9
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker