eucalypt 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c60fdfe8acbb3fc20522a15ba2b2ae84ae44e0bf38cac367e0cb8e68ca27d93
-  data.tar.gz: 44a5f0030d260eed36904ff8b25d5604b37168dec7bdc6e0da7a65ef6c4d5838
+  metadata.gz: 30f59d26df1bd25928ccbc4f6ffed978bf3d3fc9387928d100ad3dbb21c419ae
+  data.tar.gz: 21e246723e17aa247f0c263018ad81864f65bb5184419f1f8d2ad2d27db80f5c
 SHA512:
-  metadata.gz: 4327801d427b9edf24794acac2cf0dc27149aacefdc93c3a2819395237c93fc78dc180119c34cbc9397f7d2730ee2b6b5377f38b81c87d6219ce2abb4e72ef79
-  data.tar.gz: c365dc1bf0e21686501762fb4bb7408e6a1873eec45285fd930f214e1e94501c2b017512c6e10b9a1e9a9726fed6c35f1558abd457074a16e48a7d38b1a62771
+  metadata.gz: 678240c6a339075aeab896c6eb08f1193581cd667d034a996d1041be4462a064d2d4a87179bb78bd5533cf1deaf4499acb04d5a1c4727602f03822a392f0243e
+  data.tar.gz: 491dccc27711788d533a81aeee63edbb4ee619575d6f9c52c76f251b8f96cff0e8488afaa8251461ab2533abf426aba0f17a2e8db905420a8e6bd042f78260a8

data/lib/eucalypt/core/helpers/logging.rb

@@ -0,0 +1,48 @@
+class ApplicationController < Sinatra::Base
+  LOGGER = if (settings.logging == !!settings.logging)
+    Lumberjack::Logger.new $stdout
+  else
+    Lumberjack::Logger.new $stdout, level: settings.logging
+  end
+
+  set :logger, LOGGER
+
+  class DummyLogger
+    def initialize(silence = false, stdout = nil)
+      @silence = silence
+      @stdout = stdout
+    end
+
+    def method_missing(m, *args, &block)
+      LOGGER.send(m, *args, &block)
+      $stdout.reopen(@stdout) if @silence
+    end
+  end
+
+  helpers do
+    def logger()
+      if settings.logging
+        return DummyLogger.new
+      else
+        stdout = $stdout.clone
+        $stdout.reopen IO::NULL
+        return DummyLogger.new(true, stdout)
+      end
+    end
+  end
+
+  private_constant :DummyLogger
+
+  if settings.log_file
+    time = Time.now.strftime settings.log_directory_format # Sanitize time!
+    path = Eucalypt.path('logs', time)
+
+    require 'fileutils'
+    FileUtils.mkdir_p path
+
+    $stderr.reopen File.new(File.join(path, "#{settings.environment}.stderr.log"), 'a+')
+    $stderr.sync = true
+    $stdout.reopen File.new(File.join(path, "#{settings.environment}.stdout.log"), 'a+')
+    $stdout.sync = true
+  end
+end

data/lib/eucalypt/core/templates/eucalypt/config/logging.rb

@@ -1,29 +1,24 @@
-require 'fileutils'
 class ApplicationController < Sinatra::Base
-  set :logger, Lumberjack::Logger.new
-  helpers { def logger() settings.logger end }
+  configure :test do
+    disable :logging
+    disable :log_file
+  end
 
-  configure(:test) { disable :logging }
-  configure(:development) { enable :logging }
+  configure :development do
+    enable :logging
+    disable :log_file
+  end
 
-  # Environments where STDOUT should be redirected to log file
-  %i[production].each do |app_env|
-    configure app_env do
-      enable :logging
-      use Rack::CommonLogger, $stdout
+  configure :production do
+    set :logging, Lumberjack::Severity::UNKNOWN
+    enable :log_file
+  end
 
-      time = Time.now.strftime("%Y-%m-%d_%H-%M-%S")
-      log_path = Eucalypt.path 'log', time.sub(/_\+/, ?p).sub(/_\-/, ?m)
-      FileUtils.mkdir_p log_path
+  set :log_directory_format, "%Y-%m-%d_%H-%M-%S"
 
-      $stderr.reopen File.new(File.join(log_path, "#{app_env}.stderr.log"), 'a+')
-      $stderr.sync = true
-      $stdout.reopen File.new(File.join(log_path, "#{app_env}.stdout.log"), 'a+')
-      $stdout.sync = true
-    end
-  end
+  require 'eucalypt/core/helpers/logging'
 
   # ActiveRecord logging
   ActiveRecord::Base.logger = Logger.new STDOUT
-  ActiveRecord::Migration.verbose = true # Set to false for quieter logging
+  ActiveRecord::Migration.verbose = true
 end

data/lib/eucalypt/version.rb

@@ -1,3 +1,3 @@
 module Eucalypt
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eucalypt
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Edwin Onuonga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-22 00:00:00.000000000 Z
+date: 2018-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -233,6 +233,7 @@ files:
 - lib/eucalypt/core/cli/rake.rb
 - lib/eucalypt/core/cli/test.rb
 - lib/eucalypt/core/cli/version.rb
+- lib/eucalypt/core/helpers/logging.rb
 - lib/eucalypt/core/helpers/manifest.rb
 - lib/eucalypt/core/helpers/partial.rb
 - lib/eucalypt/core/templates/Gemfile.tt
@@ -259,7 +260,7 @@ files:
 - lib/eucalypt/core/templates/eucalypt/config/database.yml
 - lib/eucalypt/core/templates/eucalypt/config/initializers/.empty_directory
 - lib/eucalypt/core/templates/eucalypt/config/logging.rb
-- lib/eucalypt/core/templates/eucalypt/log/.empty_directory
+- lib/eucalypt/core/templates/eucalypt/logs/.empty_directory
 - lib/eucalypt/core/templates/eucalypt/spec/controllers/application_controller_spec.rb
 - lib/eucalypt/core/templates/eucalypt/spec/helpers/application_helper_spec.rb
 - lib/eucalypt/core/templates/eucalypt/spec/models/.empty_directory