vagrant-yaybu 0.0.5 → 0.0.6

data/CHANGES

@@ -0,0 +1,47 @@
+Changelog for vagrant-yaybu
+===========================
+
+0.0.6 (2012-02-12)
+------------------
+
+ - Add an automatically generated ``vagrant`` node accessible from yay. This
+   can provide details about all your defined VMs:: 
+
+       vagrant:
+         vms:
+           web:
+             name: web
+             interfaces:
+               - name: eth1
+                 address: 10.33.33.33
+                 netmask: 255.255.255.0
+                 gateway: 10.33.33.1
+
+               - name: eth0
+                 type: dhcp
+
+   To reference eth1 on the current VM you can use::
+
+       ${vagrant.vm.interfaces[0].address}
+
+   Unfortunately you won't be able to access the IP address of eth0 presently.
+   When using vagrant you rarely access the IP directly and have port forwards
+   to localhost on the host. eth0 will always be the last interface in the list.
+
+ - The bootstrap functionality will bootstrap the same version of yay and Yaybu
+   This can be overriden by setting ``yay_version`` and ``yaybu_version`` in
+   your Vagrantfile.
+
+
+0.0.5 (2012-02-18)
+------------------
+
+ - Update to support vagrant 0.9.7+
+
+
+0.0.4 (2012-02-18)
+-------------
+
+ - Update to support vagrant 0.9+
+
+

data/Vagrantfile

@@ -15,11 +15,11 @@ Vagrant::Config.run do |config|
     # 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/"
+    # 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"
+    # cfg.include << "configuration/minecraft.yay"
 
     # The ``yay`` parameter lets you put arbritrary config inside your Vagrant file
     cfg.yay  = <<-EOS
@@ -31,7 +31,7 @@ Vagrant::Config.run do |config|
 
     # 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"
+    cfg.python = "/opt/virtualenvs/yaybu/bin/python"
 
   end
 end

data/lib/vagrant-yaybu/provisioner.rb

@@ -38,6 +38,10 @@ class opts:
     no_resume = False
     env_passthrough = []
 
+vagrant_config = StringIO.StringIO("""
+<%= vagrant %>
+""")
+
 includes = StringIO.StringIO("""
 <% if includes.length > 0 %>
 .include:
@@ -52,6 +56,7 @@ raw_config = StringIO.StringIO("""
 """)
 
 config = Config(searchpath=opts.ypath)
+config.load(vagrant_config)
 config.load(includes)
 config.load(raw_config)
 
@@ -80,6 +85,8 @@ module Vagrant
         attr_accessor :python
         attr_accessor :searchpath
         attr_accessor :include
+        attr_accessor :yay_version
+        attr_accessor :yaybu_version
 
         def initialize
           super
@@ -88,6 +95,9 @@ module Vagrant
           @python = "python"
           @searchpath = []
           @include = []
+
+          @yay_version = nil
+          @yaybu_version = nil
         end
       end
 
@@ -101,9 +111,26 @@ module Vagrant
           ssh.sudo("which yaybu", :error_class => YaybuError, :_key => :yaybu_not_detected, :binary => "yaybu")
         rescue
           env[:ui].info "Yaybu not found so attempting to install it"
+
+          if not config.yay_version then
+              env[:ui].info "yay version not specified in Vagrantfile, determining from host system"
+              config.yay_version = get_local_version?("yay")
+          end
+
+          if not config.yaybu_version then
+              env[:ui].info "Yaybu version not specified in Vagrantfile, determining from host system"
+              config.yaybu_version = get_local_version?("Yaybu")
+          end
+
+          env[:ui].info "Running apt-get updating and checking setuptools"
           ssh.sudo("apt-get update")
           ssh.sudo("apt-get install python-setuptools -y")
-          ssh.sudo("easy_install Yaybu")
+
+          env[:ui].info "Running 'easy_install yay==#{config.yay_version}'"
+          ssh.sudo("easy_install yay==#{config.yay_version}")
+
+          env[:ui].info "Running 'easy_install Yaybu==#{config.yaybu_version}'"
+          ssh.sudo("easy_install Yaybu==#{config.yaybu_version}")
         end
       end
 
@@ -122,6 +149,53 @@ module Vagrant
           end
       end
 
+      def get_local_version?(mod)
+          version = `#{config.python} -c 'print __import__("pkg_resources").get_distribution("#{mod}").version'`.strip
+          if $?.to_i != 0 then
+              raise YaybuError.new "Failed to get host version for '#{mod}'"
+          end
+
+          version
+      end
+
+      def get_vagrant_yaml?
+          data = {}
+          vagrant = data['vagrant'] = {}
+          vms = vagrant['vms'] = {}
+
+          env[:vm].env.vms.each do |name, vm|
+              info = {
+                  "name" => vm.name.to_s,
+                  "interfaces" => [],
+                  }
+
+              idx = 1
+              vm.config.vm.networks.each do |type, ips|
+                  ips.each do |ip|
+                      info["interfaces"] << {
+                          "name" => "eth#{idx}",
+                          "address" => ip,
+                          "netmask" => "255.255.255.0",
+                          "gateway" => (ip.split(".").slice(0, 3) + [1]).join("."),
+                          }
+                      idx += 1
+                  end
+              end
+
+              info["interfaces"] << {
+                  "name" => "eth0",
+                  "type" => "dhcp",
+                  }
+
+              vms[name.to_s] = info
+          end
+
+          name = env[:vm].name.to_s
+          vagrant["vm"] = "${vagrant.vms.#{name}}"
+
+          "#" + data.to_yaml
+      end
+
       def provision!
         verify_import "yaybu"
         verify_import "yay"
@@ -136,6 +210,7 @@ module Vagrant
           :ssh_port => env[:vm].ssh.info[:port],
           :private_key_path => env[:vm].ssh.info[:private_key_path],
           :yay => config.yay,
+          :vagrant => get_vagrant_yaml?,
           :searchpath => config.searchpath,
           :includes => config.include,
           })

data/lib/vagrant-yaybu/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Yaybu
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-yaybu
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-18 00:00:00.000000000Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies: []
 description: This plugin adds a Yaybu 'push' provisioner to Vagrant
 email:
@@ -19,6 +19,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGES
 - Gemfile
 - Rakefile
 - Vagrantfile
@@ -48,7 +49,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: vagrant-yaybu
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Teach Vagrant about Yaybu