onceover 3.2.6 → 3.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3017c18343feee112c67aa4d2eee9e96ed40c269
-  data.tar.gz: d7e83b25247b59be7f5585ef0d0929888340270a
+  metadata.gz: 6258620982ccd165a8b28db772919db88228298f
+  data.tar.gz: a605dc65458a48fe892558a350d08f69c1478ac3
 SHA512:
-  metadata.gz: 3537a0ed03929ef0bb538aa291be8a38906ee17f0ff06901743571ec0905c05816b4459cd5febb3dff60b5bc47d2afae94a1902586160fd26438c36854fb03e4
-  data.tar.gz: a929a56a8431e7e853b671b23e39ed54c2a1bc40b8fea4f1a506e969a65a973b716ac8fcf49f60daa61d7990811468bac4b908b5c670731f1d0131afa57f993d
+  metadata.gz: 6de5b5c139e1b6a931dfa34f748967c69d54866d3ddce13b2a7e77f6ccc203cde527f8d6ed6bef4002eb83b9c458cda3b61f38e5f569ca5c319f1a7e0d9856ec
+  data.tar.gz: c4671a56297178b4d61c9f49984b86cc3a7ab3c2302e77528685d62fc9b19c482885c781e60f2e2e3cba01db5115f5e610e8c5090ee35da4440bdaeb1471875b

data/.gitignore

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

data/Rakefile

@@ -4,24 +4,32 @@ require 'cucumber/rake/task'
 Gem::Tasks.new
 
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = '--pattern spec/\*/\*_spec.rb'
+  t.rspec_opts = '--pattern spec/onceover/**/*_spec.rb'
+end
+
+RSpec::Core::RakeTask.new(:acceptance) do |t|
+  t.rspec_opts = '--pattern spec/acceptance/**/*_spec.rb'
 end
 
 Cucumber::Rake::Task.new
 
 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]
+task rspec_unit_tests: [:syntax, :rubocop, :spec]
 
-desc "Run acceptance tests"
-task acceptance_tests: [:syntax, :rubocop, :cucumber]
+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]
+
+desc "Run full set of tests"
+task full_tests: [:rspec_unit_tests, :rspec_acceptance_tests, :cucumber_acceptance_tests]
 
 task :syntax do
-  paths = ['lib',]
+  paths = ['lib', 'spec/onceover', 'spec/acceptance', 'features']
   require 'find'
   Find.find(*paths) do |path|
     next unless path =~ /\.rb$/
@@ -35,3 +43,9 @@ task :rubocop do
   exit_code = cli.run(%w(--display-cop-names --format simple))
   raise "RuboCop detected offenses" if exit_code != 0
 end
+
+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

@@ -0,0 +1,19 @@
+Feature: Initialize Onceover application
+  For correct control repo I would like to generate all folders and files needed
+  by Onceover. For incorrect control repo I would like to get information why
+  I can not initialize application.
+
+  Background:
+    Given onceover executable
+
+ Scenario: Initialize basic repo
+    Given control repo "controlrepo_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"
+    When I run onceover command "init"
+    Then I should see error with message pattern "No such file or directory.*environment.conf"
+

data/features/step_definitions/command.rb

@@ -0,0 +1,28 @@
+require "open3"
+
+class Command
+
+  attr_reader(:output, :result)
+
+  attr_writer(:command, :params, :controlrepo)
+
+  def initialize
+    @executable = ENV["BUNDLE_GEMFILE"] ? "bundle exec onceover" : "onceover"
+  end
+
+  def run
+    controlrepo_param = @controlrepo ? "--path tmp/tests/#{@controlrepo}" : ''
+    full_cmd = "#{@executable} #{@command} #{controlrepo_param}"
+    @output, @result = Open3.capture2e full_cmd
+  end
+
+  def success?
+    return @result.success?
+  end
+
+  def to_s
+    controlrepo_param = @controlrepo ? "--path tmp/tests/#{@controlrepo}" : ''
+    return "#{@executable} #{@command} #{controlrepo_param}"
+  end
+
+end

