vagrant_bootstrap 0.1.10 → 0.1.11

data/lib/vagrant_bootstrap/cli.rb

@@ -1,12 +1,12 @@
 require 'vagrant_bootstrap'
 require 'vagrant_bootstrap/bootstrap'
+require 'vagrant_bootstrap/tap_bridge'
 require 'trollop'
 require 'ostruct'
 
 module VagrantBootstrap
   class CLI
 
-    DEFAULT_BRIDGE = 'br0'
     DEFAULT_TEMPLATE_FILE = 'default.erb'
 
     BANNER = <<-EOS
@@ -25,7 +25,7 @@ hostname of the VM, e.g. 'vagrant_bootstrap taco' will yield a directory and hos
         trollopts = Trollop::options do
           version VagrantBootstrap::VERSION
           banner BANNER % {:name => VagrantBootstrap.vm_name('taco')}
-          opt :bridge,  'The bridge to attach the VM to', :default => DEFAULT_BRIDGE
+          opt :bridge,  'The bridge to attach the VM to', :default => TapBridge.new.iface
           opt :quiet,   "Don't output anything unless there's a problem", :default => false
           opt :verbose, "More verbose output", :default => false
           opt :template_file, 'Specify a different template file', :type => String
@@ -36,7 +36,7 @@ hostname of the VM, e.g. 'vagrant_bootstrap taco' will yield a directory and hos
         opts.name = VagrantBootstrap.vm_name(ARGV[0])
         opts.template_file = DEFAULT_TEMPLATE_FILE if opts.template_file.nil?
 
-        puts "Your vagrant is called #{opts.name}" unless opts.quiet
+        puts "Your vagrant is called #{opts.name} and your adapter is #{opts.bridge}" unless opts.quiet
         VagrantBootstrap::Bootstrap.new opts
       end
     end

data/lib/vagrant_bootstrap/tap_bridge.rb

@@ -0,0 +1,54 @@
+module VagrantBootstrap
+  class TapBridge
+
+    BRIDGE = 'br0'
+
+    def me
+      @me ||= `whoami`.strip
+    end
+
+    def iface
+      @iface ||= "tap-#{me}"
+    end
+
+    def iface_exists?
+      `ip tuntap|grep "#{iface}" 2>/dev/null`
+      $?.exitstatus == 0
+    end
+
+    def create_iface
+      `sudo ip tuntap add mode tap user #{me} #{iface}`
+    end
+
+    def bridge_exists?
+      `brctl show #{BRIDGE} 2>/dev/null | grep "No such device" 2>/dev/null`
+      $? == 1
+    end
+
+    def create_bridge
+      `sudo brctl addbr #{BRIDGE}`
+      `sudo ip link set #{BRIDGE} up`
+    end
+
+    def bridge_configured?
+      `brctl show #{BRIDGE} 2>/dev/null | grep #{iface} 2>/dev/null`
+      $?.exitstatus == 0
+    end
+
+    def link_up(link)
+      `sudo ip link set #{link} up`
+    end
+
+    def configure_bridge
+      create_bridge unless bridge_exists?
+      `sudo brctl addif #{BRIDGE} #{iface}`
+      link_up BRIDGE
+      link_up iface
+    end
+
+    def initialize
+      create_iface unless iface_exists?
+      configure_bridge unless bridge_configured?
+    end
+  end
+end

data/lib/vagrant_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module VagrantBootstrap
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/vagrant_bootstrap.gemspec

@@ -15,4 +15,5 @@ Gem::Specification.new do |gem|
   gem.version       = VagrantBootstrap::VERSION
 
   gem.add_dependency 'trollop'
+  gem.add_dependency 'vagrant'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-18 00:00:00.000000000 Z
+date: 2012-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: vagrant
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Easily generate a Vagrantfile in a namespaced directory
 email:
 - justin.force@gmail.com
@@ -44,6 +60,7 @@ files:
 - lib/vagrant_bootstrap.rb
 - lib/vagrant_bootstrap/bootstrap.rb
 - lib/vagrant_bootstrap/cli.rb
+- lib/vagrant_bootstrap/tap_bridge.rb
 - lib/vagrant_bootstrap/version.rb
 - templates/default.erb
 - vagrant_bootstrap.gemspec