simp-beaker-helpers 1.5.0 → 1.5.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -1
  3. data/lib/simp/beaker_helpers.rb +25 -14
  4. metadata +10 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4956f5f8e1a5a81d0f8daeb6ee58c54516756b96
4
- data.tar.gz: e45cc0c1a5f3a609d049755994fdd2fc72edfd40
3
+ metadata.gz: e8882ab90efc503edf3b79dd740f67113638742a
4
+ data.tar.gz: 503cc5f3e423d32ac0e18bf5408f43e20a9dfa5d
5
5
  SHA512:
6
- metadata.gz: 087b061992ae56669a7600eebe9562ed1fe5dc24333506aa367bf28d24f028f2d2f163e76e45b51a890060588a47a40f55a6ee4b5602ce3b04aaaf00f99e5103
7
- data.tar.gz: 4e96ebc13c03aa9c54bf75bb1a7f45db7ffd688f0518ba0a98c5419b2be546f510c31731f11a289d40cae50142158afb8962b504f77afe9c4b31374443363e6e
6
+ metadata.gz: e64b7f85a079395c428a05a8724b98a6811b1d51787b951d778a5c5f6f1cb1722371bd13f06c9feaf7a382c5853c5ac65913edb345044d057bcaec860d6e25bd
7
+ data.tar.gz: 857d0014ca8bf6b79036a7cf9cf80cb3bd82328f016198efeb10a33824dc220228cb1604eb01eb46fb6247e3d7cc793073a0617a9a19ba942af9cdc3d18916d0
data/Gemfile CHANGED
@@ -17,7 +17,6 @@ group :system_tests do
17
17
  gem 'pry'
18
18
  gem 'beaker'
19
19
  gem 'beaker-rspec'
20
- gem 'vagrant-wrapper'
21
20
  # NOTE: Workaround because net-ssh 2.10 is busting beaker
22
21
  # lib/ruby/1.9.1/socket.rb:251:in `tcp': wrong number of arguments (5 for 4) (ArgumentError)
23
22
  gem 'net-ssh', '~> 2.9.0'
@@ -1,7 +1,7 @@
1
1
  module Simp; end
2
2
 
3
3
  module Simp::BeakerHelpers
4
- VERSION = '1.5.0'
4
+ VERSION = '1.5.1'
5
5
 
6
6
  # use the `puppet fact` face to look up facts on an SUT
7
7
  def pfact_on(sut, fact_name)
@@ -91,23 +91,34 @@ module Simp::BeakerHelpers
91
91
  sut, 'puppet config print modulepath --environment production'
92
92
  ).output.chomp.split(':').first
93
93
 
94
+ mod_root = File.expand_path( "spec/fixtures/modules", File.dirname( fixtures_yml_path ))
94
95
 
95
96
  pupmods_in_fixtures_yml.each do |pupmod|
96
97
  STDERR.puts " ** copy_fixture_modules_to: '#{sut}': '#{pupmod}'" if ENV['BEAKER_helpers_verbose']
97
- mod_root = File.expand_path( "spec/fixtures/modules/#{pupmod}", File.dirname( fixtures_yml_path ))
98
- # These options can be overridden by `opt`
99
- _opts = {
100
- :target_module_path => target_module_path,
101
- }.merge(opts)
102
-
103
- # These options always override `opt`
104
- _opts = _opts.merge({
105
- :source => mod_root,
106
- :module_name => pupmod,
107
- })
108
-
109
- copy_module_to( sut, _opts )
98
+
99
+ pupmod_root = File.join(mod_root, pupmod)
100
+
101
+ if File.symlink?(pupmod_root)
102
+ _opts = {
103
+ :target_module_path => target_module_path,
104
+ }.merge(opts)
105
+
106
+ _opts = _opts.merge({
107
+ :source => pupmod_root,
108
+ :module_name => pupmod
109
+ })
110
+
111
+ copy_module_to(sut, _opts)
112
+ end
110
113
  end
114
+
115
+ _opts = {
116
+ :ignore_list => PUPPET_MODULE_INSTALL_IGNORE
117
+ }.merge(opts)
118
+
119
+ _opts[:ignore] = build_ignore_list(_opts)
120
+
121
+ scp_to(sut, mod_root, File.dirname(target_module_path), _opts)
111
122
  end
112
123
  end
113
124
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: simp-beaker-helpers
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.0
4
+ version: 1.5.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Tessmer
@@ -9,20 +9,20 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-06-17 00:00:00.000000000 Z
12
+ date: 2016-06-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: beaker
16
16
  requirement: !ruby/object:Gem::Requirement
17
17
  requirements:
18
- - - ~>
18
+ - - "~>"
19
19
  - !ruby/object:Gem::Version
20
20
  version: '2'
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
- - - ~>
25
+ - - "~>"
26
26
  - !ruby/object:Gem::Version
27
27
  version: '2'
28
28
  description: |2
@@ -32,10 +32,10 @@ executables: []
32
32
  extensions: []
33
33
  extra_rdoc_files: []
34
34
  files:
35
- - .fixtures.yml
36
- - .gitignore
37
- - .rspec
38
- - .travis.yml
35
+ - ".fixtures.yml"
36
+ - ".gitignore"
37
+ - ".rspec"
38
+ - ".travis.yml"
39
39
  - Gemfile
40
40
  - LICENSE
41
41
  - README.md
@@ -65,12 +65,12 @@ require_paths:
65
65
  - lib
66
66
  required_ruby_version: !ruby/object:Gem::Requirement
67
67
  requirements:
68
- - - '>='
68
+ - - ">="
69
69
  - !ruby/object:Gem::Version
70
70
  version: '0'
71
71
  required_rubygems_version: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - '>='
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  requirements: []