communard 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c9e103be14fa7120ec68d05c5dd7ec6ba00c994
-  data.tar.gz: fb23470d09fba6b7b8fa412f82073425efcc7f80
+  metadata.gz: b9d35465b96eb5d58be0796c018ee8621dc2d139
+  data.tar.gz: 262fddbd090945bd223795f180b3cde77cfb7f75
 SHA512:
-  metadata.gz: fc5b5ffcc913a2546606d0bd873193b33bcbf21094dd1273d31098f95851774d4937034689facd8771c1a83a92a4c88a28b834cf6480e6cf686375d7e82fae8d
-  data.tar.gz: 243c758d06102891eee3d735112cd27b068c78c30d5b08e5a630ab52f7264c2896f99d62814cb8208d6912dd14a847808875a3eeef9daa71ce853af60857c8f1
+  metadata.gz: b761f87f3f14335888116e531945b8b400a0f87d586c768058ce8778b3e6ec146b515e3f6688708ec31dce614fff11147d3adc0903f4f0e6022f08c5dcf9963c
+  data.tar.gz: 0007179282297452070dc6a6283290a7bb0bfa2a65d94a33705326e1f30990bc931520aa235a778323062383e97f1cdb7a3407e4109ce31877812b091c5304e7

data/lib/communard/configuration.rb

@@ -4,13 +4,16 @@ require "pathname"
 module Communard
   class Configuration
 
-    attr_accessor :environment, :root, :logger, :dump_same_db
+    attr_accessor :environment, :root, :dump_same_db, :loggers, :sql_log_level, :log_warn_duration
 
     def initialize
-      self.environment  = ENV["RACK_ENV"] || ENV["RUBY_ENV"] || ENV["RACK_ENV"] || "development"
-      self.root         = Pathname(Dir.pwd)
-      self.logger       = default_logger
-      self.dump_same_db = false
+      self.environment       = ENV["RACK_ENV"] || ENV["RUBY_ENV"] || ENV["RACK_ENV"] || "development"
+      self.root              = Pathname(Dir.pwd)
+      self.logger            = stdout_logger
+      self.log_level         = :info
+      self.dump_same_db      = false
+      self.sql_log_level     = :debug
+      self.log_warn_duration = 0.5
       yield self if block_given?
     end
 
@@ -18,13 +21,31 @@ module Communard
       self.dump_same_db = true
     end
 
-    private
+    def logger=(logger)
+      self.loggers = [logger]
+    end
+
+    def loggers
+      Array(@loggers).compact
+    end
+
+    def log_level=(level)
+      real_level = ::Logger.const_get(level.to_s.upcase)
+      loggers.each do |logger|
+        logger.level = real_level
+      end
+    end
 
-    def default_logger
-      ::Logger.new($stdout).tap { |l|
+    def stdout_logger(out = $stdout)
+      ::Logger.new(out).tap { |l|
         alternate = 0
-        l.formatter = proc { |sev, _, _, msg|
-          color = sev == "INFO" ? 35 + ((alternate += 1) % 2) : 31
+        l.formatter = Proc.new { |sev, _, _, msg|
+          alternate = ((alternate + 1) % 2)
+          color = case sev
+          when "INFO" then 35 + alternate
+          when "DEBUG" then 90
+          else 31
+          end
           "\e[#{color}m[#{sev}]\e[0m #{msg}\n"
         }
       }

data/lib/communard/context.rb

@@ -10,11 +10,11 @@ module Communard
     end
 
     def connect(opts = options)
-      connection = ::Sequel.connect(opts)
-      connection.loggers = [logger]
-      connection.sql_log_level = :debug
-      connection.log_warn_duration = 1
-      connection
+      ::Sequel.connect(opts).tap do |connection|
+        connection.loggers = loggers
+        connection.sql_log_level = configuration.sql_log_level
+        connection.log_warn_duration = configuration.log_warn_duration
+      end
     end
 
     def generate_migration(name: nil)
@@ -35,7 +35,7 @@ module Communard
       run_without_database("CREATE DATABASE %{database_name}", env: env)
     rescue Sequel::DatabaseError => error
       if /database (.*) already exists/ === error.message
-        logger.info "Database #{$1} already exists, which is fine."
+        loggers.each { |logger| logger.info "Database #{$1} already exists, which is fine." }
       else
         raise
       end
@@ -99,8 +99,8 @@ module Communard
       configuration.root
     end
 
-    def logger
-      configuration.logger
+    def loggers
+      configuration.loggers
     end
 
   end

data/lib/communard/version.rb

@@ -1,3 +1,3 @@
 module Communard
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: communard
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - iain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel