dimples 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f30fbd75e775cf280a833ceb82d300e49a50d9a
-  data.tar.gz: afe74aa069759f960a01dc4aac48ceb562123964
+  metadata.gz: b735e5c1923e5031dcf45fcb806258bf9f54edcd
+  data.tar.gz: 8b82d836b87a8d3cab0a4c2c44b64bd37782670f
 SHA512:
-  metadata.gz: 70a4771af0e75ee3fa7cca7eaaded26f5a3fe22869dc76e5d58e6310f47838d8db3f2d8437fd44ba56ec0c41a466d9a4a7af9d43979366d7263fd97831e9a83a
-  data.tar.gz: dfdfebedfb6e403a86f58d6cd3b76d47a55933ac6579318b480de6a1f1eca46577fcaf16d3c13ded38283cc9a5594d253456c11ea91cd109ea736fa43dda1e0d
+  metadata.gz: 04b49469ca3ec690671015dcc885553be7d2f728f48b3a14da141e81f40b60cdf0441c423c3369608e2a6369b563a4a6be21942fdaeddf68fefc21f8e4e42ad3
+  data.tar.gz: 9fac79f506828681abb38006beb7efaaf1cf71554499c8670348a27327ef09e14b0ce3f9c87d9fe08e44986fafb5eba7e702cffa6457170885bc1d8395c1d507

data/bin/dimples

@@ -12,12 +12,13 @@ options = Trollop::options do
 A very, very simple static site generator.
 
 Usage:
-  dimples [#{valid_commands.join('|')}] [options]
+  dimples <#{valid_commands.join('|')}> [options]
 
 Options:
 EOS
   opt :config, "Config file path", default: File.join('config', 'site.yml')
   opt :lib, "Library file path", default: 'lib'
+  opt :verbose, "Verbose mode", default: false
 end
 
 Trollop::educate if ARGV.empty?
@@ -42,6 +43,8 @@ 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"
@@ -52,6 +55,5 @@ site = site_klass.new(config)
 
 case command.to_sym
 when :build
-  puts "Generating site at #{site.output_paths[:site]}"
   site.generate
 end

data/lib/dimples.rb

@@ -1,10 +1,13 @@
 $LOAD_PATH.unshift(__dir__)
 
+require 'benchmark'
 require 'fileutils'
-require 'yaml'
+require 'logger'
 require 'tilt'
+require 'yaml'
 
 require 'dimples/errors'
+require 'dimples/logger'
 
 require 'dimples/frontable'
 require 'dimples/writeable'
@@ -15,3 +18,11 @@ require 'dimples/page'
 require 'dimples/post'
 require 'dimples/site'
 require 'dimples/template'
+
+module Dimples
+  class << self
+    def logger
+      @logger ||= Dimples::Logger.new(STDOUT)
+    end
+  end
+end

data/lib/dimples/configuration.rb

@@ -27,6 +27,7 @@ module Dimples
       {
         'source_path' => current_path,
         'destination_path' => File.join(current_path, 'site'),
+        'verbose_logging' => false,
         'class_overrides' => { site: nil, post: nil, page: nil },
         'rendering' => {},
         'category_names' => {},
@@ -80,7 +81,8 @@ module Dimples
     def self.default_file_extensions
       {
         'pages' => 'html',
-        'posts' => 'html'
+        'posts' => 'html',
+        'feeds' => 'atom'
       }
     end
 

data/lib/dimples/logger.rb

@@ -0,0 +1,22 @@
+module Dimples
+  class Logger < Logger
+    def initialize(*)
+      super
+      @formatter = LogFormatter
+    end
+
+    def debug_generation(type, count)
+      message = "Generating #{type} (#{count} item"
+      message += 's' if count != 1
+      message += ')...'
+
+      debug(message)
+    end
+  end
+
+  class LogFormatter < Logger::Formatter
+    def self.call(severity, time, program_name, message)
+      "#{time.strftime('%r')}: #{'- ' if severity == 'DEBUG'}#{message}\n"
+    end
+  end
+end

data/lib/dimples/site.rb

@@ -43,16 +43,30 @@ module Dimples
     end
 
     def generate
-      prepare_output_directory
-      scan_files
-      generate_files
-      copy_assets
+      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
-      puts "Error: Failed to render #{e.file}: #{e.message}"
+      Dimples.logger.error("Failed to render #{e.file}: #{e.message}")
     rescue Errors::PublishingError => e
-      puts "Error: Failed to publish #{e.file}: #{e.message}"
+      Dimples.logger.error("Failed to publish #{e.file}: #{e.message}")
     end
 
+    private
+
     def prepare_output_directory
       if Dir.exist?(@output_paths[:site])
         FileUtils.remove_dir(@output_paths[:site])
@@ -148,6 +162,8 @@ module Dimples
     end
 
     def generate_posts
+      Dimples.logger.debug_generation('posts', @posts.length) if @config['verbose_logging']
+
       @posts.each do |post|
         generate_post(post)
       end
@@ -165,6 +181,8 @@ module Dimples
     end
 
     def generate_pages
+      Dimples.logger.debug_generation('pages', @pages.length) if @config['verbose_logging']
+
       @pages.each do |page|
         generate_page(page)
       end
@@ -175,6 +193,8 @@ module Dimples
     end
 
     def generate_categories
+      Dimples.logger.debug_generation('category pages', @categories.length) if @config['verbose_logging']
+
       @categories.each do |slug, posts|
         generate_category(slug, posts)
       end
@@ -192,9 +212,15 @@ module Dimples
     def generate_archives
       %w(year month day).each do |date_type|
         if @config['generation']["#{date_type}_archives"]
+          date_type_sym = date_type.to_sym
+
+          if @config['verbose_logging']
+            Dimples.logger.debug_generation("#{date_type} archives", @archives[date_type_sym].count)
+          end
+
           layout = @config['layouts']["#{date_type}_archives"]
 
-          @archives[date_type.to_sym].each_value do |posts|
+          @archives[date_type_sym].each_value do |posts|
             title = posts[0].date.strftime(@config['date_formats'][date_type])
             paths = [@output_paths[:archives], posts[0].year]
             dates = { year: posts[0].year }
@@ -218,7 +244,7 @@ module Dimples
       feed = @page_class.new(self)
 
       feed.filename = 'feed'
-      feed.extension = 'atom'
+      feed.extension = @config['file_extensions']['feeds']
       feed.layout = 'feed'
 
       feed.write(feed.output_path(path), options)
@@ -240,6 +266,8 @@ module Dimples
 
     def copy_assets
       if Dir.exist?(@source_paths[:public])
+        Dimples.logger.debug("Copying assets...") if @config['verbose_logging']
+
         path = File.join(@source_paths[:public], '.')
         FileUtils.cp_r(path, @output_paths[:site])
       end

data/lib/dimples/version.rb

@@ -1,3 +1,3 @@
 module Dimples
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-21 00:00:00.000000000 Z
+date: 2017-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -121,6 +121,7 @@ files:
 - lib/dimples/configuration.rb
 - lib/dimples/errors.rb
 - lib/dimples/frontable.rb
+- lib/dimples/logger.rb
 - lib/dimples/page.rb
 - lib/dimples/post.rb
 - lib/dimples/renderable.rb