locomotivecms_builder 1.0.0.alpha6 → 1.0.0.alpha7

data/lib/locomotive/builder/cli.rb

@@ -109,7 +109,11 @@ module Locomotive
           if generator.nil?
             say "Unknown site template '#{options[:template]}'", :red
           else
-            Locomotive::Builder.init(name, path, generator)
+            begin
+              Locomotive::Builder.init(name, path, generator)
+            rescue GeneratorException => e
+              say e.message, :red
+            end
           end
         end
 

data/lib/locomotive/builder/exceptions.rb

@@ -23,5 +23,13 @@ module Locomotive
     class MounterException < DefaultException
     end
 
+    class GeneratorException < DefaultException
+
+      def log_backtrace(parent_exception)
+        # Logger not initialized at this step
+      end
+
+    end
+
   end
 end

data/lib/locomotive/builder/generators/site.rb

@@ -95,3 +95,4 @@ end
 require 'locomotive/builder/generators/site/base'
 require 'locomotive/builder/generators/site/blank'
 require 'locomotive/builder/generators/site/bootstrap'
+require 'locomotive/builder/generators/site/unzip'

data/lib/locomotive/builder/liquid/tags/snippet.rb

@@ -10,6 +10,8 @@ module Locomotive
 
             source = context.registers[:mounting_point].snippets[name].try(:source)
 
+            Locomotive::Builder::Logger.info "  Rendered snippet #{name}"
+
             partial = ::Liquid::Template.parse(source)
 
             variable = context[@variable_name || @template_name[1..-2]]

data/lib/locomotive/builder/server/renderer.rb

@@ -10,11 +10,11 @@ module Locomotive::Builder
           if self.page.redirect?
             self.redirect_to(self.page.redirect_url, self.page.redirect_type)
           else
-            self.log "Rendered liquid template"
-
             type = self.page.response_type || 'text/html'
             html = self.render
 
+            self.log "  Rendered liquid page template"
+
             [200, { 'Content-Type' => type }, [html]]
           end
         else

data/lib/locomotive/builder/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Builder
-    VERSION = '1.0.0.alpha6'
+    VERSION = '1.0.0.alpha7'
   end
 end

data/locomotivecms_builder.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rmagick',               '2.12.2'
   gem.add_dependency 'httmultiparty',         '~> 0.3.8'
   gem.add_dependency 'will_paginate',         '~> 3.0.3'
-  gem.add_dependency 'locomotivecms_mounter', '1.0.0.alpha3'
+  gem.add_dependency 'locomotivecms_mounter', '1.0.0.alpha4'
 
   gem.add_dependency 'faker',                 '~> 0.9.5'
 

metadata

@@ -2,7 +2,7 @@
 name: locomotivecms_builder
 version: !ruby/object:Gem::Version
   prerelease: 6
-  version: 1.0.0.alpha6
+  version: 1.0.0.alpha7
 platform: ruby
 authors:
 - Didier Lafforgue
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime
@@ -195,7 +195,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha3
+        version: 1.0.0.alpha4
   name: locomotivecms_mounter
   prerelease: false
   requirement: !ruby/object:Gem::Requirement
@@ -203,7 +203,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha3
+        version: 1.0.0.alpha4
 - !ruby/object:Gem::Dependency
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
@@ -444,7 +444,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 2027933287861164302
+      hash: -210573927176501707
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false