Merge pull request #250 from Shopify/master0.10.0

refactoring, test coverage and github hook

1 files changed, 45 insertions, 2 deletions

diff --git a/lib/oxidized.rb b/lib/oxidized.rb
index 61948ff..e92224a 100644
--- a/lib/oxidized.rb
+++ b/lib/oxidized.rb
@@ -1,6 +1,49 @@
 module Oxidized
   class OxidizedError < StandardError; end
-  Encoding.default_external = 'UTF-8'
-  Directory = File.expand_path File.join File.dirname(__FILE__), '../' 
+
+  Directory = File.expand_path(File.join(File.dirname(__FILE__), '../'))
+
+  require 'oxidized/string'
+  require 'oxidized/config'
+  require 'oxidized/config/vars'
+  require 'oxidized/worker'
+  require 'oxidized/nodes'
+  require 'oxidized/manager'
+  require 'oxidized/hook'
   require 'oxidized/core'
+
+  def self.asetus
+    @@asetus
+  end
+
+  def self.asetus=(val)
+    @@asetus = val
+  end
+
+  def self.config
+    asetus.cfg
+  end
+
+  def self.logger
+    @@logger
+  end
+
+  def self.logger=(val)
+    @@logger = val
+  end
+
+  def self.setup_logger
+    self.logger = if config.has_key?('use_syslog') && config.use_syslog
+                    require 'syslog/logger'
+                    Syslog::Logger.new('oxidized')
+                  else
+                    require 'logger'
+                    if config.has_key?('log')
+                      Logger.new(config.log)
+                    else
+                      Logger.new(STDERR)
+                    end
+                  end
+    logger.level = Logger::INFO unless config.debug
+  end
 end