From 0ec6b16d9a312f1a81c68110d21c3afd00476d28 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Wed, 10 Jun 2020 11:53:42 +0200
Subject: [PATCH] [lib] wikigen: remove parse_options (#11949)
---
.../gen/wiki/generators/cpu_parameters.rb | 20 -------
.../gen/wiki/generators/disk_reservation.rb | 21 -------
lib/refrepo/gen/wiki/generators/hardware.rb | 21 -------
.../gen/wiki/generators/oar_properties.rb | 20 -------
.../gen/wiki/generators/site_network.rb | 23 --------
lib/refrepo/gen/wiki/generators/status.rb | 21 -------
lib/refrepo/gen/wiki/wiki_generator.rb | 58 -------------------
7 files changed, 184 deletions(-)
diff --git a/lib/refrepo/gen/wiki/generators/cpu_parameters.rb b/lib/refrepo/gen/wiki/generators/cpu_parameters.rb
index 013c1f7b996..550765aba45 100644
--- a/lib/refrepo/gen/wiki/generators/cpu_parameters.rb
+++ b/lib/refrepo/gen/wiki/generators/cpu_parameters.rb
@@ -55,23 +55,3 @@ class CPUParametersGenerator < WikiGenerator
@generated_content += MW::LINE_FEED
end
end
-
-if __FILE__ == $0
- generator = CPUParametersGenerator.new("Generated/CPUParameters")
-
- options = WikiGenerator::parse_options
- if (options)
- ret = 2
- begin
- ret = generator.exec(options)
- rescue MediawikiApi::ApiError => e
- puts e, e.backtrace
- ret = 3
- rescue StandardError => e
- puts e, e.backtrace
- ret = 4
- ensure
- exit(ret)
- end
- end
-end
diff --git a/lib/refrepo/gen/wiki/generators/disk_reservation.rb b/lib/refrepo/gen/wiki/generators/disk_reservation.rb
index b88db2dc21a..8489b70f41a 100644
--- a/lib/refrepo/gen/wiki/generators/disk_reservation.rb
+++ b/lib/refrepo/gen/wiki/generators/disk_reservation.rb
@@ -59,24 +59,3 @@ class DiskReservationGenerator < WikiGenerator
end
end
end
-
-if __FILE__ == $0
- generator = DiskReservationGenerator.new("Generated/DiskReservation")
-
- options = WikiGenerator::parse_options
- pp options
- if (options)
- ret = 2
- begin
- ret = generator.exec(options)
- rescue MediawikiApi::ApiError => e
- puts e, e.backtrace
- ret = 3
- rescue StandardError => e
- puts e, e.backtrace
- ret = 4
- ensure
- exit(ret)
- end
- end
-end
diff --git a/lib/refrepo/gen/wiki/generators/hardware.rb b/lib/refrepo/gen/wiki/generators/hardware.rb
index 07e9c5e5672..9abab8f66e4 100644
--- a/lib/refrepo/gen/wiki/generators/hardware.rb
+++ b/lib/refrepo/gen/wiki/generators/hardware.rb
@@ -479,24 +479,3 @@ class G5KHardwareGenerator < WikiGenerator
end
end
end
-
-if __FILE__ == $0
- generator = G5KHardwareGenerator.new("Hardware")
-
- options = WikiGenerator::parse_options
- if (options)
- ret = 2
- begin
- ret = generator.exec(options)
- rescue MediawikiApi::ApiError => e
- puts e, e.backtrace
- ret = 3
- rescue StandardError => e
- puts "Error with node: #{generator.instance_variable_get(:@node)}"
- puts e, e.backtrace
- ret = 4
- ensure
- exit(ret)
- end
- end
-end
diff --git a/lib/refrepo/gen/wiki/generators/oar_properties.rb b/lib/refrepo/gen/wiki/generators/oar_properties.rb
index 360e25956e1..fb0116632da 100644
--- a/lib/refrepo/gen/wiki/generators/oar_properties.rb
+++ b/lib/refrepo/gen/wiki/generators/oar_properties.rb
@@ -314,23 +314,3 @@ class OarPropertiesGenerator < WikiGenerator
@generated_content += MW::LINE_FEED
end
end
-
-if __FILE__ == $0
- generator = OarPropertiesGenerator.new("OAR_Properties")
-
- options = WikiGenerator::parse_options
- if (options)
- ret = 2
- begin
- ret = generator.exec(options)
- rescue MediawikiApi::ApiError => e
- puts e, e.backtrace
- ret = 3
- rescue StandardError => e
- puts e, e.backtrace
- ret = 4
- ensure
- exit(ret)
- end
- end
-end
diff --git a/lib/refrepo/gen/wiki/generators/site_network.rb b/lib/refrepo/gen/wiki/generators/site_network.rb
index f30e8777e17..cf6c77048f6 100644
--- a/lib/refrepo/gen/wiki/generators/site_network.rb
+++ b/lib/refrepo/gen/wiki/generators/site_network.rb
@@ -38,26 +38,3 @@ class SiteNetworkGenerator < WikiGenerator
check_network_description({:sites => [@site], :dot => true})
end
end
-
-if __FILE__ == $0
- options = WikiGenerator::parse_options
-
- if (options)
- ret = 2
- begin
- ret = true
- generators = options[:sites].map{ |site| SiteNetworkGenerator.new('Generated/' + site.capitalize + 'Network', site) }
- generators.each{ |generator|
- ret &= generator.exec(options)
- }
- rescue MediawikiApi::ApiError => e
- puts e, e.backtrace
- ret = 3
- rescue StandardError => e
- puts e, e.backtrace
- ret = 4
- ensure
- exit(ret)
- end
- end
-end
diff --git a/lib/refrepo/gen/wiki/generators/status.rb b/lib/refrepo/gen/wiki/generators/status.rb
index 49d013874a3..28d8a67e50d 100644
--- a/lib/refrepo/gen/wiki/generators/status.rb
+++ b/lib/refrepo/gen/wiki/generators/status.rb
@@ -193,24 +193,3 @@ class StatusGenerator < WikiGenerator
false
end
end
-
-if __FILE__ == $0
- generator = StatusGenerator.new("Status")
-
- options = WikiGenerator::parse_options
- if (options)
- ret = 2
- begin
- ret = generator.exec(options)
- rescue MediawikiApi::ApiError => e
- puts e, e.backtrace
- ret = 3
- rescue StandardError => e
- puts "Error with node: #{generator.instance_variable_get(:@node)}"
- puts e, e.backtrace
- ret = 4
- ensure
- exit(ret)
- end
- end
-end
diff --git a/lib/refrepo/gen/wiki/wiki_generator.rb b/lib/refrepo/gen/wiki/wiki_generator.rb
index 7a0653c4a39..96731a8fc19 100644
--- a/lib/refrepo/gen/wiki/wiki_generator.rb
+++ b/lib/refrepo/gen/wiki/wiki_generator.rb
@@ -112,64 +112,6 @@ class WikiGenerator
puts '----------- GENERATED PAGE END -----------'
end
- #Generic static method for cli arguments parsing
- def self.parse_options
- conf = ENV['HOME']+'/.grid5000_api.yml'
- yconf = YAML::load(IO::read(conf)) rescue {}
- api_user = yconf['username']
- api_password = yconf['password']
-
- options = {
- :generators => [],
- :sites => ['global'] + G5K::SITES,
- :diff => false,
- :print => false,
- :update => false,
- :user => ENV['API_USER'] || api_user,
- :pwd => ENV['API_PASSWORD'] || api_password
- }
-
- opt_parse = OptionParser.new do |opts|
- opts.banner = "Usage: wikigen\n"
- opts.banner += "This script looks for file ~/.grid5000_api.yml containing your API username and password credentials. The script also recognize API_USER and API_PASSWORD environment variables."
-
- opts.on('-g', '--generators=generator1,generator2', Array, 'Run those generators') do |g|
- options[:generators] = g
- end
-
- opts.on('-s', '--sites=site1,site2', Array, 'Only consider these sites (when applicable)') do |sites|
- options[:sites] = sites.map{ |e| e.downcase }
- end
-
- opts.on('-d', '--diff', 'Print a diff of the current wiki page against the content to generate') do
- options[:diff] = true
- end
-
- opts.on('-u', '--update', 'Update the wiki page with the new generated content') do
- options[:update] = true
- end
-
- opts.on('-o', '--print', 'Print the new generated content on stdout') do
- options[:print] = true
- end
-
- # Print an options summary.
- opts.on("-h", "--help", "Show this message") do
- puts opts
- exit
- end
-
- opts.separator ""
- opts.separator "Generators: #{GENERATORS.keys.join(' ')}"
- end
- opt_parse.parse!
- if (!options[:diff] && !options[:print] && !options[:update])
- puts "ERROR: At least one action must be given! (--diff, --print, --update)\n#{opt_parse}"
- exit(1)
- end
- return options
- end
-
#Execute actions on generator based on given options
def exec(options)
generate_content()
--
GitLab