onceover 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5793369dbc229784ac127ea5423beb981d755962
-  data.tar.gz: 96431e9aeae8575c5bd718d448f7c5b61d438f29
+  metadata.gz: b023f0f8f31431d60042f2dc223f4587a1dae757
+  data.tar.gz: c6d67802e4cbe23475d775494a9829a53866f202
 SHA512:
-  metadata.gz: a2dcb286035893ab1d539745552edd83b263bd87f20f9caa468428550c94656dffcc7ba6328c8858d4817a379e4a95ad4f1176439dd5304578472b75fbccf5ff
-  data.tar.gz: 2f657473b5c46f12b582c65b67573d83bdd893dae4e6c8c232cb19d6572c02dd34157d6a768edba9c491f9e6777c98b5ebc279f5778be2ea56076feed91621eb
+  metadata.gz: 3ad92d08ba6ab4e063283c902199bd59d453dff673bb365f735dad9793313298011fe2a9d5b60face8e3fd73eec0bde5e2f450c8414f70b3318fabacbadbf0ba
+  data.tar.gz: e7f1baa93bb1dc677092007d4e043b12d815447134a180b39aed8cd9a4dc22fdd0f3c97ac23e9a799d43ac8e084f007f8133706e66ca0984bdd5aa145d255e00

data/README.md

@@ -186,7 +186,7 @@ One or many tags that tests in this group should be tagged with. This allows you
 
 This gem comes with a few pre-canned factsets. These are listed under the `nodes` sections of `onceover.yaml` when you run `onceover init`. You can also add your own factsets by putting them in:
 
-`spec/factsets/*.yaml`
+`spec/factsets/*.json`
 
 Factsets are used by the controlrepo gem to generate spec tests, which compile a given class against a certain set of facts. To create these factsets all we need to do is log onto a real machine that has puppet installed and run:
 
@@ -198,7 +198,7 @@ Which will give raw json output of every fact which puppet knows about. Usually
 
 Once we have our factset all we need to do is copy it into `spec/factsets/` inside our controlrepo and commit it to version control. Factsets are named based on their filename, not the name of the server they came from (Although you can, if you want). i.e the following factset file:
 
-`spec/factsets/server2008r2.yaml`
+`spec/factsets/server2008r2.json`
 
 Would map to a node named `server2008r2` in `onceover.yaml`
 

data/controlrepo.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "onceover"
-  s.version     = "3.0.7"
+  s.version     = "3.0.8"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"

data/lib/onceover/cli/run.rb

@@ -21,6 +21,7 @@ This includes deploying using r10k and running all custom tests.
           optional :t, :tags, 'A list of tags. Only tests with these tags will be run'
           optional :c, :classes, 'A list of classes. Only tests with these classes will be run'
           optional :n, :nodes, 'A list of nodes. Only tests with these nodes will be run'
+          optional :s, :skip_r10k, 'Skip the r10k step'
 
           run do |opts, args, cmd|
             puts cmd.help(:verbose => opts[:verbose])
@@ -38,7 +39,7 @@ This includes deploying using r10k and running all custom tests.
 
             run do |opts, args, cmd|
               repo = Onceover::Controlrepo.new(opts)
-              runner = Onceover::Runner.new(repo,Onceover::TestConfig.new(repo.onceover_yaml,opts),:spec)
+              runner = Onceover::Runner.new(repo,Onceover::TestConfig.new(repo.onceover_yaml, opts), :spec)
               runner.prepare!
               runner.run_spec!
             end

data/lib/onceover/cli/show.rb

@@ -10,7 +10,7 @@ class Onceover
         @cmd ||= Cri::Command.define do
           name 'show'
           usage 'show [controlrepo|puppetfile]'
-          summary 'Shows the current state things'
+          summary 'Shows the current state of things'
           description <<-DESCRIPTION
 Shows the state of either the controlrepo or the Puppetfile
           DESCRIPTION

data/lib/onceover/controlrepo.rb

@@ -8,13 +8,6 @@ require 'onceover/beaker'
 require 'onceover/logger'
 include Onceover::Logger
 
-begin
-  require 'pry'
-rescue LoadError
-  # We don't care if i'ts not here, this is just used for
-  # debugging sometimes
-end
-
 class Onceover
   class Controlrepo
     attr_accessor :root

data/lib/onceover/group.rb

@@ -16,12 +16,16 @@ class Onceover
       @name = name
       @members = []
 
-      if Onceover::Group.valid_members?(members)
+      case
+      when Onceover::Group.valid_members?(members)
         # If it's already a valid list just chuck it in there
         @members = members
-      elsif members.is_a?(Hash)
+      when members.is_a?(Hash)
         # if it's a hash then do subtractive stiff
         @members = Onceover::Group.subtractive_to_list(members)
+      when members.nil?
+        # Support empty groups yo
+        @members = []
       else
         # Turn it into a full list
         member_objects = []

data/lib/onceover/runner.rb

@@ -11,8 +11,10 @@ class Onceover
     end
 
     def prepare!
-      # Deploy the puppetfile
-      @config.r10k_deploy_local(@repo)
+      unless @config.skip_r10k
+        # Deploy the puppetfile
+        @config.r10k_deploy_local(@repo)
+      end
 
       # Remove the entire spec directory to make sure we have
       # all the latest tests

data/lib/onceover/testconfig.rb

@@ -23,6 +23,7 @@ class Onceover
     attr_accessor :filter_classes
     attr_accessor :filter_nodes
     attr_accessor :mock_functions
+    attr_accessor :skip_r10k
 
     def initialize(file,opts = {})
       begin
@@ -54,6 +55,7 @@ class Onceover
       @filter_tags      = opts[:tags] ? [opts[:tags].split(',')].flatten : nil
       @filter_classes   = opts[:classes] ? [opts[:classes].split(',')].flatten.map {|x| Onceover::Class.find(x)} : nil
       @filter_nodes     = opts[:nodes] ? [opts[:nodes].split(',')].flatten.map {|x| Onceover::Node.find(x)} : nil
+      @skip_r10k        = opts[:skip_r10k] ? true : false
 
       config['test_matrix'].each do |test_hash|
         test_hash.each do |machines, settings|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000 Z
+date: 2016-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -340,7 +340,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Testing tools for Puppet controlrepos