whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Sam Ruby <ru...@apache.org>
Subject [whimsy.git] [1/1] Commit 48272c1: apply and commit changes
Date Sun, 21 Feb 2016 15:28:27 GMT
Commit 48272c12597d4b47fa8b9902ac80e2a0eceb2ed4:
    apply and commit changes


Branch: refs/heads/master
Author: Sam Ruby <rubys@intertwingly.net>
Committer: Sam Ruby <rubys@intertwingly.net>
Pusher: rubys <rubys@apache.org>

------------------------------------------------------------
www/members/inactive.cgi                                     | +++++++++ -
------------------------------------------------------------
34 changes: 33 additions, 1 deletions.
------------------------------------------------------------


diff --git a/www/members/inactive.cgi b/www/members/inactive.cgi
index cefac47..b350c05 100755
--- a/www/members/inactive.cgi
+++ b/www/members/inactive.cgi
@@ -5,11 +5,12 @@ require 'whimsy/asf'
 require 'wunderbar/bootstrap'
 require 'date'
 require 'json'
+require 'tmpdir'
 
 # locate and read the attendance file
 MEETINGS = ASF::SVN['private/foundation/Meetings']
 attendance = JSON.parse(IO.read("#{MEETINGS}/attendance.json"))
-latest = Dir["#{MEETINGS}/2*"].sort.last
+latest = Dir["#{MEETINGS}/2*"].sort.last.untaint
 tracker = JSON.parse(IO.read("#{latest}/non-participants.json"))
 
 # determine user's name as found in members.txt
@@ -18,10 +19,14 @@ matrix = attendance['matrix'][name]
 
 # produce HTML
 _html do
+  _style :system
   _style %{
     div.status, .status form {margin-left: 16px}
     .btn {margin: 4px}
     form {margin-bottom: 1em}
+    .transcript {margin: 0 16px}
+    .transcript pre {border: none; line-height: 0}
+    pre._hilite {background-color: yellow}
   }
 
   if not tracker[$USER]
@@ -30,6 +35,33 @@ _html do
     _p.alert.alert_warning "You have missed the last " + 
       tracker[$USER]['missed'].to_s + " meetings."
 
+    if _.post? and @status
+      _h3_ 'Session Transcript'
+
+      # setup authentication
+      if $PASSWORD
+        auth = [['--username', $USER, '--password', $PASSWORD]]
+      else
+        auth = [[]]
+      end
+
+      # apply and commit changes
+      Dir.mktmpdir do |dir|
+        _div_.transcript do
+          work = `svn info #{latest}`[/URL: (.*)/, 1]
+          _.system ['svn', 'checkout', auth, '--depth', 'empty', work, dir]
+           json = File.join(dir, '/non-participants.json')
+          _.system ['svn', 'update', auth, json]
+          tracker = JSON.parse(IO.read(json))
+          tracker[$USER]['status'] = @status
+          IO.write(json, JSON.pretty_generate(tracker))
+          _.system ['svn', 'diff', json], hilite: [/"status":/],
+            class: {hilight: '_stdout _hilite'}
+          _.system ['svn', 'commit', auth, json, '-m', status]
+        end
+      end
+    end
+
     _h1_ 'Status'
 
     _div.status do

Mime
View raw message