vagrant-ansible 0.0.1 → 0.0.2

data/README.md

@@ -1,4 +1,4 @@
-## vagrant-ansible
+## vagrant-ansible [![Build Status](https://secure.travis-ci.org/dsander/vagrant-ansible.png?branch=master)](http://travis-ci.org/dsander/vagrant-ansible)
 
 https://github.com/dsander/vagrant-ansible
 

data/Rakefile

@@ -1,22 +1,27 @@
 # -*- ruby -*-
 
 require 'rubygems'
-require 'hoe'
+if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ruby'
+  require 'hoe'
 
-Hoe.plugin :git
-Hoe.plugin :gemspec
-Hoe.plugin :bundler
-Hoe.plugin :gemcutter
-Hoe.plugins.delete :rubyforge
+  Hoe.plugin :git
+  Hoe.plugin :gemspec
+  Hoe.plugin :bundler
+  Hoe.plugin :gemcutter
+  Hoe.plugins.delete :rubyforge
 
-Hoe.spec 'vagrant-ansible' do
-  developer('Dominik Sander', 'git@dsander.de')
-  self.description ="Develop & test your ansible playbooks with Vagrant" 
-  self.summary = "Vagrant-ansible is a provisioning plugin for Vagrant, that makes developing and testing playbooks for ansible easy."
-  
-  self.readme_file = 'README.md'
-  self.history_file = 'CHANGELOG.md'
-  self.extra_deps << ["vagrant"]
+  Hoe.spec 'vagrant-ansible' do
+    developer('Dominik Sander', 'git@dsander.de')
+    self.description ="Develop & test your ansible playbooks with Vagrant" 
+    self.summary = "Vagrant-ansible is a provisioning plugin for Vagrant, that makes developing and testing playbooks for ansible easy."
+    
+    self.readme_file = 'README.md'
+    self.history_file = 'CHANGELOG.md'
+    self.extra_deps << ["vagrant"]
+  end
 end
 
+task :default => :spec
+task :test => :spec
+
 # vim: syntax=ruby

data/lib/vagrant-ansible/provisioner.rb

@@ -3,15 +3,16 @@ require 'tempfile'
 module Vagrant
   module Provisioners
     class Ansible < Base
-      VERSION = '0.0.1'
+      VERSION = '0.0.2'
       include Util::SafeExec
 
       class Config < Vagrant::Config::Base
         attr_accessor :playbook
         attr_accessor :hosts
+        attr_accessor :inventory_file
 
         def initialize
-          
+
         end
 
         def validate(env, errors)
@@ -19,7 +20,7 @@ module Vagrant
           if playbook.nil?
             errors.add(I18n.t("vagrant.provisioners.ansible.no_playbook"))
           end
-          if hosts.nil?
+          if hosts.nil? and inventory_file.nil?
             errors.add(I18n.t("vagrant.provisioners.ansible.no_hosts"))
           end
         end
@@ -32,33 +33,37 @@ module Vagrant
       # This methods yield the path to a temporally created inventory
       # file.
       def with_inventory_file(ssh)
-        begin
-          forward = env[:vm].config.vm.forwarded_ports.select do |x| 
-            x[:guestport] == ssh.guest_port
-          end.first[:hostport]
-          file = Tempfile.new('inventory')
-          file.write("[#{config.hosts}]\n")
-          file.write("#{ssh.host}:#{forward}")
-          file.fsync
-          file.close
-          yield file.path
-        ensure
-          file.unlink
+        if not config.inventory_file.nil?
+          yield config.inventory_file
+        else
+          begin
+            forward = env[:vm].config.vm.forwarded_ports.select do |x|
+              x[:guestport] == ssh.guest_port
+            end.first[:hostport]
+            file = Tempfile.new('inventory')
+            file.write("[#{config.hosts}]\n")
+            file.write("#{ssh.host}:#{forward}")
+            file.fsync
+            file.close
+            yield file.path
+          ensure
+            file.unlink
+          end
         end
       end
 
       def provision!
         ssh = env[:vm].config.ssh
- 
+
         with_inventory_file(ssh) do |inventory_file|
           puts ["ansible-playbook",
-                    "--user=#{ssh.username}", 
-                    "--inventory-file=#{inventory_file}", 
+                    "--user=#{ssh.username}",
+                    "--inventory-file=#{inventory_file}",
                     "--private-key=#{env[:vm].env.default_private_key_path}",
                     config.playbook].join(' ')
           safe_exec("ansible-playbook",
-                    "--user=#{ssh.username}", 
-                    "--inventory-file=#{inventory_file}", 
+                    "--user=#{ssh.username}",
+                    "--inventory-file=#{inventory_file}",
                     "--private-key=#{env[:vm].env.default_private_key_path}",
                     config.playbook)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-ansible
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant
-  requirement: &12257060 !ruby/object:Gem::Requirement
+  requirement: &19992640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12257060
+  version_requirements: *19992640
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &12270200 !ruby/object:Gem::Requirement
+  requirement: &20005240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *12270200
+  version_requirements: *20005240
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &12267880 !ruby/object:Gem::Requirement
+  requirement: &20002620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *12267880
+  version_requirements: *20002620
 description: Develop & test your ansible playbooks with Vagrant
 email:
 - git@dsander.de
@@ -61,6 +61,7 @@ files:
 - lib/vagrant-ansible.rb
 - lib/vagrant-ansible/provisioner.rb
 - lib/vagrant_init.rb
+- .gemtest
 homepage: https://github.com/dsander/vagrant-ansible
 licenses: []
 post_install_message: