onceover 3.2.5 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 130a240137b4bcb6a3f12944ec67d87b5df340ce
-  data.tar.gz: bb79bd6c41981ee5edb7aa0de06f8e54e8636ce3
+  metadata.gz: 3017c18343feee112c67aa4d2eee9e96ed40c269
+  data.tar.gz: d7e83b25247b59be7f5585ef0d0929888340270a
 SHA512:
-  metadata.gz: a1a9a99167c3c55849ce9864271b85066b1698239e238113c8e782393e06e1b9f8b23077ba5a828ccfbf4572c9b04097e2d013b48f3624cd99dce1a838b2b96b
-  data.tar.gz: 7fb28d8a49203486459fdd0599300c8ca88873d4d99aa5306e7c680030f291dbbbc7e01d27f9ef44732c83630849a633c392bfdccce5af0c37a2d5034abae1b7
+  metadata.gz: 3537a0ed03929ef0bb538aa291be8a38906ee17f0ff06901743571ec0905c05816b4459cd5febb3dff60b5bc47d2afae94a1902586160fd26438c36854fb03e4
+  data.tar.gz: a929a56a8431e7e853b671b23e39ed54c2a1bc40b8fea4f1a506e969a65a973b716ac8fcf49f60daa61d7990811468bac4b908b5c670731f1d0131afa57f993d

data/.gitignore

@@ -6,6 +6,7 @@ Gemfile.lock
 /.bundle
 /.bin
 /.ruby-version
+tmp
 
 #Vim
 /.projections.json

data/.travis.yml

@@ -5,7 +5,7 @@ cache:
   directories:
     - 'spec/fixtures/puppet_controlrepo/.onceover' # Onceover cache
 
-script: bundler exec rake test
+script: bundle exec rake full_tests
 bundler_args: --path vendor/bundle
 
 rvm:
@@ -15,4 +15,5 @@ rvm:
   - 2.1.9
   - 2.2.7
   - 2.3.4
+  - 2.4.0
   - 2.4.1

data/README.md

@@ -634,6 +634,10 @@ Install gem dependencies:
 
 `bundle install`
 
+Clone the submodules
+
+`git submodule init && git submodule update --recursive`
+
 Execute tests
 
 `bundle exec rake`
@@ -650,3 +654,4 @@ Cheers to all of those who helped out:
   - natemccurdy
   - aardvark
   - Mandos
+

data/Rakefile

@@ -1,14 +1,24 @@
 require 'rubygems/tasks'
 require 'rspec/core/rake_task'
+require 'cucumber/rake/task'
 Gem::Tasks.new
 
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.rspec_opts = '--pattern spec/\*/\*_spec.rb'
 end
 
-task default: :test
+Cucumber::Rake::Task.new
 
-task test: [:syntax, :rubocop, :spec]
+task default: :full_tests
+
+desc "Run full set of tests"
+task full_tests: [:unit_tests, :acceptance_tests]
+
+desc "Run unit tests"
+task unit_tests: [:syntax, :rubocop, :spec]
+
+desc "Run acceptance tests"
+task acceptance_tests: [:syntax, :rubocop, :cucumber]
 
 task :syntax do
   paths = ['lib',]

data/features/basic.feature

@@ -0,0 +1,14 @@
+Feature: Run basic function of Onceover
+  I would like to use executable file to run Onceover and read help
+
+  Background:
+    Given onceover executable
+
+  Scenario: Show main options with executable wihtout parameters
+    When I run onceover command ""
+    Then I see help for commands: "help, init, run, show, update"
+
+  Scenario: Show main help with "help" command
+    When I run onceover command "help"
+    Then I see help for commands: "help, init, run, show, update"
+

data/features/step_definitions/common.rb

