whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From curc...@apache.org
Subject [whimsy] branch master updated: Improve description; fixup erroneous /tools paths
Date Thu, 25 May 2017 12:23:27 GMT
This is an automated email from the ASF dual-hosted git repository.

curcuru pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git

The following commit(s) were added to refs/heads/master by this push:
       new  6ed8fb6   Improve description; fixup erroneous /tools paths
6ed8fb6 is described below

commit 6ed8fb6739e5753cb1ddc2760daf57f6541f61d7
Author: Shane Curcuru <asf@shanecurcuru.org>
AuthorDate: Thu May 25 08:23:23 2017 -0400

    Improve description; fixup erroneous /tools paths
---
 www/test/dataflow.cgi  | 98 +++++++++++++++++++++++++++++++-------------------
 www/test/dataflow.json |  6 ++--
 2 files changed, 64 insertions(+), 40 deletions(-)

diff --git a/www/test/dataflow.cgi b/www/test/dataflow.cgi
index b5a6c03..ac5ff1a 100755
--- a/www/test/dataflow.cgi
+++ b/www/test/dataflow.cgi
@@ -15,44 +15,64 @@ _html do
     _whimsy_header PAGETITLE
     deplist = JSON.parse(File.read(DATAFLOWDATA)) 
     _whimsy_content do
-      _p %{ Whimsy tools consume and produce a variety of data files 
-        about PMCs and the ASF as a whole.  This non-comprehensive 
-        page explains which tools generate what intermediate data, 
-        and where the canonical underlying data sources are (many
-        of which are privately stored).
-        }
-
-      _ul.list_group do
-        deplist.each do |dep, info|
-          _li.list_group_item do
-            _a '', name: dep.gsub(/[#%\[\]\{\}\\"<>]/, '')
-            if dep =~ /http/i then
-              _code! do
-                _a! File.basename(dep), href: dep
-              end
-            elsif dep =~ %r{\A/} then
-              _code! do
-                _a! dep, href: "#{GITWHIMSY}#{dep}"
-              end              
-            else
-              _code! dep
-            end
-            _ " #{info['description']}"
-            _br
-            if info['maintainer'] =~ %r{/} then
-              _span.text_muted 'Maintained by: Whimsy PMC using script: '
-              _a.text_muted "#{info['maintainer']}", href: "#{GITWHIMSY}#{info['maintainer']}"
-            else
-              _span.text_muted 'Maintained by role/PMC: '
-              _a.text_muted "#{info['maintainer']}", href: "https://whimsy.apache.org/roster/orgchart/#{info['maintainer']}"
+      _div.row do
+        _div.col_sm_11 do
+          _div.panel.panel_primary do
+            _div.panel_heading {_h3.panel_title 'What Data Comes From Where'}
+            _div.panel_body do
+              _p %{ Whimsy tools consume and produce a variety of data files 
+                about PMCs and the ASF as a whole.  This non-comprehensive 
+                page explains which tools generate what intermediate data, 
+                and where the canonical underlying data sources are (many
+                of which are privately stored). .json files generated in 
+                /public are consumed by many other websites.
+              }
+              _p %{ Whimsy has a number of cron jobs - typically hourly - 
+                that periodically regenerate the /public directory, but 
+                only when the underlying data source has changed.
+                See the 
+              }
+              _a 'server docs for more info.', href: 'https://github.com/apache/whimsy/blob/master/DEPLOYMENT.md'
             end
-            _br
-            if info.key?('sources') then
-              _span 'Derived from:'
-              _ul do
-                info['sources'].each do |src|
-                  _li do 
-                    _a "#{src}", href: "##{src.gsub(/[#%\[\]\{\}\\"<>]/, '')}"
+          end
+        end
+      end
+      
+      _div.row do
+        _div.col_sm_11 do
+          _ul.list_group do
+            deplist.each do |dep, info|
+              _li.list_group_item do
+                _a '', name: dep.gsub(/[#%\[\]\{\}\\"<>]/, '')
+                if dep =~ /http/i then
+                  _code! do
+                    _a! File.basename(dep), href: dep
+                  end
+                elsif dep =~ %r{\A/} then
+                  _code! do
+                    _a! dep, href: "#{GITWHIMSY}#{dep}"
+                  end              
+                else
+                  _code! dep
+                end
+                _ " #{info['description']}"
+                _br
+                if info['maintainer'] =~ %r{/} then
+                  _span.text_muted 'Maintained by: Whimsy PMC using script: '
+                  _a.text_muted "#{info['maintainer']}", href: "#{GITWHIMSY}#{info['maintainer']}"
+                else
+                  _span.text_muted 'Maintained by role/PMC: '
+                  _a.text_muted "#{info['maintainer']}", href: "https://whimsy.apache.org/roster/orgchart/#{info['maintainer']}"
+                end
+                _br
+                if info.key?('sources') then
+                  _span 'Derived from:'
+                  _ul do
+                    info['sources'].each do |src|
+                      _li do 
+                        _a "#{src}", href: "##{src.gsub(/[#%\[\]\{\}\\"<>]/, '')}"
+                      end
+                    end
                   end
                 end
               end
@@ -68,6 +88,10 @@ _html do
           _li "Starting with '/' means it's a path within whimsy repo"
           _li "All other paths means it's an SVN/Git reference from repository.yml"
         end
+        _ul do
+          _li "Maintainers starting with '/' are a path to a script"
+          _li "All other maintainers are a role or PMC"
+        end
       end
     end
   end
diff --git a/www/test/dataflow.json b/www/test/dataflow.json
index 1979198..a9d3d0c 100644
--- a/www/test/dataflow.json
+++ b/www/test/dataflow.json
@@ -10,21 +10,21 @@
   },
   "https://whimsy.apache.org/public/icla-info.json": {
     "description": "Names of people who have submitted ICLAs who have uids (committer accounts)",
-    "maintainer": "/tools/icla-info.rb",
+    "maintainer": "/www/roster/public_icla_info.rb",
     "sources": [
       "/lib/whimsy/asf/icla.rb"
     ]
   },
   "https://whimsy.apache.org/public/icla-info_noid.json": {
     "description": "Names of people who have submitted ICLAs who don't (yet) have uids (commiter
accounts)",
-    "maintainer": "/tools/icla-info_noid.rb",
+    "maintainer": "/www/roster/public_icla_info.rb",
     "sources": [
       "/lib/whimsy/asf/icla.rb"
     ]
   },
   "https://whimsy.apache.org/public/member-info.json": {
     "description": "ASF Member name listing",
-    "maintainer": "/tools/member-info.rb",
+    "maintainer": "/www/roster/public_member_info.rb",
     "sources": [
       "/lib/whimsy/asf/member.rb"
     ]

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <commits@whimsical.apache.org>'].

Mime
View raw message