dimples 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb07e2dae3e97f99ebb95ea5705b64cb983aa0b0
-  data.tar.gz: 7d392ce9d2675950095c3c8f73ed79d1548b2c41
+  metadata.gz: 08b81d38a02d31e703220e8da704b1c5a907023f
+  data.tar.gz: 77dbd35e0466ae3af0ea1e43d52a97c0a10cfff3
 SHA512:
-  metadata.gz: 6e672a6cb580456ea3c71a0dc60dbf97ad07212bf709c88a50278868c5341af9dea16603a8e058cdd44d66f8a1494cdcb3427b899e5af118fa57aa7a70646215
-  data.tar.gz: 738a445ec92f50848dca3a16512cba0856ddab3a5dc30d15139c63361f4d8a143d723e513da7dabf2bcc0177ddb6455c3380a22da460fc644dd71a22fbd0c505
+  metadata.gz: 0e9012866a9d7f93efedf32d4d7047cfda09e0dcd69f984a39f575b8d0c617a1677e7cadf24e81b09a1ffb416d5da1bc94cf042732c5016199b45bb3c899b961
+  data.tar.gz: 69cb4cb077aa8ac22cb63396d2505dc3d2e6171443576c4ae552532a12a10bd4e91ece3aa2717f7473430464ead1f6fe89c1b268a8d794a762832ef8fc0b025c

data/bin/dimples

@@ -4,6 +4,11 @@ require 'dimples'
 require 'dimples/version'
 require 'trollop'
 
+trap('SIGINT') do
+  puts "Generation cancelled!"
+  exit!
+end
+
 valid_commands = %w[build]
 
 options = Trollop::options do
@@ -16,7 +21,7 @@ Usage:
 
 Options:
 EOS
-  opt :config, "Config file path", default: File.join('config', 'site.yml')
+  opt :config, "Config file path", type: :string
   opt :lib, "Library file path", default: 'lib'
   opt :verbose, "Verbose mode", default: false
 end
@@ -28,32 +33,45 @@ unless valid_commands.include?(command)
   Trollop::die "Command must be '#{valid_commands.join('\', \'')}'"
 end
 
-config_path = File.join(Dir.pwd, options[:config])
 lib_path = File.join(Dir.pwd, options[:lib])
+config_path = File.join(Dir.pwd, options[:config] || 'config', 'site.yml')
 
-unless File.exist?(config_path)
-  Trollop::die "Missing config file (#{config_path})"
+if File.exist?(config_path)
+  begin
+    config_hash = YAML.load_file(config_path)
+  rescue
+    Trollop::die "Invalid or malformed YAML config file"
+  end
+else
+  Trollop::die "Unable to find config file" if options[:config]
+  config_hash = {}
 end
 
+config_hash['verbose_logging'] = true if options[:verbose]
+config = Dimples::Configuration.new(config_hash)
+
 if Dir.exist?(lib_path)
   Dir.glob(File.join(lib_path, '**', '*')) do |path|
     require path
   end
 end
 
-begin
-  config_hash = YAML.load_file(config_path)
-  config_hash['verbose_logging'] = true if options[:verbose]
-
-  config = Dimples::Configuration.new(config_hash)
-rescue
-  Trollop::die "Invalid or malformed YAML config file"
-end
-
 site_klass = config.class_override(:site) || Dimples::Site
 site = site_klass.new(config)
 
 case command.to_sym
 when :build
-  site.generate
+  Dimples.logger.info("Building site at #{site.output_paths[:site]}...")
+
+  result = Benchmark.measure do
+    site.generate
+  end
+
+  generation_time = result.real.round(2)
+
+  message = "\033[92mDone!\033[0m Site built in #{generation_time} second"
+  message += 's' if generation_time != 1
+  message += '.'
+
+  Dimples.logger.info(message)
 end

data/lib/dimples/errors.rb

@@ -1,18 +1,12 @@
 module Dimples
   module Errors
-    class Error < StandardError
-      attr_reader :file
-
-      def initialize(file, message)
-        @file = file
-        super(message)
-      end
+    class PublishingError < StandardError
     end
 
-    class PublishingError < Error
+    class RenderingError < StandardError
     end
 
-    class RenderingError < Error
+    class GenerationError < StandardError
     end
   end
 end

data/lib/dimples/logger.rb

@@ -16,7 +16,14 @@ module Dimples
 
   class LogFormatter < Logger::Formatter
     def self.call(severity, time, program_name, message)
