Rename a few variables and greatly reduce the amount of data sent for steps* events

pylibs/buildbot/status/builder.py

 # -*- test-case-name: buildbot.test.test_status -*-
 
 from zope.interface import implements
 from twisted.python import log
 from twisted.persisted import styles
 from twisted.internet import reactor, defer, threads
 from twisted.protocols import basic
 from buildbot.process.properties import Properties
 
 import weakref
@@ skipping 720 matching lines @@
         return self.results
     def getID(self):
         return self.id
 
     def getBuilderNames(self):
         return self.builderNames
     def getBuildRequests(self):
         return self.buildRequests
     def isFinished(self):
         return self.finished
-    
+
     def waitUntilSuccess(self):
         if self.finished or not self.stillHopeful:
             # the deferreds have already fired
             return defer.succeed(self)
         d = defer.Deferred()
         self.successWatchers.append(d)
         return d
 
     def waitUntilFinished(self):
         if self.finished:
@@ skipping 359 matching lines @@
             self.statistics = {}
 
     def asDict(self):
         result = {}
         # Constant
         result['name'] = self.getName()
 
         # Transient
         result['text'] = self.getText()
         result['results'] = self.getResults()
-        result['is_started'] = self.isStarted()
-        result['is_finished'] = self.isFinished()
+        result['isStarted'] = self.isStarted()
+        result['isFinished'] = self.isFinished()
         result['statistics'] = self.statistics
         result['times'] = self.getTimes()
         result['expectations'] = self.getExpectations()
         result['eta'] = self.getETA()
         result['urls'] = self.getURLs()
         # TODO(maruel): Move that to a sub-url or just publish the log_url
         # instead.
         #result['logs'] = self.getLogs()
         return result
 
@@ skipping 402 matching lines @@
                     os.unlink(filename)
             os.rename(tmpfilename, filename)
         except:
             log.msg("unable to save build %s-#%d" % (self.builder.name,
                                                      self.number))
             log.err()
 
     def asDict(self):
         result = {}
         # Constant
+        result['builderName'] = self.builder.name
         result['number'] = self.getNumber()
-        result['source_stamp'] = self.getSourceStamp().asDict()
+        result['sourceStamp'] = self.getSourceStamp().asDict()
         result['reason'] = self.getReason()
         result['requests'] = [r.asDict() for r in self.getRequests()]
         result['blame'] = self.getResponsibleUsers()
         result['changes'] = [c.asText() for c in self.getChanges()]
 
         # Transient
         result['properties'] = self.getProperties().asList()
         result['times'] = self.getTimes()
         result['text'] = self.getText()
         result['results'] = self.getResults()
         result['slave'] = self.getSlavename()
         # TODO(maruel): Add.
         #result['test_results'] = self.getTestResults()
         # TODO(maruel): Include the url? It's too heavy otherwise.
         #result['logs'] = self.getLogs()
         result['eta'] = self.getETA()
         result['steps'] = [bss.asDict() for bss in self.steps]
         if self.getCurrentStep():
-            result['current_step'] = self.getCurrentStep().asDict()
+            result['currentStep'] = self.getCurrentStep().asDict()
         else:
-            result['current_step'] = None
+            result['currentStep'] = None
         return result
 
 
 
 class BuilderStatus(styles.Versioned):
     """I handle status information for a single process.base.Builder object.
     That object sends status changes to me (frequently as Events), and I
     provide them on demand to the various status recipients, like the HTML
     waterfall display and the live status clients. It also sends build
     summaries to me, which I log and provide to status clients who aren't
@@ skipping 575 matching lines @@
         result['slaves'] = self.slavenames
         #result['url'] = self.parent.getURLForThing(self)
         # TODO(maruel): Add cache settings? Do we care?
 
         # Transient
         # Collect build numbers.
         # Important: Only grab the *cached* builds numbers to reduce I/O.
         current_builds = [b.getNumber() for b in self.currentBuilds]
         cached_builds = list(set(self.buildCache.keys() + current_builds))
         cached_builds.sort()
-        result['cached_builds'] = cached_builds
-        result['current_builds'] = current_builds
+        result['cachedBuilds'] = cached_builds
+        result['currentBuilds'] = current_builds
         result['state'] = self.getState()[0]
         # BuildRequestStatus doesn't have a number so display the SourceStamp.
-        result['pending_builds'] = [
+        result['pendingBuilds'] = [
             b.getSourceStamp().asDict() for b in self.getPendingBuilds()
         ]
         return result
 
 
 class SlaveStatus:
     implements(interfaces.ISlaveStatus)
 
     admin = None
     host = None
@@ skipping 356 matching lines @@
         result = {}
         # Constant
         result['projectName'] = self.getProjectName()
         result['projectURL'] = self.getProjectURL()
         result['buildbotURL'] = self.getBuildbotURL()
         # TODO: self.getSchedulers()
         # self.getChangeSources()
         return result
 
 # vim: set ts=4 sts=4 sw=4 et: