onceover-octocatalog-diff 0.1.3 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 68aa04b2c0ceb4c15ca00ab21af57ec27f2924ca
-  data.tar.gz: 1a8d7817d910b3b9426f97a9ca9132448fd8a422
+SHA256:
+  metadata.gz: f6b8efb6be914b821f8901c3d6f419de0b1b270bfcda5aa4eab7cc69bcff6916
+  data.tar.gz: b4c07fb7929daaf8d5b3312e137a1c94706b5d1a5c49ec0fa70248fd631b0406
 SHA512:
-  metadata.gz: bd7c80e73b8a074c8610cb126917f313bb9a5412820fa33827c515b07cb9892af3ef52e8c74fff1ce5cd6dff29d11023094dc5a00476df357ff5e12d7b6f82c4
-  data.tar.gz: a061f8dd56be4548ceb2093846c68461c48e004a8a8a45b2b9831bf9495343df5eccde2590e1420ff4889b5af0f985cde793deff3b96dbc15ac36d430bfbc2fb
+  metadata.gz: db3dd83d2afab6235ace362f5a3668ef94725dcdef002d57cf89c81d4564822e206f9faecc49960d8b065f7222b59c23510c4b96b76907ec6804ac8cc739af4f
+  data.tar.gz: 2a74afa2dd587f8ee2d56f3c25eab847b0664a270036060b5b1e2e2d00cc35859309a280509a47178ff66349cc36786ff4652c2bbd7fc65d4acdf06795481758

data/lib/onceover/octocatalog/diff.rb

@@ -4,14 +4,7 @@ require "onceover/octocatalog/diff/cli"
 class Onceover
   module Octocatalog
     module Diff
-      def self.create_facts_yaml(repo,output_location)
-        require 'json'
-
-        repo.facts_files.each do |facts_file|
-          facts = JSON.load(File.read(facts_file))
-          File.open("#{output_location}/#{File.basename(facts_file,'.*')}.yaml", 'w') {|f| f.write facts.to_yaml }
-        end
-      end
+      
     end
   end
 end

data/lib/onceover/octocatalog/diff/cli.rb

@@ -49,14 +49,24 @@ revisions to compare between.
                     logger.debug "Copying controlrepo to #{tempdir}"
                     FileUtils.copy_entry(repo.root,tempdir)
 
+                    # Copy all of the factsets over in reverse order so that
+                    # local ones override vendored ones
+                    logger.debug "Deploying vendored factsets"
+                    deduped_factsets = repo.facts_files.reverse.inject({}) do |hash, file|
+                      hash[File.basename(file)] = file
+                      hash
+                    end
+
+                    deduped_factsets.each do |basename,path|
+                      facts = JSON.load(File.read(path))
+                      File.open("#{tempdir}/spec/factsets/#{File.basename(path,'.*')}.yaml", 'w') { |f| f.write facts.to_yaml }
+                    end
+
                     if File.directory?("#{r10k_cache_dir}/modules")
                       logger.debug "Copying modules from thread cache to #{tempdir}"
                       FileUtils.copy_entry("#{r10k_cache_dir}/modules","#{tempdir}/modules")
                     end
 
-                    logger.debug "Converting facts to yaml"
-                    Onceover::Octocatalog::Diff.create_facts_yaml(repo,"#{tempdir}/spec/factsets")
-
                     logger.info "Deploying Puppetfile for #{test.classes[0].name} on #{test.nodes[0].name}"
                     r10k_cmd = "r10k puppetfile install --verbose --color --puppetfile #{repo.puppetfile} --config #{r10k_cache_dir}/r10k.yaml"
                     Open3.popen3(r10k_cmd, :chdir => tempdir) do |stdin, stdout, stderr, wait_thr|
@@ -80,9 +90,31 @@ revisions to compare between.
                     binary = `which puppet`.chomp
 
                     logger.debug "Running Octocatalog diff"
-                    logger.debug "Command: octocatalog-diff --fact-file #{tempdir}/spec/factsets/#{test.nodes[0].name}.yaml -f #{opts[:from]} -t #{opts[:to]} --basedir #{tempdir} --puppet-binary #{binary} --bootstrap-script #{tempdir}/bootstrap_script.rb"
                     logger.info "Compiling catalogs for #{test.classes[0].name} on #{test.nodes[0].name}"
-                    cmd = "octocatalog-diff --fact-file #{tempdir}/spec/factsets/#{test.nodes[0].name}.yaml -f #{opts[:from]} -t #{opts[:to]} --basedir #{tempdir} --puppet-binary #{binary} --bootstrap-script '#{tempdir}/bootstrap_script.rb'"
+
+                    command_prefix = ENV['BUNDLE_GEMFILE'] ? 'bundle exec ' : ''
+
+                    command_args = [
+                      '--fact-file',
+                      "#{tempdir}/spec/factsets/#{test.nodes[0].name}.yaml",
+                      '--from',
+                      opts[:from],
+                      '--to',
+                      opts[:to],
+                      '--basedir',
+                      tempdir,
+                      '--puppet-binary',
+                      binary,
+                      '--bootstrap-script',
+                      "'#{tempdir}/bootstrap_script.rb'",
+                      '--hiera-config',
+                      repo.hiera_config_file,
+                      '--pass-env-vars',
+                      ENV.keys.keep_if {|k| k =~ /^RUBY|^BUNDLE/ }.join(',')
+                    ]
+
+                    cmd = "#{command_prefix}octocatalog-diff #{command_args.join(' ')}"
+                    logger.debug "Running: #{cmd}"
                     Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
                       exit_status = wait_thr.value
                       @results << {

data/lib/onceover/octocatalog/diff/version.rb

@@ -1,7 +1,7 @@
 class Onceover
   module Octocatalog
     module Diff
-      VERSION = "0.1.3"
+      VERSION = "0.1.8"
     end
   end
 end

data/onceover-octocatalog-diff.gemspec

@@ -21,8 +21,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 2.2.10"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_runtime_dependency 'octocatalog-diff', '~> 1.0'
   spec.add_runtime_dependency 'onceover', '>= 3.2.0'
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: onceover-octocatalog-diff
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 platform: ruby
 authors:
 - Dylan Ratcliffe
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 2.2.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: octocatalog-diff
   requirement: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ homepage: https://github.com/dylanratcliffe/onceover-octocatalog-diff
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,9 +105,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6.2
+signing_key:
 specification_version: 4
 summary: Adds octocatalog-diff functionality to onceover
 test_files: []