onceover 3.2.8 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2c62563cf5b896213394193150a990cceaa671c
-  data.tar.gz: 6872e6d67a0f3863745e5713ca33611f03978afa
+  metadata.gz: 5e3d01548767f7131506d6a421d7c87d38fbd85b
+  data.tar.gz: 17bb3e2bf387bd4dbb7032f2dddb8f0ed23b0215
 SHA512:
-  metadata.gz: 4816f05bf7055452336ff743b177feffdb8b3d75bda749b148b85edd63655c82a9d3348e1f3c36469538dbc33f581f8d8e45910bb74ceb5a085e6a799c34f745
-  data.tar.gz: '0883183e90d99f4ae800bbc8b843edb2202b9e744f88a053fdbabffe92ecb27a3c9ec65bcaee273c026230d5d252b175828f3a33a4a22353bb71115adae4f6f7'
+  metadata.gz: e8c006df260af3879470b5a9593ef00b02ca76746fadf95cb3d923b52a254b12e652c51f2cec2f116db325c8dbe32af2f40d124044acbdfa627e1a17d9a53490
+  data.tar.gz: 6941572c2ab56aaec5c572f8fa786d3b4bd6437c6cb8bf4efd4c90e9350d3299df2c33e470cb241a8b5740aeddad87469674243c231d6dea4dc88cf828ed50d0

data/.gitmodules

@@ -1,4 +1,4 @@
-[submodule "spec/fixtures/puppet_controlrepo"]
-	path = spec/fixtures/puppet_controlrepo
+[submodule "spec/fixtures/controlrepos/puppet_controlrepo"]
+	path = spec/fixtures/controlrepos/puppet_controlrepo
 	url = https://github.com/dylanratcliffe/puppet_controlrepo.git
 	branch = production

data/.rubocop.yml

@@ -61,7 +61,7 @@ Lint/AssignmentInCondition:
   Enabled: false
 
 # DISABLED - not useful
-Style/SpaceBeforeComment:
+Layout/SpaceBeforeComment:
   Enabled: false
 
 # DISABLED - not useful
@@ -81,6 +81,9 @@ Style/RedundantSelf:
 Metrics/MethodLength:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: false
+
 # DISABLED - not useful
 Style/WhileUntilModifier:
   Enabled: false
@@ -90,8 +93,9 @@ Lint/AmbiguousRegexpLiteral:
   Enabled: false
 
 # DISABLED
-Lint/Eval:
+Security/Eval:
   Enabled: false
+
 # DISABLED
 Lint/BlockAlignment:
   Enabled: false
@@ -140,7 +144,7 @@ Lint/UselessAssignment:
 Lint/Void:
   Enabled: false
 
-Style/AccessModifierIndentation:
+Layout/AccessModifierIndentation:
   Enabled: false
 
 Style/AccessorMethodName:
@@ -149,13 +153,16 @@ Style/AccessorMethodName:
 Style/Alias:
   Enabled: false
 
-Style/AlignArray:
+Layout/AlignArray:
+  Enabled: false
+
+Layout/AlignHash:
   Enabled: false
 
-Style/AlignHash:
+Layout/AlignParameters:
   Enabled: false
 
-Style/AlignParameters:
+Layout/IndentHeredoc:
   Enabled: false
 
 Metrics/BlockNesting:
@@ -173,7 +180,16 @@ Style/BracesAroundHashParameters:
 Style/CaseEquality:
   Enabled: false
 
-Style/CaseIndentation:
+Style/SymbolArray:
+  Enabled: false
+
+Style/EmptyCaseCondition:
+  Enabled: false
+
+Layout/CaseIndentation:
+  Enabled: false
+
+Layout/MultilineMethodCallBraceLayout:
   Enabled: false
 
 Style/CharacterLiteral:
@@ -208,65 +224,65 @@ Style/WordArray:
 Style/UnneededPercentQ:
   Enabled: false
 
-Style/Tab:
+Layout/Tab:
   Enabled: false
 
-Style/SpaceBeforeSemicolon:
+Layout/SpaceBeforeSemicolon:
   Enabled: false
 
-Style/TrailingBlankLines:
+Layout/TrailingBlankLines:
   Enabled: false
 
-Style/SpaceInsideBlockBraces:
+Layout/SpaceInsideBlockBraces:
   Enabled: false
 
-Style/SpaceInsideBrackets:
+Layout/SpaceInsideBrackets:
   Enabled: false
 
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
   Enabled: false
 
-Style/SpaceInsideParens:
+Layout/SpaceInsideParens:
   Enabled: false
 
-Style/LeadingCommentSpace:
+Layout/LeadingCommentSpace:
   Enabled: false
 
-Style/SpaceAfterColon:
+Layout/SpaceAfterColon:
   Enabled: false
 
-Style/SpaceAfterComma:
+Layout/SpaceAfterComma:
   Enabled: false
 
-Style/SpaceAroundKeyword:
+Layout/SpaceAroundKeyword:
   Enabled: false
 
-Style/SpaceAfterMethodName:
+Layout/SpaceAfterMethodName:
   Enabled: false
 
-Style/SpaceAfterNot:
+Layout/SpaceAfterNot:
   Enabled: false
 
-Style/SpaceAfterSemicolon:
+Layout/SpaceAfterSemicolon:
   Enabled: false
 
-Style/SpaceAroundEqualsInParameterDefault:
+Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: false
 
-Style/SpaceAroundOperators:
+Layout/SpaceAroundOperators:
   Enabled: false
 
-Style/SpaceBeforeBlockBraces:
+Layout/SpaceBeforeBlockBraces:
   Enabled: false
 
-Style/SpaceBeforeComma:
+Layout/SpaceBeforeComma:
   Enabled: false
 
 
 Style/CollectionMethods:
   Enabled: false
 
-Style/CommentIndentation:
+Layout/CommentIndentation:
   Enabled: false
 
 Style/ColonMethodCall:
@@ -287,10 +303,10 @@ Style/Documentation:
 Style/DefWithParentheses:
   Enabled: false
 
-Style/DeprecatedHashMethods:
+Style/PreferredHashMethods:
   Enabled: false
 
-Style/DotPosition:
+Layout/DotPosition:
   Enabled: false
 
 # DISABLED - used for converting to bool
@@ -300,25 +316,25 @@ Style/DoubleNegation:
 Style/EachWithObject:
   Enabled: false
 
-Style/EmptyLineBetweenDefs:
+Layout/EmptyLineBetweenDefs:
   Enabled: false
 
-Style/IndentArray:
+Layout/IndentArray:
   Enabled: false
 
-Style/IndentHash:
+Layout/IndentHash:
   Enabled: false
 
-Style/IndentationConsistency:
+Layout/IndentationConsistency:
   Enabled: false
 
-Style/IndentationWidth:
+Layout/IndentationWidth:
   Enabled: false
 
-Style/EmptyLines:
+Layout/EmptyLines:
   Enabled: false
 
-Style/EmptyLinesAroundAccessModifier:
+Layout/EmptyLinesAroundAccessModifier:
   Enabled: false
 
 Style/EmptyLiteral:
@@ -327,7 +343,7 @@ Style/EmptyLiteral:
 Metrics/LineLength:
   Enabled: false
 
-Style/MethodCallParentheses:
+Style/MethodCallWithoutArgsParentheses:
   Enabled: false
 
 Style/MethodDefParentheses:
@@ -336,7 +352,7 @@ Style/MethodDefParentheses:
 Style/LineEndConcatenation:
   Enabled: false
 
-Style/TrailingWhitespace:
+Layout/TrailingWhitespace:
   Enabled: false
 
 Style/StringLiterals:
@@ -487,7 +503,7 @@ Metrics/ParameterLists:
 Lint/RequireParentheses:
   Enabled: false
 
-Style/SpaceBeforeFirstArg:
+Layout/SpaceBeforeFirstArg:
   Enabled: false
 
 Style/ModuleFunction:
@@ -508,7 +524,7 @@ Metrics/PerceivedComplexity:
 Style/SymbolProc:
   Enabled: false
 
-Style/SpaceInsideRangeLiteral:
+Layout/SpaceInsideRangeLiteral:
   Enabled: false
 
 Style/InfiniteLoop:
@@ -520,7 +536,7 @@ Style/BarePercentLiterals:
 Style/PercentQLiterals:
   Enabled: false
 
-Style/MultilineBlockLayout:
+Layout/MultilineBlockLayout:
   Enabled: false
 
 Metrics/AbcSize:
@@ -532,22 +548,22 @@ Style/MutableConstant:
 Style/BlockDelimiters:
   Enabled: false
 
-Style/EmptyLinesAroundClassBody:
+Layout/EmptyLinesAroundClassBody:
   Enabled: false
 
 Style/ConditionalAssignment:
   Enabled: false
 
-Style/ExtraSpacing:
+Layout/ExtraSpacing:
   Enabled: false
 
-Style/EmptyLinesAroundBlockBody:
+Layout/EmptyLinesAroundBlockBody:
   Enabled: false
 
-Style/EmptyLinesAroundModuleBody:
+Layout/EmptyLinesAroundModuleBody:
   Enabled: false
 
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
   Enabled: false
 
 Style/EmptyElse:
@@ -556,13 +572,13 @@ Style/EmptyElse:
 Style/StringLiteralsInInterpolation:
   Enabled: false
 
-Style/MultilineMethodCallIndentation:
+Layout/MultilineMethodCallIndentation:
   Enabled: false
 
 Metrics/ModuleLength:
   Enabled: false
 
-Style/EmptyLinesAroundMethodBody:
+Layout/EmptyLinesAroundMethodBody:
   Enabled: false
 
 Lint/IneffectiveAccessModifier:
@@ -571,28 +587,28 @@ Lint/IneffectiveAccessModifier:
 Performance/StringReplacement:
   Enabled: false
 
-Style/ClosingParenthesisIndentation:
+Layout/ClosingParenthesisIndentation:
   Enabled: false
 
 Style/UnneededInterpolation:
   Enabled: false
 
-Style/ElseAlignment:
+Layout/ElseAlignment:
   Enabled: false
 
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-Style/FirstParameterIndentation:
+Layout/FirstParameterIndentation:
   Enabled: false
 
 Style/IfInsideElse:
   Enabled: false
 
-Style/IndentAssignment:
+Layout/IndentAssignment:
   Enabled: false
 
-Style/SpaceAroundBlockParameters:
+Layout/SpaceAroundBlockParameters:
   Enabled: false
 
 Style/ParallelAssignment:
@@ -616,7 +632,7 @@ Performance/Casecmp:
 Lint/NestedMethodDefinition:
   Enabled: false
 
-Style/SpaceInsideStringInterpolation:
+Layout/SpaceInsideStringInterpolation:
   Enabled: false
 
 Performance/RedundantMerge:
@@ -637,7 +653,7 @@ Performance/Count:
 Style/NestedParenthesizedCalls:
   Enabled: false
 
-Style/RescueEnsureAlignment:
+Layout/RescueEnsureAlignment:
   Enabled: false
 
 Lint/DuplicateMethods:
@@ -649,9 +665,6 @@ Performance/RangeInclude:
 Style/TrailingUnderscoreVariable:
   Enabled: false
 
-Lint/LiteralInInterpolation:
-  Enabled: false
-
 Performance/DoubleStartEndWith:
   Enabled: false
 
@@ -661,7 +674,7 @@ Performance/RedundantSortBy:
 Performance/TimesMap:
   Enabled: false
 
-Style/InitialIndentation:
+Layout/InitialIndentation:
   Enabled: false
 
 Style/StructInheritance:
@@ -676,4 +689,5 @@ Style/IfUnlessModifierOfIfUnless:
 Style/ZeroLengthPredicate:
   Enabled: false
 
-
+Bundler/OrderedGems:
+  Enabled: false

data/Rakefile

@@ -20,16 +20,13 @@ desc "Run unit tests"
 task rspec_unit_tests: [:syntax, :rubocop, :spec]
 
 desc "Run acceptance cucumber tests"
-task cucumber_acceptance_tests: [:syntax, :rubocop, :cucumber]
-
-desc "Run acceptance rspec tests"
-task rspec_acceptance_tests: [:syntax, :rubocop, :fixtures, :acceptance]
+task cucumber_acceptance_tests: [:syntax, :rubocop, :fixtures, :cucumber]
 
 desc "Run full set of tests"
