Merge pull request #57 from omniti-labs/upgrade_ansible

Upgrade ansible - 1.0.0 release

ansible-dk-cli/ansible-dk

@@ -5,18 +5,36 @@
 import click
 import os
 import sys
-
+import json
 
 ###################################################
 # Defaults
 RUBY_ABI = "2.1.0"
 PYTHON_ABI = "2.7"
 HOME = os.getenv("HOME")
 
+def check_version():
+    file='/opt/ansible-dk/version-manifest.json'
+    try:
+        version = json.loads(open(file).read())['build_version']
+    except ValueError as e:
+        print "%s in %s" % (e, file)
+        sys.exit(-1)
+    except KeyError as e:
+        print "Could not find %s in %s" % (e, file)
+        sys.exit(-1)
+    except (IOError, OSError) as e:
+        message = "Error checking version: %s" % e.strerror
+        if type(e.filename) == str:
+            message += " %s" % e.filename
+        print(message)
+        sys.exit(e.errno)
+    return version
 
 ###################################################
 # Generic top-level group definitions
 @click.group()
+@click.version_option(version=check_version())
 def cli():
     pass
 

omnibus-ansible-dk/.gitignore

@@ -1,7 +1,7 @@
 *.gem
 .bundle
 .kitchen/
-.kitchen.local.yml
+.kitchen.*.yml
 vendor/bundle
 pkg/*
 .vagrant

omnibus-ansible-dk/config/projects/ansible-dk.rb

@@ -1,3 +1,4 @@
+
 name "ansible-dk"
 maintainer "OmniTI"
 homepage "https://github.com/omniti-labs/ansible-dk"
@@ -11,23 +12,25 @@
 
 # Version pinning.  Most of the software definitons have a
 # default_version of "master" (ie, floating on latest)
-override :ruby,              version: "2.1.7"
-override :bundler,           version: "1.10.6"
-override :rubygems,          version: "2.4.8"
-override :'test-kitchen',    version: "v1.4.2"
-override :'kitchen-ansible', version: "0.0.30"
+override :ruby,              version: "2.1.8"
+override :bundler,           version: "1.11.2"
+override :rubygems,          version: "v2.6.1"
+override :'test-kitchen',    version: "v1.6.0"
+override :'kitchen-ansible', version: "0.0.38"
 override :'kitchen-vagrant', version: "v0.19.0"
-override :'kitchen-ec2',     version: "v0.10.0"
-override :awscli,            version: "1.9.5"
+override :'kitchen-ec2',     version: "v1.0.0"
+override :awscli,            version: "1.10.1"
 override :jq,                version: "jq-1.5"
-override :ansible,           version: "1.9.4"
+override :python,            version: "2.7.11"
+override :pip,               version: "8.0.3"
+override :ansible,           version: "2.0.0.2"
 override :paramiko,          version: "1.16.0"
 override :pycrypto,          version: "2.6.1"
-override :'ansible-lint',    version: "2.1.3"
+override :'ansible-lint',    version: "2.3.3"
 override :'ansible-toolkit', version: "1.3.2"
 override :appbundler,        version: "v0.7.0"
-override :serverspec,        version: "v2.24.2"
-override :molecule,          version: "1.0.6"
+override :serverspec,        version: "v2.30.1"
+override :molecule,          version: "1.3.0"
 override :bats,              version: "v0.4.0"
 
 
@@ -72,7 +75,3 @@
 end
 
 compress :dmg
-
-
-
-

omnibus-ansible-dk/config/software/pip.rb

@@ -3,8 +3,10 @@
 
 dependency "setuptools"
 
-source :url => "https://pypi.python.org/packages/source/p/pip/pip-#{version}.tar.gz",
-       :md5 => '3823d2343d9f3aaab21cf9c917710196'
+version('7.1.2') { source md5: '3823d2343d9f3aaab21cf9c917710196' }
+version('8.0.3') { source md5: '8f000fc101e47f4f199fa29df1e0b0df' }
+
+source :url => "https://pypi.python.org/packages/source/p/pip/pip-#{version}.tar.gz"
 
 relative_path "pip-#{version}"
 

omnibus-ansible-dk/config/software/python.rb

@@ -25,6 +25,7 @@
 
 version("2.7.5") { source md5: "b4f01a1d0ba0b46b05c73b2ac909b1df" }
 version("2.7.9") { source md5: "5eebcaa0030dc4061156d3429657fb83" }
+version("2.7.11") { source md5: "6b6076ec9e93f05dd63e47eb9c15728b" }
 
 source url: "http://python.org/ftp/python/#{version}/Python-#{version}.tgz"
 
@@ -38,7 +39,7 @@
 
   # Added - omniti labs
   env['MACOSX_DEPLOYMENT_TARGET'] = '10.9' if mac_os_x?
-  
+
   command "./configure" \
           " --prefix=#{install_dir}/embedded" \
           " --enable-shared" \