utopia 1.9.4 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a4f99328db2c8c6246dd0106078a47f172e08c7
-  data.tar.gz: 7af566aaf349482f40cc5dcfde3104b3f384d223
+  metadata.gz: 7de15ab25d817b448a1c21a6f4d182997f4f05f2
+  data.tar.gz: 312bb8afd81ed6d896023c91b3967e8ecb9e685a
 SHA512:
-  metadata.gz: b117b99e129ffcc91b35f29d6e49d69b142cec155c1fa177db4acf02724c2f84006dfedecefce709f0003d8aaf00bddb48c4dbccbd587846bb95219291609bcd
-  data.tar.gz: 4c87195b6a26203e983f339255ae1f8cb768ba47f4400d82c0ce5ef5ac2b4e1cadf8b0eb871576fd317056d36f207f9d45a2045196688b9fe94f10551e86db13
+  metadata.gz: 438c588e37cfe3bc2ebf0014cf138bfcee0843a77c31478ca33bb888d6018fe8c1dd38ba62686a77ba357f4d105bd88ca3f8464178c247ba49094794b0e35add
+  data.tar.gz: 1ee534d2c10acc63dacf401dcf3b8c530895f5eef38a2134dc98ccc03e5cc9a9b314c47fc8596e6917235fe77f2e6e64ace21909acab428d1278301e99eef2ef

data/lib/utopia/logger.rb

@@ -0,0 +1,33 @@
+# 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_relative 'logger/compact_formatter'
+
+module Utopia
+	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
+end

data/lib/utopia/logger/compact_formatter.rb

@@ -0,0 +1,46 @@
+# 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
+		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

data/lib/utopia/version.rb

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

data/setup/server/git/hooks/post-receive

@@ -71,9 +71,6 @@ Dir.chdir(GIT_WORK_TREE) do
 	end
 	
 	if File.exist? 'Rakefile'
-		sudo %W{bundle exec rake deploy}
-		
-		puts "Restarting server..."
-		sudo %W{bundle exec rake restart}
+		sudo %W{bundle exec rake deploy restart}
 	end
 end

data/setup/site/tasks/log.rake

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

data/setup/site/tasks/utopia.rake

@@ -15,6 +15,9 @@ end
 desc 'Set up the environment for running your web application'
 task :environment do
 	require_relative '../config/environment'
+	
+	# We ensure this is part of the shell environment so if other commands are invoked they will work correctly.
+	ENV['RACK_ENV'] = RACK_ENV.to_s
 end
 
 desc 'Run a server for testing your web application'

data/utopia.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utopia
 version: !ruby/object:Gem::Version
-  version: 1.9.4
+  version: 1.9.5
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trenni
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -350,6 +364,8 @@ files:
 - lib/utopia/http.rb
 - 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
@@ -392,6 +408,7 @@ files:
 - setup/site/spec/website_context.rb
 - setup/site/spec/website_spec.rb
 - setup/site/tasks/bower.rake
+- setup/site/tasks/log.rake
 - setup/site/tasks/test.rake
 - setup/site/tasks/utopia.rake
 - setup/site/tmp/readme.txt