-task full_tests: [:rspec_unit_tests, :rspec_acceptance_tests, :cucumber_acceptance_tests]
+task full_tests: [:rspec_unit_tests, :cucumber_acceptance_tests]
 
 task :syntax do
-  paths = ['lib', 'spec/onceover', 'spec/acceptance', 'features']
+  paths = ['lib', 'spec/onceover', 'features']
   require 'find'
   Find.find(*paths) do |path|
     next unless path =~ /\.rb$/
@@ -48,4 +45,3 @@ task :fixtures do
   system 'git submodule init && git submodule update --recursive'
   raise "Couldn't clone controlrepo to fixtures directory" unless $?.success?
 end
-

data/features/init.feature

@@ -6,14 +6,13 @@ Feature: Initialize Onceover application
   Background:
     Given onceover executable
 
- Scenario: Initialize basic repo
-    Given control repo "controlrepo_basic"
+  Scenario: Initialize basic repo
+    Given control repo "basic"
     When I run onceover command "init"
     Then I should not see any errors
     And I should see generated all necessary files and folders
 
- Scenario: Initialize repo with missing environment.conf file
-    Given control repo "controlrepo_basic" without "environment.conf"
+  Scenario: Initialize repo with missing environment.conf file
+    Given control repo "basic" without "environment.conf"
     When I run onceover command "init"
     Then I should see error with message pattern "No such file or directory.*environment.conf"
-

data/features/run.feature

@@ -6,14 +6,23 @@ Feature: Run rspec and acceptance test suits
   Background:
     Given onceover executable
 
- Scenario: Run correct spec tests
-    Given initialized control repo "controlrepo_basic"
+  Scenario: Run correct spec tests
+    Given initialized control repo "basic"
     When I run onceover command "run spec"
     Then I should not see any errors
 
- Scenario: Run spec tests with misspelled module in Puppetfile
-    Given initialized control repo "controlrepo_basic"
+  Scenario: Run spec tests with misspelled module in Puppetfile
+    Given initialized control repo "basic"
     And in Puppetfile is misspelled module's name
     When I run onceover command "run spec"
     Then I should see error with message pattern "The module acme-not_exists does not exist"
 
+  Scenario: Run advanced spec tests
+    Given control repo "puppet_controlrepo"
+    When I run onceover command "run spec"
+    Then I should not see any errors
+
+  Scenario: Check that control_branch functionality works
+    Given initialized control repo "control_branch"
+    When I run onceover command "run spec"
+    Then the temporary Puppetfile should contain the git branch

data/features/show.feature

@@ -0,0 +1,28 @@
+Feature: Show the state of things
+  For a correct controlrepo I would like to see details of the Puppetfile and
+  the things that have been detedted by onceover in the controlrepo.
+
+  Background:
+    Given onceover executable
+
+  Scenario: Show info for basic repo
+    Given initialized control repo "basic"
+    When I run onceover command "show repo"
+    Then I should not see any errors
+
+  Scenario: Detect roles and profiles
+    Given initialized control repo "basic"
+    When I run onceover command "show repo"
+    Then I should not see any errors
+    And I should see message pattern "roles.*role::database_server"
+    And I should see message pattern "roles.*role::webserver"
+    And I should see message pattern "roles.*role::example"
+    And I should see message pattern "profiles.*profile::example"
+    And I should see message pattern "profiles.*profile::base"
+
+  Scenario: Detect modules
+    Given initialized control repo "basic"
+    When I run onceover command "show puppetfile"
+    Then I should not see any errors
+    And I should see message pattern "puppetlabs-stdlib\s+\|\s+4\.11\.0"
+    And I should see message pattern "apache\s+\|\s+N/A"

data/features/step_definitions/common.rb

@@ -6,8 +6,8 @@ Given(/^control repo "([^"]*)"$/) do |controlrepo_name|
   @repo = ControlRepo_Helper.new( controlrepo_name )
   @cmd.controlrepo = @repo
   FileUtils.rm_rf @repo.root_folder
-  FileUtils.mkdir_p 'tmp'
-  FileUtils.cp_r "spec/fixtures/#{controlrepo_name}", 'tmp'
+  FileUtils.mkdir_p @repo.tmp_folder
+  FileUtils.cp_r "spec/fixtures/controlrepos/#{controlrepo_name}", @repo.tmp_folder
 end
 
 Given(/^initialized control repo "([^"]*)"$/) do |controlrepo_name|
