[asterisk-commits] dlee: trunk r397932 - in /trunk: ./ rest-api-templates/

[SVN commits to the Asterisk project]

Author: dlee
Date: Thu Aug 29 11:21:31 2013
New Revision: 397932

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=397932
Log:
Merged revisions 397565-397674 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    trunk/   (props changed)
    trunk/rest-api-templates/api.wiki.mustache
    trunk/rest-api-templates/asterisk_processor.py
    trunk/rest-api-templates/make_ari_stubs.py

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Thu Aug 29 11:21:31 2013
@@ -1,1 +1,1 @@
-/branches/12:1-397816,397854,397856,397859,397870,397874,397876,397885,397892,397894,397896,397898,397900,397902,397911,397921-397922,397924
+/branches/12:1-397927

Modified: trunk/rest-api-templates/api.wiki.mustache
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api-templates/api.wiki.mustache?view=diff&rev=397932&r1=397931&r2=397932
==============================================================================
--- trunk/rest-api-templates/api.wiki.mustache (original)
+++ trunk/rest-api-templates/api.wiki.mustache Thu Aug 29 11:21:31 2013
@@ -13,7 +13,7 @@
 {anchor:{{nickname}}}
 h2. {{http_method}} {{wiki_path}}
 
-{{{summary}}}{{#notes}} {{{notes}}}{{/notes}}
+{{{summary}}}{{#wiki_notes}} {{{wiki_notes}}}{{/wiki_notes}}
 {{#has_path_parameters}}
 
 h3. Path parameters

Modified: trunk/rest-api-templates/asterisk_processor.py
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api-templates/asterisk_processor.py?view=diff&rev=397932&r1=397931&r2=397932
==============================================================================
--- trunk/rest-api-templates/asterisk_processor.py (original)
+++ trunk/rest-api-templates/asterisk_processor.py Thu Aug 29 11:21:31 2013
@@ -187,6 +187,7 @@
         operation.c_http_method = 'AST_HTTP_' + operation.http_method
         if not operation.summary.endswith("."):
             raise SwaggerError("Summary should end with .", context)
+        operation.wiki_notes = wikify(operation.notes or "")
 
     def process_parameter(self, parameter, context):
         if not parameter.data_type in self.type_mapping:

Modified: trunk/rest-api-templates/make_ari_stubs.py
URL: http://svnview.digium.com/svn/asterisk/trunk/rest-api-templates/make_ari_stubs.py?view=diff&rev=397932&r1=397931&r2=397932
==============================================================================
--- trunk/rest-api-templates/make_ari_stubs.py (original)
+++ trunk/rest-api-templates/make_ari_stubs.py Thu Aug 29 11:21:31 2013
@@ -16,13 +16,15 @@
 # at the top of the source tree.
 #
 
+import sys
+
 try:
     import pystache
 except ImportError:
     print >> sys.stderr, "Pystache required. Please sudo pip install pystache."
+    sys.exit(1)
 
 import os.path
-import sys
 
 from asterisk_processor import AsteriskProcessor
 from optparse import OptionParser