nanoc 4.12.0 → 4.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e12faf42299a1114ebaadbce4c04d117a0f761ec1318e97f1e8d60bde5aa344e
-  data.tar.gz: d5752906600af435f07b247b8db87c07dfeea5660f3060e88d079ed5fd3af115
+  metadata.gz: 03e5fe63fbd9c83f6e9cda3917fee02b124812dab948dc0e08517bec14e209e5
+  data.tar.gz: 503710ac47ccea7c3a4c30c2bea8dd566598c5a4369f6412b087f04488d3e9fa
 SHA512:
-  metadata.gz: 41cd7d78a20514fe699464378198b959d6583373104c1bf363881eb0507a445170a76b31db1b01acafc0a7878a9c22ee0b50ed3b18d5ced049e24b43c187d603
-  data.tar.gz: 54f9cb7d4b5b0bf0ab2426a48ff3cbce61b2f7823790aafd5397388fb5f0c4a7d9052ba9f9489b927782cb3812d8fa2e6503401692a1544cd86fff85cc54e471
+  metadata.gz: 89416645ab505a5d48e4a7ed5da24c62f9c69fde586c86a9ad8d01b0c8ee19c24e24c503124c5e943d2cd92587891e9c0a50ed7ba7d1f41d236517567c96710f
+  data.tar.gz: f571bb80982f05073f382d7b54b89c7a4e88054a0e92d0d7dcc56c3a0a9404ca80a6e31df0bbe2811a86341dc51c347e9d8de76d18096ed8c95aa2865537b180

data/NEWS.md

@@ -1,5 +1,11 @@
 # Nanoc news
 
+## 4.12.1 (2021-04-05)
+
+Enhancements:
+
+- Made Nanoc expand paths containing `~` (home directory) in the filesystem data source configuration (!4, !5, !6)
+
 ## 4.12.0 (2021-02-20)
 
 Features:

data/lib/nanoc/data_sources/filesystem.rb

@@ -92,14 +92,16 @@ module Nanoc::DataSources
       require 'listen'
 
       Nanoc::Core::ChangesStream.new do |cl|
-        listener =
-          Listen.to(dir) do |_modifieds, _addeds, _deleteds|
-            cl.unknown
-          end
+        if dir
+          listener =
+            Listen.to(File.expand_path(dir)) do |_modifieds, _addeds, _deleteds|
+              cl.unknown
+            end
 
-        listener.start
+          listener.start
 
-        cl.to_stop { listener.stop }
+          cl.to_stop { listener.stop }
+        end
 
         sleep
       end
@@ -182,6 +184,8 @@ module Nanoc::DataSources
 
       return [] if dir_name.nil?
 
+      dir_name = Tools.expand_and_relativize_path(dir_name)
+
       each_content_meta_pair_in(dir_name) do |content_filename, meta_filename|
         proto_doc = read_proto_document(content_filename, meta_filename, klass)
 
@@ -295,6 +299,8 @@ module Nanoc::DataSources
     #     'content/qux' => [ nil,    ['html']       ]
     #   }
     def all_split_files_in(dir_name)
+      dir_name = Tools.expand_and_relativize_path(dir_name)
+
       by_basename =
         all_files_in(dir_name)
         .reject   { |fn| fn =~ /(~|\.orig|\.rej|\.bak)$/ }

data/lib/nanoc/data_sources/filesystem/tools.rb

@@ -81,6 +81,15 @@ class Nanoc::DataSources::Filesystem < Nanoc::DataSource
       end.compact.flatten
     end
 
+    # Expands the path (including resolving ~ for home directory) and returns
+    # a relative path to the expanded path.
+    def expand_and_relativize_path(path)
+      from = Pathname.new(Dir.getwd)
+      to = Pathname.new(File.expand_path(path))
+
+      to.relative_path_from(from).to_s
+    end
+
     # Returns all files and directories in the given directory and
     # directories below it.
     #

data/lib/nanoc/version.rb

@@ -2,5 +2,5 @@
 
 module Nanoc
   # The current Nanoc version.
-  VERSION = '4.12.0'
+  VERSION = '4.12.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nanoc
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.12.1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-20 00:00:00.000000000 Z
+date: 2021-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.12.1
 - !ruby/object:Gem::Dependency
   name: nanoc-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.12.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.12.1
 - !ruby/object:Gem::Dependency
   name: nanoc-deploying
   requirement: !ruby/object:Gem::Requirement
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.11
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: A static-site generator with a focus on flexibility.