dimples 5.5.1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 523ca9490b506eb7f2c4da685e85809ec650f4a1
-  data.tar.gz: 5b40db0b29c2e846c1ed45f1a7bf9d0685244543
+  metadata.gz: 77e8de957e6642626aa3d9650f8320409f94d559
+  data.tar.gz: 95f90263a6d7c1d830d3ce349cf867514cd2bc4e
 SHA512:
-  metadata.gz: 644e0fcdfe86e59cb76175297ffc29fbc7655f94ae112c27338d84b971634cfff0ec6816a69d14a5e766fa7b33df954492700f1ce419b152469e1c1e82e8f620
-  data.tar.gz: 71625d1493f0b6731e56160e3b06ff6f65bb598aa1baf2e40db8b60b19888fe2d7974596e57e9264ca460dd5a60edbe175d37cd5dfae989540b356bce1d43f43
+  metadata.gz: 902856fce02764c766327d3f080851460899949d0485987234ca20b0d4ba69929d54a5311878823fa81a5dd464bf2518f298b2d450d134eb579175cd7b5f8bbe
+  data.tar.gz: fb94b4111e0060d671d0b81640123b08b1dd4f56bf140faa57464d0f3c99a4bda9d67972afc6b4b8e6950cca999c1275b1848e34b49799ca2a6bfd6df995cba2

data/bin/dimples

@@ -26,7 +26,8 @@ dimples <#{valid_commands.join('|')}> [options]
 Options:
 BANNER
   opt :config, 'Config file path', type: :string
-  opt :output, 'Destination directory', type: :string
+  opt :source, 'Source directory', type: :string
+  opt :destination, 'Destination directory', type: :string
   opt :verbose, 'Verbose mode', default: false
 end
 
@@ -37,8 +38,14 @@ unless valid_commands.include?(command)
   Trollop.die "Command must be '#{valid_commands.join('\', \'')}'"
 end
 
-plugins_path = File.join(Dir.pwd, 'plugins')
-config_path = options[:config] || File.join(Dir.pwd, 'config.json')
+source_path = if options[:source]
+                File.expand_path(options[:source])
+              else
+                Dir.pwd
+              end
+
+plugins_path = File.join(source_path, 'plugins')
+config_path = options[:config] || File.join(source_path, 'config.json')
 
 if File.exist?(config_path)
   begin
@@ -59,7 +66,11 @@ if Dir.exist?(plugins_path)
   end
 end
 
-config[:paths][:output] = options[:output] if options[:output]
+config[:source] = source_path
+
+if options[:destination]
+  config[:destination] = File.expand_path(options[:destination])
+end
 
 site = Dimples::Site.new(config)
 
@@ -70,7 +81,7 @@ when :build
   site.generate
 
   if site.errors.empty?
-    puts "Done! Your site has been built (#{site.paths[:output]})."
+    puts "Done! Your site has been built in #{site.paths[:destination]}."
   else
     puts 'Generation failed:'
     site.errors.each { |error| puts error }

data/lib/dimples/configuration.rb