@@ -45,6 +45,9 @@ Then(/^I should see error with message pattern "([^"]*)"$/) do |err_msg_regexp|
   expect(@cmd.output.match err_msg_regexp).to_not be nil
 end
 
-Given(/^in Puppetfile is misspelled module's name$/) do
-  @repo.add_line_to_puppetfile %Q(mod "acme/not_exists", "7.7.7")
+Then(/^I should see message pattern "([^"]*)"$/) do |err_msg_regexp|
+  expect(@cmd.success?).to be true
+  puts @cmd.output unless @cmd.success?
+  expect(@cmd.output).to match(err_msg_regexp)
+  puts @cmd.output.match(err_msg_regexp).to_s
 end

data/features/step_definitions/init.rb

@@ -1,3 +1,7 @@
+Given(/^in Puppetfile is misspelled module's name$/) do
+  @repo.add_line_to_puppetfile %Q(mod "acme/not_exists", "7.7.7")
+end
+
 Then(/^I should see generated all necessary files and folders$/) do
   files = [ 'spec/onceover.yaml', 'Rakefile', 'Gemfile' ].map { |x| @repo.root_folder + x }
   folders = [ 'spec/factsets', 'spec/pre_conditions'].map! { |x| @repo.root_folder + x}

data/features/step_definitions/run.rb

@@ -0,0 +1,9 @@
+Then(/^the temporary Puppetfile should contain \/(.*)\/$/) do |regex|
+  puppetfile = File.read(@repo.onceover_temp_puppetfile)
+  expect(puppetfile).to match(Regexp.new(regex))
+end
+
+Then(/^the temporary Puppetfile should contain the git branch/) do
+  git_branch = `git rev-parse --abbrev-ref HEAD`.chomp
+  step %Q(the temporary Puppetfile should contain /#{git_branch}/)
+end

data/features/support/command_helper.rb

@@ -19,7 +19,7 @@ class Command_Helper
   end
 
   def generate_command
-    controlrepo_param = @controlrepo ? "--path #{@controlrepo.root_folder}" : ''
+    controlrepo_param = @controlrepo ? "--path #{File.expand_path(@controlrepo.root_folder)}" : ''
     return "#{@executable} #{@command} #{controlrepo_param}"
   end
 

data/features/support/controlrepo_helper.rb

@@ -1,16 +1,30 @@
 class ControlRepo_Helper
 
+  attr_reader :tmp_folder
+
   def initialize( name )
-    @name = name
-    @tmp_folder = 'tmp/'
+    @name       = name
+    @tmp_folder = '.cucumber/tmp/'
   end
 
   def root_folder
     return @tmp_folder + @name + '/'
   end
 
+  def puppetfile
+    return root_folder + "Puppetfile"
+  end
+
+  def onceover_temp_root_folder
+    return root_folder + '.onceover/etc/puppetlabs/code/environments/production/'
+  end
+
+  def onceover_temp_puppetfile
+    return onceover_temp_root_folder + "Puppetfile"
+  end
+
   def add_line_to_puppetfile( line )
-    open(root_folder + 'Puppetfile', 'a') { |f| f.puts line }
+    open(puppetfile, 'a') { |f| f.puts line }
   end
 
 end

data/lib/onceover/controlrepo.rb

@@ -439,16 +439,20 @@ class Onceover
       #Onceover::Controlrepo.init_write_file(generate_nodesets(repo),repo.nodeset_file)
       init_write_file(
         evaluate_template('pre_conditions_README.md.erb', binding),
-        File.expand_path('./pre_conditions/README.md', repo.spec_dir))
+        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))
+        File.expand_path('./factsets/README.md', repo.spec_dir)
+      )
       init_write_file(
         evaluate_template('Rakefile.erb', binding),
-        File.expand_path('./Rakefile', repo.root))
+        File.expand_path('./Rakefile', repo.root)
+      )
       init_write_file(
         evaluate_template('Gemfile.erb', binding),
-        File.expand_path('./Gemfile', repo.root))
+        File.expand_path('./Gemfile', repo.root)
+      )
 
       # Add .onceover to Gitignore
       gitignore_path = File.expand_path('.gitignore', repo.root)

data/lib/onceover/logger.rb

@@ -4,7 +4,7 @@ module Onceover::Logger
   def logger
     unless $logger
       # here we setup a color scheme called 'bright'
-      Logging.color_scheme( 'bright',
+      Logging.color_scheme('bright',
         :levels => {
           :debug => :cyan,
           :info  => :green,

data/lib/onceover/testconfig.rb

@@ -28,7 +28,7 @@ class Onceover
 
     def initialize(file, opts = {})
       begin
-        config = YAML.load(File.read(file))
+        config = YAML.safe_load(File.read(file))
       rescue Errno::ENOENT
         raise "Could not find #{file}"
       rescue Psych::SyntaxError
@@ -153,7 +153,7 @@ class Onceover
         logger.debug "Reading pre_conditions from #{condition_file}"
         puppetcode << File.read(condition_file)
       end
-      return nil if puppetcode.count == 0
+      return nil if puppetcode.count.zero?
       puppetcode.join("\n")
     end
 
@@ -203,6 +203,22 @@ class Onceover
       files_to_copy.each do |file|
         FileUtils.cp(file,"#{temp_controlrepo}/#{(Pathname(file).relative_path_from(Pathname(repo.root))).to_s}")
       end
+
+      # When using puppetfile vs deploy with r10k, we want to respect the :control_branch
+      # located in the Puppetfile. To accomplish that, we use git and find the current
+      # branch name, then replace strings within the staged puppetfile, prior to copying.
+
+      logger.debug "Checking current working branch"
+      git_branch = `git rev-parse --abbrev-ref HEAD`.chomp
+
+      logger.debug "found #{git_branch} as current working branch"
+      puppetfile_contents = File.read("#{temp_controlrepo}/Puppetfile")
+
+      logger.debug "replacing :control_branch mentions in the Puppetfile with #{git_branch}"
+      new_puppetfile_contents = puppetfile_contents.gsub(/:control_branch/, "'#{git_branch}'")
+      File.write("#{temp_controlrepo}/Puppetfile", new_puppetfile_contents)
+
+
       FileUtils.mkdir_p("#{repo.tempdir}/#{repo.environmentpath}/production")
 
       logger.debug "Copying #{temp_controlrepo} to #{repo.tempdir}/#{repo.environmentpath}/production"

data/onceover.gemspec

@@ -1,9 +1,10 @@
 # -*- encoding: utf-8 -*-
+
 $LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "onceover"
-  s.version     = "3.2.8"
+  s.version     = "3.3.0"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"

data/spec/fixtures/{controlrepo_basic → controlrepos/basic}/Puppetfile

@@ -8,9 +8,9 @@ mod "puppetlabs/stdlib",      '4.11.0'
 
 # Modules from Git
 # Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
-#mod 'apache',
-#  :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
-#  :commit => '83401079053dca11d61945bd9beef9ecf7576cbf'
+mod 'apache',
+ :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
+ :commit => '83401079053dca11d61945bd9beef9ecf7576cbf'
 
 #mod 'apache',
 #  :git    => 'https://github.com/puppetlabs/puppetlabs-apache',

data/spec/fixtures/controlrepos/control_branch/Puppetfile

@@ -0,0 +1,18 @@
+forge "http://forge.puppetlabs.com"
+#
+# I want to download some modules to check if r10k feature in Onceover works correctly.
+#
+
+# Versions should be updated to be the latest at the time you start
+mod "puppetlabs/stdlib",      '4.11.0'
+
+# Modules from Git
+# Examples: https://github.com/puppetlabs/r10k/blob/master/doc/puppetfile.mkd#examples
+#mod 'apache',
+#  :git    => 'https://github.com/puppetlabs/puppetlabs-apache',
+#  :commit => '83401079053dca11d61945bd9beef9ecf7576cbf'
+
+mod 'apache',
+ :git            => 'https://github.com/puppetlabs/puppetlabs-apache',
+ :branch         => :control_branch,
+ :default_branch => 'master'

data/spec/fixtures/controlrepos/minimal/environment.conf

@@ -0,0 +1,2 @@
+modulepath          = site:modules:$basemodulepath
+config_version      = 'scripts/config_version.sh $environmentpath $environment'

data/spec/onceover/controlrepo_spec.rb

@@ -6,7 +6,7 @@ describe "Onceover::Controlrepo" do
     before do
       @repo = Onceover::Controlrepo.new(
         {
-          path:'spec/fixtures/controlrepo_minimal'
+          path:'spec/fixtures/controlrepos/minimal'
         }
       )
     end

data/templates/Gemfile.erb

@@ -1,5 +1,3 @@
 source 'https://rubygems.org'
 
 gem 'onceover'
-gem 'beaker', '~> 2.0'
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.2.8
+  version: 3.3.0
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -344,8 +344,10 @@ files:
 - features/help.feature
 - features/init.feature
 - features/run.feature
+- features/show.feature
 - features/step_definitions/common.rb
 - features/step_definitions/init.rb
+- features/step_definitions/run.rb
 - features/support/command_helper.rb
 - features/support/controlrepo_helper.rb
 - features/support/env.rb
@@ -367,18 +369,19 @@ files:
 - lib/onceover/test.rb
 - lib/onceover/testconfig.rb
 - onceover.gemspec
-- spec/acceptance/controlrepo_spec.rb
-- spec/fixtures/controlrepo_basic/Puppetfile
-- spec/fixtures/controlrepo_basic/environment.conf
-- spec/fixtures/controlrepo_basic/hieradata/common.yaml
-- spec/fixtures/controlrepo_basic/hieradata/nodes/example-node.yaml
-- spec/fixtures/controlrepo_basic/manifests/site.pp
-- spec/fixtures/controlrepo_basic/site/profile/manifests/base.pp
-- spec/fixtures/controlrepo_basic/site/profile/manifests/example.pp
-- spec/fixtures/controlrepo_basic/site/role/manifests/database_server.pp
-- spec/fixtures/controlrepo_basic/site/role/manifests/example.pp
-- spec/fixtures/controlrepo_basic/site/role/manifests/webserver.pp
-- spec/fixtures/controlrepo_minimal/environment.conf
+- spec/fixtures/controlrepos/basic/Puppetfile
+- spec/fixtures/controlrepos/basic/environment.conf
+- spec/fixtures/controlrepos/basic/hieradata/common.yaml
+- spec/fixtures/controlrepos/basic/hieradata/nodes/example-node.yaml
+- spec/fixtures/controlrepos/basic/manifests/site.pp
+- spec/fixtures/controlrepos/basic/site/profile/manifests/base.pp
+- spec/fixtures/controlrepos/basic/site/profile/manifests/example.pp
+- spec/fixtures/controlrepos/basic/site/role/manifests/database_server.pp
+- spec/fixtures/controlrepos/basic/site/role/manifests/example.pp
+- spec/fixtures/controlrepos/basic/site/role/manifests/webserver.pp
+- spec/fixtures/controlrepos/control_branch/Puppetfile
+- spec/fixtures/controlrepos/control_branch/environment.conf
+- spec/fixtures/controlrepos/minimal/environment.conf
 - spec/onceover/controlrepo_spec.rb
 - spec/spec_helper.rb
 - templates/.fixtures.yml.erb

data/spec/acceptance/controlrepo_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-require 'onceover/controlrepo'
-
-describe "Onceover::Controlrepo" do
-  context "in a complex repo" do
-    before do
-      @repo = Onceover::Controlrepo.new(
-        {
-          path:'spec/fixtures/puppet_controlrepo'
-        }
-      )
-    end
-
-    context "when initialising the object" do
-      it { expect(@repo).not_to be_nil }
-    end
-
-    context "when running the tests" do
-      it "doesn't die horribly" do
-        expect{
-          Dir.chdir('spec/fixtures/puppet_controlrepo') do
-            require 'onceover/controlrepo'
-            require 'onceover/cli'
-            require 'onceover/runner'
-            require 'onceover/testconfig'
-            require 'onceover/logger'
-
-            repo = Onceover::Controlrepo.new({})
-            runner = Onceover::Runner.new(repo,Onceover::TestConfig.new(repo.onceover_yaml, {}), :spec)
-            runner.prepare!
-            runner.run_spec!
-          end
-        }.not_to raise_error
-      end
-    end
-  end
-end