jekyll-theme-open-project-helpers 2.0.20 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4171bb52044da1871926010e89b596e2de0426a534f49a349f0a2a7a9419056
-  data.tar.gz: 35f85e3fb538d00d22a7ec53c6ad01b1b33daa38919e7a86c99f25118fb7adb0
+  metadata.gz: 41c88b1efe40f6112387d3d2a0c1dbcc9ac5492c1dbb44b23fbabcc07eba88ff
+  data.tar.gz: cbf2ad92454b97bb43cb23bee8e38f00b7394e1a13efb9bd283bd9aca0174a3d
 SHA512:
-  metadata.gz: 8adbfc5e2a52cc6c8484cc7814c725932b9f1c45b17fb154f9ed3d3e13369fffc8a9bbb07f4f08f1fccbe5fd8715d0ec6d310025cb33b62ef04ac5912884e328
-  data.tar.gz: e104986345cde94f0abee2ec76b9e75d53583b8216be88d34e5c9c6442593b830e6371666369a538146781024dbd314568c6e256eba81eb621a35ce3cbc37867
+  metadata.gz: ddf5c0d05f8e808ce21c94ae8b2ff263e31da28cf1c092cd0e57c0ea65157a574883ec42aa0a532633098246554f003e79941407a086990603db821a94f637d3
+  data.tar.gz: 234074e6bb51cc98a49bbbf334ae4ac43f3fd6423c4c0a15b12838b690762ffa9e3ab16f3b810891f069d09b7ede2c9e11230accdbbedee864434bacb3bec513

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Ribose
+Copyright (c) 2020 Ribose
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -12,7 +12,7 @@ fetching open project/software/specification data from their repos.
 ## Releasing
 
 **Release this helpers gem and theme gem in tandem with matching versions.**
-See [https://github.com/riboseinc/jekyll-theme-open-project-helpers](theme gem docs) for more.
+See [Theme gem docs](https://github.com/riboseinc/jekyll-theme-open-project) for more.
 
 
 1. Inside .gemspec within this repo’s root, update main gem version to the one being released.

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.0.20'
+  s.version       = '2.1.3'
   s.authors       = ['Ribose Inc.']
   s.email         = ['open.source@ribose.com']
 
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r!^(test|spec|features)/!) }
 
-  s.add_runtime_dependency 'jekyll', '~> 3.8'
+  s.add_runtime_dependency 'jekyll', '~> 4.0'
   s.add_runtime_dependency 'git', '~> 1.4'
   s.add_runtime_dependency 'fastimage', '~> 2.1.4'
   s.add_development_dependency 'rake', '~> 12.0'

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
@@ -131,7 +131,13 @@ end
 def get_all_items(site, collection_name, filter_func)
   # Fetches items of specified type, ordered and prepared for usage in index templates
 
-  items = site.collections[collection_name].docs.select { |item|
+  collection = site.collections[collection_name]
+
+  if collection == nil
+    raise "Collection does not exist: #{collection_name}"
+  end
+
+  items = collection.docs.select { |item|
     filter_func.call(item)
   }
 

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.0.20
+  version: 2.1.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Helpers for the Open Project Jekyll theme