Changeset 267

Timestamp:

03-06-07 19:42:09 (6 years ago)

Author:

thomas

Message:

fix changelog name

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• moap/command/cl.py (modified) (9 diffs)
• moap/extern/command/command.py (modified) (1 diff)
• moap/test/test_commands_cl.py (modified) (1 diff)

trunk/ChangeLog

@@ -1 +1 @@
 2007-05-30  Thomas Vander Stichele  <thomas at apestaart dot org>
 
-        patch by: bilboed@gmail.com
+        patch by: Edward Hervey <bilboed@gmail.com>
 
         * moap/command/cl.py (Prepare.do):

trunk/moap/command/cl.py

@@ -20 +20 @@
 # for matching the address out of the second part of the first line
 _addressRegex = re.compile('^([^<]*)<(.*)>$')
+
+# for matching contributors
+_byRegex = re.compile(' by: ([^<]*)\s*.*$')
+
 # for matching files changed
 _fileRegex = re.compile('^\s*\* (.[^:\s\(]*).*')
 
+# for matching release lines
+_releaseRegex = re.compile(r'^=== release (.*) ===$')
+
 class Entry:
     """
     I represent one entry in a ChangeLog file.
-
-    @ivar text:    the text of the message, without name line or
-                   preceding/following newlines
-    @type text:    str
-    @type date:    str
-    @type name:    str
-    @type address: str
-    @ivar files:   list of files referenced in this ChangeLog entry
-    @type files:   list of str
+    """
+ 
+class ChangeEntry(Entry):
+    """
+    I represent one entry in a ChangeLog file.
+
+    @ivar text:         the text of the message, without name line or
+                        preceding/following newlines
+    @type text:         str
+    @type date:         str
+    @type name:         str
+    @type address:      str
+    @ivar files:        list of files referenced in this ChangeLog entry
+    @type files:        list of str
+    @ivar contributors: list of people who've contributed to this entry
+    @type contributors: str
     """
     date = None
@@ -42 +56 @@
     def __init__(self):
         self.files = []
+        self.contributors = []
 
     def parse(self, lines):
@@ -56 +71 @@
             self.address = m.expand("\\2")
 
-        # all the other lines can contain files
+        # all the other lines can contain files or contributors
         for line in lines[1:]:
             m = _fileRegex.search(line)
@@ -62 +77 @@
                 fileName = m.expand("\\1")
                 self.files.append(fileName)
+            m = _byRegex.search(line)
+            if m:
+                # only append entries that we actually have a name for
+                name = m.expand("\\1").strip()
+                if name:
+                    self.contributors.append(name)
 
         # create the text attribute
@@ -71 +92 @@
         self.text = "\n".join(save) + "\n"
 
+class ReleaseEntry:
+    """
+    I represent a release separator in a ChangeLog file.
+    """
+    version = None
+
+    def parse(self, lines):
+        """
+        @type lines: list of str
+        """
+        # first and only line is the "release" line
+        m = _releaseRegex.search(lines[0])
+        self.version = m.expand("\\1")
+ 
 class ChangeLogFile(log.Loggable):
     logCategory = "ChangeLog"
@@ -78 +113 @@
         self._blocks = []
         self._entries = []
+        self._releases = {} # map of release -> index in self._entries
         handle = open(path, "r")
 
         def parseBlock(block):
-            if block:
-                self._blocks.append(block)
-                entry = Entry()
-                entry.parse(block)
-                self._entries.append(entry)
+            if not block:
+                return
+
+            self._blocks.append(block)
+            if _nameRegex.match(block[0]):
+                entry = ChangeEntry()
+            elif _releaseRegex.match(block[0]):
+                entry = ReleaseEntry()
+
+            entry.parse(block)
+            self._entries.append(entry)
+
+            if isinstance(entry, ReleaseEntry):
+                self._releases[entry.version] = len(self._entries) - 1
+
+            return entry
 
         block = []
         for line in handle.readlines():
-            if _nameRegex.match(line):
-                # new entry starting, save old block
+            if _nameRegex.match(line) or _releaseRegex.match(line):
+                # new entry starting, parse old block
                 parseBlock(block)
-
                 block = []
+
             block.append(line)
 
