simp-beaker-helpers 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4956f5f8e1a5a81d0f8daeb6ee58c54516756b96
-  data.tar.gz: e45cc0c1a5f3a609d049755994fdd2fc72edfd40
+  metadata.gz: e8882ab90efc503edf3b79dd740f67113638742a
+  data.tar.gz: 503cc5f3e423d32ac0e18bf5408f43e20a9dfa5d
 SHA512:
-  metadata.gz: 087b061992ae56669a7600eebe9562ed1fe5dc24333506aa367bf28d24f028f2d2f163e76e45b51a890060588a47a40f55a6ee4b5602ce3b04aaaf00f99e5103
-  data.tar.gz: 4e96ebc13c03aa9c54bf75bb1a7f45db7ffd688f0518ba0a98c5419b2be546f510c31731f11a289d40cae50142158afb8962b504f77afe9c4b31374443363e6e
+  metadata.gz: e64b7f85a079395c428a05a8724b98a6811b1d51787b951d778a5c5f6f1cb1722371bd13f06c9feaf7a382c5853c5ac65913edb345044d057bcaec860d6e25bd
+  data.tar.gz: 857d0014ca8bf6b79036a7cf9cf80cb3bd82328f016198efeb10a33824dc220228cb1604eb01eb46fb6247e3d7cc793073a0617a9a19ba942af9cdc3d18916d0

data/Gemfile

@@ -17,7 +17,6 @@ group :system_tests do
   gem 'pry'
   gem 'beaker'
   gem 'beaker-rspec'
-  gem 'vagrant-wrapper'
   # 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'

data/lib/simp/beaker_helpers.rb

@@ -1,7 +1,7 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
 
   # use the `puppet fact` face to look up facts on an SUT
   def pfact_on(sut, fact_name)
@@ -91,23 +91,34 @@ module Simp::BeakerHelpers
             sut, 'puppet config print modulepath --environment production'
           ).output.chomp.split(':').first
 
+          mod_root = File.expand_path( "spec/fixtures/modules", File.dirname( fixtures_yml_path ))
 
           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 ))
-            # These options can be overridden by `opt`
-            _opts = {
-                      :target_module_path => target_module_path,
-                    }.merge(opts)
-
-            # These options always override `opt`
-            _opts = _opts.merge({
-                                :source      => mod_root,
-                                :module_name => pupmod,
-                               })
-
-            copy_module_to( sut, _opts )
+
+            pupmod_root = File.join(mod_root, pupmod)
+
+            if File.symlink?(pupmod_root)
+              _opts = {
+                :target_module_path => target_module_path,
+              }.merge(opts)
+
+              _opts = _opts.merge({
+                :source => pupmod_root,
+                :module_name => pupmod
+              })
+
+              copy_module_to(sut, _opts)
+            end
           end
+
+          _opts = {
+            :ignore_list => PUPPET_MODULE_INSTALL_IGNORE
+          }.merge(opts)
+
+          _opts[:ignore] = build_ignore_list(_opts)
+
+          scp_to(sut, mod_root, File.dirname(target_module_path), _opts)
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 description: |2
@@ -32,10 +32,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .fixtures.yml
-- .gitignore
-- .rspec
-- .travis.yml
+- ".fixtures.yml"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -65,12 +65,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []