jekyll-theme-open-project-helpers 1.0.10 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc322992afb62223d7cceeb6a36f6353e82dd604f6981fe6595c914f2bb7c04c
-  data.tar.gz: 9b73a21a7839fc9fbaa2819d66bac08ca27c0d0f25312d517f5a77fccd4d7208
+  metadata.gz: c4caffb9cfa475c2158792ede91bfd553b0f00c7a4a804f7cea2395303fdf259
+  data.tar.gz: d3a757674abd4e54779249f3a9c3af217b5750adbb9c21c0bf568b961d7af2a1
 SHA512:
-  metadata.gz: 026b9a3deca52e19094b9f648081ca75b9e20fc86bba134ab5ecd4e04a3bf2f85880ba9cdc3aecb9d192b6b771aa7564d6e1c42a040c974a489093279f3f6bba
-  data.tar.gz: eee74a830c3c65cd5bd9b71d1081420b340ae75785711195d10340b93421c534e0f5903c04f5bc5cfd9b59378695af88e84ab6e4a95c0a64feb9daff66ea7e93
+  metadata.gz: ca3499c57d88fcd8fb1a3e4fb9ad6840c77d5eab09a94993a9923ae9acd473ee567bf59c1ba2b79f1b1516560d8fbce78bde4888889c9f3489a015e40b79dfdc
+  data.tar.gz: c2632738e61787344005d344bf64b1130fe0bb88c0ec56c2bf24c0348f4a8a314fa46dbb21108bf7d2d8e3c4a18b1f73927e77bc73e998a1b40b7a6b43c79697

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       = '1.0.10'
+  s.version       = '1.1.10'
   s.authors       = ['Ribose Inc.']
   s.email         = ['open.source@ribose.com']
 

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

@@ -5,6 +5,9 @@ module Jekyll
 
     DEFAULT_DOCS_SUBTREE = 'docs'
 
+    DEFAULT_REPO_REMOTE_NAME = 'origin'
+    DEFAULT_REPO_BRANCH = 'master'
+
     class NonLiquidDocument < Jekyll::Document
       def render_with_liquid?
         return false
@@ -58,6 +61,8 @@ module Jekyll
 
     class OpenProjectReader < JekyllData::Reader
 
+      @@siteconfig = Jekyll.configuration({})
+
       def read
         super
         if @site.config['is_hub']
@@ -163,6 +168,8 @@ module Jekyll
         repo = nil
 
         git_dir = File.join(repo_path, '.git')
+        git_info_dir = File.join(git_dir, 'info')
+        git_sparse_checkout_file = File.join(git_dir, 'info', 'sparse-checkout')
         unless File.exists? git_dir
           newly_initialized = true
 
@@ -172,13 +179,13 @@ module Jekyll
             'core.sshCommand',
             'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no')
 
-          repo.add_remote('origin', remote_url)
+          repo.add_remote(DEFAULT_REPO_REMOTE_NAME, remote_url)
 
           if sparse_subtrees.size > 0
             repo.config('core.sparseCheckout', true)
 
-            FileUtils.mkdir_p File.join(git_dir, 'info')
-            open(File.join(git_dir, 'info', 'sparse-checkout'), 'a') { |f|
+            FileUtils.mkdir_p git_info_dir
+            open(git_sparse_checkout_file, 'a') { |f|
               sparse_subtrees.each { |path| f << "#{path}\n" }
             }
           end
@@ -188,15 +195,45 @@ module Jekyll
 
         end
 
-        repo.fetch('origin', { :depth => 1 })
-        repo.reset_hard
-        repo.checkout('origin/master', { :f => true })
+        refresh_condition = @@siteconfig['refresh_remote_data'] || 'last-resort'
 
-        latest_commit = repo.gcommit('HEAD')
+        unless ['always', 'last-resort', 'skip'].include?(refresh_condition)
+          raise RuntimeError.new('Invalid refresh_remote_data value in site’s _config.yml!')
+        end
 
-        latest_commit.date
+        if refresh_condition == 'always'
+          repo.fetch(DEFAULT_REPO_REMOTE_NAME, { :depth => 1 })
+          repo.reset_hard
+          repo.checkout("#{DEFAULT_REPO_REMOTE_NAME}/#{DEFAULT_REPO_BRANCH}", { :f => true })
+
+        else
+          begin
+            repo.checkout("#{DEFAULT_REPO_REMOTE_NAME}/#{DEFAULT_REPO_BRANCH}", { :f => true })
+          rescue Exception => e
+            if e.message.include? "Sparse checkout leaves no entry on working directory"
+              # Supposedly, software docs are missing! No big deal.
+              return {
+                :success => false,
+                :newly_initialized => nil,
+                :modified_at => nil,
+              }
+            elsif refresh_condition == 'last-resort'
+              repo.fetch(DEFAULT_REPO_REMOTE_NAME, { :depth => 1 })
+              repo.checkout("#{DEFAULT_REPO_REMOTE_NAME}/#{DEFAULT_REPO_BRANCH}", { :f => true })
+            else
+              return {
+                :success => false,
+                :newly_initialized => nil,
+                :modified_at => nil,
+              }
+            end
+          end
+        end
+
+        latest_commit = repo.gcommit('HEAD')
 
         return {
+          :success => true,
           :newly_initialized => newly_initialized,
           :modified_at => latest_commit.date,
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-open-project-helpers
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-27 00:00:00.000000000 Z
+date: 2018-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll