One curious observation is that Elon was at SpaceX yesterday (tweeting F9 landing leg pics) and is scheduled for a 45 min Q&A discussion with Lyndon tomorrow... doesn't seem to indicate he's tied up finalizing deal details.
I took it the other way considering that he'll be co speaking with Rive and at the California Public Utilities Commission, seems like that would be a pretty good indicator of what will be on the talking agenda. So I am inclined to think that the the gigafactory is pretty much solidified, regarding a separate cap raise I don't see an indication whether that would be this week or some other time.