Merge lp:~tvansteenburgh/charm-tools/fix-symlinks into lp:charm-tools/1.3

[Tim Van Steenburgh]

* Create charm symlinks dynamically when charm is created.
* Ensure charmhelpers destination path exists before syncing.

[Tim Van Steenburgh (tvansteenburgh)]

Also, need to add bzr to the deb dependencies, otherwise charmhelpers sync will fail.

[Marco Ceppi (marcoceppi)]

Thanks, LGTM.

review: Approve

[lp:~tvansteenburgh/charm-tools/fix-symlinks]

332. By Marco Ceppi on 2014-06-23

[tvansteenburgh] Create charm symlinks dynamically when charm is created. Ensure charmhelpers destination path exists before syncing.

=== modified file 'charmtools/templates/bash/template.py'
--- charmtools/templates/bash/template.py	2014-05-23 20:26:16 +0000
+++ charmtools/templates/bash/template.py	2014-06-20 19:02:22 +0000
@@ -49,7 +49,7 @@
         template_dir = path.join(here, 'files')
         if os.path.exists(output_dir):
             shutil.rmtree(output_dir)
-        shutil.copytree(template_dir, output_dir, symlinks=True)
+        shutil.copytree(template_dir, output_dir)
 
     def _template_file(self, config, outfile):
         if path.islink(outfile):

=== removed symlink 'charmtools/templates/python/files/hooks_symlinked/config-changed'
=== target was u'hooks.py'
=== removed symlink 'charmtools/templates/python/files/hooks_symlinked/install'
=== target was u'hooks.py'
=== removed symlink 'charmtools/templates/python/files/hooks_symlinked/start'
=== target was u'hooks.py'
=== removed symlink 'charmtools/templates/python/files/hooks_symlinked/stop'
=== target was u'hooks.py'
=== removed symlink 'charmtools/templates/python/files/hooks_symlinked/upgrade-charm'
=== target was u'hooks.py'
=== modified file 'charmtools/templates/python/template.py'
--- charmtools/templates/python/template.py	2014-05-27 21:23:41 +0000
+++ charmtools/templates/python/template.py	2014-06-20 19:02:22 +0000
@@ -54,7 +54,7 @@
         template_dir = path.join(here, 'files')
         if os.path.exists(output_dir):
             shutil.rmtree(output_dir)
-        shutil.copytree(template_dir, output_dir, symlinks=True)
+        shutil.copytree(template_dir, output_dir)
 
     def _template_file(self, config, outfile):
         if path.islink(outfile):
@@ -75,12 +75,23 @@
     def _cleanup_hooks(self, config, output_dir):
         rmdir = 'hooks' if config['symlink'] else 'hooks_symlinked'
         shutil.rmtree(os.path.join(output_dir, rmdir))
-        if rmdir == 'hooks':
+
+        if config['symlink']:
             os.rename(
                 os.path.join(output_dir, 'hooks_symlinked'),
                 os.path.join(output_dir, 'hooks')
             )
+            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)
+                )
 
     def _install_charmhelpers(self, output_dir):
+        helpers_dest = os.path.join(output_dir, 'lib', 'charmhelpers')
+        if not os.path.exists(helpers_dest):
+            os.makedirs(helpers_dest)
+
         cmd = './scripts/charm_helpers_sync.py -c charm-helpers.yaml'
         subprocess.check_call(cmd.split(), cwd=output_dir)

=== modified file 'setup.py'
--- setup.py	2014-06-20 18:35:44 +0000
+++ setup.py	2014-06-20 19:02:22 +0000
@@ -14,7 +14,8 @@
 setup(
     name='charm-tools',
     version="1.3.1",
-    packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
+    packages=find_packages(
+        exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     install_requires=['launchpadlib', 'argparse', 'cheetah', 'pyyaml',
                       'pycrypto', 'paramiko', 'bzr', 'requests',
                       'charmworldlib'],