hydeweb 0.1.6 → 0.1.7

data/HISTORY.md

@@ -1,3 +1,10 @@
+v0.1.7
+------
+
+ - Show friendlier error messages.
+ - Show steps on how to install missing gems when any are encountered.
+ - Change 'hyde build' display format to look better.
+
 v0.1.6
 ------
 

data/lib/hyde/cli/helpers.rb

@@ -27,12 +27,22 @@ module Helpers
     say_status '*', str, 30
   end
 
+  def say_error(str)
+    say_status 'error', str, 31
+  end
+
   def say_status(what, cmd, color=32)
     c1 = "\033[0;#{color}m"
     c0 = "\033[0;m"
     puts "#{c1}%10s#{c0}  %s" % [ what, cmd ]
   end
 
+  def show_needed_gem(name)
+    err
+    say_error "You will need additional gems for this project."
+    say_info "To install: gem install #{name}"
+  end
+
   def no_project
     "Error: no Hyde config file found.\n" +
     "(Looked for #{Hyde::CONFIG_FILES.join(', ')})\n\n" +
@@ -46,6 +56,14 @@ module Helpers
     !! @hydefile
   end
 
+  # Gets the gem name from a LoadError exception.
+  def gem_name(e)
+    name = e.message.split(' ').last
+    name = 'RedCloth'  if name == 'redcloth'
+    name = 'haml'  if name == 'sass/plugin'
+    name
+  end
+
   def project
     @project ||= begin
       pass no_project unless project?

data/lib/hyde/cli.rb

@@ -47,19 +47,16 @@ class CLI < Shake
   task(:build) do
     pre = project.config.output_path
 
-    begin
-      project.build { |page|
-        handler = ''
-        handler = "(#{page.tilt_engine_name})"  if page.tilt?
-        puts ("\033[0;33m*\033[0;32m #{pre}\033[0;m%-50s%s" % [ page.path, handler ]).strip
-      }
-    rescue NoGemError => e
-      err "Error: #{e.message}"
-    rescue Error => e
-      err "Error: #{e.message}"
-    ensure
-      project.send :build_cleanup
-    end
+    project.build { |page|
+      c, handler = if page.tilt?
+        [ 33, "#{page.tilt_engine_name.downcase}" ]
+      else
+        [ 30, '*' ]
+      end
+
+      puts ("\033[0;#{c}m%10s\033[0;32m  #{pre}\033[0;m%s" % [ handler, page.path ]).strip
+    }
+    project.send :build_cleanup
   end
 
   task.description = "Builds the current project"
@@ -151,14 +148,51 @@ class CLI < Shake
     end
   end
 
-  def self.run!(options={})
-    @hydefile = options[:file]
-    return invoke(:version)  if ARGV == ['-v']
-    return invoke(:version)  if ARGV == ['--version']
+  def self.run(*argv)
+    return invoke(:version)  if argv == ['-v'] || argv == ['--version']
+    trace = (!!argv.delete('--trace'))
+
 
     begin
-      super *[]
+      super *argv
+
+    rescue SyntaxError => e
+      raise e  if trace
+      err
+      say_error e.message.split("\n").last
+      err
+      say_error "You have a syntax error."
+      say_info "Use --trace for more info."
+
+    # Convert 'can't load redcloth' to a friendly 'please gem install RedCloth'
+    rescue LoadError => e
+      raise e  if trace
+      show_needed_gem gem_name(e)
+
+    # Print generic errors as something friendlier
+    rescue => e
+      raise e  if trace
+
+      # Can't assume that HAML is always available.
+      if Object.const_defined?(:Haml) && e.is_a?(Haml::Error)
+        # Convert HAML's "Can't run XX filter; required 'yy'" messages
+        # to something friendlier
+        needed = %w(rdiscount stringio sass/plugin redcloth)
+        needed.detect { |what| show_needed_gem(what) && true  if e.message.include?(what) }
+      else
+        err
+        say_error "#{e.class}: #{e.message}"
+        say_info "#{e.backtrace.first}"
+        err
+        say_error "Oops! An error occured."
+        say_info "Use --trace for more info."
+      end
     end
   end
+
+  def self.run!(options={})
+    @hydefile = options[:file]
+    super *[]
+  end
 end
 end

data/lib/hyde/page.rb

@@ -188,17 +188,11 @@ class Page
   # Returns the tilt layout.
   def tilt
     if tilt?
-      begin
-        parts
-        # HAML options and such (like :escape_html)
-        options = project.config.tilt_options_for(@file)
-        offset = @offset || 1
-        @tilt ||= Tilt.new(@file, offset, options) { markup }
-      rescue LoadError => e
-        gem = e.message.split(' ').last
-        ext = File.extname(@file)
-        raise NoGemError, "You need the '#{gem}' gem to parse #{ext} files."
-      end
+      parts
+      # HAML options and such (like :escape_html)
+      options = project.config.tilt_options_for(@file)
+      offset = @offset || 1
+      @tilt ||= Tilt.new(@file, offset, options) { markup }
     end
   end
 

data/lib/hyde.rb

@@ -15,13 +15,12 @@ require 'shake'
 Tilt.mappings['html'] = Tilt.mappings['erb']
 
 class Hyde
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
   PREFIX  = File.expand_path('../', __FILE__)
 
   Error        = Class.new(StandardError)
   LegacyError  = Class.new(Error)
   VersionError = Class.new(Error)
-  NoGemError   = Class.new(Error)
 
   # Allowed config filenames
   CONFIG_FILES = ['hyde.conf', '.hyderc']

metadata

@@ -2,7 +2,7 @@
 name: hydeweb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Rico Sta. Cruz