onceover 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10cb60864702bbdffbe00089c6f8d931c9d8757c
-  data.tar.gz: f37afccaec1d4d78edd98d8857db9f33cc629d5a
+  metadata.gz: fadf99405e225f596dc733991e921b575ff4ff3d
+  data.tar.gz: e64a282077068f8d878e9f0f61553c41279c6c1c
 SHA512:
-  metadata.gz: 322b0987cf4f0f50d2f134888a3af34c774a307ff760fe9d2f12d7441f9d0e6a49c60748f468d9950ead2134f8402015b995fb5d27735758d50c16dc5e4a26f2
-  data.tar.gz: 1f1398ff2c251ca54844e69deb45247e218a4c88db9f1b7282f3425cbf5f25307d53f23ee14ae97a829444e324326474a01f66c3625d5586e56141b16246de60
+  metadata.gz: fae38e2a4b3e875f8427df08e09b99420475dce16cf124498ec7151cfdd05294a85d3dbb6dbdf10e3295553375a13b46bd5790f5c7c06c432321c8ba9d2c97f6
+  data.tar.gz: e3770b45c7de68659f623b8e37995892a05d4cdf47c3761f3d068ebfa5fda7c33fba95d44a8431b99374f3ceed22e8390a7829da88972a3a3df0f69e4aab43f0

data/README.md

@@ -6,6 +6,8 @@ Onceover is a tool to automatically run basic tests on an entire Puppet controlr
 
 **NEW FEATURE! REGEX SUPPORT!**
 
+**NEW NEW FEATURE! Parallel tests, run** `onceover run spec --help` **for more info**
+
 ## Table of Contents
 
   - [Overview](#overview)
@@ -409,7 +411,23 @@ Here we are specifying custom commands to run for starting, stopping and checkin
 
 ## Extra Tooling
 
-Is this all too simple for you? Great! This is supposed to be a gateway to writing your own super-awesome really complicated tests using more traditional tools. If you want to ditch this tool in favour of doing it yourself, go ahead, but take these ruby methods as a parting gift:
+### Inspecting and updating the Puppetfile
+
+Onceover comes with some extra commands for interacting with the Puppetfile in useful ways. These are:
+
+`onceover show puppetfile`
+
+This will display all the current versions of all modules that are in the Puppetfile alongside the latest versions and whether or not they are out of date. This is a useful took for making sure your modules don't get too stale.
+
+`onceover update puppetfile`
+
+This takes your Puppetfile and actually modifies all of the module versions in there to the latest versions and saves the file. This is useful for setting up automated Puppetfile updates, just get Jenkins or Bamboo to:
+
+  1. Check out the Controlrepo
+  2. Run onceover to get a passing baseline
+  3. Update the Puppetfile with the latest versions of all modules
+  4. Run Onceover agan
+  5. Create a pull request if all tests pass
 
 ### Accessing Onceover in a traditional RSpec test
 

data/lib/onceover/cli/run.rb

@@ -38,6 +38,8 @@ This includes deploying using r10k and running all custom tests.
             usage 'spec'
             summary 'Runs spec tests'
 
+            optional :p,  :parallel, 'Runs spec tests in parallel. This increases speed at the cost of poorly formatted logs and irrelevant junit output.'
+
             run do |opts, args, cmd|
               repo = Onceover::Controlrepo.new(opts)
               runner = Onceover::Runner.new(repo,Onceover::TestConfig.new(repo.onceover_yaml, opts), :spec)

data/lib/onceover/controlrepo.rb

@@ -4,6 +4,7 @@ require 'json'
 require 'yaml'
 require 'find'
 require 'pathname'
+require 'thread'
 require 'onceover/beaker'
 require 'onceover/logger'
 include Onceover::Logger
@@ -196,32 +197,37 @@ class Onceover
       puppetfile.load!
 
       output_array = []
+      threads      = []
       puppetfile.modules.each do |mod|
-        return_hash = {}
-        logger.debug "Loading data for #{mod.full_name}"
-        return_hash[:full_name] = mod.full_name
-        if mod.is_a?(R10K::Module::Forge)
-          return_hash[:current_version] = mod.expected_version
-          return_hash[:latest_version] = mod.v3_module.current_release.version
-          current = Versionomy.parse(return_hash[:current_version])
-          latest = Versionomy.parse(return_hash[:latest_version])
-          if current.major < latest.major
-            return_hash[:out_of_date] = "Major".red
-          elsif current.minor < latest.minor
-            return_hash[:out_of_date] = "Minor".yellow
-          elsif current.tiny < latest.tiny
-            return_hash[:out_of_date] = "Tiny".green
+        threads << Thread.new do
+          return_hash = {}
+          logger.debug "Loading data for #{mod.full_name}"
+          return_hash[:full_name] = mod.full_name
+          if mod.is_a?(R10K::Module::Forge)
+            return_hash[:current_version] = mod.expected_version
+            return_hash[:latest_version] = mod.v3_module.current_release.version
+            current = Versionomy.parse(return_hash[:current_version])
+            latest = Versionomy.parse(return_hash[:latest_version])
+            if current.major < latest.major
+              return_hash[:out_of_date] = "Major".red
+            elsif current.minor < latest.minor
+              return_hash[:out_of_date] = "Minor".yellow
+            elsif current.tiny < latest.tiny
+              return_hash[:out_of_date] = "Tiny".green
+            else
+              return_hash[:out_of_date] = "No".green
+            end
           else
-            return_hash[:out_of_date] = "No".green
+            return_hash[:current_version] = "N/A"
+            return_hash[:latest_version] = "N/A"
+            return_hash[:out_of_date] = "N/A"
           end
-        else
-          return_hash[:current_version] = "N/A"
-          return_hash[:latest_version] = "N/A"
-          return_hash[:out_of_date] = "N/A"
+          output_array << return_hash
         end
-        output_array << return_hash
       end
 
+      threads.map(&:join)
+
       tp output_array, \
         {:full_name => {:display_name => "Full Name"}}, \
         {:current_version => {:display_name => "Current Version"}}, \
@@ -239,12 +245,30 @@ class Onceover
 
       # TODO: Make sure we can deal with :latest
 
+      # Create threading resources
+      threads = []
+      queue   = Queue.new
+      queue.push(puppetfile_string)
+
       puppetfile.modules.keep_if {|m| m.is_a?(R10K::Module::Forge)}
       puppetfile.modules.each do |mod|
-        line_index = puppetfile_string.index {|l| l =~ /^\s*[^#]*#{mod.owner}[\/-]#{mod.name}/}
-        logger.debug "Getting latest version of #{mod.full_name}"
-        puppetfile_string[line_index].gsub!(mod.expected_version,mod.v3_module.current_release.version)
+        threads << Thread.new do
+          logger.debug "Getting latest version of #{mod.full_name}"
+          latest_version = mod.v3_module.current_release.version
+
+          # Get the data off the queue, or wait if something else is using it
+          puppetfile_string_temp = queue.pop
+          line_index = puppetfile_string_temp.index {|l| l =~ /^\s*[^#]*#{mod.owner}[\/-]#{mod.name}/}
+          puppetfile_string_temp[line_index].gsub!(mod.expected_version,latest_version)
+
+          # Put the data back into the queue once we are done with it
+          queue.push(puppetfile_string_temp)
+        end
       end
+
+      threads.map(&:join)
+      puppetfile_string = queue.pop
+
       File.open(@puppetfile, 'w') {|f| f.write(puppetfile_string.join("\n")) }
       puts "#{'changed'.yellow} #{@puppetfile}"
     end

data/lib/onceover/runner.rb

@@ -76,8 +76,13 @@ class Onceover
       Dir.chdir(@repo.tempdir) do
         #`bundle install --binstubs`
         #`bin/rake spec_standalone`
-        logger.debug "Running #{@command_prefix}rake spec_standalone from #{@repo.tempdir}"
-        exec("#{@command_prefix}rake spec_standalone")
+        if @config.opts[:parallel]
+          logger.debug "Running #{@command_prefix}rake parallel_spec from #{@repo.tempdir}"
+          exec("#{@command_prefix}rake parallel_spec")
+        else
+          logger.debug "Running #{@command_prefix}rake spec_standalone from #{@repo.tempdir}"
+          exec("#{@command_prefix}rake spec_standalone")
+        end
       end
     end
 

data/onceover.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "onceover"
-  s.version     = "3.1.0"
+  s.version     = "3.1.1"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'json', '>= 1.8.2'
   s.add_runtime_dependency 'beaker-rspec'
   s.add_runtime_dependency 'rspec-puppet', ">= 2.4.0"
+  s.add_runtime_dependency 'parallel_tests', ">= 2.0.0"
   s.add_runtime_dependency 'puppetlabs_spec_helper', ">= 0.4.0"
   s.add_runtime_dependency 'rspec-puppet-utils', '>= 2.0.0'
   s.add_runtime_dependency 'rspec', '>= 3.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: parallel_tests
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: puppetlabs_spec_helper
   requirement: !ruby/object:Gem::Requirement