@@ -0,0 +1,18 @@
+Given /^onceover executable$/  do
+  @executable = ENV["BUNDLE_GEMFILE"] ? "bundle exec onceover " : "onceover "
+end
+
+When /^I run onceover command "([^"]*)"$/  do |arg1|
+  command = @executable + arg1
+  puts command
+  @output = `#{command}`
+  expect($?.success?).to be true
+end
+
+Then /^I see help for commands: "([^"]*)"$/ do |commands|
+  commands_help = @output[/COMMANDS(.*)OPTIONS/m, 1]
+  commands.split(',').each do |command|
+    result = commands_help.match(/^\s+#{command.strip}.+\n/)
+    puts result.to_s if expect(result).not_to be nil
+  end
+end

data/features/support/env.rb

@@ -0,0 +1,2 @@
+
+

data/lib/onceover/beaker.rb

@@ -124,10 +124,10 @@ class Onceover
       host.install_package('git')
 
       # copy the file over to the host (Maybe I should be changing the directory here??)
-      scp_to(host,repo.r10k_config_file,'/tmp/r10k.yaml')
+      scp_to(host, repo.r10k_config_file, '/tmp/r10k.yaml')
 
       # Do an r10k deploy
-      r10k_deploy(host,{
+      r10k_deploy(host, {
         :puppetfile => true,
         :configfile => '/tmp/r10k.yaml',
         })
@@ -143,7 +143,7 @@ class Onceover
     # This is not helpful for us. We want to be able to test all of our classes on
     # all of our nodes, this could be a lot of vms and having them all running at once
     # would be a real kick in the dick for whatever system was running it.
-    def self.provision_and_test(host,puppet_class,opts = {},repo = Onceover::Controlrepo.new)
+    def self.provision_and_test(host,puppet_class,opts = {}, repo = Onceover::Controlrepo.new)
       warn "[DEPRECATION] #{__method__} is deprecated due to the removal of Beaker"
 
       opts = {:runs_before_idempotency => 1}.merge(opts)
@@ -175,11 +175,11 @@ class Onceover
       manifest = "include #{puppet_class}"
 
       opts[:runs_before_idempotency].times do
-        apply_manifest_on(host,manifest,{:catch_failures => true})
+        apply_manifest_on(host, manifest, {:catch_failures => true})
       end
 
       if opts[:check_idempotency]
-        apply_manifest_on(host,manifest,{:catch_changes => true})
+        apply_manifest_on(host, manifest, {:catch_changes => true})
       end
 
       network_manager.cleanup
@@ -193,7 +193,7 @@ class Onceover
 
     def self.host_create(name, nodes)
       warn "[DEPRECATION] #{__method__} is deprecated due to the removal of Beaker"
-      
+
       require 'beaker/network_manager'
 
       current_opts = {}

data/lib/onceover/cli/init.rb

@@ -20,6 +20,9 @@ tool to work.
 
           run do |opts, args, cmd|
             Onceover::Controlrepo.init(Onceover::Controlrepo.new(opts))
+            # Would it make sense for #init to be a class instance method of Controlrepo ? Then you could:
+            # cp = Onceover::Controlrepo.new(opts)
+            # cp.init
           end
         end
       end

data/lib/onceover/cli/plugins.rb

@@ -1,10 +1,10 @@
 require 'rubygems'
 
 # Get all of the gems that start with onceover-
-plugins = Gem::Specification.group_by{ |g| g.name }.keep_if do |name,details|
+plugins = Gem::Specification.group_by{ |g| g.name }.keep_if do |name, details|
   name =~ /^onceover-.*$/
 end.keys
 
 plugins.each do |plugin|
-  require plugin.gsub('-','/')
+  require plugin.gsub('-', '/')
 end

data/lib/onceover/cli/run.rb

@@ -38,7 +38,7 @@ 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.'
+            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)
@@ -61,7 +61,7 @@ This includes deploying using r10k and running all custom tests.
               warn "[DEPRECATION] Acceptance testing is deprecated due to the removal of Beaker dependencies"
               warn "[DEPRECATION] Appeptance testing will be replaced by a more pluggable framework in the future, if you have ideas as to how this should be done please submit a ticket."
               repo = Onceover::Controlrepo.new(opts)
-              runner = Onceover::Runner.new(repo,Onceover::TestConfig.new(repo.onceover_yaml,opts),:acceptance)
+              runner = Onceover::Runner.new(repo,Onceover::TestConfig.new(repo.onceover_yaml,opts), :acceptance)
               runner.prepare!
               runner.run_acceptance!
             end

data/lib/onceover/controlrepo.rb

@@ -89,38 +89,38 @@ class Onceover
         @root = opts[:path]
       else
         @root = Dir.pwd
-        until File.exist?(File.expand_path('./environment.conf',@root)) do
+        until File.exist?(File.expand_path('./environment.conf', @root)) do
           # Throw an exception if we can't go any further up
-          throw "Could not file root of the controlrepo anywhere above #{Dir.pwd}" if @root == File.expand_path('../',@root)
+          throw "Could not file root of the controlrepo anywhere above #{Dir.pwd}" if @root == File.expand_path('../', @root)
 
           # Step up and try again
-          @root = File.expand_path('../',@root)
+          @root = File.expand_path('../', @root)
         end
       end
 
-      @onceover_yaml    = ENV['ONCEOVER_YAML'] || opts[:onceover_yaml] || File.expand_path("#{@root}/spec/onceover.yaml")
+      @onceover_yaml = ENV['ONCEOVER_YAML'] || opts[:onceover_yaml] || File.expand_path("#{@root}/spec/onceover.yaml")
 
       if File.exists?(@onceover_yaml) && _data = YAML.load_file(@onceover_yaml)
         opts.merge!(_data.fetch('opts',{})||{})
       end
-      opts.fetch(:facts_dir,'').sub!(%r{^[^/.].+} ){|path| File.expand_path(path,@root)}
+      opts.fetch(:facts_dir,'').sub!(%r{^[^/.].+} ){|path| File.expand_path(path, @root)}
       opts.fetch(:facts_files,[]).map!{|path| path =~ %r{^[/.]} ? path : File.expand_path(path, @root)}
 
-      @environmentpath  = opts[:environmentpath] || 'etc/puppetlabs/code/environments'
-      @puppetfile       = opts[:puppetfile] || File.expand_path('./Puppetfile',@root)
-      @environment_conf = opts[:environment_conf] || File.expand_path('./environment.conf',@root)
-      @spec_dir         = opts[:spec_dir] || File.expand_path('./spec',@root)
-      @facts_dir        = opts[:facts_dir] || File.expand_path('factsets',@spec_dir)
-      _facts_dirs       = [@facts_dir, File.expand_path('../../../factsets',__FILE__)]
-      _facts_files      = opts[:facts_files] || _facts_dirs.map{|d| File.join(d,'*.json')}
+      @environmentpath  = opts[:environmentpath]  || 'etc/puppetlabs/code/environments'
+      @puppetfile       = opts[:puppetfile]       || File.expand_path('./Puppetfile', @root)
+      @environment_conf = opts[:environment_conf] || File.expand_path('./environment.conf', @root)
+      @spec_dir         = opts[:spec_dir]         || File.expand_path('./spec', @root)
+      @facts_dir        = opts[:facts_dir]        || File.expand_path('factsets', @spec_dir)
+      _facts_dirs       = [@facts_dir, File.expand_path('../../../factsets', __FILE__)]
+      _facts_files      = opts[:facts_files]      || _facts_dirs.map{|d| File.join(d, '*.json')}
       @facts_files      = _facts_files.map{|_path| Dir[_path]}.flatten
 
-      @nodeset_file     = opts[:nodeset_file] || File.expand_path('./spec/acceptance/nodesets/onceover-nodes.yml',@root)
-      @role_regex       = opts[:role_regex] ?  Regexp.new(opts[:role_regex]) : /role[s]?:{2}/
-      @profile_regex    = opts[:profile_regex] ? Regexp.new(opts[:profile_regex]) : /profile[s]?:{2}/
-      @tempdir          = opts[:tempdir] || File.expand_path('./.onceover',@root)
+      @nodeset_file     = opts[:nodeset_file]     || File.expand_path('./spec/acceptance/nodesets/onceover-nodes.yml', @root)
+      @role_regex       = opts[:role_regex]       ?  Regexp.new(opts[:role_regex]) : /role[s]?:{2}/
+      @profile_regex    = opts[:profile_regex]    ?  Regexp.new(opts[:profile_regex]) : /profile[s]?:{2}/
+      @tempdir          = opts[:tempdir]          || File.expand_path('./.onceover', @root)
       $temp_modulepath  = nil
-      @manifest         = opts[:manifest] || config['manifest'] ? File.expand_path(config['manifest'],@root) : nil
+      @manifest         = opts[:manifest]         || config['manifest'] ? File.expand_path(config['manifest'], @root) : nil
       @opts             = opts
       logger.level = :debug if @opts[:debug]
       @@existing_controlrepo = self
@@ -159,7 +159,7 @@ class Onceover
 
       # Make sure that the paths are relative to the controlrepo root
       code_dirs.map! do |dir|
-        File.expand_path(dir,@root)
+        File.expand_path(dir, @root)
       end
 
       # Get all the classes from all of the manifests
@@ -230,8 +230,8 @@ class Onceover
             end
           else
             return_hash[:current_version] = "N/A"
-            return_hash[:latest_version] = "N/A"
-            return_hash[:out_of_date] = "N/A"
+            return_hash[:latest_version]  = "N/A"
+            return_hash[:out_of_date]     = "N/A"
           end
           output_array << return_hash
         end
@@ -239,11 +239,11 @@ class Onceover
 
       threads.map(&:join)
 
-      tp output_array, \
-        {:full_name => {:display_name => "Full Name"}}, \
-        {:current_version => {:display_name => "Current Version"}}, \
-        {:latest_version => {:display_name => "Latest Version"}}, \
-        {:out_of_date => {:display_name => "Out of Date?"}}
+      tp output_array,
+        {:full_name       => {:display_name => "Full Name"}},
+        {:current_version => {:display_name => "Current Version"}},
+        {:latest_version  => {:display_name => "Latest Version"}},
+        {:out_of_date     => {:display_name => "Out of Date?"}}
     end
 
     def update_puppetfile
@@ -291,9 +291,9 @@ class Onceover
       modules = puppetfile.modules
 
       # Iterate over everything and seperate it out for the sake of readability
-      symlinks = []
+      symlinks      = []
       forge_modules = []
-      repositories = []
+      repositories  = []
 
       modules.each do |mod|
         logger.debug "Converting #{mod.to_s} to .fixtures.yml format"
@@ -303,14 +303,14 @@ class Onceover
             # Set it up as a symlink, because we are using local files in the Puppetfile
             symlinks << {
               'name' => mod.name,
-              'dir' => mod.expected_version[:path]
+              'dir'  => mod.expected_version[:path]
             }
           elsif mod.expected_version.is_a?(String)
-            # Set it up as a normal firge module
+            # Set it up as a normal forge module
             forge_modules << {
               'name' => mod.name,
               'repo' => mod.title,
-              'ref' => mod.expected_version
+              'ref'  => mod.expected_version
             }
           end
         elsif mod.is_a? R10K::Module::Git
@@ -320,7 +320,7 @@ class Onceover
               # I know I shouldn't be doing this, but trust me, there are no methods
               # anywhere that expose this value, I looked.
               'repo' => mod.instance_variable_get(:@remote),
-              'ref' => mod.version
+              'ref'  => mod.version
             }
         end
       end
@@ -335,20 +335,24 @@ class Onceover
         Dir["#{dir}/*"].each do |mod|
           symlinks << {
             'name' => File.basename(mod),
-            'dir' => Pathname.new(File.expand_path(mod)).relative_path_from(Pathname.new(@root))#File.expand_path(mod)
+            'dir'  => Pathname.new(File.expand_path(mod)).relative_path_from(Pathname.new(@root))#File.expand_path(mod)
           }
         end
       end
 
       # Use an ERB template to write the files
-      Onceover::Controlrepo.evaluate_template('.fixtures.yml.erb',binding)
+      Onceover::Controlrepo.evaluate_template('.fixtures.yml.erb', binding)
     end
 
     def hiera_config_file
-      # try to find the hiera.iyaml file
-      hiera_config_file = File.expand_path('./hiera.yaml',@root) if File.exist?(File.expand_path('./hiera.yaml',@root))
-      hiera_config_file = File.expand_path('./hiera.yaml',@spec_dir) if File.exist?(File.expand_path('./hiera.yaml',@spec_dir))
-      hiera_config_file
+      case
+      when File.exist?(File.expand_path('./hiera.yaml', @spec_dir))
+        File.expand_path('./hiera.yaml', @spec_dir)
+      when File.exist?(File.expand_path('./hiera.yaml', @root))
+        File.expand_path('./hiera.yaml', @root)
+      else
+        nil
+      end
     end
 
     def hiera_config_file_relative_path
@@ -402,9 +406,14 @@ class Onceover
     end
 
     def r10k_config_file
-      r10k_config_file = File.expand_path('./r10k.yaml',@spec_dir) if File.exist?(File.expand_path('./r10k.yaml',@spec_dir))
-      r10k_config_file = File.expand_path('./r10k.yaml',@root) if File.exist?(File.expand_path('./r10k.yaml',@root))
-      r10k_config_file
+      case
+      when File.exist?(File.expand_path('./r10k.yaml', @spec_dir))
+        File.expand_path('./r10k.yaml', @spec_dir)
+      when File.exist?(File.expand_path('./r10k.yaml', @root))
+        File.expand_path('./r10k.yaml', @root)
+      else
+        nil
+      end
     end
 
     def r10k_config
@@ -412,11 +421,11 @@ class Onceover
     end
 
     def r10k_config=(data)
-      File.write(r10k_config_file,data.to_yaml)
+      File.write(r10k_config_file, data.to_yaml)
     end
 
     def temp_manifest
-      config['manifest'] ? File.expand_path(config['manifest'],@tempdir) : nil
+      config['manifest'] ? File.expand_path(config['manifest'], @tempdir) : nil
     end
 
     def self.init(repo)
@@ -425,18 +434,26 @@ class Onceover
       require 'pathname'
       require 'colored'
 
-      Onceover::Controlrepo.init_write_file(generate_onceover_yaml(repo),repo.onceover_yaml)
+      Onceover::Controlrepo.init_write_file(generate_onceover_yaml(repo), repo.onceover_yaml)
       # [DEPRECATION] Writing nodesets is deprecated due to the removal of Beaker"
       #Onceover::Controlrepo.init_write_file(generate_nodesets(repo),repo.nodeset_file)
-      Onceover::Controlrepo.init_write_file(Onceover::Controlrepo.evaluate_template('pre_conditions_README.md.erb',binding),File.expand_path('./pre_conditions/README.md',repo.spec_dir))
-      Onceover::Controlrepo.init_write_file(Onceover::Controlrepo.evaluate_template('factsets_README.md.erb',binding),File.expand_path('./factsets/README.md',repo.spec_dir))
-      Onceover::Controlrepo.init_write_file(Onceover::Controlrepo.evaluate_template('Rakefile.erb',binding),File.expand_path('./Rakefile',repo.root))
-      Onceover::Controlrepo.init_write_file(Onceover::Controlrepo.evaluate_template('Gemfile.erb',binding),File.expand_path('./Gemfile',repo.root))
+      init_write_file(
+        evaluate_template('pre_conditions_README.md.erb', binding),
+        File.expand_path('./pre_conditions/README.md', repo.spec_dir))
+      init_write_file(
+        evaluate_template('factsets_README.md.erb', binding),
+        File.expand_path('./factsets/README.md', repo.spec_dir))
+      init_write_file(
+        evaluate_template('Rakefile.erb', binding),
+        File.expand_path('./Rakefile', repo.root))
+      init_write_file(
+        evaluate_template('Gemfile.erb', binding),
+        File.expand_path('./Gemfile', repo.root))
 
       # Add .onceover to Gitignore
-      gitignore_path = File.expand_path('.gitignore',repo.root)
+      gitignore_path = File.expand_path('.gitignore', repo.root)
       if File.exists? gitignore_path
-        gitignore_content = (File.open(gitignore_path,'r') {|f| f.read }).split("\n")
+        gitignore_content = (File.open(gitignore_path, 'r') {|f| f.read }).split("\n")
         message = "#{'changed'.green}"
       else
         message = "#{'created'.green}"
@@ -445,14 +462,14 @@ class Onceover
 
       unless gitignore_content.include?(".onceover")
         gitignore_content << ".onceover\n"
-        File.open(gitignore_path,'w') {|f| f.write(gitignore_content.join("\n")) }
+        File.open(gitignore_path, 'w') {|f| f.write(gitignore_content.join("\n")) }
         puts "#{message} #{Pathname.new(gitignore_path).relative_path_from(Pathname.new(Dir.pwd)).to_s}"
       end
     end
 
     def self.generate_onceover_yaml(repo)
       # This will return a controlrepo.yaml that can be written to a file
-      Onceover::Controlrepo.evaluate_template('controlrepo.yaml.erb',binding)
+      evaluate_template('controlrepo.yaml.erb', binding)
     end
 
     def self.generate_nodesets(repo)
@@ -465,9 +482,9 @@ class Onceover
       hosts_hash = {}
 
       repo.facts.each do |fact_set|
-        node_name = File.basename(repo.facts_files[repo.facts.index(fact_set)],'.json')
-        boxname = Onceover::Beaker.facts_to_vagrant_box(fact_set)
-        platform = Onceover::Beaker.facts_to_platform(fact_set)
+        node_name = File.basename(repo.facts_files[repo.facts.index(fact_set)], '.json')
+        boxname   = Onceover::Beaker.facts_to_vagrant_box(fact_set)
+        platform  = Onceover::Beaker.facts_to_platform(fact_set)
 
         logger.debug "Querying hashicorp API for Vagrant box that matches #{boxname}"
 
@@ -484,7 +501,7 @@ class Onceover
           comment_out = false
           box_info = JSON.parse(response.body)
           box_info['current_version']['providers'].each do |provider|
-            if  provider['name'] == 'virtualbox'
+            if provider['name'] == 'virtualbox'
               url = provider['original_url']
             end
           end
@@ -501,7 +518,7 @@ class Onceover
       end
 
       # Use an ERB template
-      Onceover::Controlrepo.evaluate_template('nodeset.yaml.erb',binding)
+      evaluate_template('nodeset.yaml.erb', binding)
     end
 
     def self.create_dirs_and_log(dir)
@@ -513,15 +530,15 @@ class Onceover
       end
     end
 
-    def self.evaluate_template(template_name,bind)
+    def self.evaluate_template(template_name, bind)
       logger.debug "Evaluating template #{template_name}"
-      template_dir = File.expand_path('../../templates',File.dirname(__FILE__))
-      template = File.read(File.expand_path("./#{template_name}",template_dir))
+      template_dir = File.expand_path('../../templates', File.dirname(__FILE__))
+      template = File.read(File.expand_path("./#{template_name}", template_dir))
       ERB.new(template, nil, '-').result(bind)
     end
 
-    def self.init_write_file(contents,out_file)
-      Onceover::Controlrepo.create_dirs_and_log(File.dirname(out_file))
+    def self.init_write_file(contents, out_file)
+      create_dirs_and_log(File.dirname(out_file))
       if File.exists?(out_file)
         puts "#{'skipped'.yellow} #{Pathname.new(out_file).relative_path_from(Pathname.new(Dir.pwd)).to_s} #{'(exists)'.yellow}"
       else
@@ -536,13 +553,13 @@ class Onceover
       require 'onceover/testconfig'
 
       # Load up all of the tests and deduplicate them
-      testconfig = Onceover::TestConfig.new(@onceover_yaml,@opts)
-      testconfig.spec_tests.each { |tst| testconfig.verify_spec_test(self,tst) }
+      testconfig = Onceover::TestConfig.new(@onceover_yaml, @opts)
+      testconfig.spec_tests.each { |tst| testconfig.verify_spec_test(self, tst) }
       tests = testconfig.run_filters(Onceover::Test.deduplicate(testconfig.spec_tests))
 
       # Loop over each test, executing the user's block on each
       tests.each do |tst|
-        block.call(tst.classes[0].name,tst.nodes[0].name,tst.nodes[0].fact_set,testconfig.pre_condition)
+        block.call(tst.classes[0].name, tst.nodes[0].name, tst.nodes[0].fact_set, testconfig.pre_condition)
       end
     end
 
@@ -562,8 +579,8 @@ class Onceover
       matches = []
       if first_hash.has_key?(key)
         if value.is_a?(Hash)
-          value.each do |k,v|
-            matches << keypair_is_in_hash(first_hash[key],k,v)
+          value.each do |k, v|
+            matches << keypair_is_in_hash(first_hash[key], k, v)
           end
         else
           if first_hash[key] == value

data/lib/onceover/group.rb

@@ -5,7 +5,7 @@ class Onceover
   class Group
     @@all = []
 
-    # Work out how to do class veriables so that I can keep track of all the groups easily
+    # Work out how to do class variables so that I can keep track of all the groups easily
     attr_accessor :name
     attr_accessor :members
 
@@ -13,7 +13,7 @@ class Onceover
     # by itself, and yes it will reference them, not just create additional ones, woo!
 
     def initialize(name = nil, members = [])
-      @name = name
+      @name    = name
       @members = []
 
       case
@@ -21,7 +21,7 @@ class Onceover
         # If it's already a valid list just chuck it in there
         @members = members
       when members.is_a?(Hash)
-        # if it's a hash then do subtractive stiff
+        # if it's a hash then do subtractive stuff
         @members = Onceover::TestConfig.subtractive_to_list(members)
       when members.nil?
         # Support empty groups yo

data/lib/onceover/logger.rb

@@ -17,7 +17,7 @@ module Onceover::Logger
       Logging.appenders.stdout(
         'stdout',
         :layout => Logging.layouts.pattern(
-          :pattern => '%l\t -> %m\n',
+          :pattern      => '%l\t -> %m\n',
           :color_scheme => 'bright'
         )
       )

data/lib/onceover/node.rb

@@ -15,7 +15,10 @@ class Onceover
 
       # If we can't find the factset it will fail, so just catch that error and ignore it
       begin
-        @fact_set = Onceover::Controlrepo.facts[Onceover::Controlrepo.facts_files.index{|facts_file| File.basename(facts_file,'.json') == name}]
+        facts_file_index = Onceover::Controlrepo.facts_files.index {|facts_file|
+          File.basename(facts_file, '.json') == name
+        }
+        @fact_set = Onceover::Controlrepo.facts[facts_file_index]
       rescue TypeError
         @fact_set = nil
       end

data/lib/onceover/rake_tasks.rb

@@ -1,15 +1,17 @@
 require 'onceover/controlrepo'
 require 'pathname'
 
-@repo = nil
+@repo   = nil
 @config = nil
 
 
 desc 'Writes a `fixtures.yml` file based on the Puppetfile'
 task :generate_fixtures do
   repo = Onceover::Controlrepo.new
-  raise ".fixtures.yml already exits, we won't overwrite because we are scared" if File.exists?(File.expand_path('./.fixtures.yml',repo.root))
-  File.write(File.expand_path('./.fixtures.yml',repo.root),repo.fixtures)
+  if File.exists?(File.expand_path('./.fixtures.yml', repo.root))
+    raise ".fixtures.yml already exits, we won't overwrite because we are scared"
+  end
+  File.write(File.expand_path('./.fixtures.yml', repo.root), repo.fixtures)
 end
 
 
@@ -20,7 +22,8 @@ task :hiera_setup do
   current_config.each do |key, value|
     if value.is_a?(Hash)
       if value.has_key?(:datadir)
-        current_config[key][:datadir] = Pathname.new(repo.hiera_data).relative_path_from(Pathname.new(File.expand_path('..',repo.hiera_config_file))).to_s
+        hiera_config_path = Pathname.new(File.expand_path('..', repo.hiera_config_file))
+        current_config[key][:datadir] = Pathname.new(repo.hiera_data).relative_path_from(hiera_config_path).to_s
       end
     end
   end
@@ -36,8 +39,8 @@ end
 task :generate_onceover_yaml do
   require 'onceover/controlrepo'
   repo = Onceover::Controlrepo.new
-  template_dir = File.expand_path('../../templates',File.dirname(__FILE__))
-  onceover_yaml_template = File.read(File.expand_path('./controlrepo.yaml.erb',template_dir))
+  template_dir = File.expand_path('../../templates', File.dirname(__FILE__))
+  onceover_yaml_template = File.read(File.expand_path('./controlrepo.yaml.erb', template_dir))
   puts ERB.new(onceover_yaml_template, nil, '-').result(binding)
 end
 
@@ -54,9 +57,9 @@ task :generate_nodesets do
   puts "HOSTS:"
 
   repo.facts.each do |fact_set|
-    node_name = File.basename(repo.facts_files[repo.facts.index(fact_set)],'.json')
-    boxname = Onceover::Beaker.facts_to_vagrant_box(fact_set)
-    platform = Onceover::Beaker.facts_to_platform(fact_set)
+    node_name = File.basename(repo.facts_files[repo.facts.index(fact_set)], '.json')
+    boxname   = Onceover::Beaker.facts_to_vagrant_box(fact_set)
+    platform  = Onceover::Beaker.facts_to_platform(fact_set)
 
     uri = URI("https://atlas.hashicorp.com:443/api/v1/box/#{boxname}")
     request = Net::HTTP.new(uri.host, uri.port)
@@ -78,8 +81,8 @@ task :generate_nodesets do
     end
 
     # Use an ERB template
-    template_dir = File.expand_path('../../templates',File.dirname(__FILE__))
-    fixtures_template = File.read(File.expand_path('./nodeset.yaml.erb',template_dir))
+    template_dir = File.expand_path('../../templates', File.dirname(__FILE__))
+    fixtures_template = File.read(File.expand_path('./nodeset.yaml.erb', template_dir))
     puts ERB.new(fixtures_template, nil, '-').result(binding)
   end
 

data/lib/onceover/runner.rb

@@ -11,10 +11,8 @@ class Onceover
     end
 
     def prepare!
-      unless @config.skip_r10k
-        # Deploy the puppetfile
-        @config.r10k_deploy_local(@repo)
-      end
+      # Deploy the control repo
+      @config.deploy_local(@repo, {:skip_r10k => @config.skip_r10k})
 
       # Remove the entire spec directory to make sure we have
       # all the latest tests
@@ -25,48 +23,49 @@ class Onceover
       FileUtils.mkdir_p("#{@repo.tempdir}/spec/acceptance/nodesets")
 
       # Copy our entire spec directory over
-      FileUtils.cp_r("#{@repo.spec_dir}","#{@repo.tempdir}")
+      FileUtils.cp_r("#{@repo.spec_dir}", "#{@repo.tempdir}")
 
       # Create the Rakefile so that we can take advantage of the existing tasks
       @config.write_rakefile(@repo.tempdir, "spec/classes/**/*_spec.rb")
 
       # Create spec_helper.rb
-      @config.write_spec_helper("#{@repo.tempdir}/spec",@repo)
+      @config.write_spec_helper("#{@repo.tempdir}/spec", @repo)
 
       # Create spec_helper_accpetance.rb
-      @config.write_spec_helper_acceptance("#{@repo.tempdir}/spec",@repo)
+      @config.write_spec_helper_acceptance("#{@repo.tempdir}/spec", @repo)
 
       # TODO: Remove all tests that do not match set tags
 
       if @mode.include?(:spec)
         # Verify all of the spec tests
-        @config.spec_tests.each { |test| @config.verify_spec_test(@repo,test) }
+        @config.spec_tests.each { |test| @config.verify_spec_test(@repo, test) }
 
         # Deduplicate and write the tests (Spec and Acceptance)
         @config.run_filters(Onceover::Test.deduplicate(@config.spec_tests)).each do |test|
-          @config.write_spec_test("#{@repo.tempdir}/spec/classes",test)
+          @config.write_spec_test("#{@repo.tempdir}/spec/classes", test)
         end
       end
 
       if @mode.include?(:acceptance)
         # Verify all of the acceptance tests
-        @config.acceptance_tests.each { |test| @config.verify_acceptance_test(@repo,test) }
+        @config.acceptance_tests.each { |test| @config.verify_acceptance_test(@repo, test) }
 
         # Write them out
-        @config.write_acceptance_tests("#{@repo.tempdir}/spec/acceptance",@config.run_filters(Onceover::Test.deduplicate(@config.acceptance_tests)))
+        @config.write_acceptance_tests("#{@repo.tempdir}/spec/acceptance",
+          @config.run_filters(Onceover::Test.deduplicate(@config.acceptance_tests)))
       end
 
       # Parse the current hiera config, modify, and write it to the temp dir
-      unless @repo.hiera_config ==nil
+      unless @repo.hiera_config == nil
         hiera_config = @repo.hiera_config
-        hiera_config.each do |setting,value|
+        hiera_config.each do |setting, value|
           if value.is_a?(Hash)
             if value.has_key?(:datadir)
               hiera_config[setting][:datadir] = "#{@repo.tempdir}/#{@repo.environmentpath}/production/#{value[:datadir]}"
             end
           end
         end
-        File.write("#{@repo.tempdir}/#{@repo.environmentpath}/production/hiera.yaml",hiera_config.to_yaml)
+        File.write("#{@repo.tempdir}/#{@repo.environmentpath}/production/hiera.yaml", hiera_config.to_yaml)
       end
 
       @config.create_fixtures_symlinks(@repo)

data/lib/onceover/test.rb

@@ -11,24 +11,22 @@ class Onceover
     # This can accept a bunch of stuff. It can accept nodes, classes or groups anywhere
     # it will then detect them and expand them out into their respective objects so that
     # we just end up with a list of nodes and classes
-    #def initialize(on_this,test_config['classes'],options = {})
-    def initialize(on_this,test_this,test_config)
+    def initialize(on_this, test_this, test_config)
 
       @default_test_config = {
-        'check_idempotency' => true,
+        'check_idempotency'       => true,
         'runs_before_idempotency' => 1
       }
 
       # Add defaults if they do not exist
       test_config = @default_test_config.merge(test_config)
 
-      @nodes = []
+      @nodes   = []
       @classes = []
       @test_config = test_config
       @test_config.delete('classes') # remove classes from the config
       @tags = @test_config['tags']
 
-
       # Make sure that tags are an array
       @test_config['tags'] = [@test_config['tags']].flatten if @test_config['tags']
 
@@ -64,12 +62,12 @@ class Onceover
     end
 
     def eql?(other)
-      (@nodes.sort.eql?(other.nodes.sort)) and (@classes.sort.eql?(other.classes.sort))
+      @nodes.sort.eql?(other.nodes.sort) and @classes.sort.eql?(other.classes.sort)
     end
 
     def to_s
       class_msg = ""
-      node_msg = ""
+      node_msg  = ""
       if classes.count > 1
         class_msg = "#{classes.count}_classes"
       else
@@ -91,7 +89,8 @@ class Onceover
 
       # this will be an array of arrays, or maybe hashes
       combinations = []
-      new_tests = []
+      new_tests    = []
+
       tests.each do |test|
         test.nodes.each do |node|
           test.classes.each do |cls|
@@ -104,7 +103,7 @@ class Onceover
               end]
 
               # Delete all default values in the current options hash
