vagrant-guest_ansible 0.0.1 → 0.0.2.dev

data/lib/vagrant-guest_ansible/guest_script.sh

@@ -1,9 +1,8 @@
 #!/bin/bash
 
-ANSIBLE_DIR=$1
-ANSIBLE_PLAYBOOK=$2
-ANSIBLE_HOSTS=$3
-ANSIBLE_EXTRA_VARS=$4
+ANSIBLE_PLAYBOOK=$1
+ANSIBLE_HOSTS=$2
+ANSIBLE_EXTRA_VARS=$3
 TEMP_HOSTS="/tmp/ansible_hosts"
 
 if [ ! -f /vagrant/$ANSIBLE_PLAYBOOK ]; then
@@ -16,25 +15,39 @@ if [ ! -f /vagrant/$ANSIBLE_HOSTS ]; then
         exit 2
 fi
 
-if [ ! -d $ANSIBLE_DIR ]; then
-        echo -n "Updating apt cache..."
-        sudo apt-get update -qq
-        echo " DONE!"
-
-        echo -n "Installing Ansible dependencies and Git..."
-        sudo apt-get install -y -qq git python-yaml python-paramiko python-jinja2
-        echo " DONE!"
-
-        # Clone ansible:
-        sudo git clone git://github.com/ansible/ansible.git ${ANSIBLE_DIR}
+if ! command -v ansible >/dev/null; then
+        echo "Installing Ansible dependencies and Git."
+        if command -v yum >/dev/null; then
+                sudo yum install -y git python python-devel
+        elif command -v apt-get >/dev/null; then
+                sudo apt-get update -qq
+                #sudo apt-get install -y -qq git python-yaml python-paramiko python-jinja2
+                sudo apt-get install -y -qq git python python-dev
+        else
+                echo "neither yum nor apt-get found!"
+                exit 1
+        fi
+        echo "Installing pip via easy_install."
+        wget http://peak.telecommunity.com/dist/ez_setup.py
+        sudo python ez_setup.py && rm -f ez_setup.py
+        sudo easy_install pip
+        # Make sure setuptools are installed crrectly.
+        sudo pip install setuptools --no-use-wheel --upgrade
+        echo "Installing required python modules."
+        sudo pip install paramiko pyyaml jinja2 markupsafe
+        sudo pip install ansible
 fi
 
 if [ ! -z "$ANSIBLE_EXTRA_VARS" -a "$ANSIBLE_EXTRA_VARS" != " " ]; then
         ANSIBLE_EXTRA_VARS=" --extra-vars \"$ANSIBLE_EXTRA_VARS\""
 fi
 
-cd ${ANSIBLE_DIR}
+# stream output
+export PYTHONUNBUFFERED=1
+# show ANSI-colored output
+export ANSIBLE_FORCE_COLOR=true
+
 cp /vagrant/${ANSIBLE_HOSTS} ${TEMP_HOSTS} && chmod -x ${TEMP_HOSTS}
 echo "Running Ansible as $USER:"
-bash -c "source hacking/env-setup && ansible-playbook /vagrant/${ANSIBLE_PLAYBOOK} --inventory-file=${TEMP_HOSTS} --connection=local $ANSIBLE_EXTRA_VARS"
+ansible-playbook /vagrant/${ANSIBLE_PLAYBOOK} --inventory-file=${TEMP_HOSTS} --connection=local $ANSIBLE_EXTRA_VARS
 rm ${TEMP_HOSTS}

data/lib/vagrant-guest_ansible/provisioner.rb

@@ -11,10 +11,9 @@ module VagrantPlugins
       def provision
 
         args = [
-          './ansible',
           config.playbook,
           File.basename(self.setup_inventory_file),
-          (config.extra_vars.blank? ? "''" : config.extra_vars.map { |k,v| "#{k}=#{v}" }.join(" "))
+          format_extra_vars(config.extra_vars)
         ].join(' ')
         
         command = "chmod +x #{config.upload_path} && #{config.upload_path} #{args}"
@@ -54,6 +53,15 @@ module VagrantPlugins
 
       protected
 
+      # converts the extra_vars to a properly formatted string
+      def format_extra_vars(extra_vars)
+        if extra_vars.kind_of?(String)
+          extra_vars.strip
+        elsif extra_vars.kind_of?(Hash)
+          extra_vars.map { |k,v| "#{k}=#{v}" }.join(" ")
+        end
+      end
+
       # This method yields the path to a script to upload and execute
       # on the remote server. This method will properly clean up the
       # script file if needed.

data/lib/vagrant-guest_ansible/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module GuestAnsible
-    VERSION = "0.0.1"
+    VERSION = "0.0.2.dev"
   end
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-guest_ansible
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2.dev
+  prerelease: 6
 platform: ruby
 authors:
 - Roberto Quintanilla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,15 +30,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ansible provisioner intended to run in the guest machine.
@@ -60,25 +65,26 @@ files:
 homepage: https://github.com/vovimayhem/vagrant-guest_ansible
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ansible provisioner for guest machine.
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e79cdd8250c933184102b00d37202b3a19c550f2
-  data.tar.gz: fdb8611d8fa378890a87360fece1149e5cb493e8
-SHA512:
-  metadata.gz: cf2af14c8fac3d6e9f63839776407f6dc80453991c77b3f10c36e62cb5a2fd9d603ef3c64c503ceb451249109083c6e32d9768ad6599b7d47ed5be9d634a20c1
-  data.tar.gz: 8fe3cb9abeeb92fba13fa7b8c5ffb3f83b71d88a8782c3fa768a40fde03211eabf2b54a0c653a82631c004e0735bd71e2e51652704b80ec96d6df78743dc5870