Fix warnings

ngiger · Jan 6, 2015 · 0ff2c08 · 0ff2c08
1 parent 26b5c74
commit 0ff2c08
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/lib/medreg/company_importer.rb b/lib/medreg/company_importer.rb
@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
+require 'medreg'
 require 'medreg/address'
 require 'medreg/ba_type'
 require 'medreg/company'
@@ -13,7 +14,6 @@
 require "yaml"
 
 module Medreg
-  DebugImport           = defined?(Minitest) ? true : false
   BetriebeURL         = 'https://www.medregbm.admin.ch/Betrieb/Search'
   BetriebeXLS_URL     = "https://www.medregbm.admin.ch/Publikation/CreateExcelListBetriebs"
   RegExpBetriebDetail = /\/Betrieb\/Details\//

diff --git a/lib/medreg/medreg.rb b/lib/medreg/medreg.rb
@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 require 'fileutils'
-require 'medreg/company_importer'
-require 'medreg/person_importer'
 
 module Medreg
+  DebugImport         ||= defined?(Minitest) ? true : false
   ARCHIVE_PATH = File.expand_path(File.join(Dir.pwd, 'data'))
   LOG_PATH     = File.expand_path(File.join(Dir.pwd, 'log'))
   Mechanize_Log = File.join(LOG_PATH, File.basename(__FILE__).sub('.rb', '.log'))
@@ -35,3 +34,6 @@ def Medreg.run(only_run=false)
     Medreg.log("Finished.")
   end
 end
+
+require 'medreg/company_importer'
+require 'medreg/person_importer'
diff --git a/lib/medreg/person_importer.rb b/lib/medreg/person_importer.rb
@@ -17,7 +17,6 @@
 require 'csv'
 
 module Medreg
-  DebugImport           = defined?(Minitest) ? true : false
   Personen_Candidates   = File.expand_path(File.join(__FILE__, '../../../data/Personen_20*.xlsx'))
   Personen_YAML         = File.expand_path(File.join(__FILE__, "../../../data/persons_#{Time.now.strftime('%Y.%m.%d-%H%M')}.yaml"))
   Personen_CSV          = File.expand_path(File.join(__FILE__, "../../../data/persons_#{Time.now.strftime('%Y.%m.%d-%H%M')}.csv"))