-        # don't forget the last block
+        # don't forget to parse the last block
         parseBlock(block)
 
@@ -109 +156 @@
         """
         return self._entries[num]
+
+    def getReleaseIndex(self, release):
+        return self._releases[release]
+        
 
 class Checkin(util.LogCommand):
@@ -145 +196 @@
         if not ret:
             return 1
+
+        return 0
+
+class Contributors(util.LogCommand):
+    usage = "contributors [path to directory or ChangeLog file]"
+    summary = "get a list of contributors since the previous release"
+    aliases = ["cont", "contrib"]
+
+    def addOptions(self):
+        self.parser.add_option('-r', '--release',
+            action="store", dest="release",
+            help="release to get contributors to")
+
+    def do(self, args):
+        path = os.getcwd()
+        if args:
+            path = os.path.abspath(args[0])
+         
+        if os.path.isdir(path):
+            filePath = os.path.join(path, 'ChangeLog')
+        else:
+            filePath = path
+
+        cl = ChangeLogFile(filePath)
+
+        names = []
+        # find entry to start at
+        i = 0
+        if self.options.release:
+            try:
+                i = cl.getReleaseIndex(self.options.release) + 1
+            except KeyError:
+                self.stderr.write('No release %s found in %s !\n' % (
+                    self.options.release, filePath))
+                return 3
+
+            self.debug('Release %s is entry %d' % (self.options.release, i))
+
+        # now scan all entries from that point downwards
+        while True:
+            try:
+                entry = cl.getEntry(i)
+            except IndexError:
+                break
+            if isinstance(entry, ReleaseEntry):
+                break
+
+            if not entry.name in names:
+                self.debug("Adding name %s" % entry.name)
+                names.append(entry.name)
+            for n in entry.contributors:
+                if not n in names:
+                    self.debug("Adding name %s" % n)
+                    names.append(n)
+
+            i += 1
+
+        names.sort()
+        print names
+        self.stdout.write("\n".join(names) + "\n")
 
         return 0
@@ -347 +458 @@
 
 Supported VCS systems: %s""" % ", ".join(vcs.getNames())
-    subCommandClasses = [Checkin, Diff, Prepare]
+    subCommandClasses = [Checkin, Contributors, Diff, Prepare]
     aliases = ["cl", ]

trunk/moap/extern/command/command.py

@@ -175 +175 @@
         Parse the given arguments and act on them.
         """
-        options, args = self.parser.parse_args(argv)
-
-        ret = self.handleOptions(options)
+        print "THOMAS: parsing argv"
+        self.options, args = self.parser.parse_args(argv)
+        print "THOMAS: options %r" % self.options
+
+        # FIXME: make handleOptions not take options, since we store it
+        # in self.options now
+        ret = self.handleOptions(self.options)
         if ret:
             return ret

trunk/moap/test/test_commands_cl.py

@@ -72 +72 @@
         lines = e.text.split("\n")[:-1]
         self.assertEquals(len(lines), 3)
+
+class TestClGstPluginsBase(common.TestCase):
+    def setUp(self):
+        self.file = os.path.join(os.path.dirname(__file__), 'ChangeLog',
+            'ChangeLog.gst-plugins-base')
+        self.cl = cl.ChangeLogFile(self.file)
+
+    def testGetRelease(self):
+        e = self.cl.getEntry(0)
+        self.assertEquals(e.version, "0.10.10")
+
+    def testGetContributors(self):
+        e = self.cl.getEntry(1)
+        self.assertEquals(e.contributors, ["Michael Smith", ])
+
+    def testContributors(self):
+        stdout = StringIO.StringIO()
+        c = cl.Contributors(stdout=stdout)
+        ret = c.parse([self.file, ])
+        self.assertEquals(ret, 0)
+        self.assertEquals(stdout.getvalue(), "\n")
+
+    def testContributorsRelease(self):
+        stdout = StringIO.StringIO()
+        c = cl.Contributors(stdout=stdout)
+        ret = c.parse(["-r", "0.10.10", self.file, ])
+        self.assertEquals(ret, 0)
+        self.assertEquals(stdout.getvalue(), """Michael Smith
+Thomas Vander Stichele
+Wim Taymans
+""")
 
 class TestCheckin(common.SVNTestCase):