Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Retab /Rakefile
......................................................................
Retab /Rakefile
Change-Id: Ic8a93dbc027d0bebf0fadd4b9147cd2b012f787c
---
M Rakefile
1 file changed, 90 insertions(+), 90 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Rakefile b/Rakefile
index 0f776c4..18e8ed4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -29,30 +29,30 @@
# Only care about color when using a tty.
if Rake.application.tty_output?
- # Since we are going to use puppet internal stuff, we might as
- # well attempt to reuse their colorization utility. Note the utility
class
- # is not available in older puppet versions.
- begin
- require'puppet/util/colors'
- include Puppet::Util::Colors
- $enable_color=true
- rescue LoadError
- puts "Cant load puppet/util/colors .. no color for you!"
- end
+ # Since we are going to use puppet internal stuff, we might as
+ # well attempt to reuse their colorization utility. Note the utility class
+ # is not available in older puppet versions.
+ begin
+ require'puppet/util/colors'
+ include Puppet::Util::Colors
+ $enable_color=true
+ rescue LoadError
+ puts "Cant load puppet/util/colors .. no color for you!"
+ end
end
unless respond_to? :console_color
- # Define our own colorization method that simply outputs the message.
- def console_color( level, message )
- return message
- end
+ # Define our own colorization method that simply outputs the message.
+ def console_color( level, message )
+ return message
+ end
end
task :default => [:help]
desc 'Show the help'
task :help do
- puts "Puppet helper for operations/puppet.git
+ puts "Puppet helper for operations/puppet.git
Welcome #{ENV['USER']} to WMFs wonderful rake helper to play with puppet.
@@ -62,8 +62,8 @@
---[Available rake tasks]----------------------------------------------"
- # Show our tasks list.
- system "rake -T"
+ # Show our tasks list.
+ system "rake -T"
puts "-----------------------------------------------------------------------"
puts "
@@ -82,19 +82,19 @@
end
task :run_puppet_lint do
- system('puppet-lint .')
+ system('puppet-lint .')
end
desc "Build documentation"
task :doc do
- doc_cmd = ["puppet doc",
- "--mode rdoc",
- "--all", # build all references
- "--manifestdir manifests",
- "--modulepath modules",
- ].join(' ')
- puts "Running #{doc_cmd}"
- system(doc_cmd)
+ doc_cmd = ["puppet doc",
+ "--mode rdoc",
+ "--all", # build all references
+ "--manifestdir manifests",
+ "--modulepath modules",
+ ].join(' ')
+ puts "Running #{doc_cmd}"
+ system(doc_cmd)
end
desc "Lint puppet files"
@@ -103,100 +103,100 @@
desc "Validate puppet syntax (default: manifests/site.pp)"
task :validate, [:files ] do |t, args|
- success = true
+ success = true
- if args.files
- puts console_color( :info, "Validating " + args.files.inspect )
- ok = puppet_parser_validate args.files
- else
- ok = puppet_parser_validate 'manifests/site.pp'
- success = success && ok
+ if args.files
+ puts console_color( :info, "Validating " + args.files.inspect )
+ ok = puppet_parser_validate args.files
+ else
+ ok = puppet_parser_validate 'manifests/site.pp'
+ success = success && ok
- Dir.glob("modules/*").each do |dir|
- puts console_color( :info, "Validating manifests in
'#{dir}'" )
- ok = puppet_parser_validate Dir.glob( "#{dir}/**/*.pp" )
- success = success && ok
- end
- end
+ Dir.glob("modules/*").each do |dir|
+ puts console_color( :info, "Validating manifests in '#{dir}'" )
+ ok = puppet_parser_validate Dir.glob( "#{dir}/**/*.pp" )
+ success = success && ok
+ end
+ end
- if success
- puts "[OK] " + console_color( :info, "files looks fine!" )
- else
- raise console_color( :alert, "puppet failed to validate files
(exit: #{res.exitstatus}" )
- end
+ if success
+ puts "[OK] " + console_color( :info, "files looks fine!" )
+ else
+ raise console_color( :alert, "puppet failed to validate files (exit:
#{res.exitstatus}" )
+ end
end
# Validate manifests passed as an array of filenames.
def puppet_parser_validate(*manifests)
- manifests = manifests.join(' ')
- sh "puppet parser validate #{manifests}"
+ manifests = manifests.join(' ')
+ sh "puppet parser validate #{manifests}"
end
desc "Run spec tests found in modules"
task :spec do
- # Hold a list of modules not passing tests.
- failed_modules = []
+ # Hold a list of modules not passing tests.
+ failed_modules = []
- # Invoke rake whenever a module has a Rakefile.
- FileList["modules/*/Rakefile"].each do |rakefile|
+ # Invoke rake whenever a module has a Rakefile.
+ FileList["modules/*/Rakefile"].each do |rakefile|
- module_name = rakefile.match('modules/(.+)/')[1]
+ module_name = rakefile.match('modules/(.+)/')[1]
- if not run_module_spec(module_name)
- failed_modules << module_name # recording
- end
- puts "\n"
+ if not run_module_spec(module_name)
+ failed_modules << module_name # recording
+ end
+ puts "\n"
- end
+ end
- puts '-' * 80
- puts 'Finished running tests for all modules'
- puts '-' * 80
+ puts '-' * 80
+ puts 'Finished running tests for all modules'
+ puts '-' * 80
- unless failed_modules.empty?
- puts "\nThe following modules are NOT passing tests:\n"
- puts '- ' + failed_modules * "\n- "
- puts
- raise "Some modules had failures, sorry."
- end
+ unless failed_modules.empty?
+ puts "\nThe following modules are NOT passing tests:\n"
+ puts '- ' + failed_modules * "\n- "
+ puts
+ raise "Some modules had failures, sorry."
+ end
end
desc "Generates ctags"
task :tags do
- puts "Generating ctags file.."
- system('ctags -R .')
- puts "Done"
- puts
- puts "See https://github.com/majutsushi/tagbar/wiki#puppet for vim"
- puts "integration with the vim tagbar plugin."
+ puts "Generating ctags file.."
+ system('ctags -R .')
+ puts "Done"
+ puts
+ puts "See https://github.com/majutsushi/tagbar/wiki#puppet for vim"
+ puts "integration with the vim tagbar plugin."
end
# Wrapper to run rspec in a module.
def run_module_spec(module_name)
- puts '-' * 80
- puts "Running rspec tests for module #{module_name}"
- puts '-' * 80
+ puts '-' * 80
+ puts "Running rspec tests for module #{module_name}"
+ puts '-' * 80
- Dir.chdir("modules/#{module_name}") do
- # The following is a customized replacement for 'spec_prep'.
- # We do not want to use upstream modules which are usually
installed
- # using `rake spec_prep`, instead we symlink to our own modules.
- directory_name = "spec/fixtures"
- Dir.mkdir(directory_name) unless File.exists?(directory_name)
- link_name = "spec/fixtures/modules"
- system("ln -s ../../../../modules #{link_name}") unless
File.exists?(link_name)
+ Dir.chdir("modules/#{module_name}") do
+ # The following is a customized replacement for 'spec_prep'.
+ # We do not want to use upstream modules which are usually installed
+ # using `rake spec_prep`, instead we symlink to our own modules.
+ directory_name = "spec/fixtures"
+ Dir.mkdir(directory_name) unless File.exists?(directory_name)
+ link_name = "spec/fixtures/modules"
+ system("ln -s ../../../../modules #{link_name}") unless
File.exists?(link_name)
- # We also need to create an empty site.pp file in the manifests
dir.
- directory_name = "spec/fixtures/manifests"
- Dir.mkdir(directory_name) unless File.exists?(directory_name)
- site_file_name = "spec/fixtures/manifests/site.pp"
- system("touch #{site_file_name}") unless
File.exists?(site_file_name)
+ # We also need to create an empty site.pp file in the manifests dir.
+ directory_name = "spec/fixtures/manifests"
+ Dir.mkdir(directory_name) unless File.exists?(directory_name)
+ site_file_name = "spec/fixtures/manifests/site.pp"
+ system("touch #{site_file_name}") unless File.exists?(site_file_name)
- puts "Invoking tests on module #{module_name}"
- system('rake spec_standalone')
- end
+ puts "Invoking tests on module #{module_name}"
+ system('rake spec_standalone')
+ end
end
--
To view, visit https://gerrit.wikimedia.org/r/252905
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic8a93dbc027d0bebf0fadd4b9147cd2b012f787c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
