Reorganize code to avoid duplicate requires

generators/wiki/cpu_parameters.rb

-require_relative '../lib/input_loader'
-require_relative './wiki_generator'
-require_relative './mw_utils'
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'lib')))
+require 'wiki_generator'
 
 class CPUParametersGenerator < WikiGenerator
 

generators/wiki/disk_reservation.rb

 # coding: utf-8
-require_relative '../lib/input_loader'
-require_relative './wiki_generator'
-require_relative './mw_utils'
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'lib')))
+require 'wiki_generator'
 
 class DiskReservationGenerator < WikiGenerator
 

generators/wiki/hardware.rb

 # coding: utf-8
-require 'pp'
-require_relative '../lib/input_loader'
-require_relative './wiki_generator'
-require_relative './mw_utils'
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'lib')))
+require 'wiki_generator'
 require_relative './site_hardware.rb'
 
 class G5KHardwareGenerator < WikiGenerator

generators/wiki/mw_utils.rb → generators/wiki/lib/mw_utils.rb

@@ -5,7 +5,10 @@ require 'net/http'
 require 'net/https'
 require 'mediawiki_api'
 
-require_relative "../lib/input_loader"
+# also add generators/lib to load path
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '../../lib')))
+require 'input_loader'
+
 
 #Adding method to mediawiki_api client
 module MediawikiApi
@@ -109,7 +112,7 @@ module G5K
   @@global_hash = nil
   def self.get_global_hash
     if @@global_hash.nil?
-      @@global_hash = load_yaml_file_hierarchy(File.expand_path("../../input/grid5000/", File.dirname(__FILE__)))
+      @@global_hash = load_yaml_file_hierarchy(File.expand_path("../../../input/grid5000/", File.dirname(__FILE__)))
     end
     # return a deep copy of global_hash
     return Marshal.load(Marshal.dump(@@global_hash))

generators/wiki/wiki_generator.rb → generators/wiki/lib/wiki_generator.rb

+# also add generators/lib to load path
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '../../lib')))
+
+require 'input_loader'
 require "optparse"
 require "mediawiki_api"
 require "diffy"
-
-require_relative "./mw_utils"
+require "mw_utils"
 
 class WikiGenerator
 

generators/wiki/oar_properties.rb

 # coding: utf-8
-require 'pp'
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'lib')))
+require 'wiki_generator'
 
-require_relative '../lib/input_loader'
 require_relative '../oar-properties/lib/lib-oar-properties'
-require_relative './wiki_generator'
-require_relative './mw_utils'
 
 class OarPropertiesGenerator < WikiGenerator
 

generators/wiki/site_hardware.rb

 # coding: utf-8
-require 'optparse'
-require 'date'
-require 'pp'
-
-require_relative '../lib/input_loader'
-require_relative './wiki_generator'
-require_relative './mw_utils'
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'lib')))
+require 'wiki_generator'
 
 class SiteHardwareGenerator < WikiGenerator
 

generators/wiki/site_hardware_data.rb

-# coding: utf-8
-require 'pp'
-require_relative './site_hardware.rb'
-require_relative './mw_utils.rb'
-
-pp get_hardware(G5K::SITES)

generators/wiki/site_network.rb

 # coding: utf-8
-require 'optparse'
-require 'date'
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'lib')))
+require 'wiki_generator'
 
-require_relative '../lib/input_loader'
-require_relative './wiki_generator'
-require_relative './mw_utils'
 require_relative '../input-validators/check-network-description'
 
 # This class generates the network description of each site, in .dot