octocatalog-diff 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd8f7061eaf89165ab41fe52f67b2a6a16a355e9
-  data.tar.gz: 82ced3eb61baa30e35c979fbe748f00ed13c015f
+  metadata.gz: a5c575bb439d7b065379f5c30bb650d74f3fa09b
+  data.tar.gz: ba4dda3fd34774227a3babac32f981bdbb4fb03b
 SHA512:
-  metadata.gz: 3d93c41ab87ba8a41dd701d53efa2074eab6f3bfd3b7327db2150db0d0c42eb7179ed336d4300d16956010b73dc1446acea0b9d0bc516b32e2025b6631718e5b
-  data.tar.gz: c951dc4cdf13de9ff9204e845bcf87f9f07d13a0cb50eb9844c30322846c90685fca4a3a16bc805bab1932bb40f86f33ddd0b31505c1606144e623424b1a7f0d
+  metadata.gz: 3c577fe4b8add2eb722b83ac5b5c33efece70619d6ca7da88287d2a1d49ac24a7091615d33fd7fe80f413ecee268ecdc24af016e53df0d7dc3f57bc491174db9
+  data.tar.gz: bbb4cdd2d011c87f0ae9f688af9e416bad7009f3391bbb01981a831d16ae83ffe46aadec12cbef579b6076e2c52b77e505c242e5196a381a9258dd679c3a1df2

data/.version

@@ -1 +1 @@
-1.0.3
+1.0.4

data/doc/CHANGELOG.md

@@ -8,6 +8,13 @@
 </tr>
 </thead><tbody>
 <tr valign=top>
+<td>1.0.4</td>
+<td>2017-03-17</td>
+<td>
+<li><a href="https://github.com/github/octocatalog-diff/pull/94">#94</a>: Make Puppet version check respect env vars</li>
+</td>
+</tr>
+<tr valign=top>
 <td>1.0.3</td>
 <td>2017-03-15</td>
 <td>

data/lib/octocatalog-diff/catalog/computed.rb

@@ -68,7 +68,7 @@ module OctocatalogDiff
       # @return [String] Puppet version
       def puppet_version
         raise ArgumentError, '"puppet_binary" was not passed to OctocatalogDiff::Catalog::Computed' unless @puppet_binary
-        @puppet_version ||= OctocatalogDiff::Util::PuppetVersion.puppet_version(@puppet_binary)
+        @puppet_version ||= OctocatalogDiff::Util::PuppetVersion.puppet_version(@puppet_binary, @opts)
       end
 
       # Compilation directory

data/lib/octocatalog-diff/util/puppetversion.rb

@@ -12,8 +12,9 @@ module OctocatalogDiff
     class PuppetVersion
       # Determine the version of Puppet.
       # @param puppet [String] Path to Puppet binary
+      # @param options [Hash] Options hash as defined in OctocatalogDiff::Catalog::Computed
       # @return [String] Puppet version number
-      def self.puppet_version(puppet)
+      def self.puppet_version(puppet, options = {})
         raise ArgumentError, 'Puppet binary was not supplied' if puppet.nil?
         raise Errno::ENOENT, "Puppet binary #{puppet} doesn't exist" unless File.file?(puppet)
         cmdline = [Shellwords.escape(puppet), '--version'].join(' ')
@@ -24,6 +25,8 @@ module OctocatalogDiff
           'PATH' => ENV['PATH'],
           'PWD' => File.dirname(puppet)
         }
+        pass_env_vars = options.fetch(:pass_env_vars, [])
+        pass_env_vars.each { |var| env[var] ||= ENV[var] }
         out, err, _status = Open3.capture3(env, cmdline, unsetenv_others: true, chdir: env['PWD'])
         return Regexp.last_match(1) if out =~ /^([\d\.]+)\s*$/
         raise "Unable to determine Puppet version: #{out} #{err}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octocatalog-diff
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - GitHub, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy