unicorn-cuba-base 1.5.0 → 1.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzE3ODM1NDM5Y2ZhODc5ZGE4OTU5ZTFhZDU4M2RmNTExYzM5ZjQ3NQ==
+    NDM4MGI3YTdmZWYyNWE4NmU5M2Q0ODhlZDBmYzBmNGRhZmRhNDY3Mw==
   data.tar.gz: !binary |-
-    OGM3NTRmYTYzOTgxN2Q2ZmY2NDQ3NjIwZjRjNzU0NTNiNjZmMDZhYg==
+    MjUzOTJiMTgwMmRkMGY2MDg1YTU3MGNjNzA2MDIyZGMzMDU0YTdhNQ==
 SHA512:
   metadata.gz: !binary |-
-    NTExZDAxOTVkZDExNTJhMjViZjliODE1NzIwNDVlODZkMTdlZjAyZjFjNDNk
-    OGQ4YzhkNjg4NGE2ODViZjg3NzI1YTk1NmZlOTVhN2E5ZDIwZTAzYTk2Nzdk
-    NzQ5MjM5NWE4NjQ0Zjg3MWJlOGU4ZjBiMTQ3YzIzMjA0Zjc1ZWQ=
+    NzUzM2M4ODdkZTdjODM5ZTViNjJhZTYxNGRlNTFjNTQ5ZmNiZDJhMDVmYzVj
+    OTk5ODAyYjU4NzQwNWQzMzMwNjMzNDczYjlkMzMxZjJiYjkzMGI0Mjc5NDMx
+    MmVhNjFlZGE4ZTdlY2JmYjA1YWY1YmMzYTkxZTdiNTlhZGI3YmE=
   data.tar.gz: !binary |-
-    ZjliMzIwMTM1YmUzMzY2YzVlMTFiMGI3ZDY0MzljN2ZiMDI4NGZhMjQ0NGI2
-    ZTZiZWFjZTExZDUyODEyMjBlNTJmM2RlYjdkNjM1ZmRjZjcwNmI5OTUzM2Ux
-    MmNmOTVjOWIyMmVlMTkyYTNhOWQ4YTdmNTViMGExMjQxY2Q2ODM=
+    ODAxOTFhZjRlNGY0ZTRhMjBhODczNDA3MTExMDdmYTBjZGEyOWFkN2I3YmNh
+    MTYxNjE2ZTkwZGRlMGM2YjNmMTYxYmNjZTgyYjdmODI1N2NiYjI0MmE3MjNj
+    NzdlMGYwYzEyNjI4Mjc5MzJkNmNjNjUzZWQ3YmM1ZmZiMDdmM2M=

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 ruby "1.9.3"
 
 gem "cuba", "~> 3.0"
-gem "unicorn", "~> 4.6.2"
+gem "unicorn", '~> 4.6', '>= 4.6.2'
 gem "raindrops", "~> 0.11"
 gem "cli", "~> 1.3"
 gem "facter", "~> 1.6", ">= 1.6.18"

data/Gemfile.lock

@@ -75,4 +75,4 @@ DEPENDENCIES
   rdoc (~> 3.9)
   rspec (~> 2.13)
   ruby-ip (~> 0.9)
-  unicorn (~> 4.6.2)
+  unicorn (~> 4.6, >= 4.6.2)

data/Rakefile

@@ -17,10 +17,13 @@ Jeweler::Tasks.new do |gem|
   gem.name = "unicorn-cuba-base"
   gem.homepage = "http://github.com/jpastuszek/unicorn-cuba-base"
   gem.license = "MIT"
-  gem.summary = "web appliaction base powered by Unicorn and Cuba"
-  gem.description = "web application base powered by Unicorn HTTP server and based on Cuba framework extended with additional Rack middleware and Cuba plugins"
+  gem.summary = "Web appliaction base powered by Unicorn and Cuba"
+  gem.description = "Web application base powered by Unicorn HTTP server and based on Cuba framework extended with additional Rack middleware and Cuba plugins"
   gem.email = "jpastuszek@gmail.com"
   gem.authors = ["Jakub Pastuszek"]
+  gem.files.exclude "spec/**/*"
+  gem.files.exclude "*.gemspec"
+  gem.files.exclude ".rspec"
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-1.5.0
+1.6.0

data/lib/unicorn-cuba-base.rb

@@ -63,6 +63,7 @@ class Application
 		root_logger.level = RootLogger::WARN
 		root_logger.level = RootLogger::INFO if @settings.verbose
 		root_logger.level = RootLogger::DEBUG if @settings.debug
+		root_logger.enable_perf_logging if @settings.perf_stats
 		Controller.logger = root_logger
 		MemoryLimit.logger = Controller.logger_for(MemoryLimit)
 
@@ -175,6 +176,9 @@ class Application
 			switch :debug,
 				short: :d,
 				description: 'enable verbose and debug logging (DEBUG)'
+			switch :perf_stats,
+				short: :V,
+				description: 'enable logging of performance statistics on ANY level'
 		end
 	end
 

data/lib/unicorn-cuba-base/perf_stats.rb

@@ -1,18 +1,37 @@
 require 'benchmark'
 
 $perf_stats_nest_level = -1
+$perf_stats_tasks = []
 
 module PerfStats
-	def measure(name)
-		$perf_stats_nest_level += 1
-		ret = nil
-		took = Benchmark.measure do
-			ret = yield
+	def measure(task, object = nil)
+		if log.perf?
+			begin
+				$perf_stats_nest_level += 1
+				$perf_stats_tasks << task
+				task = $perf_stats_tasks.join(' -> ')
+				ret = nil
+				took = Benchmark.measure do
+					ret = yield
+				end
+				log.with_meta(
+					type: 'perf-stats',
+					user_time: took.utime.round(6),
+					system_time:took.stime.round(6),
+					total_time: took.total.round(6),
+					real_time: took.real.round(6),
+					task: task,
+					object: object,
+					level: $perf_stats_nest_level
+				).perf "took #{"%0.6f" % took.real} sec - #{task}#{object ? ": #{object}" : ''}"
+				ret
+			ensure
+				$perf_stats_nest_level -= 1
+				$perf_stats_tasks.pop
+			end
+		else
+			yield
 		end
-		log.info "[PERF] #{took.to_s.chomp} -#{'+' * $perf_stats_nest_level} #{name}"
-		ret
-	ensure
-		$perf_stats_nest_level -= 1
 	end
 end
 

data/lib/unicorn-cuba-base/root_logger.rb

@@ -73,6 +73,8 @@ class RootLogger < Logger
 	def initialize(logdev = STDERR, &formatter)
 		super(logdev)
 
+		@perf_enabled = false
+
 		@ext_formatter = proc do |severity, datetime, progname, meta, msg|
 			if formatter
 				formatter.call(severity, datetime, progname, meta, msg)
@@ -89,6 +91,19 @@ class RootLogger < Logger
 		end
 	end
 
+	def enable_perf_logging
+		@perf_enabled = true
+		self
+	end
+
+	def perf?
+		@perf_enabled
+	end
+
+	def perf(msg)
+		unknown(msg) if @perf_enabled
+	end
+
 	def logger_for(class_obj)
 		ClassLogger.new(self, class_obj)
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-cuba-base
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Jakub Pastuszek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cuba
@@ -28,16 +28,22 @@ dependencies:
   name: unicorn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.6.2
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 4.6.2
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.6'
 - !ruby/object:Gem::Dependency
   name: raindrops
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +168,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-description: web application base powered by Unicorn HTTP server and based on Cuba
+description: Web application base powered by Unicorn HTTP server and based on Cuba
   framework extended with additional Rack middleware and Cuba plugins
 email: jpastuszek@gmail.com
 executables: []
@@ -172,7 +178,6 @@ extra_rdoc_files:
 - README.md
 files:
 - .document
-- .rspec
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -196,10 +201,6 @@ files:
 - lib/unicorn-cuba-base/stats.rb
 - lib/unicorn-cuba-base/stats_reporter.rb
 - lib/unicorn-cuba-base/uri_ext.rb
-- spec/memory_limit_spec.rb
-- spec/root_logger_spec.rb
-- spec/spec_helper.rb
-- unicorn-cuba-base.gemspec
 homepage: http://github.com/jpastuszek/unicorn-cuba-base
 licenses:
 - MIT
@@ -220,8 +221,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
-summary: web appliaction base powered by Unicorn and Cuba
+summary: Web appliaction base powered by Unicorn and Cuba
 test_files: []

data/.rspec

@@ -1 +0,0 @@
---color

data/spec/memory_limit_spec.rb

@@ -1,66 +0,0 @@
-require_relative 'spec_helper'
-require 'unicorn-cuba-base/memory_limit'
-MemoryLimit.logger = Logger.new('/dev/null')
-
-describe MemoryLimit do
-	subject do
-		MemoryLimit.new(10)
-	end
-
-	it 'should raise MemoryLimitedExceededError when too much memory is borrowed' do
-		subject.borrow 8
-		subject.return 3
-		subject.borrow 4
-		subject.borrow 1
-		expect {
-			subject.borrow 1
-		}.to raise_error MemoryLimit::MemoryLimitedExceededError, 'memory limit exceeded'
-	end
-
-	describe '#get' do
-		it 'should yield limit left and borrow as much as returned string bytesize' do
-			subject.get do |limit|
-				limit.should == 10
-				'123'
-			end.should == '123'
-			subject.limit.should == 7
-		end
-
-		it 'should raise MemoryLimit::MemoryLimitedExceededError if retruned string is longer than the limit' do
-			expect {
-				subject.get do |limit|
-					'12345678901'
-				end
-			}.to raise_error MemoryLimit::MemoryLimitedExceededError
-		end
-	end
-
-	describe MemoryLimit::IO do
-		it 'should limit reading from extended IO like object' do
-			test_file = Pathname.new('/tmp/memlimtest')
-			test_file.open('w+') { |io|
-				io.write '12345'
-				io.seek 0
-
-				subject.io io
-				io.read.should == '12345'
-
-				io.seek 0
-				io.truncate 0
-				io.write '678'
-				io.seek 0
-				io.read.should == '678'
-
-				io.seek 0
-				io.write '09123'
-				io.seek 0
-
-				expect {
-					io.read
-				}.to raise_error MemoryLimit::MemoryLimitedExceededError, 'memory limit exceeded'
-			}
-			test_file.unlink
-		end
-	end
-end
-

data/spec/root_logger_spec.rb

