Merge lp:~sinzui/launchpad/lost-glob-bug-484365 into lp:launchpad

[Curtis Hovey]

[Curtis Hovey (sinzui)]

This is my branch to fix the +addseries view to save the release file glob.

    lp:~sinzui/launchpad/lost-glob-bug-484365
    Diff size: 116
    Launchpad bug: https://bugs.launchpad.net/bugs/484365
    Test command: ./bin/test -vv -t product-views -t productseries.txt
    Pre-implementation: kiko
    Target release: 3.1.11

= Fix the +addseries view to save the release file glob =

The ProductAddSeriesView.add_action does not pass the releasefileglob glob
to the constructor.

== Rules ==

    * Update ProductAddSeriesView.add_action to pass the releasefileglob
      field to the constructor.
    * Update Product.newSeries() to support the releasefileglob argument.

== QA ==

    * On staging, create a series with a releasefileglob
    * Verify the glob is listed on the series page.

== Lint ==

Linting changed files:
  lib/lp/registry/browser/product.py
  lib/lp/registry/browser/tests/product-views.txt
  lib/lp/registry/doc/productseries.txt
  lib/lp/registry/interfaces/product.py
  lib/lp/registry/model/product.py

== Test ==

    * lib/lp/registry/browser/tests/product-views.txt
      * Added a test to verify the fields are accepted by the +addseries
        view.
    * lib/lp/registry/doc/productseries.txt
      * Updated doctest to show that the releasefileglob and verify the
        pertinent info is set.

== Implementation ==

    * lib/lp/registry/browser/product.py
      * Updated the view to pass the releasefileglob to product.newSeries()
    * lib/lp/registry/interfaces/product.py
      * Added the releasefileglob argument to newSeries()
      * Fixed a long line reported by lint.
    * lib/lp/registry/model/product.py
      * Added the releasefileglob argument to the newSeries() method.

[Michael Nelson (michael.nelson)]

Wow - you always do such clean branches Curtis - it's great to review!

The only comment I could make is actually in the form of Barry's voice in my head - whether you want to take the time to add the doc params to IProductDriverRestricted.newSeries().

Thanks!

review: Approve (code)

[Curtis Hovey (sinzui)]

On Thu, 2009-11-19 at 15:46 +0000, Michael Nelson wrote:
> Review: Approve code
> Wow - you always do such clean branches Curtis - it's great to review!
>
> The only comment I could make is actually in the form of Barry's voice
> in my head - whether you want to take the time to add the doc params
> to IProductDriverRestricted.newSeries().

I agree.

--- lib/lp/registry/interfaces/product.py 2009-11-19 04:39:48 +0000
+++ lib/lp/registry/interfaces/product.py 2009-11-19 16:18:54 +0000
@@ -273,7 +273,17 @@
     """`IProduct` properties which require launchpad.Driver permission."""

     def newSeries(owner, name, summary, branch=None, releasefileglob=None):
- """Creates a new ProductSeries for this product."""
+ """Creates a new `IProductSeries` for this `IProduct`.
+
+ :param owner: The registrant of this series.
+ :param name: The unique name of this series.
+ :param summary: The summary of the purpose and focus of development
+ of this series.
+ :param branch: The bazaar branch that contains the code for
+ this series.
+ :param releasefileglob: The public URL pattern where release files can
+ be automatically downloaded from and linked to this series.
+ """

 class IProductEditRestricted(IOfficialBugTagTargetRestricted,):

--
__Curtis C. Hovey_________
http://launchpad.net/

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2009-11-19 07:45:09 +0000
+++ lib/lp/registry/browser/product.py	2009-11-19 22:21:17 +0000
@@ -1307,7 +1307,8 @@
             owner=self.user,
             name=data['name'],
             summary=data['summary'],
-            branch=data['branch'])
+            branch=data['branch'],
+            releasefileglob=data['releasefileglob'])
 
     @property
     def next_url(self):

