Merge bc04ee8 into 13537e3

collective · Oct 2, 2018 · 2a0d9a7 · 2a0d9a7
2 parents 13537e3 + bc04ee8
commit 2a0d9a7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,7 +4,8 @@ Changelog
 1.1b2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Emit current package version in package.json configuration (closes `#40 <https://github.com/simplesconsultoria/sc.recipe.staticresources/issues/40>`_).
+  [rodfersou]
 
 
 1.1b1 (2018-09-28)

diff --git a/src/sc/recipe/staticresources/__init__.py b/src/sc/recipe/staticresources/__init__.py
@@ -9,9 +9,11 @@
 import json
 import logging
 import os
+import pkg_resources
 import subprocess
 
 
+VERSION = pkg_resources.get_distribution('sc.recipe.staticresources').version
 CURRENT_DIR = path.dirname(__file__)
 SCRIPT_TEMPLATE = """#!/bin/sh
 export PATH={bin_directory}:$PATH
@@ -45,6 +47,7 @@ def __init__(self, buildout, name, options):
         self.options.setdefault('destination', 'dist')
         self.options.setdefault('bobtemplate', path.join(CURRENT_DIR, 'bobtemplate'))
         self.bobtemplate = options['bobtemplate']
+        self.options.setdefault('version', VERSION)
 
     def _error(self, msg):
         self.logger.error(msg)

diff --git a/src/sc/recipe/staticresources/bobtemplate/package.json.bob b/src/sc/recipe/staticresources/bobtemplate/package.json.bob
@@ -25,6 +25,6 @@
   "repository": {},
   "license": "GPL-2.0",
   "dependencies": {
-    "sc-recipe-staticresources": "simplesconsultoria/sc.recipe.staticresources#1.0b2"
+    "sc-recipe-staticresources": "simplesconsultoria/sc.recipe.staticresources#{{{version}}}"
   }
 }