misc changes I found uncommitted for years - sorry for that

Author: novoid

Diff for: .gitignore

@@ -60,3 +60,5 @@ target/
 
 #Ipython Notebook
 .ipynb_checkpoints
+.gitignore
+jiraconfig.py

Diff for: README.org

@@ -31,8 +31,7 @@ corresponding stories are retrieved as well.
 python ./jira2org-story.py --help
 #+END_SRC
 
-#+RESULTS:
-#+BEGIN_quote
+#+BEGIN_src
 usage: jira2org-story.py [-h] [--version] IPD [IPD ...]
 
 This tool retrieves a Jira issue and returns an Org-mode
@@ -56,7 +55,7 @@ license:    GPL v3 or any later version
 URL:        https://github.com/novoid/jira2org-story.py/
 bugreports: via GitHub
 version:    Time-stamp: <2016-05-13 14:00:47 karl.voit>
-#+END_quote
+#+END_src
 
 ** Motivation and Similar Projects
 
@@ -75,26 +74,28 @@ synchronize Jira with Org-mode:
 ** Example
 
 Following headings are an example output when I call my script with
-the parameter "1234".
+the parameter "1234" (as of 2016-05-14).
 
 Usually, I do use babel to execute the script:
 
 : #+BEGIN_SRC sh :results output raw :dir c:/Users/karl.voit/src/jira2org-story.py/
 : c:/Users/karl.voit/src/jira2org-story.py/jira2org-story.py 1234
 : #+END_SRC
 
-Please note that I make use of task dependencies using TRIGGER and
-BLOCKER properties according to [[http://orgmode.org/worg/org-contrib/org-depend.html][org-depend.el]].
+Some remarks:
 
-I did create a customized link so that "IPD:1234" links to its Jira
-representative "https://product.infonova.at/jira/browse/IPD-1234".
+- Please note that I make use of task dependencies using TRIGGER and
+  BLOCKER properties according to [[http://orgmode.org/worg/org-contrib/org-depend.html][org-depend.el]].
 
-Usually, I manually do search&replace "i1234" with a human-readable
-short version of the story title.
+- I did create a customized link so that "IPD:1234" links to its Jira
+  representative "https://product.infonova.at/jira/browse/IPD-1234".
 
-You might wonder about the status "NEXT". I am using "TODO" to define
-a task which will be of interest in future (but not now) and "NEXT"
-for a task that can be done *now*.
+- Usually, I manually do search&replace "i1234" with a human-readable
+  short version of the story title.
+
+- You might wonder about the status "NEXT". I am using "TODO" to
+  define a task which will be of interest in future (but not now) and
+  "NEXT" for a task that can be done *now*.
 
 This structure is in constant change as I add and remove things or
 modify my Org-mode-related workflows.

Diff for: jira2org-story.py

@@ -1,6 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
 # -*- coding: utf-8 -*-
-PROG_VERSION = u"Time-stamp: <2016-05-13 14:00:47 karl.voit>"
+PROG_VERSION = u"Time-stamp: <2017-04-10 17:50:01 karl.voit>"
 
 import sys
 import os
@@ -89,7 +89,7 @@ def thing2string(data, addlink=False):
 def orglink(text):
     "Takes a text like 'IPD-1234' and generates an Org-mode link"
 
-    return '[[' + text.replace('IPD-', 'https://product.infonova.at/jira/browse/IPD-') + '][' + text.replace('IPD-', '') + ']]'
+    return '[[' + text.replace('IPD-', 'https://r6portal-defects.infonova.com/browse/IPD-') + '][' + text.replace('IPD-', '') + ']]'
 
 
 def get(issues, ipd, query):
@@ -154,7 +154,7 @@ def retrieve_data_from_jira(ipds):
         print_line("ERROR: Could not find Python module \"JIRA\".\nPlease install it, e.g., with \"sudo pip install jira\".")
         sys.exit(12)
 
-    jira = JIRA('https://product.infonova.at/jira/', basic_auth=(jiraconfig.JIRA_USER, jiraconfig.JIRA_PASSWORD))
+    jira = JIRA('https://r6portal-defects.infonova.com/', basic_auth=(jiraconfig.JIRA_USER, jiraconfig.JIRA_PASSWORD))
 
     query = 'key = "IPD-' + '" or key = "IPD-'.join(ipds) + '" ORDER BY key'
     queryissues = jira.search_issues(query)
@@ -198,37 +198,36 @@ def print_issue(issue):
 :ID: ''' + orgdate + '''-Story-''' + short)
     print_line(u''':END:
 
- | *IPD* | *Confluence* | *Champ* |''')
+ | *IPD* | *Confluence*         | *Champ* |''')
 
     if issue['''assignee''']:
-        champ = issue['''assignee''']
+        champ = '@' + issue['''assignee''']
     else:
-        champ = '''-'''
+        champ = '''@champ'''
 
     print_line(u''' | [[IPD:''' + issue['''key'''] + '''][''' + issue['''key'''] + ''']]  | ''' + \
                issue['''summary'''] + ''' | ''' + champ + ''' |
 
-*** STARTED create Jira [[IPD:%s]]''' % issue['''key'''])
+*** DONE create Jira [[IPD:%s]]                                      :USprep:''' % issue['''key'''])
     print_line(u''':PROPERTIES:
 :CREATED:  [''' + orgtime + ''']
 :ID: ''' + orgdate + '''-''' + short + '''-create-jira-ipd
 :BLOCKER:
-:TRIGGER:  ''' + orgdate + '''-''' + short + '''-define-champ(NEXT) ''' + \
-               orgdate + '''-''' + short + '''-estimation(NEXT)
+:TRIGGER:
 :END:
 
 - fill out:
   - [X] set reporter
   - [ ] set level red
   - [ ] fixVersion
 
-*** NEXT create Confluence page with template
+*** NEXT create Confluence page with template                                                   :USprep:
 SCHEDULED: <''' + orgdate + '''>
 :PROPERTIES:
 :CREATED:  [''' + orgtime + ''']
 :ID:    ''' + orgdate + '''-''' + short + '''-create-confluence-page
 :BLOCKER:
-:TRIGGER:  ''' + orgdate + '''-''' + short + '''-write-acceptance-criteria(NEXT)
+:TRIGGER:  ''' + orgdate + '''-''' + short + '''-write-acceptance-criteria(NEXT) ''' + orgdate + '''-''' + short + '''-DoR(NEXT)
 :END:
 
 - fill out:
@@ -238,16 +237,48 @@ def print_issue(issue):
   - [ ] Business Value
 - [ ] add Confluence-short-URL to story table above
 
-*** TODO write Acceptance Criteria, Docu, Perms
+*** NEXT DoR checklist written                                                     :USprep:
+SCHEDULED: <''' + orgdate + '''>
+:PROPERTIES:
+:CREATED:  [''' + orgtime + ''']
+:ID:    ''' + orgdate + '''-''' + short + '''-DoR-checklist-written
+:BLOCKER:
+:TRIGGER:
+:END:
+
+*** TODO write Acceptance Criteria                                                   :USprep:
 :PROPERTIES:
 :CREATED:  [''' + orgtime + ''']
 :ID: ''' + orgdate + '''-''' + short + '''-write-acceptance-criteria
 :BLOCKER: ''' + orgdate + '''-''' + short + '''-create-confluence-page
 :TRIGGER: ''' + orgdate + '''-''' + short + '''-confidence-green(NEXT) ''' + \
-               orgdate + '''-''' + short + '''-hand-over-team(NEXT)
+               orgdate + '''-''' + short + '''-hand-over-team(NEXT) ''' + \
+               orgdate + '''-''' + short + '''-story-signoff(NEXT)
+:END:
+
+*** DoR                                                  :@underscore:
+:PROPERTIES:
+:CREATED:  [''' + orgtime + ''']
+:ID: ''' + orgdate + '''-''' + short + '''-DoR
+:CATEGORY: refinement
+:BLOCKER: ''' + orgdate + '''-''' + short + '''-create-confluence-page
+:TRIGGER:
+:END:
+
+- [ ] Acceptance criteria OK
+- [ ] Assumptions & constraints checked
+- [ ] External & internal dependencies checked
+- [ ] Define impact on testing
+- [ ] Impacted Documentation check
+
+*** PM Signoff                                                   :USprep:
+:PROPERTIES:
+:CREATED:  [''' + orgtime + ''']
+:ID: ''' + orgdate + '''-''' + short + '''-story-signoff
+:BLOCKER: ''' + orgdate + '''-''' + short + '''-write-acceptance-criteria
 :END:
 
-*** TODO add Champ to Confluence and Jira                                    :refinement:
+*** NEXT add Champ to Confluence and Jira                                    :@underscore:''' + champ + '''
 :PROPERTIES:
 :CATEGORY: refinement
 :CREATED:  [''' + orgtime + ''']
@@ -256,7 +287,7 @@ def print_issue(issue):
 :END:
 
 *** TODO get Estimation on [[IPD:''' + issue['''key'''] + \
-               ''']]                                           :refinement:
+               ''']]                                           :@underscore:
 :PROPERTIES:
 :CREATED:  [''' + orgtime + ''']
 :CATEGORY: refinement
@@ -268,7 +299,7 @@ def print_issue(issue):
 - Estimation:
 
 *** TODO get confidence-level green on [[IPD:''' + issue['''key'''] + \
-               ''']]                                :refinement:
+               ''']]                                :@underscore:
 :PROPERTIES:
 :CATEGORY: refinement
 :CREATED:  [''' + orgtime + ''']
@@ -282,20 +313,26 @@ def print_issue(issue):
 :PROPERTIES:
 :CREATED:  [''' + orgtime + ''']
 :BLOCKER: ''' + orgdate + '''-''' + short + '''-write-acceptance-criteria ''' + \
-               orgdate + '''-''' + short + '''-estimation
+               orgdate + '''-''' + short + '''-estimation ''' + orgdate + '''-''' + short + '''-DoR
 :ID: ''' + orgdate + '''-''' + short + '''-hand-over-team
 :TRIGGER:  ''' + orgdate + '''-''' + short + '''-accept(WAITING) ''' + \
                orgdate + '''-Story-''' + short + '''(TEAM)
 :END:
 
-*** acceptance + finish US
+*** acceptance                                                  :@underscore:
 :PROPERTIES:
 :CREATED:  [''' + orgtime + ''']
 :ID: ''' + orgdate + '''-''' + short + '''-accept
 :BLOCKER: ''' + orgdate + '''-''' + short + '''-hand-over-team
-:TRIGGER: ''' + orgdate + '''-Story-''' + short + '''(DONE)
 :END:
-''')
+
+*** close US
+:PROPERTIES:
+:CREATED:  [''' + orgtime + ''']
+:ID: ''' + orgdate + '''-''' + short + '''-close
+:BLOCKER: ''' + orgdate + '''-''' + short + '''-accept
+:TRIGGER: ''' + orgdate + '''-Story-''' + short + '''(DONE)
+:END:''')
 
 
 def main():