vagrant-yaybu 0.0.1 → 0.0.2

data/Vagrantfile

@@ -0,0 +1,38 @@
+# This is a demo Vagrantfile to prove that vagrant-yaybu is working correctly
+
+# When you install this gem (using ``gem install vagrant-yaybu``) you do not
+# need to ``require`` the provisioner. We do so here so that the development
+# version is loaded.
+require "lib/vagrant-yaybu/provisioner.rb"
+
+
+Vagrant::Config.run do |config|
+  config.vm.box = "lucid64"
+  config.vm.box_url = "http://files.vagrantup.com/lucid64.box"
+
+  config.vm.provision :yaybu do |cfg|
+
+    # You can add directories and remote locations to the search path
+    # Both Yay files and assets (templates, etc) will be fetched from here.
+    # The default search path is the current working directory
+    cfg.searchpath << "../Projects/yaybu-configuration/"
+    cfg.searchpath << "https://raw.github.com/isotoma/yaybu-examples/master/"
+
+    # You can load any config that is on the searchpath
+    cfg.include << "configuration/minecraft.yay"
+
+    # The ``yay`` parameter lets you put arbritrary config inside your Vagrant file
+    cfg.yay  = <<-EOS
+      resources.append:
+        - Execute:
+            name: example
+            command: date
+    EOS
+
+    # Advanced Yaybu hackers might not want to use the default python or a packaged
+    # version of Yaybu. You can set this to point at your development environment.
+    cfg.python = "/opt/virtualenvs/yaybu/bin/python"
+
+  end
+end
+

data/install-vagrant.sh

@@ -0,0 +1,15 @@
+#! /bin/bash
+
+bash < <(curl -s https://rvm.beginrescueend.com/install/rvm)
+
+echo '[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm"' >> ~/.bash_profile
+
+. "$HOME/.rvm/scripts/rvm"
+
+rvm install 1.9.2
+rvm use 1.9.2
+rvm --default 1.9.2
+
+gem update
+gem install vagrant vagrant-snap vagrant-yaybu
+

data/lib/vagrant-yaybu/provisioner.rb

@@ -22,25 +22,39 @@ from yay.config import Config
 from yaybu.core.remote import RemoteRunner
 from yaybu.core.runcontext import RunContext
 
-raw_config = StringIO.StringIO("""
-<%= yay %>
-""")
-
-config = Config()
-config.load(raw_config)
-
 class opts:
     log_level = "info"
     logfile = "-"
     host = "<%= ssh_user %>@<%= ssh_host %>:<%= ssh_port %>"
     user = "root"
-    ypath = []
+    ypath = [
+<% searchpath.each do |path| %>
+        "<%= path %>",
+<% end %>
+        ]
     simulate = False
     verbose = False
     resume = True
     no_resume = False
     env_passthrough = []
 
+includes = StringIO.StringIO("""
+<% if includes.length > 0 %>
+.include:
+  <% includes.each do |include| %>
+  - <%= include %>
+  <% end %>
+<% end %>
+""")
+
+raw_config = StringIO.StringIO("""
+<%= yay %>
+""")
+
+config = Config(searchpath=opts.ypath)
+config.load(includes)
+config.load(raw_config)
+
 ctx = RunContext(None, opts)
 ctx.set_config(config)
 
@@ -66,10 +80,14 @@ module Vagrant
       class Config < Vagrant::Config::Base
         attr_accessor :yay
         attr_accessor :python
+        attr_accessor :searchpath
+        attr_accessor :include
 
         def initialize
           @yay = ""
           @python = "python"
+          @searchpath = []
+          @include = []
         end
       end
 
@@ -89,7 +107,24 @@ module Vagrant
       def prepare
       end
 
+      def verify_import(mod)
+          if not system("#{config.python}", "-c", "import #{mod}") then
+            raise YaybuError.new "Module #{mod} not found"
+          end
+      end
+
+      def verify_local_binary(binary)
+          if not system("which #{binary}") then
+            raise YaybuError.new "Local binary #{binary} not found"
+          end
+      end
+
       def provision!
+        verify_import "yaybu"
+        verify_import "yay"
+
+        verify_local_binary "ssh"
+
         bootstrap
 
         deployment_script = TemplateRenderer.render_string($deploy_script, {
@@ -98,6 +133,8 @@ module Vagrant
           :ssh_port => vm.ssh.port,
           :private_key_path => vm.env.config.ssh.private_key_path,
           :yay => config.yay,
+          :searchpath => config.searchpath,
+          :includes => config.include,
           })
 
         IO.popen("#{config.python} -", "r+") do |io|

data/lib/vagrant-yaybu/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Yaybu
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,75 +1,55 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vagrant-yaybu
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.0.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - John Carr
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-07 00:00:00 +00:00
-default_executable: 
+date: 2011-11-10 00:00:00.000000000Z
 dependencies: []
-
 description: This plugin adds a Yaybu 'push' provisioner to Vagrant
-email: 
+email:
 - john.carr@isotoma.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Rakefile
+- Vagrantfile
+- install-vagrant.sh
 - lib/vagrant-yaybu.rb
 - lib/vagrant-yaybu/provisioner.rb
 - lib/vagrant-yaybu/version.rb
 - lib/vagrant_init.rb
 - vagrant-yaybu.gemspec
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: vagrant-yaybu
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Teach Vagrant about Yaybu
 test_files: []
-