@@ -5,6 +5,8 @@ module Dimples
   module Configuration
     def self.defaults
       {
+        source: Dir.pwd,
+        destination: File.join(Dir.pwd, 'public'),
         paths: default_paths,
         generation: default_generation,
         layouts: default_layouts,
@@ -18,7 +20,6 @@ module Dimples
 
     def self.default_paths
       {
-        output: './public',
         archives: 'archives',
         paginated_posts: 'posts',
         posts: 'archives/%Y/%m/%d',

data/lib/dimples/site.rb

@@ -17,13 +17,11 @@ module Dimples
       @config = Hashie::Mash.new(Configuration.defaults).deep_merge(config)
 
       @paths = {}.tap do |paths|
-        paths[:base] = Dir.pwd
-        paths[:output] = File.expand_path(@config.paths.output)
+        paths[:source] = File.expand_path(@config.source)
+        paths[:destination] = File.expand_path(@config.destination)
 
-        paths[:sources] = {}.tap do |sources|
-          %w[pages posts static templates].each do |type|
-            sources[type.to_sym] = File.join(paths[:base], type)
-          end
+        %w[pages posts static templates].each do |type|
+          paths[type.to_sym] = File.join(paths[:source], type)
         end
       end
 
@@ -40,27 +38,6 @@ module Dimples
       @errors << error
     end
 
-    def scan_sources
-      trigger_event(:before_file_scanning)
-
-      read_templates
-      read_posts
-      read_pages
-
-      trigger_event(:after_file_scanning)
-    end
-
-    def publish_files
-      trigger_event(:before_publishing)
-
-      publish_posts
-      publish_pages
-      publish_archives if @config.generation.year_archives
-      publish_categories if @config.generation.categories
-
-      trigger_event(:after_publishing)
-    end
-
     def inspect
       "#<#{self.class} @paths=#{paths}>"
     end
@@ -80,15 +57,25 @@ module Dimples
       @latest_post = nil
     end
 
+    def scan_sources
+      trigger_event(:before_file_scanning)
+
+      read_templates
+      read_posts
+      read_pages
+
+      trigger_event(:after_file_scanning)
+    end
+
     def read_templates
       @templates = {}
-      template_glob = File.join(@paths[:sources][:templates], '**', '*.*')
+      template_glob = File.join(@paths[:templates], '**', '*.*')
 
       Dir.glob(template_glob).each do |path|
         basename = File.basename(path, File.extname(path))
         dir_name = File.dirname(path)
 
-        unless dir_name == @paths[:sources][:templates]
+        unless dir_name == @paths[:templates]
           basename = dir_name.split(File::SEPARATOR)[-1] + '.' + basename
         end
 
@@ -97,7 +84,7 @@ module Dimples
     end
 
     def read_posts
-      post_glob = File.join(@paths[:sources][:posts], '**', '*.*')
+      post_glob = File.join(@paths[:posts], '**', '*.*')
 
       @posts = Dir.glob(post_glob).sort.map do |path|
         Post.new(self, path).tap do |post|
@@ -110,7 +97,7 @@ module Dimples
     end
 
     def read_pages
-      page_glob = File.join(@paths[:sources][:pages], '**', '*.*')
+      page_glob = File.join(@paths[:pages], '**', '*.*')
       @pages = Dir.glob(page_glob).sort.map { |path| Page.new(self, path) }
     end
 
@@ -130,26 +117,40 @@ module Dimples
     end
 
     def create_output_directory
-      FileUtils.remove_dir(@paths[:output]) if Dir.exist?(@paths[:output])
-      Dir.mkdir(@paths[:output])
+      if Dir.exist?(@paths[:destination])
+        FileUtils.remove_dir(@paths[:destination])
+      end
+
+      Dir.mkdir(@paths[:destination])
     rescue StandardError => e
       message = "Couldn't prepare the output directory (#{e.message})"
       raise GenerationError, message
     end
 
     def copy_static_assets
-      return unless Dir.exist?(@paths[:sources][:static])
-      FileUtils.cp_r(File.join(@paths[:sources][:static], '.'), @paths[:output])
+      return unless Dir.exist?(@paths[:static])
+      FileUtils.cp_r(File.join(@paths[:static], '.'), @paths[:destination])
     rescue StandardError => e
       raise GenerationError, "Failed to copy site assets (#{e.message})"
     end
 
+    def publish_files
+      trigger_event(:before_publishing)
+
+      publish_posts
+      publish_pages
+      publish_archives if @config.generation.year_archives
+      publish_categories if @config.generation.categories
+
+      trigger_event(:after_publishing)
+    end
+
     def publish_posts
       @posts.each do |post|
         trigger_event(:before_post_write, post)
 
         path = File.join(
-          @paths[:output],
+          @paths[:destination],
           post.date.strftime(@config.paths.posts),
           post.slug
         )
@@ -159,13 +160,15 @@ module Dimples
         trigger_event(:after_post_write, post)
       end
 
-      publish_feeds(@posts, @paths[:output]) if @config.generation.main_feed
+      if @config.generation.main_feed
+        publish_feeds(@posts, @paths[:destination])
+      end
 
       return unless @config.generation.paginated_posts
 
       paginate_posts(
         @posts,
-        File.join(@paths[:output], @config.paths.paginated_posts),
+        File.join(@paths[:destination], @config.paths.paginated_posts),
         @config.layouts.paginated_post
       )
     end
@@ -176,11 +179,11 @@ module Dimples
 
         path = if page.path
                  File.dirname(page.path).sub(
-                   @paths[:sources][:pages],
-                   @paths[:output]
+                   @paths[:pages],
+                   @paths[:destination]
                  )
                else
-                 @paths[:output]
+                 @paths[:destination]
                end
 
         page.write(path)
@@ -215,7 +218,7 @@ module Dimples
                   end
 
       date_parts = [year, month, day].compact
-      path = File.join(@paths[:output], @config.paths.archives, date_parts)
+      path = File.join(@paths[:destination], @config.paths.archives, date_parts)
 
       posts = archive(year, month, day)[:posts]
 
@@ -234,7 +237,7 @@ module Dimples
     def publish_categories
       @categories.each_value do |category|
         path = File.join(
-          @paths[:output],
+          @paths[:destination],
           @config.paths.categories,
           category.slug
         )
@@ -255,7 +258,7 @@ module Dimples
 
     def paginate_posts(posts, path, layout, context = {})
       pager = Pager.new(
-        path.sub(@paths[:output], '') + '/',
+        path.sub(@paths[:destination], '') + '/',
         posts,
         @config.pagination
       )

data/lib/dimples/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dimples
-  VERSION = '5.5.1'
+  VERSION = '6.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 5.5.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2018-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie