jekyll-theme-open-project-helpers 1.0.0.rc3 → 1.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 498d821d48e4e9aede7a1fe07626609d0659e8cf
-  data.tar.gz: cead8af8a560cf3b42e99512f447fc1d722f581d
+  metadata.gz: 484676c702c097e92bb095d92c12930ebe1efdb0
+  data.tar.gz: e72a6b3ef75ea55af4eff283f6af0fa2ac00f8ee
 SHA512:
-  metadata.gz: 710d9a5d4561baa114daf48a3b75bc4b8e176826da9bf71da7602ad359bfe8af46c72ea1252f96aced9545d26291a515d3e7ad8250a8146c80b9002059c8e6de
-  data.tar.gz: 650f554f122170c80ad5af1d1bba922f8b3302600203e6dd04f5bb7db8852216b398f3b089d06e5aab65326a3201a20fa2ec2b15e974e4b830b26cedba93a9e8
+  metadata.gz: 8e2db778262d26d911f5f8b11ee5ec5ac838607984960c975d658c065210ebde47808ed954177c3c7e7aa97af3b9d4dea2ea6d95db0aabca779bb6852f845810
+  data.tar.gz: 8e7f7560581e90cd728bbfe04e3657009e3c0207eee4f995b8f832fcc223163042731f7e7f9cf4c9bdc95c79a51576eac21cac55f466070235f82292ec5d8e3d

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

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

@@ -69,7 +69,8 @@ class OpenProjectReader < JekyllData::Reader
     if is_hub(@site)
       fetch_and_read_projects
     else
-      fetch_and_read_docs
+      fetch_and_read_docs_for_items('software')
+      fetch_and_read_docs_for_items('specs')
       fetch_hub_logo
     end
   end
@@ -93,72 +94,52 @@ class OpenProjectReader < JekyllData::Reader
     project_indexes.each do |project|
       project_path = project.path.split('/')[0..-2].join('/')
 
-      did_check_out = git_sparse_checkout(
+      result = git_sparse_checkout(
         project_path,
         project['site']['git_repo_url'],
         ['assets/', '_posts/', '_software/', '_specs/'])
 
-      if did_check_out
+      if result[:newly_initialized]
         CollectionDocReader.new(site).read(
           project_path,
           @site.collections['projects'])
       end
+
+      fetch_and_read_docs_for_items('projects', 'software')
+      fetch_and_read_docs_for_items('projects', 'specs')
     end
   end
 
-  def fetch_and_read_docs
-
-    # Software
-    software_entry_points = @site.collections['software'].docs.select do |doc|
-      pieces = doc.id.split('/')
-      product_name = pieces[2]
-      last_piece = pieces[-1]
+  def fetch_docs_for_item(item_doc)
+    item_name = item_doc.id.split('/')[-1]
+    docs_path = "#{item_doc.path.split('/')[0..-2].join('/')}/#{item_name}"
 
-      doc.data.key?('docs') and
-      doc.data['docs']['git_repo_url'] and
-      pieces[1] == 'software' and
-      last_piece == product_name
-    end
-    software_entry_points.each do |index_doc|
-      item_name = index_doc.id.split('/')[-1]
-      docs_path = "#{index_doc.path.split('/')[0..-2].join('/')}/#{item_name}"
-
-      did_check_out = git_sparse_checkout(
+    return {
+      :checkout_result => git_sparse_checkout(
         docs_path,
-        index_doc['docs']['git_repo_url'],
-        [index_doc['docs']['git_repo_subtree']])
+        item_doc['docs']['git_repo_url'],
+        [item_doc['docs']['git_repo_subtree']]),
+      :docs_path => docs_path,
+    }
+  end
 
-      if did_check_out
-        CollectionDocReader.new(site).read(
-          docs_path,
-          @site.collections['software'])
-      end
-    end
+  def fetch_and_read_docs_for_items(collection_name, index_collection_name=nil)
+    # collection_name would be either software, specs, or (for hub site) projects
+    # index_collection_name would be either software or specs
 
-    # Specs
-    spec_entry_points = @site.collections['specs'].docs.select do |doc|
-      pieces = doc.id.split('/')
-      product_name = pieces[2]
-      last_piece = pieces[-1]
+    index_collection_name = index_collection_name or collection_name
 
+    entry_points = @site.collections[collection_name].docs.select do |doc|
       doc.data.key?('docs') and
-      doc.data['docs']['git_repo_url'] and
-      pieces[1] == 'specs' and
-      last_piece == product_name
+      doc.data['docs']['git_repo_url']
     end
-    spec_entry_points.each do |index_doc|
-      item_name = index_doc.id.split('/')[-1]
-      docs_path = "#{index_doc.path.split('/')[0..-2].join('/')}/#{item_name}"
-
-      did_check_out = git_sparse_checkout(
-        docs_path,
-        index_doc['docs']['git_repo_url'],
-        [index_doc['docs']['git_repo_subtree']])
-
-      if did_check_out
+    entry_points.each do |index_doc|
+      result = fetch_docs_for_item(index_doc)
+      index_doc.merge_data!({ 'last_update' => result[:checkout_result][:modified_at] })
+      if result[:checkout_result][:newly_initialized]
         CollectionDocReader.new(site).read(
-          docs_path,
-          @site.collections['software'])
+          result[:docs_path],
+          @site.collections[collection_name])
       end
     end
   end
@@ -166,33 +147,43 @@ class OpenProjectReader < JekyllData::Reader
   def git_sparse_checkout(repo_path, remote_url, subtrees)
     # Returns boolean indicating whether the checkout happened
 
+    newly_initialized = false
+    repo = nil
+
     git_dir = File.join(repo_path, '.git')
     unless File.exists? git_dir
+      newly_initialized = true
+
       repo = Git.init(repo_path)
 
+      repo.config(
+        'core.sshCommand',
+        'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no')
+
       repo.add_remote('origin', remote_url)
 
       repo.config('core.sparseCheckout', true)
       open(File.join(git_dir, 'info', 'sparse-checkout'), 'a') { |f|
-        subtrees.each { |path|
-          f << "#{path}\n"
-        }
+        subtrees.each { |path| f << "#{path}\n" }
       }
 
-      repo.config(
-        'core.sshCommand',
-        'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no')
+    else
+      repo = Git.open(repo_path)
 
-      repo.fetch
-      repo.reset_hard
-      repo.checkout('origin/master', { :f => true })
+    end
 
-      return true
+    repo.fetch
+    repo.reset_hard
+    repo.checkout('origin/master', { :f => true })
 
-    else
-      return false
+    latest_commit = repo.gcommit('HEAD')
 
-    end
+    latest_commit.date
+
+    return {
+      :newly_initialized => newly_initialized,
+      :modified_at => latest_commit.date,
+    }
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-open-project-helpers
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
 platform: ruby
 authors:
 - Ribose Inc.