Merge pull request #58 from jeromelebleu/dev

Refactor moulinette versioning

action_map.yml

@@ -37,9 +37,9 @@
 general_arguments:
         -v:
             full: --version
-            help: Display YunoHost version
+            help: Display moulinette version
             action: version
-            version: YunoHost %version%
+            version: moulinette %version%
 
 #############################
 #           User            #

generate_api_doc.py

@@ -28,7 +28,7 @@ import sys
 import yaml
 import json
 import requests
-from yunohost import str_to_func
+from yunohost import str_to_func, __version__
 
 def main():
     """
@@ -47,7 +47,7 @@ def main():
         action_map = yaml.load(f)
 
     resource_list = {
-        'apiVersion': '0.1',
+        'apiVersion': __version__,
         'swaggerVersion': '1.1',
         'basePath': 'http://'+ domain + ':6767',
         'apis': []
@@ -64,7 +64,7 @@ def main():
             'description': category_params['category_help']
         })
         resources[category] = {
-            'apiVersion': '0.1',
+            'apiVersion': __version__,
             'swaggerVersion': '1.1',
             'basePath': 'http://'+ domain + ':6767',
             'apis': []

yunohost.py

@@ -40,7 +40,7 @@ __credits__ = """
     along with this program; if not, see http://www.gnu.org/licenses
     """
 __author__  = 'Kload <kload@kload.fr>'
-__version__ = '2.0-beta3'
+__version__ = '695'
 
 import os
 import sys