[close #2] Prevent start from non-integration branch; add milestone i…

…nformation to git-issues

CHANGES

@@ -1,6 +1,12 @@
 Changelog
 ---------
 
+Version 0.4.2
+^^^^^^^^^^^^^
+
+* Prevent start from non-integration branch.
+* Add milestone to 'issues' command.
+
 Version 0.4.1
 ^^^^^^^^^^^^^
 

continuity/__init__.py

@@ -5,10 +5,10 @@
 
     Continuity API.
 
-    :copyright: 2012 by Jonathan Zempel.
+    :copyright: 2013 by Jonathan Zempel.
     :license: BSD, see LICENSE for more details.
 """
 
 __author__ = "Jonathan Zempel"
 __license__ = "BSD"
-__version__ = "0.4.1"
+__version__ = "0.4.2"

continuity/cli.py

@@ -5,7 +5,7 @@
 
     Continuity command line interface.
 
-    :copyright: 2012 by Jonathan Zempel.
+    :copyright: 2013 by Jonathan Zempel.
     :license: BSD, see LICENSE for more details.
 """
 
@@ -746,11 +746,17 @@ def issues(arguments):
         else:
             title = issue.title
 
-        if issue.assignee:
-            login = issue.assignee.login
-            title = "{0} ({1})".format(title, login)
+        information = issue.assignee
 
-        message = "{0}: {1}\n".format(number, title)
+        if information and issue.milestone:
+            information = "{0}, {1}".format(information, issue.milestone)
+        else:
+            information = issue.milestone
+
+        if information:
+            title = "{0} ({1})".format(title, information)
+
+        message = "{0}: {1}\n".format(number, title.strip())
         output.write(message)
 
     pipepager(output.getvalue(), cmd="less -FRSX")
@@ -839,6 +845,12 @@ def start(arguments):
 
     namespace = ContinuityNamespace(git)
     parser.parse_args(arguments.all, namespace=namespace)
+    integration_branch = _get_value(git, "continuity", "integration-branch")
+
+    if git.branch.name != integration_branch:
+        message = "error: Attempted start from non-integration branch, switch to '{0}'."  # NOQA
+        puts_err(message.format(integration_branch))
+        exit(128)
 
     if tracker == "github":
         token = _get_value(git, "github", "oauth-token")

continuity/git.py

@@ -5,7 +5,7 @@
 
     Git API.
 
-    :copyright: 2012 by Jonathan Zempel.
+    :copyright: 2013 by Jonathan Zempel.
     :license: BSD, see LICENSE for more details.
 """
 

continuity/github.py

@@ -5,7 +5,7 @@
 
     GitHub API.
 
-    :copyright: 2012 by Jonathan Zempel.
+    :copyright: 2013 by Jonathan Zempel.
     :license: BSD, see LICENSE for more details.
 """
 
@@ -83,6 +83,11 @@ class Issue(IDObject):
     STATE_CLOSED = "closed"
     STATE_OPEN = "open"
 
+    def __str__(self):
+        """Issue string representation.
+        """
+        return self.title
+
     @property
     def assignee(self):
         """Issue assignee accessor.
@@ -217,6 +222,11 @@ class Milestone(IDObject):
     STATE_CLOSED = "closed"
     STATE_OPEN = "open"
 
+    def __str__(self):
+        """Milestone string representation.
+        """
+        return self.title
+
     @property
     def closed_issues(self):
         """Milestone closed issues count.

continuity/pt.py

@@ -5,7 +5,7 @@
 
     Pivotal Tracker API.
 
-    :copyright: 2012 by Jonathan Zempel.
+    :copyright: 2013 by Jonathan Zempel.
     :license: BSD, see LICENSE for more details.
 """
 

main.py

@@ -6,7 +6,7 @@
 
     Main continuity entry point.
 
-    :copyright: 2012 by Jonathan Zempel.
+    :copyright: 2013 by Jonathan Zempel.
     :license: BSD, see LICENSE for more details.
 """
 

setup.py

@@ -6,7 +6,7 @@
 
     Setup the continuity distribution.
 
-    :copyright: 2012 by Jonathan Zempel.
+    :copyright: 2013 by Jonathan Zempel.
     :license: BSD, see LICENSE for more details.
 """