-      "#{time.strftime('%r')}: #{'- ' if severity == 'DEBUG'}#{message}\n"
+      prefix = case severity
+      when "ERROR"
+        "\033[31mError:\033[0m "
+      when 'DEBUG'
+        "\033[93m- "
+      end
+
+      "#{prefix}#{message}\033[0m\n"
     end
   end
 end

data/lib/dimples/renderable.rb

@@ -5,8 +5,12 @@ module Dimples
         output = renderer.render(build_scope(context)) { body }.strip
         @rendered_contents = output
       rescue RuntimeError, TypeError, NoMethodError, SyntaxError, NameError => e
-        file = @path || "dynamic #{self.class}"
-        raise Errors::RenderingError.new(file, e.message)
+        file = @path || "a dynamic #{self.class}"
+
+        error_message = "Unable to render #{file}"
+        error_message << " (#{e.message})" if @site.config['verbose_logging']
+
+        raise Errors::RenderingError.new(e.message)
       end
 
       if use_layout && defined?(@layout) && @site.templates[@layout]

data/lib/dimples/site.rb

@@ -43,26 +43,12 @@ module Dimples
     end
 
     def generate
-      Dimples.logger.info("Building site at #{@output_paths[:site]}...")
-
-      result = Benchmark.measure do
-        prepare_output_directory
-        scan_files
-        generate_files
-        copy_assets
-      end
-
-      generation_time = result.real.round(2)
-
-      message = "Done! Site built in #{generation_time} second"
-      message += 's' if generation_time != 1
-      message += '.'
-
-      Dimples.logger.info(message)
-    rescue Errors::RenderingError => e
-      Dimples.logger.error("Failed to render #{e.file}: #{e.message}")
-    rescue Errors::PublishingError => e
-      Dimples.logger.error("Failed to publish #{e.file}: #{e.message}")
+      prepare_output_directory
+      scan_files
+      generate_files
+      copy_assets
+    rescue Errors::RenderingError, Errors::PublishingError, Errors::GenerationError => e
+      Dimples.logger.error("Failed to generate the site: #{e.message}.")
     end
 
     private
@@ -74,7 +60,10 @@ module Dimples
 
       Dir.mkdir(@output_paths[:site])
     rescue => e
-      raise "Failed to prepare the site directory (#{e})"
+      error_message = "Couldn't prepare the output directory"
+      error_message << " (#{e.message})" if @config['verbose_logging']
+
+      raise Errors::GenerationError(error_message)
     end
 
     def scan_files
@@ -86,7 +75,6 @@ module Dimples
     def scan_templates
       Dir.glob(File.join(@source_paths[:templates], '**', '*.*')).each do |path|
         template = Dimples::Template.new(self, path)
-        prepare_template(template)
         @templates[template.slug] = template
       end
     end
@@ -94,7 +82,6 @@ module Dimples
     def scan_pages
       Dir.glob(File.join(@source_paths[:pages], '**', '*.*')).each do |path|
         page = @page_class.new(self, path)
-        prepare_page(page)
         @pages << page
       end
     end
@@ -102,7 +89,6 @@ module Dimples
     def scan_posts
       Dir.glob(File.join(@source_paths[:posts], '*.*')).reverse_each do |path|
         post = @post_class.new(self, path)
-        prepare_post(post)
 
         next if post.draft
 
@@ -147,15 +133,6 @@ module Dimples
       @archives[:day]["#{year}/#{month}/#{day}"] ||= []
     end
 
-    def prepare_template(template)
-    end
-
-    def prepare_page(page)
-    end
-
-    def prepare_post(post)
-    end
-
     def generate_files
       generate_posts
       generate_pages
@@ -276,7 +253,10 @@ module Dimples
         FileUtils.cp_r(path, @output_paths[:site])
       end
     rescue => e
-      raise "Failed to copy site assets (#{e})"
+      error_message = "Site assets failed to copy"
+      error_message << " (#{e.message})" if @config['verbose_logging']
+
+      raise Errors::GenerationError.new(error_message)
     end
 
     def paginate(posts:, title: nil, paths:, layout: false, context: {})

data/lib/dimples/version.rb

@@ -1,3 +1,3 @@
 module Dimples
-  VERSION = '2.1.0'.freeze
+  VERSION = '2.2.0'.freeze
 end

data/lib/dimples/writeable.rb

@@ -11,7 +11,10 @@ module Dimples
           file.write(output)
         end
       rescue SystemCallError => e
-        raise Errors::PublishingError.new(path, e.message)
+        error_message = "Failed to write #{path}"
+        error_message << " (#{e.message})" if @site.config['verbose_logging']
+
+        raise Errors::PublishingError.new(error_message)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt