Merge lp:~gary/charms/precise/juju-gui/gitdevrelease into lp:~juju-gui/charms/precise/juju-gui/trunk

[Gary Poster]

Restore development build support

This branch restores the ability to follow the quick trunk deploy workflow.

- In GUI: `BRANCH_IS_GOOD make distfile`
- Copy new release into local GUI charm releases folder
- bootstrap juju and run `make deploy` in charm

This is the fastest way I know to demo or qa a GUI branch with the charm trunk.

https://codereview.appspot.com/52230045/

[Gary Poster (gary)]

Reviewers: mp+204579_code.launchpad.net,

Message:
Please take a look.

Description:
Restore development build support

This branch restores the ability to follow the quick trunk deploy
workflow.

- In GUI: `BRANCH_IS_GOOD make distfile`
- Copy new release into local GUI charm releases folder
- bootstrap juju and run `make deploy` in charm

This is the fastest way I know to demo or qa a GUI branch with the charm
trunk.

https://code.launchpad.net/~gary/charms/precise/juju-gui/gitdevrelease/+merge/204579

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/52230045/

[Francesco Banconi (frankban)]

LGTM + QA ok. Thank you!

https://codereview.appspot.com/52230045/

[Gary Poster (gary)]

*** Submitted:

Restore development build support

This branch restores the ability to follow the quick trunk deploy
workflow.

- In GUI: `BRANCH_IS_GOOD make distfile`
- Copy new release into local GUI charm releases folder
- bootstrap juju and run `make deploy` in charm

This is the fastest way I know to demo or qa a GUI branch with the charm
trunk.

R=frankban
CC=
https://codereview.appspot.com/52230045

https://codereview.appspot.com/52230045/

[Gary Poster (gary)]

On 2014/02/04 09:13:47, frankban wrote:
> LGTM + QA ok. Thank you!

Thank you for the review, Francesco.

https://codereview.appspot.com/52230045/

=== modified file 'hooks/utils.py'
--- hooks/utils.py	2014-02-03 16:30:24 +0000
+++ hooks/utils.py	2014-02-03 21:39:35 +0000
@@ -129,7 +129,7 @@
     juju-gui-  # Juju GUI prefix.
     (
         \d+\.\d+\.\d+  # Major, minor, and patch version numbers.
-        (?:\+build\.\d+)?  # Optional bzr revno for development releases.
+        (?:\+build\.\w+)?  # Optional git hash for development releases.
     )
     \.(?:tgz|xz)  # File extension.
 """, re.VERBOSE)

=== modified file 'tests/test_utils.py'
--- tests/test_utils.py	2014-02-03 16:30:24 +0000
+++ tests/test_utils.py	2014-02-03 21:39:35 +0000
@@ -345,6 +345,17 @@
             path = get_release_file_path()
         self.assert_path('juju-gui-2.0.1.xz', path)
 
+    def test_xz_git_dev(self):
+        # The last release is correctly retrieved.
+        self.add('juju-gui-0.12.1.tgz')
+        self.add('juju-gui-1.2.3.tgz')
+        self.add('juju-gui-2.0.0+build.42.tgz')
+        self.add('juju-gui-2.0.1.tgz')
+        self.add('juju-gui-2.1.0+build.42a.xz')
+        with self.mock_releases_dir():
+            path = get_release_file_path()
+        self.assert_path('juju-gui-2.1.0+build.42a.xz', path)
+
     def test_ordering(self):
         # Release versions are correctly ordered.
         self.add('juju-gui-0.12.1.tgz')
@@ -394,6 +405,16 @@
             path = get_release_file_path('2.42.47+build.4247')
         self.assert_path('juju-gui-2.42.47+build.4247.tgz', path)
 
+    def test_xz_git_development_version(self):
+        # A specific development version is correctly retrieved.
+        self.add('juju-gui-1.2.3+build.4247.tgz')
+        self.add('juju-gui-2.42.47+build.42b7.xz')
+        self.add('juju-gui-2.42.47.tgz')
+        self.add('juju-gui-3.42.47+build.4247.tgz')
+        with self.mock_releases_dir():
+            path = get_release_file_path('2.42.47+build.42b7')
+        self.assert_path('juju-gui-2.42.47+build.42b7.xz', path)
+
     def test_version_not_found(self):
         # None is returned if the requested version is not found.
         self.add('juju-gui-1.2.3.tgz')