add second blog for mika

diff --git a/bloggers.yml b/bloggers.yml
index bd3a74970c2ea3b8cdf2b00bf500cd806d65e237..94899b3b02b5b6cde228b2d64b6908fc2279c6cd 100644 (file)
--- a/bloggers.yml
+++ b/bloggers.yml
@@ -33,7 +33,6 @@ daf:
   - [Dafydd Harries (Fuck Yeah X11), 'http://fuckyeahx11.tumblr.com/', 'http://fuckyeahx11.tumblr.com/rss']
   start: 11/14/2011
 dandennis:
-  end: '2012-01-19'
   links:
   - [Daniel Jones, 'http://dandennis.tumblr.com/', 'http://dandennis.tumblr.com/rss']
   start: 11/21/2011
@@ -62,9 +61,10 @@ johns:
 joi:
   links:
   - [Joichi Ito, 'http://joi.ito.com/', 'http://feeds.feedburner.com/joi-ito/weblog']
+  - [Joichi Ito (Diving), 'http://diving.ito.com/', 'http://diving.ito.com/rss']
   start: 11/14/2011
 karim:
-  end: '2012-01-19'
+  end: '2012-01-25'
   links:
   - [Karim Lakhani (Spoudaiospaizen), 'http://spoudaiospaizen.net/', 'http://spoudaiospaizen.net/feed/atom/']
   - [Karim Lakhani (Strategy Profs), 'http://strategyprofs.wordpress.com/author/karimlakhani/',
@@ -91,6 +91,7 @@ mayo:
 mika:
   links:
   - [Mika Matsuzaki, 'http://mika.im/nikki', 'http://mika.im/nikki/feed/']
+  - [Mika Matsuzaki (Acetarium), 'http://acetarium.com/blog/', 'http://acetarium.com/blog/?creator=mika&feed=rss2']
   start: 11/07/2011
 mollydb:
   links:
@@ -133,6 +134,10 @@ shauna:
   links:
   - [Shauna Gordon-McKeon, 'http://www.shaunagm.net/blog', 'http://www.shaunagm.net/blog/feed/atom/']
   start: 11/14/2011
+sj:
+  links:
+  - [Samuel Klein, 'http://blogs.law.harvard.edu/sj/', 'http://blogs.law.harvard.edu/sj/feed/']
+  start: 01/16/2012
 spang:
   links:
   - [Christine Spang, 'http://blog.spang.cc/', 'http://blog.spang.cc/index.atom']

diff --git a/email_list b/email_list
index 85e2f949ed2edb9891ec263a0820bc0d52ed8f2e..9ac5acf50154323b697c458138560b5571da7740 100644 (file)
--- a/email_list
+++ b/email_list
@@ -32,3 +32,4 @@ raquelmacosta@gmail.com
 swartzcr@media.mit.edu
 jeff@unterbahn.com
 andybardagjy@gmail.com
+meta.sj@gmail.com

diff --git a/ledger b/ledger
index d133812bb434c4d701b8b0a897ac254e1e7eeb6c..d16bbadfeebdee0237fd841c856530e6711268ca 100644 (file)
--- a/ledger
+++ b/ledger
@@ -426,65 +426,68 @@
   Pool:Owed:nadav  $-30.0
   User:nadav
 
-2012-01-16 Week 11
-  User:andresmh    $-5
-  Pool:Owed:andresmh
-2012-01-16 Week 11
+2012-01-19 Punt
+  Pool:Owed:spang  $-30.0
+  User:spang
+
+2012-01-19 Unpunt
+  Pool:Owed:spang  $30.0
+  User:spang
+2012-01-18 Payment
+  Pool:Owed:spang   $-15
+  Pool:Paid
+
+2012-01-19 Payment
+  Pool:Owed:ria   $-15
+  Pool:Paid
+2012-01-19 Payment
+  Pool:Owed:sayamindu   $-15
+  Pool:Paid
+
+2012-01-24 Payment
+  Pool:Owed:andresmh   $-20
+  Pool:Paid
+2012-01-24 Payment
+  Pool:Owed:bkolko   $-20
+  Pool:Paid
+
+2012-01-23 Week 12
   User:asheesh    $-5
   Pool:Owed:asheesh
-2012-01-16 Week 11
+2012-01-23 Week 12
   User:bardagjy    $-5
   Pool:Owed:bardagjy
-2012-01-16 Week 11
+2012-01-23 Week 12
   User:bkolko    $-5
   Pool:Owed:bkolko
-2012-01-16 Week 11
+2012-01-23 Week 12
+  User:crschmidt    $-5
+  Pool:Owed:crschmidt
+2012-01-23 Week 12
   User:daf    $-5
   Pool:Owed:daf
-2012-01-16 Week 11
-  User:dandennis    $-5
-  Pool:Owed:dandennis
-2012-01-16 Week 11
-  User:djcp    $-5
-  Pool:Owed:djcp
-2012-01-16 Week 11
+2012-01-23 Week 12
   User:jgay    $-5
   Pool:Owed:jgay
-2012-01-16 Week 11
+2012-01-23 Week 12
+  User:joi    $-5
+  Pool:Owed:joi
+2012-01-23 Week 12
   User:karim    $-5
   Pool:Owed:karim
-2012-01-16 Week 11
-  User:mayo    $-5
-  Pool:Owed:mayo
-2012-01-16 Week 11
+2012-01-23 Week 12
   User:nadav    $-5
   Pool:Owed:nadav
-2012-01-16 Week 11
+2012-01-23 Week 12
   User:nadya    $-5
   Pool:Owed:nadya
-2012-01-16 Week 11
-  User:rheacock    $-5
-  Pool:Owed:rheacock
-2012-01-16 Week 11
-  User:sayamindu    $-5
-  Pool:Owed:sayamindu
-2012-01-16 Week 11
-  User:spang    $-5
-  Pool:Owed:spang
-2012-01-16 Week 11
+2012-01-23 Week 12
+  User:ria    $-5
+  Pool:Owed:ria
+2012-01-23 Week 12
   User:zig    $-5
   Pool:Owed:zig
 
-2012-01-19 Punt
-  Pool:Owed:dandennis  $-30.0
-  User:dandennis
-2012-01-19 Punt
+2012-01-25 Punt
   Pool:Owed:karim  $-30.0
   User:karim
-2012-01-19 Punt
-  Pool:Owed:spang  $-30.0
-  User:spang
-
-2012-01-18 Payment
-  Pool:Owed:spang   $-15
-  Pool:Paid

diff --git a/weekly-update.py b/weekly-update.py
index 06d85182d84c5cbf127967e0f76837fa970baf62..284ffb6056a9bf3fee868a3005bafc7bdd917d27 100755 (executable)
--- a/weekly-update.py
+++ b/weekly-update.py
@@ -81,9 +81,13 @@ if punt:
     with open('bloggers.yml','w') as b:
         yaml.safe_dump(bloggers, b)
 
-    subprocess.check_call(["git", "commit", "ledger", "bloggers.yml",
-                           "-m", "Punts for %s" % (today,)])
+    if not dry_run:
+        subprocess.check_call(["git", "commit", "ledger", "bloggers.yml",
+                               "-m", "Punts for %s" % (today,)])
 
 # if it's a dry run, lets set the ledger back to the beginning state
 if dry_run:
     subprocess.check_call(["git", "checkout", "ledger"])
+    
+    if punt:
+        subprocess.check_call(["git", "checkout", "bloggers.yml"])