ghpages_deploy 1.3.0.pre.beta9 → 1.3.0.pre.beta10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7fa581c60be7791b5cea2c18de5ee0b2b7b7ae6
-  data.tar.gz: e139e0ea5ef0e418e1b6cc68fdeaf4fc6d3fdb40
+  metadata.gz: 76b62663928a7492bfead7d860086c0e94a539fd
+  data.tar.gz: 235a81fe5fa0511a8f4e6c84ca58112824eb4169
 SHA512:
-  metadata.gz: 4f2a0e57ac44d2a697a25c88c2218e9957d3f73e52c913171a27de14d8b309f836fd379b2484fbaf06ccdb9940148e26133eca8c1c4e3e5eda724993cdb4b4ea
-  data.tar.gz: fa4041e7a085ceda82f09f152d1f2d2499e826d9070e068e9a751c24a2006029c0054a7759589e50c262837015451d4ac68e17728ad099052dd7c169cee3a4e2
+  metadata.gz: 911d1e3e13a38c23cae3c35a58522e4f3c93064c241a79180c318ddb22704095480b62e040e0e3bbc9bdef2aa3e2f16dc8ef510bd952582ece7570cd220cc515
+  data.tar.gz: 9e5b37e9c640ab1a750ce75e122d2410937fa1411718f4ddd5d2edcb7f1be881cd4503d059d3bbd581aa009a2dd9306a1d92974b726779892c8bbaa204ddd3ee

data/lib/ghpages_deploy/rake/json.rb

@@ -26,34 +26,43 @@ module GithubPages
     #   ...
     #
 
-    def self.update_sitemap
+    # if update_sitemap is being called, excluded directories should be relative to './'
+
+    def self.update_sitemap(excluded)
+      mapping = directory_sitemap('.', excluded).last
+
       File.open('sitemap.json', 'w+') do |file|
-        file.write directory_sitemap('.').to_json
+        file.write mapping.to_json
       end
     end
 
-    def self.directory_sitemap(dir)
-      index =
-        %w(index.html _index.html).find do |html|
-          File.exist?(File.join(dir, html))
-        end
+    def self.directory_sitemap(dir, excluded)
+      mapping =
+        Dir.foreach(dir).flat_map do |file|
+          file_dir = File.join(dir, file)
+          next [] if excluded.include?(file_dir)
+          next [] if %w(.git . ..).include?(file)
+          next [] unless Dir.exist?(file_dir)
 
-      return {File.basename(dir) => index} if index
+          index =
+            %w(index.html _index.html).find do |html|
+              File.exist?(File.join(file_dir, html))
+            end
 
-      Hash[Dir.foreach(dir).flat_map do |file|
-        file_dir = File.join(dir, file)
-        next [] if %w(.git . ..).include?(file)
-        next [] unless Dir.exist?(file_dir)
+          next [File.basename(file_dir), index] if index
+
+          map = directory_sitemap(file_dir, excluded)
+          next [] if !map || map.empty?
+          map
+        end
 
-        map = directory_sitemap(file_dir)
-        next [] if map.empty?
-        [file, map]
-      end]
+      return nil if mapping.empty?
+      [File.basename(dir), Hash[*mapping]]
     end
 
-    def json_sitemap
+    def json_sitemap(excluded = [])
       handler.handle_deploy do
-        JsonRakeExt.update_sitemap
+        JsonRakeExt.update_sitemap(excluded)
         ['sitemap.json']
       end
     end

data/lib/ghpages_deploy/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2016 Nathan Currier
 
 module GithubPages
-  VERSION = '1.3.0-beta9'.freeze
+  VERSION = '1.3.0-beta10'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghpages_deploy
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre.beta9
+  version: 1.3.0.pre.beta10
 platform: ruby
 authors:
 - Nathan Currier