onceover-octocatalog-diff 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 784dd39ffcb74eff41fdebe214a136b077b847a5
-  data.tar.gz: 2ef6eef78a526545bbd99eacbf37ac43701e6bdb
+  metadata.gz: f0457bcc4f5c3efc091ed7596a99bde39a501af4
+  data.tar.gz: 9eb05d24a9e322eee21214360ec365a32b34abfb
 SHA512:
-  metadata.gz: 8e379d2744f6020d8143259f4de6cd3a743713f95294f4bb6a9e1e33e6ba6dd19fbbdf27d8e2e185a31eba5a9fffabefd9a5bbef89533b565818aedb3f3aa92d
-  data.tar.gz: 4c9b9cc4b3cab6ece39669a4097b11abc44008cd51f389b6d815f88f332ad745dfb602b29f2bee80a7e122aa8c9a74bd3b4f0485f5fab6bcab9fd2bec3f7c4bb
+  metadata.gz: 7c9dd44b08702d4c149d85571b022e8887c8b4747da5f30d62356e48426271b495e29e17f2cc705b49cfb939cd0d7ad49877edd94919fde144972a07ad307021
+  data.tar.gz: 495d99145707f8eb4038eb43e0038dff06490f151bef1ddbc1b489967637c5ec95dcf9ad16b870c75227e0c27c4dd2d0aa0593f2d03a01f57505e9c1dae4636d

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,23 @@ 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|
+                      FileUtils.cp(path,"#{tempdir}/spec/factsets/")
+                    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|
@@ -86,7 +95,7 @@ revisions to compare between.
 
                     command_args = [
                       '--fact-file',
-                      "#{tempdir}/spec/factsets/#{test.nodes[0].name}.yaml",
+                      "#{tempdir}/spec/factsets/#{test.nodes[0].name}.json",
                       '--from',
                       opts[:from],
                       '--to',

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

@@ -1,7 +1,7 @@
 class Onceover
   module Octocatalog
     module Diff
-      VERSION = "0.1.5"
+      VERSION = "0.1.6"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover-octocatalog-diff
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler