Merge branch 'as_dict_djmitche' of git://github.com/maruel/buildbot

* 'as_dict_djmitche' of git://github.com/maruel/buildbot:
  Add status_json basic unit test.
  Add test_sourcestamp to test sourcestamp.SourceStamp.
  Add /json status.
  Add asDict() member function to many status classes

buildbot/changes/changes.py

@@ -130,13 +130,29 @@ def getFileContents(self):
             for f in self.files:
                 data += " %s\n" % f
         return data
-        
+
     def getProperties(self):
         data = ""
         for prop in self.properties.asList():
             data += "  %s: %s" % (prop[0], prop[1])
         return data
 
+    def asDict(self):
+        result = {}
+        # Constant
+        result['number'] = self.number
+        result['branch'] = self.branch
+        result['category'] = self.category
+        result['who'] = self.getShortAuthor()
+        result['comments'] = self.comments
+        result['revision'] = self.revision
+        result['when'] = self.when
+        result['files'] = self.files
+        result['revlink'] = self.revlink
+        result['properties'] = self.properties.asList()
+        return result
+
+
 class ChangeMaster(service.MultiService):
 
     """This is the master-side service which receives file change
@@ -280,3 +296,5 @@ class TestChangeMaster(ChangeMaster):
     """A ChangeMaster for use in tests that does not save itself"""
     def stopService(self):
         return service.MultiService.stopService(self)
+
+# vim: set ts=4 sts=4 sw=4 et:

buildbot/sourcestamp.py

@@ -1,3 +1,5 @@
+# -*- test-case-name: buildbot.test.test_sourcestamp -*-
+
 from zope.interface import implements
 from buildbot import util, interfaces
 
@@ -94,7 +96,7 @@ def getText(self):
         if self.patch:
             text.append("[patch]")
         return text
-    
+
     def getHTMLDict(self):
         if self.revision is None:
             return dict(rev='latest')
@@ -104,3 +106,15 @@ def getHTMLDict(self):
         if self.patch:
             d['patch'] = True
         return d
+
+    def asDict(self):
+        result = {}
+        # Constant
+        result['revision'] = self.revision
+        # TODO(maruel): Make the patch content a suburl.
+        result['patch'] = self.patch
+        result['branch'] = self.branch
+        result['changes'] = [c.asDict() for c in getattr(self, 'changes', [])]
+        return result
+
+# vim: set ts=4 sts=4 sw=4 et:

buildbot/status/builder.py

@@ -774,6 +774,17 @@ def getSubmitTime(self):
     def setSubmitTime(self, t):
         self.submittedAt = t
 
+    def asDict(self):
+        result = {}
+        # Constant
+        result['source'] = self.source.asDict()
+        result['builderName'] = self.getBuilderName()
+        result['submittedAt'] = self.getSubmitTime()
+
+        # Transient
+        result['builds'] = [build.asDict() for build in self.getBuilds()]
+        return result
+
 
 class BuildStepStatus(styles.Versioned):
     """
@@ -1069,6 +1080,26 @@ def upgradeToVersion2(self):
         if not hasattr(self, "statistics"):
             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['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
+
 
 class BuildStatus(styles.Versioned):
     implements(interfaces.IBuildStatus, interfaces.IStatusEvent)
@@ -1478,6 +1509,34 @@ def saveYourself(self):
                                                      self.number))
             log.err()
 
+    def asDict(self):
+        result = {}
+        # Constant
+        result['number'] = self.getNumber()
+        result['source_stamp'] = 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()
+        else:
+            result['current_step'] = None
+        return result
+
 
 
 class BuilderStatus(styles.Versioned):
@@ -2045,6 +2104,32 @@ def removeClient(self, client):
         if client in self.subscribers:
             self.subscribers.remove(client)
 
+    def asDict(self):
+        result = {}
+        # Constant
+        # TODO(maruel): Fix me. We don't want to leak the full path.
+        result['basedir'] = os.path.basename(self.basedir)
+        result['category'] = self.category
+        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['state'] = self.getState()[0]
+        # BuildRequestStatus doesn't have a number so display the SourceStamp.
+        result['pending_builds'] = [
+            b.getSourceStamp().asDict() for b in self.getPendingBuilds()
+        ]
+        return result
+
+
 class SlaveStatus:
     implements(interfaces.ISlaveStatus)
 
@@ -2115,6 +2200,16 @@ def removeGracefulWatcher(self, watcher):
         if watcher in self.graceful_callbacks:
             self.graceful_callbacks.remove(watcher)
 
+    def asDict(self):
+        result = {}
+        # Transient
+        result['host'] = self.getHost()
+        result['admin'] = self.getAdmin()
+        result['version'] = self.getVersion()
+        result['connected'] = self.isConnected()
+        return result
+
+
 class Status:
     """
     I represent the status of the buildmaster.
@@ -2389,3 +2484,14 @@ def buildsetSubmitted(self, bss):
     def changeAdded(self, change):
         for t in self.watchers:
             t.changeAdded(change)
+
+    def asDict(self):
+        result = {}
+        # Constant
+        result['name'] = self.getProjectName()
+        result['url'] = self.getProjectURL()
+        # TODO: self.getSchedulers()
+        # self.getChangeSources()
+        return result
+
+# vim: set ts=4 sts=4 sw=4 et:

buildbot/status/web/baseweb.py

@@ -22,6 +22,7 @@
 from buildbot.status.web.builder import BuildersResource
 from buildbot.status.web.buildstatus import BuildStatusStatusResource 
 from buildbot.status.web.slaves import BuildSlavesResource
+from buildbot.status.web.status_json import JsonStatusResource
 from buildbot.status.web.xmlrpc import XMLRPCServer
 from buildbot.status.web.about import AboutBuildbot
 from buildbot.status.web.auth import IAuth, AuthFailResource
@@ -555,6 +556,7 @@ def setupSite(self):
         status = self.getStatus()
         root.putChild("rss", Rss20StatusResource(status))
         root.putChild("atom", Atom10StatusResource(status))
+        root.putChild("json", JsonStatusResource(status))
 
         self.site.resource = root