gollum-site 0.1.1 → 0.1.2

data/bin/gollum-site

@@ -27,12 +27,13 @@ options = {
   'base_path' => '/',
   'output_path' => '_site',
   'port' => 8000,
-  'watch' => false
+  'watch' => false,
+  'level' => :warn
 }
 opts = OptionParser.new do |opts|
   opts.banner = help
 
-  opts.on("--ref [REF]", "Branch or commit to generate") do |ref|
+  opts.on("--ref REF", "Branch or commit to generate") do |ref|
     options['ref'] = ref
   end
 
@@ -40,7 +41,7 @@ opts = OptionParser.new do |opts|
     options['working'] = true
   end
 
-  opts.on("--base_path [BASE_PATH]", "Prefix to apply to internal links") do |base_path|
+  opts.on("--base_path BASE_PATH", "Prefix to apply to internal links") do |base_path|
     options['base_path'] = base_path
   end
 
@@ -48,7 +49,7 @@ opts = OptionParser.new do |opts|
     options['output_path'] = output_path
   end
 
-  opts.on("--port [PORT]", "Port to use when serving site (default 8000)") do |port|
+  opts.on("--port PORT", "Port to use when serving site (default 8000)") do |port|
     options['port'] = port
   end
 
@@ -56,6 +57,11 @@ opts = OptionParser.new do |opts|
     options['watch'] = true
   end
 
+  opts.on("--log_level LEVEL", %w[debug info warn error fatal],
+          "Set logging level (debug, info, warn, error, fatal)") do |level|
+    options['level'] = level.to_sym
+  end
+
   opts.on_tail("--help", "Show this information") do
     puts opts
     exit
@@ -68,7 +74,16 @@ opts = OptionParser.new do |opts|
   end
 end
 
-opts.parse!
+begin
+  opts.parse!
+rescue Exception => e
+  puts e.message
+  puts ""
+  puts opts
+  exit
+end
+
+Gollum::SiteLog.level = options['level']
 
 cmd = ARGV[0]
 
@@ -79,7 +94,10 @@ when 'generate'
                             :output_path => options['output_path'],
                             :version => options['working'] ? :working : options['ref']
                           })
+  start = Time.now
   site.generate()
+  stop = Time.now
+  Gollum::SiteLog.debug("Generated site in #{stop - start}(s)")
 when 'serve'
   if options['watch']
     require 'directory_watcher'

data/gollum-site.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('gollum', '>= 1.1.0')
   s.add_dependency('liquid')
+  s.add_dependency('mixlib-log')
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/gollum-site.rb

@@ -12,3 +12,7 @@ require 'gollum-site/markup'
 
 # Absolutely awful hack
 require 'gollum-site/wiki'
+
+# Logging
+require 'mixlib/log'
+require 'gollum-site/log'

data/lib/gollum-site/log.rb

@@ -0,0 +1,5 @@
+module Gollum
+  class SiteLog
+    extend Mixlib::Log
+  end
+end

data/lib/gollum-site/page.rb

@@ -41,12 +41,17 @@ module Gollum
     # Output static HTML of current page
     def generate(output_path, version)
       data = if l = layout()
-        l.render( 'page' => self,
-                  'site' => @wiki.site,
-                  'wiki' => {'base_path' => @wiki.base_path})
-      else
-        formatted_data
-      end
+               SiteLog.debug("Found layout - #{name}")
+               SiteLog.debug("Starting page rendering - #{name}")
+               rendered = l.render( 'page' => self,
+                         'site' => @wiki.site,
+                         'wiki' => {'base_path' => @wiki.base_path})
+               SiteLog.debug("Finished page rendering - #{name}")
+               rendered
+             else
+               SiteLog.debug("Did not find layout - #{name}")
+               formatted_data
+             end
 
       ::File.open(::File.join(output_path, self.class.cname(name)), 'w') do |f|
         f.write(data)
@@ -55,13 +60,20 @@ module Gollum
 
     # Return data for Liquid template
     def to_liquid
-      { "path" => self.class.cname(name),
+      @to_liquid ||= liquify
+    end
+
+    def liquify
+      SiteLog.debug("Starting page liquefication - #{name}")
+      data = { "path" => self.class.cname(name),
         "link" => ::File.join(@wiki.base_path, CGI.escape(self.class.cname(name))),
         "content" => formatted_data,
         "title" => title,
         "format" => format.to_s,
         "author" => version.author.name,
         "date" => version.authored_date.strftime("%Y-%m-%d %H:%M:%S")}
+      SiteLog.debug("Finished page liquefication - #{name}")
+      return data
     end
 
     def populate(blob, path)
@@ -69,5 +81,14 @@ module Gollum
       @path = (path + '/' + blob.name)
       self
     end
+
+    def formatted_data(&block)
+      if @formatted_data.nil?
+        SiteLog.debug("Starting page formatting - #{name}")
+        @formatted_data = super(&block)
+        SiteLog.debug("Finished page formatting - #{name}")
+      end
+      return @formatted_data
+    end
   end
 end

data/lib/gollum-site/site.rb

@@ -125,7 +125,9 @@ module Gollum
       ::Dir.mkdir(@output_path) unless ::File.exists? @output_path
 
       @pages.each do |name, page|
+        SiteLog.debug("Starting page generation - #{name}")
         page.generate(@output_path, @version)
+        SiteLog.debug("Finished page generation - #{name}")
       end
 
       @files.each do |path, data|

data/lib/gollum-site/version.rb

@@ -1,5 +1,5 @@
 module Gollum
   class Site
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gollum-site
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Daniel Reverri
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-07 00:00:00 -08:00
+date: 2010-12-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: mixlib-log
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Generate a static site for Gollum Wikis
 email: 
 - dan@basho.com
@@ -451,6 +465,7 @@ files:
 - lib/gollum-site/layout/javascript/jquery.previewable_comment_form.js
 - lib/gollum-site/layout/javascript/jquery.tabs.js
 - lib/gollum-site/layout/javascript/jquery.text_selection-1.0.0.min.js
+- lib/gollum-site/log.rb
 - lib/gollum-site/markup.rb
 - lib/gollum-site/page.rb
 - lib/gollum-site/site.rb