Merge branch 'devel'

BUILDING.md

@@ -26,4 +26,8 @@ make sure `~/.pypirc` is setup correctly
 
 then
 
-    python setup.py sdist upload
+    python setup.py sdist upload
+
+#### Tips for building on a blank osx vm
+
+http://ntk.me/2012/09/07/os-x-on-os-x/

lib/battleschool/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.3.3'
+__version__ = '0.3.4'
 __author__ = 'Spencer Gibb'

setup.py

@@ -37,7 +37,7 @@
       url='http://32degre.es',
       download_url='https://github.com/32degrees/battleschool/releases',
       license='Apache License, Version 2.0',
-      install_requires=['ansible'],
+      install_requires=['ansible', 'jinja2', 'pyyaml'],  # added jinja2 and pyyaml to fix installs under homebrew pip
       classifiers=[
           "Development Status :: 3 - Alpha",
           "Environment :: Console",

share/library/mac_pkg

@@ -408,7 +408,9 @@ class AppPackage(Package):
         self._app_creates = '/Applications/%s' % self.params[param_name]
 
     def install(self, pkg_path):
-        shutil.copytree(pkg_path, self._app_creates)
+        # self.module.fail_json(msg="pkg_path %s - _app_creates %s" % (pkg_path, self._app_creates))
+        # TODO: symlinks is an option?
+        shutil.copytree(pkg_path, self._app_creates, symlinks=True)
 
     def is_installed(self):
         return path.exists(self._app_creates)

test/test_app_dmg.sh

@@ -0,0 +1,6 @@
+MODULE_PARAMS="pkg_type=app"
+MODULE_PARAMS="$MODULE_PARAMS archive_type=dmg"
+MODULE_PARAMS="$MODULE_PARAMS archive_path=Adium.app"
+MODULE_PARAMS="$MODULE_PARAMS url=http://sourceforge.net/projects/adium/files/Adium_1.5.9.dmg/download"
+#echo $MODULE_PARAMS
+$ANSIBLE_SRC_PATH/hacking/test-module -m share/library/mac_pkg -a "$MODULE_PARAMS"

test/test_pkg_java.sh

@@ -1,10 +1,10 @@
-MODULE_PARAMS="pkg_name=com.oracle.jdk7u25"
+MODULE_PARAMS="pkg_name=com.oracle.jdk7u51"
 MODULE_PARAMS="$MODULE_PARAMS pkg_version=1.1x"
-MODULE_PARAMS="$MODULE_PARAMS url=https://edelivery.oracle.com/otn-pub/java/jdk/7u25-b15/jdk-7u25-macosx-x64.dmg"
-MODULE_PARAMS="$MODULE_PARAMS curl_opts='--cookie gpw_e24=http%3A%2F%2Fwww.oracle.com'"
+MODULE_PARAMS="$MODULE_PARAMS url=http://download.oracle.com/otn-pub/java/jdk/7u51-b13/jdk-7u51-macosx-x64.dmg"
+MODULE_PARAMS="$MODULE_PARAMS curl_opts='-L --cookie oraclelicense=accept-securebackup-cookie'"
 #MODULE_PARAMS="$MODULE_PARAMS dest=jdk7.dmg"
 #MODULE_PARAMS="$MODULE_PARAMS force=yes"
 MODULE_PARAMS="$MODULE_PARAMS archive_type=dmg"
-MODULE_PARAMS="$MODULE_PARAMS archive_path='JDK 7 Update 25.pkg'"
+MODULE_PARAMS="$MODULE_PARAMS archive_path='JDK 7 Update 51.pkg'"
 #echo $MODULE_PARAMS
 $ANSIBLE_SRC_PATH/hacking/test-module -m share/library/mac_pkg -a "$MODULE_PARAMS"