onceover-octocatalog-diff 0.1.4 → 0.1.5

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9a75366ba4d3680c354c2ffffb5a3ca24e7b09b6
4
- data.tar.gz: b3277d9f992709e902aac156c18b02a77df213fb
3
+ metadata.gz: 784dd39ffcb74eff41fdebe214a136b077b847a5
4
+ data.tar.gz: 2ef6eef78a526545bbd99eacbf37ac43701e6bdb
5
5
  SHA512:
6
- metadata.gz: 741bb04f8e00773863d9faaafec317b88c21db3119626349ca6b0f026c4124ad5bfd9893680e8f33b8fdd26d63a1ff195d2f6fb8f1c12778c5ee289f43f63824
7
- data.tar.gz: cc6513276ce1278009c8519724f97c56c093b4e73bd16fe51e0c4a3e6283cf746587ecb13c065fe1506686cf1876984008578e06af258251ababa466f1208ae5
6
+ metadata.gz: 8e379d2744f6020d8143259f4de6cd3a743713f95294f4bb6a9e1e33e6ba6dd19fbbdf27d8e2e185a31eba5a9fffabefd9a5bbef89533b565818aedb3f3aa92d
7
+ data.tar.gz: 4c9b9cc4b3cab6ece39669a4097b11abc44008cd51f389b6d815f88f332ad745dfb602b29f2bee80a7e122aa8c9a74bd3b4f0485f5fab6bcab9fd2bec3f7c4bb
@@ -82,6 +82,8 @@ revisions to compare between.
82
82
  logger.debug "Running Octocatalog diff"
83
83
  logger.info "Compiling catalogs for #{test.classes[0].name} on #{test.nodes[0].name}"
84
84
 
85
+ command_prefix = ENV['BUNDLE_GEMFILE'] ? 'bundle exec ' : ''
86
+
85
87
  command_args = [
86
88
  '--fact-file',
87
89
  "#{tempdir}/spec/factsets/#{test.nodes[0].name}.yaml",
@@ -97,9 +99,11 @@ revisions to compare between.
97
99
  "'#{tempdir}/bootstrap_script.rb'",
98
100
  '--hiera-config',
99
101
  repo.hiera_config_file,
102
+ '--pass-env-vars',
103
+ ENV.keys.keep_if {|k| k =~ /^RUBY|^BUNDLE/ }.join(',')
100
104
  ]
101
105
 
102
- cmd = "octocatalog-diff #{command_args.join(' ')}"
106
+ cmd = "#{command_prefix}octocatalog-diff #{command_args.join(' ')}"
103
107
  logger.debug "Running: #{cmd}"
104
108
  Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
105
109
  exit_status = wait_thr.value
@@ -1,7 +1,7 @@
1
1
  class Onceover
2
2
  module Octocatalog
3
3
  module Diff
4
- VERSION = "0.1.4"
4
+ VERSION = "0.1.5"
5
5
  end
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: onceover-octocatalog-diff
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.4
4
+ version: 0.1.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dylan Ratcliffe
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2017-03-14 00:00:00.000000000 Z
11
+ date: 2017-03-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler