Merge lp:~tvansteenburgh/charm-tools/lp-1341688 into lp:charm-tools/1.3

[Tim Van Steenburgh]

Ensure *.pyc files are skipped during template processing.

[Marco Ceppi (marcoceppi)]

LGTM

review: Approve

=== modified file 'charmtools/generators/template.py'
--- charmtools/generators/template.py	2014-05-27 21:23:41 +0000
+++ charmtools/generators/template.py	2014-07-29 18:18:49 +0000
@@ -15,6 +15,7 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from fnmatch import fnmatch
 import inspect
 import os
 import yaml
@@ -25,6 +26,15 @@
 class CharmTemplate(object):
     """Base plugin for creating a new charm."""
 
+    skip_parsing = ['README.ex', '*.pyc']
+
+    def skip_template(self, filename):
+        """Return True if file should not be processed for template
+        variable substitution.
+
+        """
+        return any(fnmatch(filename, pat) for pat in self.skip_parsing)
+
     def prompts(self):
         """Return a list :class:`Prompt` objects that will be used for
         configuring the charm created by this plugin.

=== modified file 'charmtools/templates/bash/template.py'
--- charmtools/templates/bash/template.py	2014-06-20 18:57:25 +0000
+++ charmtools/templates/bash/template.py	2014-07-29 18:18:49 +0000
@@ -32,14 +32,14 @@
 
 
 class BashCharmTemplate(CharmTemplate):
-    skip_parsing = ['README.ex']
+    """Creates a bash-based charm"""
 
     def create_charm(self, config, output_dir):
         self._copy_files(output_dir)
 
         for root, dirs, files in os.walk(output_dir):
             for outfile in files:
-                if outfile in self.skip_parsing:
+                if self.skip_template(outfile):
                     continue
 
                 self._template_file(config, path.join(root, outfile))

=== modified file 'charmtools/templates/python/files/scripts/charm_helpers_sync.py'
--- charmtools/templates/python/files/scripts/charm_helpers_sync.py	2014-05-23 20:10:24 +0000
+++ charmtools/templates/python/files/scripts/charm_helpers_sync.py	2014-07-29 18:18:49 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Copyright 2013 Canonical Ltd.
 

=== modified file 'charmtools/templates/python/template.py'
--- charmtools/templates/python/template.py	2014-06-20 18:57:25 +0000
+++ charmtools/templates/python/template.py	2014-07-29 18:18:49 +0000
@@ -34,14 +34,14 @@
 
 
 class PythonCharmTemplate(CharmTemplate):
-    skip_parsing = ['README.ex']
+    """Creates a python-based charm"""
 
     def create_charm(self, config, output_dir):
         self._copy_files(output_dir)
 
         for root, dirs, files in os.walk(output_dir):
             for outfile in files:
-                if outfile in self.skip_parsing:
+                if self.skip_template(outfile):
                     continue
 
                 self._template_file(config, path.join(root, outfile))
@@ -81,12 +81,11 @@
                 os.path.join(output_dir, 'hooks_symlinked'),
                 os.path.join(output_dir, 'hooks')
             )
+            # Symlinks must be relative so that they are copied properly
+            # when output_dir is moved to it's final location.
             for link in ['config-changed', 'install', 'start', 'stop',
                          'upgrade-charm']:
-                os.symlink(
-                    os.path.join(output_dir, 'hooks', 'hooks.py'),
-                    os.path.join(output_dir, 'hooks', link)
-                )
+                os.symlink('hooks.py', os.path.join(output_dir, 'hooks', link))
 
     def _install_charmhelpers(self, output_dir):
         helpers_dest = os.path.join(output_dir, 'lib', 'charmhelpers')