From f998752187c35fcd7b4190523c3c28f79d991e7b Mon Sep 17 00:00:00 2001
From: Lucas Nussbaum <lucas.nussbaum@loria.fr>
Date: Thu, 10 May 2018 19:21:36 +0200
Subject: [PATCH] Make all files requirable
---
generators/wiki/cpu_parameters.rb | 30 +++++++++++++-----------
generators/wiki/disk_reservation.rb | 31 ++++++++++++++-----------
generators/wiki/hardware.rb | 32 +++++++++++++------------
generators/wiki/oar_properties.rb | 33 +++++++++++++-------------
generators/wiki/site_network.rb | 36 +++++++++++++++--------------
5 files changed, 86 insertions(+), 76 deletions(-)
diff --git a/generators/wiki/cpu_parameters.rb b/generators/wiki/cpu_parameters.rb
index 930d3641232..83f1ea73f85 100644
--- a/generators/wiki/cpu_parameters.rb
+++ b/generators/wiki/cpu_parameters.rb
@@ -58,20 +58,22 @@ class CPUParametersGenerator < WikiGenerator
end
end
-generator = CPUParametersGenerator.new("Generated/CPUParameters")
+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)
+ 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/generators/wiki/disk_reservation.rb b/generators/wiki/disk_reservation.rb
index 735eeeed78b..bb23c833e30 100644
--- a/generators/wiki/disk_reservation.rb
+++ b/generators/wiki/disk_reservation.rb
@@ -62,20 +62,23 @@ class DiskReservationGenerator < WikiGenerator
end
end
-generator = DiskReservationGenerator.new("Generated/DiskReservation")
+if __FILE__ == $0
+ generator = DiskReservationGenerator.new("Generated/DiskReservation")
-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)
+ 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/generators/wiki/hardware.rb b/generators/wiki/hardware.rb
index 3eb3e0f49d8..e0439a961a5 100644
--- a/generators/wiki/hardware.rb
+++ b/generators/wiki/hardware.rb
@@ -270,21 +270,23 @@ class G5KHardwareGenerator < WikiGenerator
end
end
-generator = G5KHardwareGenerator.new("Hardware")
+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)
+ 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/generators/wiki/oar_properties.rb b/generators/wiki/oar_properties.rb
index b094d3aefe4..c24a041fe01 100644
--- a/generators/wiki/oar_properties.rb
+++ b/generators/wiki/oar_properties.rb
@@ -222,21 +222,22 @@ class OarPropertiesGenerator < WikiGenerator
end
end
-generator = OarPropertiesGenerator.new("Generated/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)
+if __FILE__ == $0
+ generator = OarPropertiesGenerator.new("Generated/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/generators/wiki/site_network.rb b/generators/wiki/site_network.rb
index b1e0cb05ebe..e1ea81133fd 100644
--- a/generators/wiki/site_network.rb
+++ b/generators/wiki/site_network.rb
@@ -29,23 +29,25 @@ class SiteNetworkGenerator < WikiGenerator
end
end
-options = WikiGenerator::parse_options
+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)
+ 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
--
GitLab