dimples 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6df1fbadb2ce282909560a859b4d240ce7d6939a
-  data.tar.gz: 4725d40c3cb0841296a37955128d490c059fcc85
+  metadata.gz: bb7fd3887cfdd5e3934eb0f5e918cd93d8e2cf61
+  data.tar.gz: a6edfe39f0b5669ec00c5156b746f74e5635bf61
 SHA512:
-  metadata.gz: 84bfd84ed05c271558a67203a1ac37173f7cec15283e27f44046eacfcf2d29b15d23d811c9c4822561f15a2b4d7c3629b4b22aabaff55e7a466118f854fd4a7c
-  data.tar.gz: ec8dbdb51b9bc734339ddefe274de4846e91f760de0c96f21060057ac7e73756fbc67430e4324bcd83c10f17f0d8820c88efe554aa90e9a6a5fa0ceca02089a6
+  metadata.gz: 8dcbeea6df70f31a04b4e3b00750f84802c3ec98039cc391108001e83366cb5121a8d6ac155e9439d74d310331d4874b7814f87079c479e6423b08485dd95d57
+  data.tar.gz: 995f7e19f86b99ba0eff33bdae2dd6180407b6c6777b0ecbd97144c5648b552d9a41f8eb4b3ae82f19f0e251708c67a33fbb06cdaffcd6c2dbbb09a5946eec3f

data/bin/dimples

@@ -36,15 +36,15 @@ end
 lib_path = File.join(Dir.pwd, options[:lib])
 config_path = File.join(Dir.pwd, options[:config] || 'config', 'site.yml')
 
-if File.exist?(config_path)
+config_hash = if File.exist?(config_path)
   begin
-    config_hash = YAML.load_file(config_path)
+    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]
@@ -63,15 +63,23 @@ case command.to_sym
 when :build
   Dimples.logger.info("Building site at #{site.output_paths[:site]}...")
 
+  generated = false
+
   result = Benchmark.measure do
     site.generate
   end
 
-  generation_time = result.real.round(2)
+  if site.generated?
+    generation_time = result.real.round(2)
 
-  message = "\033[92mDone!\033[0m Site built in #{generation_time} second"
-  message += 's' if generation_time != 1
-  message += '.'
+    message = "\033[92mDone!\033[0m Site built in #{generation_time} second"
+    message += 's' if generation_time != 1
+    message += '.'
 
-  Dimples.logger.info(message)
+    Dimples.logger.info(message)
+  else
+    site.errors.each do |error|
+      Dimples.logger.error(error)
+    end
+  end
 end

data/lib/dimples/site.rb

@@ -11,6 +11,7 @@ module Dimples
     attr_accessor :latest_post
     attr_accessor :page_class
     attr_accessor :post_class
+    attr_accessor :errors
 
     def initialize(config)
       @source_paths = {}
@@ -32,6 +33,8 @@ module Dimples
       @source_paths[:root] = File.expand_path(@config['source_path'])
       @output_paths[:site] = File.expand_path(@config['destination_path'])
 
+      @errors = []
+
       %w(pages posts public templates).each do |path|
         @source_paths[path.to_sym] = File.join(@source_paths[:root], path)
       end
@@ -48,7 +51,11 @@ module Dimples
       generate_files
       copy_assets
     rescue Errors::RenderingError, Errors::PublishingError, Errors::GenerationError => e
-      Dimples.logger.error("Failed to generate the site: #{e.message}.")
+      @errors << "Failed to generate the site: #{e.message}."
+    end
+
+    def generated?
+      @errors.count == 0
     end
 
     private
@@ -258,7 +265,7 @@ module Dimples
     end
 
     def paginate(posts:, title: nil, paths:, layout: false, context: {})
-      raise "'#{layout}' template not found" unless @templates.key?(layout)
+      raise Errors::GenerationError.new("'#{layout}' template not found") unless @templates.key?(layout)
 
       per_page = @config['pagination']['per_page']
       page_count = (posts.length.to_f / per_page.to_i).ceil
@@ -315,4 +322,4 @@ module Dimples
       pagination
     end
   end
-end
+end

data/lib/dimples/version.rb

@@ -1,3 +1,3 @@
 module Dimples
-  VERSION = '2.3.0'.freeze
+  VERSION = '2.3.1'.freeze
 end

metadata

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