-              test.test_config.delete_if do |key,value|
+              test.test_config.delete_if do |key, value|
                 test.default_test_config[key] == value
               end
 
@@ -112,7 +111,7 @@ class Onceover
               relevant_test.test_config.deep_merge!(test.test_config)
             else
               combinations << combo
-              new_tests << Onceover::Test.new(node,cls,test.test_config)
+              new_tests << Onceover::Test.new(node, cls, test.test_config)
             end
           end
         end
@@ -124,7 +123,7 @@ class Onceover
       # we don't want too many copies of the same shit going around
       #
       # Actually based on the way things are written I don't think this
-      # will duplicated node or class objects, just test objects,
+      # will deduplicate node or class objects, just test objects,
       # everything else is passed by reference
       new_tests
     end

data/lib/onceover/testconfig.rb

@@ -26,7 +26,7 @@ class Onceover
     attr_accessor :skip_r10k
     attr_accessor :strict_variables
 
-    def initialize(file,opts = {})
+    def initialize(file, opts = {})
       begin
         config = YAML.load(File.read(file))
       rescue Errno::ENOENT
@@ -53,26 +53,26 @@ class Onceover
       @nodes = Onceover::Node.all
 
       # Add the 'all_classes' and 'all_nodes' default groups
-      @node_groups << Onceover::Group.new('all_nodes',@nodes)
-      @class_groups << Onceover::Group.new('all_classes',@classes)
+      @node_groups  << Onceover::Group.new('all_nodes', @nodes)
+      @class_groups << Onceover::Group.new('all_classes', @classes)
 
       # Initialise all of the groups
       config['node_groups'].each { |name, members| @node_groups << Onceover::Group.new(name, members) } unless config['node_groups'] == nil
       config['class_groups'].each { |name, members| @class_groups << Onceover::Group.new(name, members) } unless config['class_groups'] == nil
 
-      @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
+      @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
 
       # Loop over all of the items in the test matrix and add those as test
       # objects to the list of tests
       config['test_matrix'].each do |test_hash|
         test_hash.each do |machines, settings|
           if settings['tests'] == 'spec'
-            @spec_tests << Onceover::Test.new(machines,settings['classes'],settings)
+            @spec_tests << Onceover::Test.new(machines, settings['classes'], settings)
           elsif settings['tests'] == 'acceptance'
-            @acceptance_tests << Onceover::Test.new(machines,settings['classes'],settings)
+            @acceptance_tests << Onceover::Test.new(machines, settings['classes'], settings)
           elsif settings['tests'] == 'all_tests'
             tst = Onceover::Test.new(machines,settings['classes'],settings)
             @spec_tests << tst
@@ -125,7 +125,7 @@ class Onceover
       include_list - exclude_list
     end
 
-    def verify_spec_test(controlrepo,test)
+    def verify_spec_test(controlrepo, test)
       test.nodes.each do |node|
         unless controlrepo.facts_files.any? { |file| file =~ /\/#{node.name}\.json/ }
           raise "Could not find factset for node: #{node.name}"
@@ -133,7 +133,7 @@ class Onceover
       end
     end
 
-    def verify_acceptance_test(controlrepo,test)
+    def verify_acceptance_test(controlrepo, test)
       warn "[DEPRECATION] #{__method__} is deprecated due to the removal of Beaker"
 
       require 'yaml'
@@ -157,9 +157,12 @@ class Onceover
       puppetcode.join("\n")
     end
 
-    def r10k_deploy_local(repo = Onceover::Controlrepo.new)
+    def deploy_local(repo = Onceover::Controlrepo.new, opts = {})
       require 'onceover/controlrepo'
       require 'pathname'
+
+      skip_r10k = opts[:skip_r10k] || false
+
       if repo.tempdir == nil
         repo.tempdir = Dir.mktmpdir('r10k')
       else
@@ -174,7 +177,7 @@ class Onceover
       # We might need to exclude some files
       #
       # if we are using bundler to install gems below the controlrepo
-      # we don't wan two copies so exclude those
+      # we don't want two copies so exclude those
       #
       # If there are more situations like this we can add them to this array as
       # full paths
@@ -187,8 +190,8 @@ class Onceover
 
       # Exclude the files we need to
       controlrepo_files = Dir.glob("#{repo.root}/**/*")
-      files_to_copy = (controlrepo_files - excluded_files).delete_if { |path| Pathname(path).directory? }
-      folders_to_copy = (controlrepo_files - excluded_files).keep_if { |path| Pathname(path).directory? }
+      files_to_copy     = (controlrepo_files - excluded_files).delete_if { |path| Pathname(path).directory? }
+      folders_to_copy   = (controlrepo_files - excluded_files).keep_if { |path| Pathname(path).directory? }
 
       logger.debug "Creating temp dir as a staging directory for copying the controlrepo to #{repo.tempdir}"
       temp_controlrepo = Dir.mktmpdir('controlrepo')
@@ -207,15 +210,17 @@ class Onceover
       FileUtils.rm_rf(temp_controlrepo)
 
       # Pull the trigger! If it's not already been pulled
-      if repo.tempdir
+      if repo.tempdir and not skip_r10k
         if File.directory?(repo.tempdir)
           # TODO: Change this to call out to r10k directly to do this
           # Probably something like:
           # R10K::Settings.global_settings.evaluate(with_overrides)
           # R10K::Action::Deploy::Environment
-          Dir.chdir("#{repo.tempdir}/#{repo.environmentpath}/production") do
-            logger.debug "Runing r10k puppetfile install --verbose --color --puppetfile #{repo.puppetfile} from #{repo.tempdir}/#{repo.environmentpath}/production"
-            system("r10k puppetfile install --verbose --color --puppetfile #{repo.puppetfile}")
+          prod_dir = "#{repo.tempdir}/#{repo.environmentpath}/production"
+          Dir.chdir(prod_dir) do
+            install_cmd = "r10k puppetfile install --verbose --color"
+            logger.debug "Running #{install_cmd} from #{prod_dir}"
+            system(install_cmd)
           end
         else
           raise "#{repo.tempdir} is not a directory"
@@ -228,21 +233,25 @@ class Onceover
 
     def write_spec_test(location, test)
       # Use an ERB template to write a spec test
-      File.write("#{location}/#{test.to_s}_spec.rb",Onceover::Controlrepo.evaluate_template('test_spec.rb.erb',binding))
+      File.write("#{location}/#{test.to_s}_spec.rb",
+        Onceover::Controlrepo.evaluate_template('test_spec.rb.erb', binding))
     end
 
     def write_acceptance_tests(location, tests)
       warn "[DEPRECATION] #{__method__} is deprecated due to the removal of Beaker"
 
-      File.write("#{location}/acceptance_spec.rb",Onceover::Controlrepo.evaluate_template('acceptance_test_spec.rb.erb',binding))
+      File.write("#{location}/acceptance_spec.rb",
+        Onceover::Controlrepo.evaluate_template('acceptance_test_spec.rb.erb', binding))
     end
 
     def write_spec_helper_acceptance(location, repo)
-      File.write("#{location}/spec_helper_acceptance.rb",Onceover::Controlrepo.evaluate_template('spec_helper_acceptance.rb.erb',binding))
+      File.write("#{location}/spec_helper_acceptance.rb",
+        Onceover::Controlrepo.evaluate_template('spec_helper_acceptance.rb.erb', binding))
     end
 
     def write_rakefile(location, pattern)
-      File.write("#{location}/Rakefile",Onceover::Controlrepo.evaluate_template('testconfig_Rakefile.erb',binding))
+      File.write("#{location}/Rakefile",
+        Onceover::Controlrepo.evaluate_template('testconfig_Rakefile.erb', binding))
     end
 
     def write_spec_helper(location, repo)
@@ -256,7 +265,8 @@ class Onceover
       repo.temp_modulepath = modulepath
 
       # Use an ERB template to write a spec test
-      File.write("#{location}/spec_helper.rb",Onceover::Controlrepo.evaluate_template('spec_helper.rb.erb',binding))
+      File.write("#{location}/spec_helper.rb",
+        Onceover::Controlrepo.evaluate_template('spec_helper.rb.erb', binding))
     end
 
     def create_fixtures_symlinks(repo)
@@ -279,7 +289,7 @@ class Onceover
         'classes' => @filter_classes,
         'nodes'   => @filter_nodes
       }
-      filters.each do |method,filter_list|
+      filters.each do |method, filter_list|
         if filter_list
           # Remove tests that do not have matching tags
           tests.keep_if do |test|
@@ -295,5 +305,6 @@ class Onceover
       end
       tests
     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.2.5"
+  s.version     = "3.2.6"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"
@@ -38,5 +38,6 @@ Gem::Specification.new do |s|
   # Development
   s.add_development_dependency 'rubocop', '~> 0.39.0'
   s.add_development_dependency 'rubygems-tasks', '~> 0.2.0'
-
+  s.add_development_dependency 'pry', '~> 0.10.0'
+  s.add_development_dependency 'cucumber', '~> 2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.6
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-29 00:00:00.000000000 Z
+date: 2017-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -276,6 +276,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Automatically generates tests for your Puppet code
 email:
 - dylan.ratcliffe@puppet.com
@@ -313,6 +341,9 @@ files:
 - factsets/Windows_Server-2012r2-64.json
 - factsets/solaris-10_u9-sparc-64.json
 - factsets/solaris-11.2-sparc-64.json
+- features/basic.feature
+- features/step_definitions/common.rb
+- features/support/env.rb
 - lib/onceover/beaker.rb
 - lib/onceover/beaker/spec_helper.rb
 - lib/onceover/class.rb