data/features/step_definitions/common.rb

@@ -1,18 +1,60 @@
-Given /^onceover executable$/  do
-  @executable = ENV["BUNDLE_GEMFILE"] ? "bundle exec onceover " : "onceover "
+Given /^onceover executable$/ do
+  @cmd = Command.new
 end
 
-When /^I run onceover command "([^"]*)"$/  do |arg1|
-  command = @executable + arg1
-  puts command
-  @output = `#{command}`
-  expect($?.success?).to be true
+Given(/^control repo "([^"]*)"$/) do |controlrepo_name|
+  @cmd.controlrepo = controlrepo_name
+  FileUtils.rm_rf "tmp/tests/#{controlrepo_name}"
+  FileUtils.mkdir_p 'tmp/tests'
+  FileUtils.cp_r "spec/fixtures/#{controlrepo_name}", 'tmp/tests'
+end
+
+Given(/^control repo "([^"]*)" without "([^"]*)"$/) do |controlrepo_name, filename|
+  step %Q(control repo "#{controlrepo_name}")
+  controlrepo_path = "tmp/tests/#{controlrepo_name}"
+  FileUtils.rm_rf( controlrepo_path + "/#{filename}" )
+end
+
+Then(/^I should see all tests pass$/) do
+  pending # Write code here that turns the phrase above into concrete actions
+end
+
+When /^I run onceover command "([^"]*)"$/  do |command|
+  @cmd.command = command
+  puts @cmd
+  @cmd.run
 end
 
 Then /^I see help for commands: "([^"]*)"$/ do |commands|
-  commands_help = @output[/COMMANDS(.*)OPTIONS/m, 1]
+  # Get chunk of output between COMMANDS and OPTION, there should be help section
+  commands_help = @cmd.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
+
+Then(/^I should not see any errors$/) do
+  expect(@cmd.success?).to be true
+end
+
+Then(/^I should see error with message pattern "([^"]*)"$/) do |err_msg_regexp|
+  expect(@cmd.success?).to be false
+  puts @cmd.output
+  expect(@cmd.output.match err_msg_regexp).to_not be nil
+end
+
+Then(/^I should see generated all necessary files and folders$/) do
+  controlrepo_path = "tmp/tests/controlrepo_basic/"
+  files = [ 'spec/onceover.yaml', 'Rakefile', 'Gemfile' ].map { |x| controlrepo_path + x }
+  folders = [ 'spec/factsets', 'spec/pre_conditions'].map! { |x| controlrepo_path + x}
+
+  files.each do |file|
+    puts file
+    expect( File.exist? file ).to be true
+  end
+  folders.each do |folder|
+    puts folder
+    expect( Dir.exist? folder ).to be true
+  end
+end

data/lib/onceover/testconfig.rb

@@ -218,7 +218,7 @@ class Onceover
           # R10K::Action::Deploy::Environment
           prod_dir = "#{repo.tempdir}/#{repo.environmentpath}/production"
           Dir.chdir(prod_dir) do
-            install_cmd = "r10k puppetfile install --verbose --color"
+            install_cmd = "r10k puppetfile install --verbose --color --puppetfile #{repo.puppetfile}"
             logger.debug "Running #{install_cmd} from #{prod_dir}"
             system(install_cmd)
           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.6"
+  s.version     = "3.2.7"
   s.authors     = ["Dylan Ratcliffe"]
   s.email       = ["dylan.ratcliffe@puppet.com"]
   s.homepage    = "https://github.com/dylanratcliffe/onceover"

data/spec/acceptance/controlrepo_spec.rb

@@ -0,0 +1,37 @@
+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

data/spec/fixtures/controlrepo_basic/Puppetfile