@@ -1,152 +0,0 @@
-require_relative 'spec_helper'
-
-require 'unicorn-cuba-base/root_logger'
-require 'stringio'
-
-describe RootLogger do
-	let! :log_out do
-		StringIO.new
-	end
-
-	subject do
-		RootLogger.new(log_out)
-	end
-
-	it 'should log to given logger' do
-		subject.info 'hello world'
-		log_out.string.should include 'INFO'
-		log_out.string.should include 'hello world'
-	end
-
-	describe 'support for different logging levels' do
-		it 'should log info' do
-			subject.info 'hello world'
-			log_out.string.should include 'INFO'
-		end
-
-		it 'should log warn' do
-			subject.warn 'hello world'
-			log_out.string.should include 'WARN'
-		end
-
-		it 'should log error' do
-			subject.error 'hello world'
-			log_out.string.should include 'ERROR'
-		end
-	end
-
-	describe 'class logger' do
-		it 'should report class name' do
-			TestApp = Class.new
-			subject.logger_for(TestApp).info 'hello world'
-			log_out.string.should include 'TestApp'
-
-			subject.logger_for(String).info 'hello world'
-			log_out.string.should include 'String'
-		end
-	end
-
-	it 'should log exceptions' do
-		begin
-			raise RuntimeError, 'bad luck'
-		rescue => error
-			subject.logger_for(String).error 'hello world', error
-		end
-		log_out.string.should include 'hello world: RuntimeError: bad luck'
-	end
-
-	describe 'meta data' do
-		it 'should log with metadata in RFC5424 format' do
-			subject.with_meta(type: 'access-log').info 'GET /asdfas'
-			log_out.string.should include '"type":"access-log"'
-
-			subject.info 'GET /asdfas'
-			log_out.string.lines.to_a.last.should_not include '"type":"access-log"'
-		end
-
-		it 'should work with chaining' do
-			subject.with_meta(type: 'access-log').with_meta(blah: 'xxx').info 'GET /asdfas'
-			log_out.string.should include '"type":"access-log","blah":"xxx"'
-		end
-
-		it 'should log with metadata context' do
-			subject.with_meta_context(type: 'app-log') do
-				subject.info 'GET /asdfas'
-			end
-			log_out.string.should include '"type":"app-log"'
-
-			subject.info 'GET /asdfas'
-			log_out.string.lines.to_a.last.should_not include '"type":"app-log"'
-		end
-	end
-end
-
-require 'capture-output'
-
-describe SyslogLogDev do
-	subject do
-		SyslogLogDev.new('unicorn-cuba-base-test', 'daemon', true)
-	end
-
-	after :each do
-		subject.close
-	end
-
-	it 'should write messages to syslog expecting first word to be log level' do
-		Capture.stderr{subject.write 'INFO hello world'}.should include '<Info>'
-		Capture.stderr{subject.write 'WARN hello world'}.should include '<Warning>'
-		Capture.stderr{subject.write 'INFO hello world'}.should include 'hello world'
-	end
-
-	it 'should handle multiline log entries' do
-		Capture.stderr{subject.write "INFO hello\nworld"}.should include "<Info>: hello\n\tworld\n"
-	end
-end
-
-describe RootSyslogLogger do
-	subject do
-		@subject ||= RootSyslogLogger.new('unicorn-cuba-base-test', 'daemon', true).logger_for(RSpec)
-	end
-
-	after :each do
-		subject.close
-	end
-
-	it 'should log to syslog' do
-		log_out = Capture.stderr{subject.info 'hello world'}
-
-		log_out.should include 'unicorn-cuba-base-test'
-		log_out.should match /\[[0-9]+\]/
-		log_out.should include '<Info>:'
-	end
-
-	it 'should include message' do
-		Capture.stderr{subject.info 'hello world'}.should include 'hello world'
-	end
-
-	it 'should include class name' do
-		Capture.stderr{subject.info 'hello world'}.should include 'RSpec'
-	end
-
-	it 'should map log levels to syslog severities' do
-		Capture.stderr{subject.debug 'hello world'}.should include '<Debug>'
-		Capture.stderr{subject.info 'hello world'}.should include '<Info>'
-		Capture.stderr{subject.warn 'hello world'}.should include '<Warning>'
-		Capture.stderr{subject.error 'hello world'}.should include '<Error>'
-		Capture.stderr{subject.fatal 'hello world'}.should include '<Critical>'
-	end
-
-	it 'should handle multiline logs by appending tab after new line (done by syslog?)' do
-		Capture.stderr{subject.info "hello\nworld\ntest"}.should include "hello\n\tworld\n\ttest\n"
-	end
-
-	describe 'direct wirtes' do
-		it 'should use Info level' do
-			Capture.stderr{subject.write "hello world"}.should include '<Info>'
-		end
-
-		it 'should allow use of meta data' do
-			Capture.stderr{subject.with_meta('type' => 'access-log').write "hello world"}.should include '"type":"access-log"'
-		end
-	end
-end

data/spec/spec_helper.rb

@@ -1,12 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'unicorn-cuba-base'
-
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
-
-RSpec.configure do |config|
-  
-end

data/unicorn-cuba-base.gemspec

@@ -1,96 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: unicorn-cuba-base 1.5.0 ruby lib
-
-Gem::Specification.new do |s|
-  s.name = "unicorn-cuba-base"
-  s.version = "1.5.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Jakub Pastuszek"]
-  s.date = "2015-05-13"
-  s.description = "web application base powered by Unicorn HTTP server and based on Cuba framework extended with additional Rack middleware and Cuba plugins"
-  s.email = "jpastuszek@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/unicorn-cuba-base.rb",
-    "lib/unicorn-cuba-base/default_error_reporter.rb",
-    "lib/unicorn-cuba-base/memory_limit.rb",
-    "lib/unicorn-cuba-base/perf_stats.rb",
-    "lib/unicorn-cuba-base/plugin/error_matcher.rb",
-    "lib/unicorn-cuba-base/plugin/logging.rb",
-    "lib/unicorn-cuba-base/plugin/memory_limit.rb",
-    "lib/unicorn-cuba-base/plugin/response_helpers.rb",
-    "lib/unicorn-cuba-base/rack/common_logger_xid.rb",
-    "lib/unicorn-cuba-base/rack/error_handling.rb",
-    "lib/unicorn-cuba-base/rack/memory_limit.rb",
-    "lib/unicorn-cuba-base/rack/unhandled_request.rb",
-    "lib/unicorn-cuba-base/rack/xid_logging.rb",
-    "lib/unicorn-cuba-base/root_logger.rb",
-    "lib/unicorn-cuba-base/stats.rb",
-    "lib/unicorn-cuba-base/stats_reporter.rb",
-    "lib/unicorn-cuba-base/uri_ext.rb",
-    "spec/memory_limit_spec.rb",
-    "spec/root_logger_spec.rb",
-    "spec/spec_helper.rb",
-    "unicorn-cuba-base.gemspec"
-  ]
-  s.homepage = "http://github.com/jpastuszek/unicorn-cuba-base"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
-  s.summary = "web appliaction base powered by Unicorn and Cuba"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<cuba>, ["~> 3.0"])
-      s.add_runtime_dependency(%q<unicorn>, ["~> 4.6.2"])
-      s.add_runtime_dependency(%q<raindrops>, ["~> 0.11"])
-      s.add_runtime_dependency(%q<cli>, ["~> 1.3"])
-      s.add_runtime_dependency(%q<facter>, [">= 1.6.18", "~> 1.6"])
-      s.add_runtime_dependency(%q<ruby-ip>, ["~> 0.9"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.13"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.9"])
-      s.add_development_dependency(%q<jeweler>, [">= 1.8.8", "~> 1.8"])
-      s.add_development_dependency(%q<capture-output>, ["~> 1.0"])
-    else
-      s.add_dependency(%q<cuba>, ["~> 3.0"])
-      s.add_dependency(%q<unicorn>, ["~> 4.6.2"])
-      s.add_dependency(%q<raindrops>, ["~> 0.11"])
-      s.add_dependency(%q<cli>, ["~> 1.3"])
-      s.add_dependency(%q<facter>, [">= 1.6.18", "~> 1.6"])
-      s.add_dependency(%q<ruby-ip>, ["~> 0.9"])
-      s.add_dependency(%q<rspec>, ["~> 2.13"])
-      s.add_dependency(%q<rdoc>, ["~> 3.9"])
-      s.add_dependency(%q<jeweler>, [">= 1.8.8", "~> 1.8"])
-      s.add_dependency(%q<capture-output>, ["~> 1.0"])
-    end
-  else
-    s.add_dependency(%q<cuba>, ["~> 3.0"])
-    s.add_dependency(%q<unicorn>, ["~> 4.6.2"])
-    s.add_dependency(%q<raindrops>, ["~> 0.11"])
-    s.add_dependency(%q<cli>, ["~> 1.3"])
-    s.add_dependency(%q<facter>, [">= 1.6.18", "~> 1.6"])
-    s.add_dependency(%q<ruby-ip>, ["~> 0.9"])
-    s.add_dependency(%q<rspec>, ["~> 2.13"])
-    s.add_dependency(%q<rdoc>, ["~> 3.9"])
-    s.add_dependency(%q<jeweler>, [">= 1.8.8", "~> 1.8"])
-    s.add_dependency(%q<capture-output>, ["~> 1.0"])
-  end
-end
-