awestruct 0.5.7.RC2 → 0.5.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/awestruct.gemspec +4 -2
- data/lib/awestruct/cli/auto.rb +1 -0
- data/lib/awestruct/cli/generate.rb +2 -0
- data/lib/awestruct/cli/init.rb +7 -2
- data/lib/awestruct/cli/invoker.rb +32 -8
- data/lib/awestruct/cli/manifest.rb +5 -8
- data/lib/awestruct/cli/options.rb +37 -25
- data/lib/awestruct/cli/server.rb +2 -2
- data/lib/awestruct/config.rb +2 -2
- data/lib/awestruct/deploy/base_deploy.rb +2 -2
- data/lib/awestruct/engine.rb +103 -54
- data/lib/awestruct/extensions/atomizer.rb +5 -1
- data/lib/awestruct/extensions/google_analytics.rb +3 -3
- data/lib/awestruct/extensions/partial.rb +1 -1
- data/lib/awestruct/extensions/pipeline.rb +0 -2
- data/lib/awestruct/extensions/posts.rb +7 -2
- data/lib/awestruct/extensions/tag_cloud.rb +5 -1
- data/lib/awestruct/handlers/base_tilt_handler.rb +11 -7
- data/lib/awestruct/handlers/file_handler.rb +1 -6
- data/lib/awestruct/handlers/layout_handler.rb +4 -3
- data/lib/awestruct/page.rb +3 -3
- data/lib/awestruct/page_loader.rb +6 -6
- data/lib/awestruct/pipeline.rb +35 -7
- data/lib/awestruct/rack/debug.rb +33 -18
- data/lib/awestruct/rack/trace.html +4 -0
- data/lib/awestruct/util/exception_helper.rb +4 -4
- data/lib/awestruct/version.rb +1 -1
- data/spec/awestruct/cli/invoker_spec.rb +4 -0
- data/spec/awestruct/cli/options_spec.rb +22 -1
- data/spec/awestruct/engine_spec.rb +28 -12
- data/spec/awestruct/handlers/file_handler_spec.rb +3 -6
- data/spec/awestruct/handlers/page_delegating_handler_spec.rb +5 -2
- data/spec/awestruct/handlers/tilt_handler_spec.rb +1 -4
- data/spec/awestruct/page_loader_spec.rb +16 -17
- data/spec/awestruct/rack/debug_spec.rb +15 -29
- metadata +72 -54
- data/lib/awestruct/logger.rb +0 -66
data/lib/awestruct/logger.rb
DELETED
|
@@ -1,66 +0,0 @@
|
|
|
1
|
-
require 'logger'
|
|
2
|
-
require 'colorize'
|
|
3
|
-
|
|
4
|
-
module Awestruct
|
|
5
|
-
class AwestructLoggerMultiIO
|
|
6
|
-
def initialize(log_to_debug_io = false, *targets)
|
|
7
|
-
@targets = targets
|
|
8
|
-
@log_to_debug = log_to_debug_io
|
|
9
|
-
end
|
|
10
|
-
|
|
11
|
-
def write(*args)
|
|
12
|
-
@targets.each do |target|
|
|
13
|
-
if target.instance_of?(File) && @log_to_debug
|
|
14
|
-
target.write(*args)
|
|
15
|
-
end
|
|
16
|
-
if args[0][0] != '[' && target.instance_of?(IO)
|
|
17
|
-
target.write(*args)
|
|
18
|
-
end
|
|
19
|
-
end
|
|
20
|
-
end
|
|
21
|
-
|
|
22
|
-
def close
|
|
23
|
-
@targs.each(&:close)
|
|
24
|
-
end
|
|
25
|
-
end
|
|
26
|
-
|
|
27
|
-
class AwestructLogFormatter < Logger::Formatter
|
|
28
|
-
attr_accessor :level
|
|
29
|
-
attr_accessor :progname
|
|
30
|
-
|
|
31
|
-
def call(severity, timestamp, who, object)
|
|
32
|
-
is_debug = $LOG.level == Logger::DEBUG
|
|
33
|
-
if is_debug
|
|
34
|
-
# callstack inspection, include our caller
|
|
35
|
-
# turn this: "/usr/lib/ruby/1.8/irb/workspace.rb:52:in `irb_binding'"
|
|
36
|
-
# into this: ["/usr/lib/ruby/1.8/irb/workspace.rb", "52", "irb_binding"]
|
|
37
|
-
#
|
|
38
|
-
# caller[3] is actually who invoked the Logger#<type>
|
|
39
|
-
# This only works if you use the severity methods
|
|
40
|
-
path, line, method = caller[3].split(/(?::in `|:|')/)
|
|
41
|
-
# Trim RUBYLIB path from 'file' if we can
|
|
42
|
-
#whence = $:.select { |p| path.start_with?(p) }[0]
|
|
43
|
-
whence = $:.detect { |p| path.start_with?(p) }
|
|
44
|
-
if !whence
|
|
45
|
-
# We get here if the path is not in $:
|
|
46
|
-
file = path
|
|
47
|
-
else
|
|
48
|
-
file = path[whence.length + 1..-1]
|
|
49
|
-
end
|
|
50
|
-
who = "#{file}:#{line}##{method}"
|
|
51
|
-
end
|
|
52
|
-
|
|
53
|
-
if severity[0] == 'D'
|
|
54
|
-
"[%s] %5s -- %s [%s]\n" % [timestamp.strftime('%Y-%m-%d %H:%M:%S'), severity, object, who]
|
|
55
|
-
else
|
|
56
|
-
if severity[0] == 'W'
|
|
57
|
-
("%s" % [object]).colorize(:yellow) + "\n"
|
|
58
|
-
elsif severity[0] == 'E'
|
|
59
|
-
("%s" % [object]).colorize(:red) + "\n"
|
|
60
|
-
else
|
|
61
|
-
"%s\n" % [object]
|
|
62
|
-
end
|
|
63
|
-
end
|
|
64
|
-
end
|
|
65
|
-
end
|
|
66
|
-
end
|