@@ -0,0 +1,17 @@
+forge "http://forge.puppetlabs.com"
+
+# Modules from the Puppet Forge
+# Versions should be updated to be the latest at the time you start
+#mod "puppetlabs/inifile",     '1.5.0'
+#mod "puppetlabs/stdlib",      '4.11.0'
+#mod "puppetlabs/concat",      '2.1.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 => 'docs_experiment'

data/spec/fixtures/controlrepo_basic/environment.conf

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

data/spec/fixtures/controlrepo_basic/hieradata/common.yaml

@@ -0,0 +1,2 @@
+---
+message: "This node is using common data"

data/spec/fixtures/controlrepo_basic/hieradata/nodes/example-node.yaml

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

data/spec/fixtures/controlrepo_basic/manifests/site.pp

@@ -0,0 +1,32 @@
+## site.pp ##
+
+# This file (/etc/puppetlabs/puppet/manifests/site.pp) is the main entry point
+# used when an agent connects to a master and asks for an updated configuration.
+#
+# Global objects like filebuckets and resource defaults should go in this file,
+# as should the default node definition. (The default node can be omitted
+# if you use the console and don't define any other nodes in site.pp. See
+# http://docs.puppetlabs.com/guides/language_guide.html#nodes for more on
+# node definitions.)
+
+## Active Configurations ##
+
+# Disable filebucket by default for all File resources:
+#https://docs.puppet.com/pe/2015.3/release_notes.html#filebucket-resource-no-longer-created-by-default
+File { backup => false }
+
+# DEFAULT NODE
+# Node definitions in this file are merged with node data from the console. See
+# http://docs.puppetlabs.com/guides/language_guide.html#nodes for more on
+# node definitions.
+
+# The default node definition matches any node lacking a more specific node
+# definition. If there are no other nodes in this file, classes declared here
+# will be included in every node's catalog, *in addition* to any classes
+# specified in the console for that node.
+
+node default {
+  # This is where you can declare classes for all nodes.
+  # Example:
+  #   class { 'my_class': }
+}

data/spec/fixtures/controlrepo_basic/site/profile/manifests/base.pp

@@ -0,0 +1,5 @@
+class profile::base {
+
+  #the base profile should include component modules that will be on all nodes
+
+}

data/spec/fixtures/controlrepo_basic/site/profile/manifests/example.pp

@@ -0,0 +1,3 @@
+class profile::example {
+
+}

data/spec/fixtures/controlrepo_basic/site/role/manifests/database_server.pp

@@ -0,0 +1,7 @@
+class role::database_server {
+
+  #This role would be made of all the profiles that need to be included to make a database server work
+  #All roles should include the base profile
+  include profile::base
+
+}

data/spec/fixtures/controlrepo_basic/site/role/manifests/example.pp

@@ -0,0 +1,3 @@
+class role::example {
+
+}

data/spec/fixtures/controlrepo_basic/site/role/manifests/webserver.pp

@@ -0,0 +1,7 @@
+class role::webserver {
+
+  #This role would be made of all the profiles that need to be included to make a webserver work
+  #All roles should include the base profile
+  include profile::base
+
+}

data/spec/fixtures/controlrepo_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_basic'
+          path:'spec/fixtures/controlrepo_minimal'
         }
       )
     end
@@ -15,37 +15,4 @@ describe "Onceover::Controlrepo" do
       it { expect(@repo.hiera_config_file_relative_path).to be_nil }
     end
   end
-
-  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: onceover
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.2.7
 platform: ruby
 authors:
 - Dylan Ratcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -342,6 +342,8 @@ files:
 - factsets/solaris-10_u9-sparc-64.json
 - factsets/solaris-11.2-sparc-64.json
 - features/basic.feature
+- features/init.feature
+- features/step_definitions/command.rb
 - features/step_definitions/common.rb
 - features/support/env.rb
 - lib/onceover/beaker.rb
@@ -362,7 +364,18 @@ 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/onceover/controlrepo_spec.rb
 - spec/spec_helper.rb
 - templates/.fixtures.yml.erb