utopia 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faa4b3c96229515a502fd53580408bc45b08c35a55cbda43e0d63644716e97c2
-  data.tar.gz: d00a2bf55b7b23be8c6365500986cedf672b3ffa4e0b227c18f42a57ad4f93f8
+  metadata.gz: b9b8589a3313f00ec6c24f36f42a17beb9daa7b07b45051f5cd7d08adc593960
+  data.tar.gz: d79f6ad3105f73acf2abd1e77698540578e98821f70c85ce9a15112c20b455ed
 SHA512:
-  metadata.gz: 81d9fb9ce78992d3cb1c127ba05fe4f112832721a1524bcaff08e51e415617c8be06c6b60cdd48170b18b27963bd0341f2cb8beb0626df5818f1484dd90ea6a8
-  data.tar.gz: 428dbb602a5e4dd86f282533287dc4af9dc384019e562d33cede4b998ab04d2c1bf7fa7d27c4376796c2dc27b9e74d6dd7c922960cca67ebf3e9822f3abb4671
+  metadata.gz: 67c0162c3bea51d90699b68d25dd599dc1576a7a2ee7369ed52c42f00a54c8eeccda3884b34c432002160cd97d425fe9605cdcae223e495c414df8c49f64e7c2
+  data.tar.gz: 661de3edd3e48871e2d6bd7c786e2d3db39ec4bbd77c0eb8df4cbb86ccd634782333ff667bb9f6a466eb014a535d76557a7b94b7dd75a76f2c46666006ed8702

data/lib/utopia/logger.rb

@@ -18,17 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'logger/compact_formatter'
+require 'event/console'
 
 module Utopia
-	# Manages an instance of Logger with useful defaults. Used in rake `tasks/log.rake`.
-	module Logger
-		def self.new(output: STDERR, level: ::Logger::WARN)
-			log = ::Logger.new(output)
-			log.level = level
-			log.formatter = Utopia::Logger::CompactFormatter.new
-			
-			return log
-		end
-	end
+	extend Event::Console
 end

data/lib/utopia/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Utopia
-	VERSION = "2.6.0"
+	VERSION = "2.7.0"
 end

data/setup/site/tasks/log.rake

@@ -1,17 +1,17 @@
 
 task :log do
 	require 'utopia/logger'
-	LOGGER = Utopia::Logger.new
+	LOGGER = Utopia.logger
 end
 
 namespace :log do
 	desc "Increase verbosity of logger to info."
 	task :info => :log do
-		LOGGER.level = Logger::INFO
+		LOGGER.info!
 	end
 
 	desc "Increase verbosity of global debug."
 	task :debug => :log do
-		LOGGER.level = Logger::DEBUG
+		LOGGER.debug!
 	end
 end

data/utopia.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency 'mime-types', '~> 3.0'
 	
 	spec.add_dependency 'samovar', '~> 1.2'
-	spec.add_dependency 'rainbow', '~> 2.1'
+	spec.add_dependency 'event', '~> 1.1'
 	
 	spec.add_dependency 'rack', '~> 2.0'
 	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2019-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -578,7 +578,6 @@ files:
 - lib/utopia/locale.rb
 - lib/utopia/localization.rb
 - lib/utopia/logger.rb
-- lib/utopia/logger/compact_formatter.rb
 - lib/utopia/middleware.rb
 - lib/utopia/path.rb
 - lib/utopia/path/matcher.rb

data/lib/utopia/logger/compact_formatter.rb

@@ -1,47 +0,0 @@
-# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require 'logger'
-require 'rainbow'
-
-module Utopia
-	module Logger
-		# Provides a concise log output format.
-		class CompactFormatter
-			def initialize
-				@start = Time.now
-			end
-			
-			def time_offset_string
-				offset = Time.now - @start
-				
-				"T+#{offset.round(1).to_s.ljust(5)}"
-			end
-			
-			def call(severity, datetime, progname, message)
-				if progname
-					"#{Rainbow(time_offset_string).bright.blue} #{Rainbow(progname).bright}: #{message}\n"
-				else
-					"#{Rainbow(time_offset_string).bright.blue} #{message}\n"
-				end
-			end
-		end
-	end
-end