Merge remote-tracking branch 'rouston/move-logs' into organize

roberto · May 22, 2012 · 3fd29dd · 3fd29dd
2 parents e2ea056 + 374de6f
commit 3fd29dd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/lib/integrity/configuration.rb b/lib/integrity/configuration.rb
@@ -33,8 +33,22 @@ def protected?
       @username && @password
     end
 
+    def log_dir
+      @log_dir ||= File.dirname(__FILE__) + '/../../' + 'log'
+
+      if not File.directory? @log_dir
+        Dir.mkdir @log_dir, 0775
+      end
+
+      @log_dir
+    end
+
+    def log_file
+      @log_file ||= log_dir + '/' + @log if @log
+    end
+
     def logger
-      @logger ||= Logger.new(@log)
+      @logger ||= Logger.new(log_file)
     end
 
     def database=(uri)

diff --git a/test/unit/configuration_test.rb b/test/unit/configuration_test.rb
@@ -35,7 +35,7 @@ class ConfiguratorTest < IntegrityTest
 
   test "logging" do
     Integrity.configure { |c| c.log = "test.log" }
-    assert_equal "test.log", Integrity.config.logger.
+    assert_equal "./lib/integrity/../../log/test.log", Integrity.config.logger.
       instance_variable_get(:@logdev).
       instance_variable_get(:@dev).path
   end