Merge lp:~tvansteenburgh/charm-tools/bundle-proof-v4 into lp:charm-tools/1.6

[Tim Van Steenburgh]

Update bundle proof for v4.

With v4, the expected bundle file name is bundle.yaml instead of
bundles.yaml.

Also fixed some charm-create tests that were failing due to new files in
charmhelpers.

[Marco Ceppi (marcoceppi)]

LGTM

review: Approve

=== modified file 'charmtools/bundles.py'
--- charmtools/bundles.py	2014-04-02 20:32:53 +0000
+++ charmtools/bundles.py	2015-08-20 13:36:17 +0000
@@ -79,7 +79,10 @@
 class Bundle(object):
     def __init__(self, path, debug=False):
         self.bundle_path = os.path.abspath(path)
-        self.supported_files = ['bundles.yaml', 'bundles.json']
+        self.supported_files = [
+            'bundle.yaml', 'bundle.json',    # v4
+            'bundles.yaml', 'bundles.json',  # v3
+        ]
         self.debug = debug
         if not self.is_bundle():
             raise Exception('Not a bundle')
 
=== modified file 'tests_functional/create/test_ansible_create.py'
--- tests_functional/create/test_ansible_create.py	2014-10-22 20:02:21 +0000
+++ tests_functional/create/test_ansible_create.py	2015-08-20 13:36:17 +0000
@@ -62,14 +62,19 @@
             'lib/charmhelpers/contrib/templating/__init__.py',
             'lib/charmhelpers/contrib/templating/contexts.py',
             'lib/charmhelpers/core/__init__.py',
+            'lib/charmhelpers/core/decorators.py',
+            'lib/charmhelpers/core/files.py',
             'lib/charmhelpers/core/fstab.py',
             'lib/charmhelpers/core/hookenv.py',
             'lib/charmhelpers/core/host.py',
+            'lib/charmhelpers/core/hugepage.py',
             'lib/charmhelpers/core/services/__init__.py',
             'lib/charmhelpers/core/services/base.py',
             'lib/charmhelpers/core/services/helpers.py',
+            'lib/charmhelpers/core/strutils.py',
             'lib/charmhelpers/core/sysctl.py',
             'lib/charmhelpers/core/templating.py',
+            'lib/charmhelpers/core/unitdata.py',
             'lib/charmhelpers/fetch/__init__.py',
             'lib/charmhelpers/fetch/archiveurl.py',
             'lib/charmhelpers/fetch/bzrurl.py',
 
=== modified file 'tests_functional/create/test_python_create.py'
--- tests_functional/create/test_python_create.py	2014-10-22 20:02:21 +0000
+++ tests_functional/create/test_python_create.py	2015-08-20 13:36:17 +0000
@@ -53,14 +53,19 @@
         dynamic_files = [
             'lib/charmhelpers/__init__.py',
             'lib/charmhelpers/core/__init__.py',
+            'lib/charmhelpers/core/decorators.py',
+            'lib/charmhelpers/core/files.py',
             'lib/charmhelpers/core/fstab.py',
             'lib/charmhelpers/core/hookenv.py',
             'lib/charmhelpers/core/host.py',
+            'lib/charmhelpers/core/hugepage.py',
             'lib/charmhelpers/core/services/__init__.py',
             'lib/charmhelpers/core/services/base.py',
             'lib/charmhelpers/core/services/helpers.py',
+            'lib/charmhelpers/core/strutils.py',
             'lib/charmhelpers/core/sysctl.py',
             'lib/charmhelpers/core/templating.py',
+            'lib/charmhelpers/core/unitdata.py',
         ]
         return sorted(static_files + dynamic_files)