Merge lp:~lomov-as/charm-helpers/cloud-foundry into lp:~cf-charmers/charm-helpers/cloud-foundry

[Alex Lomov]

update helpers

https://codereview.appspot.com/88870043/

[lp:~lomov-as/charm-helpers/cloud-foundry]

167. By vagrant@cf-juju on 2014-04-11

fix chownr function to resolve links

168. By vagrant@cf-juju on 2014-04-16

remove dependency on charm_dir function from upload_installer

[Alex Lomov (lomov-as)]

Reviewers: mp+215018_code.launchpad.net,

Message:
Please take a look.

Description:
update helpers

https://code.launchpad.net/~lomov-as/charm-helpers/cloud-foundry/+merge/215018

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/88870043/

Affected files (+10, -8 lines):
   M README.txt
   A [revision details]
   M charmhelpers/contrib/cloudfoundry/common.py
   M charmhelpers/contrib/cloudfoundry/upstart_helper.py
   M test_requirements.txt

Index: README.txt
=== modified file 'README.txt'
--- README.txt 2014-04-03 18:05:09 +0000
+++ README.txt 2014-04-09 19:14:19 +0000
@@ -11,6 +11,6 @@
  How to run tests
  ---

-sudo apt-get install python-dev python-apt python-virtualenv
libapt-pkg-dev zip
+sudo apt-get install python-dev python-apt python-virtualenv
libapt-pkg-dev zip debhelper
  make test

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: vagrant@cf-juju-20140416145110-u7k780vtt4i01bz0

Index: test_requirements.txt
=== modified file 'test_requirements.txt'
--- test_requirements.txt 2014-04-03 18:05:09 +0000
+++ test_requirements.txt 2014-04-09 19:14:19 +0000
@@ -13,4 +13,4 @@
  testtools==0.9.35
  wsgiref==0.1.2
  launchpadlib==1.10.2
-bzr==2.6.0
+

Index: charmhelpers/contrib/cloudfoundry/common.py
=== modified file 'charmhelpers/contrib/cloudfoundry/common.py'
--- charmhelpers/contrib/cloudfoundry/common.py 2014-04-01 06:50:54 +0000
+++ charmhelpers/contrib/cloudfoundry/common.py 2014-04-11 01:06:32 +0000
@@ -48,9 +48,9 @@
      gid = grp.getgrnam(group).gr_gid
      for root, dirs, files in os.walk(path):
          for momo in dirs:
- os.chown(os.path.join(root, momo), uid, gid)
- for momo in files:
- os.chown(os.path.join(root, momo), uid, gid)
+ os.lchown(os.path.join(root, momo), uid, gid)
+ for momo in files:
+ os.lchown(os.path.join(root, momo), uid, gid)

  @contextmanager

Index: charmhelpers/contrib/cloudfoundry/upstart_helper.py
=== modified file 'charmhelpers/contrib/cloudfoundry/upstart_helper.py'
--- charmhelpers/contrib/cloudfoundry/upstart_helper.py 2014-04-01 07:40:02
+0000
+++ charmhelpers/contrib/cloudfoundry/upstart_helper.py 2014-04-16 14:51:10
+0000
@@ -1,13 +1,13 @@
  import os
  import glob
  from charmhelpers.core import hookenv
-from charmhelpers.core.hookenv import charm_dir
  from charmhelpers.contrib.cloudfoundry.install import install

-def install_upstart_scripts(dirname=os.path.join(hookenv.charm_dir(),
- 'files/upstart'),
+def install_upstart_scripts(dirname=None,
                              pattern='*.conf'):
+ if dirname is None:
+ dirname = os.path.join(hookenv.charm_dir(), 'files/upstart')
      for script in glob.glob("%s/%s" % (dirname, pattern)):
          filename = os.path.join(dirname, script)
          hookenv.log('Installing upstart job:' + filename, hookenv.DEBUG)

[Benjamin Saller (bcsaller)]

LGTM, thanks!

lbox submit

should merge this for you

https://codereview.appspot.com/88870043/diff/1/charmhelpers/contrib/cloudfoundry/upstart_helper.py
File charmhelpers/contrib/cloudfoundry/upstart_helper.py (right):

https://codereview.appspot.com/88870043/diff/1/charmhelpers/contrib/cloudfoundry/upstart_helper.py#newcode10
charmhelpers/contrib/cloudfoundry/upstart_helper.py:10: dirname =
os.path.join(hookenv.charm_dir(), 'files/upstart')
Thanks for fixing this. Much better not to run that code on import

https://codereview.appspot.com/88870043/

Unmerged revisions

168. By vagrant@cf-juju on 2014-04-16

remove dependency on charm_dir function from upload_installer

167. By vagrant@cf-juju on 2014-04-11

fix chownr function to resolve links

166. By vagrant@cf-juju on 2014-04-09

remove bzr from test requirements, add packages to README.tx

=== modified file 'README.txt'
--- README.txt	2014-04-03 18:05:09 +0000
+++ README.txt	2014-04-17 13:40:01 +0000
@@ -11,6 +11,6 @@
 How to run tests
 ---
 
-sudo apt-get install python-dev python-apt python-virtualenv libapt-pkg-dev zip
+sudo apt-get install python-dev python-apt python-virtualenv libapt-pkg-dev zip debhelper
 make test
 

=== modified file 'charmhelpers/contrib/cloudfoundry/common.py'
--- charmhelpers/contrib/cloudfoundry/common.py	2014-04-01 06:50:54 +0000
+++ charmhelpers/contrib/cloudfoundry/common.py	2014-04-17 13:40:01 +0000
@@ -48,9 +48,9 @@
     gid = grp.getgrnam(group).gr_gid
     for root, dirs, files in os.walk(path):
         for momo in dirs:
-            os.chown(os.path.join(root, momo), uid, gid)
-            for momo in files:
-                os.chown(os.path.join(root, momo), uid, gid)
+            os.lchown(os.path.join(root, momo), uid, gid)
+        for momo in files:
+            os.lchown(os.path.join(root, momo), uid, gid)
 
 
 @contextmanager

=== modified file 'charmhelpers/contrib/cloudfoundry/upstart_helper.py'
--- charmhelpers/contrib/cloudfoundry/upstart_helper.py	2014-04-14 09:50:23 +0000
+++ charmhelpers/contrib/cloudfoundry/upstart_helper.py	2014-04-17 13:40:01 +0000
@@ -1,13 +1,13 @@
 import os
 import glob
 from charmhelpers.core import hookenv
-from charmhelpers.core.hookenv import charm_dir
 from charmhelpers.contrib.cloudfoundry.install import install
 
 
-def install_upstart_scripts(dirname=os.path.join(hookenv.charm_dir(),
-                                                 'files/upstart'),
+def install_upstart_scripts(dirname=None,
                             pattern='*.conf'):
+    if dirname is None:
+        dirname = os.path.join(hookenv.charm_dir(), 'files/upstart')
     for script in glob.glob("%s/%s" % (dirname, pattern)):
         filename = os.path.join(dirname, script)
         hookenv.log('Installing upstart job:' + filename, hookenv.DEBUG)

=== modified file 'test_requirements.txt'
--- test_requirements.txt	2014-04-03 18:05:09 +0000
+++ test_requirements.txt	2014-04-17 13:40:01 +0000
@@ -13,4 +13,4 @@
 testtools==0.9.35
 wsgiref==0.1.2
 launchpadlib==1.10.2
-bzr==2.6.0
+