=== modified file 'lib/lp/registry/browser/tests/packaging-views.txt'
--- lib/lp/registry/browser/tests/packaging-views.txt	2009-10-26 19:09:39 +0000
+++ lib/lp/registry/browser/tests/packaging-views.txt	2009-11-19 22:21:17 +0000
@@ -43,7 +43,7 @@
     >>> form = {
     ...     'field.distroseries': 'ubuntu/hoary',
     ...     'field.sourcepackagename': 'hot',
-    ...     'field.packaging': 'Primary Product',
+    ...     'field.packaging': 'Primary Project',
     ...     'field.actions.continue': 'Continue',
     ...     }
     >>> view = create_initialized_view(
@@ -61,7 +61,7 @@
     >>> form = {
     ...     'field.distroseries': 'ubuntu/hoary',
     ...     'field.sourcepackagename': 'hot',
-    ...     'field.packaging': 'Primary Product',
+    ...     'field.packaging': 'Primary Project',
     ...     'field.actions.continue': 'Continue',
     ...     }
     >>> view = create_initialized_view(
@@ -78,7 +78,7 @@
     >>> form = {
     ...     'field.distroseries': 'ubuntu/hoary',
     ...     'field.sourcepackagename': 'hot',
-    ...     'field.packaging': 'Primary Product',
+    ...     'field.packaging': 'Primary Project',
     ...     'field.actions.continue': 'Continue',
     ...     }
     >>> view = create_initialized_view(
@@ -93,7 +93,7 @@
     >>> form = {
     ...     'field.distroseries': 'ubuntu/hoary',
     ...     'field.sourcepackagename': '',
-    ...     'field.packaging': 'Primary Product',
+    ...     'field.packaging': 'Primary Project',
     ...     'field.actions.continue': 'Continue',
     ...     }
     >>> view = create_initialized_view(

=== modified file 'lib/lp/registry/browser/tests/product-views.txt'
--- lib/lp/registry/browser/tests/product-views.txt	2009-08-31 21:20:55 +0000
+++ lib/lp/registry/browser/tests/product-views.txt	2009-11-19 22:21:17 +0000
@@ -345,6 +345,29 @@
     >>> print view.cancel_url
     http://launchpad.dev/firefox
 
+The view allows the driver to set series name, summary, branch and
+releasefileglob fields.
+
+    >>> view.field_names
+    ['name', 'summary', 'branch', 'releasefileglob']
+
+    >>> form = {
+    ...     'field.name': 'master',
+    ...     'field.summary': 'The primary development series.',
+    ...     'field.releasefileglob': 'ftp://mozilla.org/firefox.*bz2',
+    ...     'field.branch': '',
+    ...     'field.actions.add': 'Register Series',
+    ...     }
+    >>> view = create_initialized_view(firefox, name='+addseries', form=form)
+    >>> print view.series.name
+    master
+
+    >>> print view.series.summary
+    The primary development series.
+
+    >>> print view.series.releasefileglob
+    ftp://mozilla.org/firefox.*bz2
+
 
 Product index view
 ==================

=== modified file 'lib/lp/registry/doc/productseries.txt'
--- lib/lp/registry/doc/productseries.txt	2009-10-26 18:40:04 +0000
+++ lib/lp/registry/doc/productseries.txt	2009-11-19 22:21:17 +0000
@@ -73,7 +73,17 @@
     Unauthorized: (..., 'newSeries', 'launchpad.Driver')
 
     >>> login_person(firefox.owner)
-    >>> emacs_series = firefox.newSeries(firefox.owner , 'emacs', summary)
+    >>> emacs_series = firefox.newSeries(
+    ...     firefox.owner , 'emacs', summary,
+    ...     releasefileglob='ftp://gnu.org/emacs*.gz')
+    >>> print emacs_series.name
+    emacs
+
+    >>> print emacs_series.summary
+    Port of Firefox to the Emacs operating system.
+
+    >>> print emacs_series.releasefileglob
+    ftp://gnu.org/emacs*.gz
 
 When a driver creates a series, he is also the driver of the new series
 to make him the release manager.

=== modified file 'lib/lp/registry/interfaces/packaging.py'
--- lib/lp/registry/interfaces/packaging.py	2009-10-19 16:29:09 +0000
+++ lib/lp/registry/interfaces/packaging.py	2009-11-19 22:21:17 +0000
@@ -31,20 +31,20 @@
     """
 
     PRIME = DBItem(1, """
-        Primary Product
+        Primary Project
 
-        This is the primary product packaged in this source package. For
-        example, a source package "apache2" would have a "prime" Packaging
+        This is the primary project packaged in this source package. For
+        example, a source package "apache2" would have a "prime" packaging
         relationship with the "apache2" product from the Apache Project.
-        The product and package don't have to have the same name.
+        The project and package don't have to have the same name.
         """)
 
     INCLUDES = DBItem(2, """
-        SourcePackage Includes Product
+        SourcePackage Includes Project
 
-        This source package includes some part or all of the product. For
-        example, the "cadaver" source package has an "includes" Packaging
-        relationship with the libneon product.
+        This source package includes some part or all of the project. For
+        example, the "cadaver" source package has an "includes" packaging
+        relationship with the libneon project.
         """)
 
 

=== modified file 'lib/lp/registry/interfaces/product.py'
--- lib/lp/registry/interfaces/product.py	2009-11-13 15:22:53 +0000
+++ lib/lp/registry/interfaces/product.py	2009-11-19 22:21:17 +0000
@@ -272,8 +272,18 @@
 class IProductDriverRestricted(Interface):
     """`IProduct` properties which require launchpad.Driver permission."""
 
-    def newSeries(owner, name, summary, branch=None):
-        """Creates a new ProductSeries for this product."""
+    def newSeries(owner, name, summary, branch=None, releasefileglob=None):
+        """Creates a new `IProductSeries` for this `IProduct`.
+
+        :param owner: The registrant of this series.
+        :param name: The unique name of this series.
+        :param summary: The summary of the purpose and focus of development
+            of this series.
+        :param branch: The bazaar branch that contains the code for
+            this series.
+        :param releasefileglob: The public URL pattern where release files can
+            be automatically downloaded from and linked to this series.
+        """
 
 
 class IProductEditRestricted(IOfficialBugTagTargetRestricted,):
@@ -638,7 +648,8 @@
         :param subscription_months: integer indicating the number of months
             the voucher is for.
         :param whiteboard: Notes for this activity.
-        :param current_datetime: Current time.  Will be datetime.now() if not specified.
+        :param current_datetime: Current time.  Will be datetime.now() if not
+            specified.
         :return: None
         """
 

=== modified file 'lib/lp/registry/interfaces/sourcepackage.py'
--- lib/lp/registry/interfaces/sourcepackage.py	2009-11-15 23:23:12 +0000
+++ lib/lp/registry/interfaces/sourcepackage.py	2009-11-19 22:21:17 +0000
@@ -94,7 +94,7 @@
             vocabulary="ProductSeries",
             schema=Interface,
             description=_(
-                "The registered project series that this source package."
+                "The registered project series that this source package. "
                 "is based on. This series may be the same as the one that "
                 "earlier versions of this source packages were based on.")))
 

=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2009-11-13 15:22:53 +0000
+++ lib/lp/registry/model/product.py	2009-11-19 22:21:17 +0000
@@ -915,12 +915,14 @@
         """See `IProduct`."""
         return ProductSeries.selectOneBy(product=self, name=name)
 
-    def newSeries(self, owner, name, summary, branch=None):
+    def newSeries(
+        self, owner, name, summary, branch=None, releasefileglob=None):
         # XXX: jamesh 2008-04-11
         # Set the ID of the new ProductSeries to avoid flush order
         # loops in ProductSet.createProduct()
-        series = ProductSeries(productID=self.id, owner=owner, name=name,
-                             summary=summary, branch=branch)
+        series = ProductSeries(
+            productID=self.id, owner=owner, name=name,
+            summary=summary, branch=branch, releasefileglob=releasefileglob)
         if owner.inTeam(self.driver) and not owner.inTeam(self.owner):
             # The user is a product driver, and should be the driver of this
             # series to make him the release manager.