onceover-octocatalog-diff 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 691c97a6f9063f49509f7c24f7e6a969ca77e59f
-  data.tar.gz: 393491acfe7f393c47222b2b170cd2e92e01cee2
+  metadata.gz: c41d68499ea3cc7dbcb44bf646cf1da88e8677d9
+  data.tar.gz: 9fd0f96f534bb43afb4cbca93c6d89b99740f4af
 SHA512:
-  metadata.gz: 33dee3aa8d06df1571bce554905711bd3c67109d4a5d6a8c417a362344078090396fa303b0484f3e70765151e092fa07ad0d259c67327f4ba1a076aff3511739
-  data.tar.gz: 024e1ecb4bc1eaabd600e90b7749c12436b728ced60f98eb1ad970dcd29ab338b53f37b4308d33c57ce7f78dc9abf29082e239021e7eddc918576a28b977462c
+  metadata.gz: 18ffdfb43aa9caa51945478e456ba5765f6e90c2d9bd698b6b295342407f718d875630e984123c10f723ff37d0fba4d94144a2f86b08242a5e83cce071d2b376
+  data.tar.gz: 8480b6c421b32fdbc9eeb0355b3f367dd840f51c89acd3901a9fb04de8b59b835273204993e5740cdf2ca8c8eb7cb891757c0018a21cd1d7db0677e3ad0d18db

data/README.md

@@ -22,7 +22,7 @@ Or install it yourself as:
 
 ## Usage
 
-`onceover run diff`
+`onceover run diff --from development --to production`
 
 All config follows the normal [onceover](https://github.com/dylanratcliffe/onceover) configuration.
 

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

@@ -25,13 +25,20 @@ revisions to compare between.
               repo        = Onceover::Controlrepo.new(opts)
               test_config = Onceover::TestConfig.new(repo.onceover_yaml, opts)
               num_threads = (Facter.value('processors')['count'] / 2)
-              #runner.prepare!
               tests = test_config.run_filters(Onceover::Test.deduplicate(test_config.spec_tests))
+
               @queue = tests.inject(Queue.new, :push)
               @results = []
 
               @threads = Array.new(num_threads) do
                 Thread.new do
+                  r10k_cache_dir = Dir.mktmpdir('r10k_cache')
+                  r10k_config = {
+                    'cachedir' => r10k_cache_dir,
+                  }
+                  logger.debug "Creating r10k cache for thread at #{r10k_cache_dir}"
+                  File.write("#{r10k_cache_dir}/r10k.yaml",r10k_config.to_yaml)
+
                   until @queue.empty?
                     test = @queue.shift
 
@@ -47,11 +54,13 @@ revisions to compare between.
                     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}"
+                    r10k_cmd = "r10k puppetfile install --verbose --color --puppetfile #{repo.puppetfile} --config #{r10k_cache_dir}/r10k.yaml"
                     Open3.popen3(r10k_cmd) do |stdin, stdout, stderr, wait_thr|
                       exit_status = wait_thr.value
                       if exit_status.exitstatus != 0
-                        throw stderr
+                        STDOUT.puts stdout.read
+                        STDERR.puts stderr.read
+                        abort "R10k encountered an error, see the logs for details"
                       end
                     end
 
@@ -82,6 +91,8 @@ revisions to compare between.
                     logger.info "Storing results for #{test.classes[0].name} on #{test.nodes[0].name}"
                     FileUtils.rm_r(tempdir)
                   end
+
+                  FileUtils.rm_r(r10k_cache_dir)
                 end
               end
 

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

@@ -1,7 +1,7 @@
 class Onceover
   module Octocatalog
     module Diff
-      VERSION = "0.1.0"
+      VERSION = "0.1.1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onceover-octocatalog-diff
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dylan Ratcliffe