jekyll-theme-open-project-helpers 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b045cd70c2375d6cc096ac8d3323e15727c907bcc78ecb627641e0f87832ec9
-  data.tar.gz: 283ad8eb59754e1d664d442aba2ead3b4fcb6a882a2fba05bc0658ddd5d09d30
+  metadata.gz: d096dee75cd2701ec861557d024217d5ae9a1ece20af4449b9711404afab5e40
+  data.tar.gz: b00a83ea68cded47ec6a54619ba8a9989de7a99efc366be0192b9dde65f69b6a
 SHA512:
-  metadata.gz: cd120bba4d87dbe8b3a20c88b9c468d8c1a561d857597ff1d3111dd177ead51920a15d27b2ac8fc52f83894eba82623b3aeb8f3dd8fbe0bef49e70df215b478e
-  data.tar.gz: 34c9f84aee668df5e6194b2a5256fe02a870286d5b3883dc9227447f110ba195e354debbe6e7788e5eb14b4d161508915930a0632da7b2c29b8e9a9946dbef73
+  metadata.gz: 8edabeaebf34a1dc29863c28387cdaa3f6f530694ce154a6d7dd5f6e3a730a7da4669f5e827b62cbec4ffc768bf584b064ee4be225e14aa272f04828d8ec8cb2
+  data.tar.gz: 2662e8d9aa452712988143669c2d91b1ff709bceaaf838578eb7a05f341431c87bfd32613ae28e8caa373bd6ec038bd2b01170b63b83812bc7dc504cbd9216e1

data/jekyll-theme-open-project-helpers.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name          = 'jekyll-theme-open-project-helpers'
-  s.version       = '2.1.0'
+  s.version       = '2.1.1'
   s.authors       = ['Ribose Inc.']
   s.email         = ['open.source@ribose.com']
 

data/lib/jekyll-theme-open-project-helpers/filterable_index.rb

@@ -55,7 +55,7 @@ module Jekyll
           # Creates a data structure like { tag1: [item1, item2], tag2: [item2, item3] }
           tags = {}
           items.each do |item|
-            item.data['tags'].each do |tag|
+            (item.data['tags'] or []).each do |tag|
               unless tags.key? tag
                 tags[tag] = []
               end

data/lib/jekyll-theme-open-project-helpers/project_data_reader.rb

@@ -30,6 +30,8 @@ module Jekyll
         entries.each do |entry|
           path = File.join(dir, entry)
 
+          Jekyll.logger.debug("OPF:", "Reading entry #{path}")
+
           if File.directory?(path)
             read_project_subdir(path, collection, nested=true)
 
@@ -41,10 +43,14 @@ module Jekyll
 
               # Add document to Jekyll document database if it refers to software or spec
               # (as opposed to be some nested document like README)
-              if doc.url.split('/').size == 4
+              if (doc.url.split('/').size == 4) or (doc.url.split('/').size == 5 and collection.label === 'projects')
+                Jekyll.logger.debug("OPF:", "Adding document with URL: #{doc.url}")
                 collection.docs << doc
+              else
+                Jekyll.logger.debug("OPF:", "Did NOT add document with URL (nesting level doesn’t match): #{doc.url}")
               end
             else
+              Jekyll.logger.debug("OPF:", "Adding static file: #{path}")
               collection.files << Jekyll::StaticFile.new(
                 @site,
                 @site.source,
@@ -104,6 +110,9 @@ module Jekyll
             project['site']['git_repo_url'],
             ['assets', '_posts', '_software', '_specs'])
 
+          
+          Jekyll.logger.debug("OPF:", "Reading files in project #{project_path}")
+
           CollectionDocReader.new(site).read(
             project_path,
             @site.collections['projects'])
@@ -131,10 +140,10 @@ module Jekyll
                       spec_checkout_path
                     end
 
+        repo_checkout = nil
         begin
           repo_checkout = git_shallow_checkout(spec_checkout_path, repo_url, [repo_subtree])
         rescue
-          repo_checkout = nil
         end
 
         if repo_checkout
@@ -164,14 +173,23 @@ module Jekyll
       def fetch_and_read_specs(collection_name, build_pages=false)
         # collection_name would be either specs or (for hub site) projects
 
+        Jekyll.logger.debug("OPF:", "Fetching specs for items in collection #{collection_name} (if it exists)")
+
         return unless @site.collections.key?(collection_name)
 
+        Jekyll.logger.debug("OPF:", "Fetching specs for items in collection #{collection_name}")
+
         # Get spec entry points
         entry_points = @site.collections[collection_name].docs.select do |doc|
           doc.data['spec_source']
         end
 
+        if entry_points.size < 1
+          Jekyll.logger.info("OPF:", "Fetching specs for items in collection #{collection_name}: No entry points")
+        end
+
         entry_points.each do |index_doc|
+          Jekyll.logger.debug("OPF:", "Fetching specs: entry point #{index_doc.id} in collection #{collection_name}")
           build_and_read_spec_pages(collection_name, index_doc, build_pages)
         end
       end
@@ -179,14 +197,23 @@ module Jekyll
       def fetch_and_read_software(collection_name)
         # collection_name would be either software or (for hub site) projects
 
+        Jekyll.logger.debug("OPF:", "Fetching software for items in collection #{collection_name} (if it exists)")
+
         return unless @site.collections.key?(collection_name)
 
+        Jekyll.logger.debug("OPF:", "Fetching software for items in collection #{collection_name}")
+
         entry_points = @site.collections[collection_name].docs.select do |doc|
           doc.data['repo_url']
         end
 
+        if entry_points.size < 1
+          Jekyll.logger.info("OPF:", "Fetching software for items in collection #{collection_name}: No entry points")
+        end
+
         entry_points.each do |index_doc|
           item_name = index_doc.id.split('/')[-1]
+          Jekyll.logger.debug("OPF:", "Fetching software: entry point #{index_doc.id} in collection #{collection_name}")
 
           docs = index_doc.data['docs']
           main_repo = index_doc.data['repo_url']
@@ -196,10 +223,10 @@ module Jekyll
 
           docs_path = "#{index_doc.path.split('/')[0..-2].join('/')}/#{item_name}"
 
+          sw_docs_checkout = nil 
           begin
             sw_docs_checkout = git_shallow_checkout(docs_path, sw_docs_repo, [sw_docs_subtree])
           rescue
-            sw_docs_checkout = nil 
           end
 
           if sw_docs_checkout
@@ -280,6 +307,7 @@ module Jekyll
                 :modified_at => nil,
               }
             else
+              Jekyll.logger.debug("OPF:", "Fetching & checking out #{remote_url} for #{repo_path}")
               repo.fetch(DEFAULT_REPO_REMOTE_NAME, { :depth => 1 })
               repo.checkout("#{DEFAULT_REPO_REMOTE_NAME}/#{DEFAULT_REPO_BRANCH}", { :f => true })
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-open-project-helpers
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-14 00:00:00.000000000 Z
+date: 2020-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll