vagrant_bootstrap 0.1.11 → 0.2.0

data/lib/vagrant_bootstrap/bootstrap.rb

@@ -1,34 +1,43 @@
 require 'erb'
 require 'fileutils'
 require 'ostruct'
+require 'log4r'
 
 module VagrantBootstrap
   class Bootstrap
     def initialize(opts)
-      dir = opts.name
+      @opts = opts
+    end
+
+    def setup
+      make_directory
+      render
+    end
+
+    private
+
+    def make_directory
+      dir = @opts[:name]
+      FileUtils.rm_rf dir if @opts[:force]
       begin
-        puts "Making directory #{dir}..." if opts.verbose
         FileUtils.mkdir_p dir
       rescue
         STDERR.puts "FATAL: #{dir} already exists!"
         exit false
       end
-      render opts.template_file, "#{dir}/Vagrantfile", opts
     end
 
-    private
-
-    def render(template_file, target, opts)
-      file = template_path(template_file)
+    def render
+      template_file = @opts[:template]
+      target = "#{@opts[:name]}/Vagrantfile"
+      file   = template_path(template_file)
       if file.nil?
         STDERR.puts "FATAL: Couldn't find a template matching `#{template_file}'!"
         exit false
       end
-      puts "Rendering #{target} from #{file}..." if opts.verbose
       template = open(file, 'r') {|f| f.read}
-      render = ERB.new(template).result(opts.instance_eval {binding})
+      render = ERB.new(template).result(OpenStruct.new(@opts).instance_eval {binding})
       open(target, 'w') {|f| f.write render}
-      puts "Done rendering #{target}." if opts.verbose
     end
 
     def template_path(file)

data/lib/vagrant_bootstrap/commands/bootstrap.rb

@@ -0,0 +1,44 @@
+require 'optparse'
+require 'vagrant'
+require 'vagrant_bootstrap/bootstrap'
+require 'vagrant_bootstrap/tap_bridge'
+
+module VagrantBootstrap
+  module Commands
+    class Bootstrap < Vagrant::Command::Base
+      def execute
+        options = {}
+
+        opts = OptionParser.new do |o|
+          o.banner = 'Usage: vagrant bootstrap <name>'
+          o.separator ''
+
+          o.on('-b', '--bridge BRIDGE',
+            "Specify a bridge interface. Default is tap-#{whoami}") do |b|
+            options[:bridge] = b
+          end
+
+          o.on '-t', '--template TEMPLATE', 'Supply your own TEMPLATE' do |t|
+            options[:template] = t
+          end
+        end
+
+        argv = parse_options(opts)
+        return if !argv
+        raise Vagrant::Errors::CLIInvalidUsage, help: opts.help.chomp if argv.length < 1
+
+        options[:template] ||= 'default.erb'
+        options[:bridge]   ||= VagrantBootstrap::TapBridge.new.iface
+        options[:name]       = "vagrant-#{whoami}-#{argv[0].strip}"
+
+        VagrantBootstrap::Bootstrap.new(options).setup
+      end
+
+      private
+
+      def whoami
+        @whoami ||= `whoami`.strip
+      end
+    end
+  end
+end

data/lib/vagrant_bootstrap/tap_bridge.rb

@@ -3,16 +3,34 @@ module VagrantBootstrap
 
     BRIDGE = 'br0'
 
-    def me
-      @me ||= `whoami`.strip
+    def initialize
+      check_for_bins
+      create_iface     unless iface_exists?
+      create_bridge    unless bridge_exists?
+      configure_bridge unless bridge_configured?
     end
 
     def iface
       @iface ||= "tap-#{me}"
     end
 
+    private
+
+    def check_for_bins
+      %w[brctl ip grep].each do |bin|
+        unless $?.exitstatus == 0
+          STDERR.puts "Required bin #{bin} not found in PATH. Install it or fix your PATH and try again."
+          exit false
+        end
+      end
+    end
+
+    def me
+      @me ||= `whoami`.strip
+    end
+
     def iface_exists?
-      `ip tuntap|grep "#{iface}" 2>/dev/null`
+      `ip tuntap|grep "#{iface}" 2>&1 > /dev/null`
       $?.exitstatus == 0
     end
 
@@ -21,34 +39,28 @@ module VagrantBootstrap
     end
 
     def bridge_exists?
-      `brctl show #{BRIDGE} 2>/dev/null | grep "No such device" 2>/dev/null`
-      $? == 1
+      `brctl show #{BRIDGE} 2>&1 | grep "No such device" 2>&1 > /dev/null`
+      $?.exitstatus != 0
     end
 
     def create_bridge
-      `sudo brctl addbr #{BRIDGE}`
-      `sudo ip link set #{BRIDGE} up`
+      `sudo brctl addbr #{BRIDGE} 2>&1 > /dev/null`
+      `sudo ip link set #{BRIDGE} up 2>&1 > /dev/null`
     end
 
     def bridge_configured?
-      `brctl show #{BRIDGE} 2>/dev/null | grep #{iface} 2>/dev/null`
+      `brctl show #{BRIDGE} 2>&1 | grep #{iface} 2>&1 > /dev/null`
       $?.exitstatus == 0
     end
 
     def link_up(link)
-      `sudo ip link set #{link} up`
+      `sudo ip link set #{link} up 2>&1 > /dev/null`
     end
 
     def configure_bridge
-      create_bridge unless bridge_exists?
-      `sudo brctl addif #{BRIDGE} #{iface}`
+      `sudo brctl addif #{BRIDGE} #{iface} 2>&1 > /dev/null`
       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.11"
+  VERSION = "0.2.0"
 end

data/lib/vagrant_init.rb

@@ -0,0 +1,4 @@
+require 'vagrant'
+require 'vagrant_bootstrap/commands/bootstrap'
+
+Vagrant.commands.register(:bootstrap) { VagrantBootstrap::Commands::Bootstrap }

data/vagrant_bootstrap.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = VagrantBootstrap::VERSION
 
-  gem.add_dependency 'trollop'
   gem.add_dependency 'vagrant'
+  gem.add_dependency 'log4r'
+
+  gem.requirements << 'brctl binary'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-25 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: vagrant
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vagrant
+  name: log4r
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -59,9 +59,10 @@ files:
 - bin/vagrant_bootstrap
 - lib/vagrant_bootstrap.rb
 - lib/vagrant_bootstrap/bootstrap.rb
-- lib/vagrant_bootstrap/cli.rb
+- lib/vagrant_bootstrap/commands/bootstrap.rb
 - lib/vagrant_bootstrap/tap_bridge.rb
 - lib/vagrant_bootstrap/version.rb
+- lib/vagrant_init.rb
 - templates/default.erb
 - vagrant_bootstrap.gemspec
 homepage: https://github.com/SmartReceipt/vagrant_bootstrap
@@ -82,7 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- brctl binary
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 

data/lib/vagrant_bootstrap/cli.rb

@@ -1,44 +0,0 @@
-require 'vagrant_bootstrap'
-require 'vagrant_bootstrap/bootstrap'
-require 'vagrant_bootstrap/tap_bridge'
-require 'trollop'
-require 'ostruct'
-
-module VagrantBootstrap
-  class CLI
-
-    DEFAULT_TEMPLATE_FILE = 'default.erb'
-
-    BANNER = <<-EOS
-Easily generate a Vagrantfile in a namespaced directory
-
-Usage:
-        vagrant_bootstrap [name] [-b adapter]
-
-If specified, the name will be used to calculate the directory name and
-hostname of the VM, e.g. 'vagrant_bootstrap taco' will yield a directory and hostname of
-'%{name}')
-    EOS
-
-    class << self
-      def start
-        trollopts = Trollop::options do
-          version VagrantBootstrap::VERSION
-          banner BANNER % {:name => VagrantBootstrap.vm_name('taco')}
-          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
-        end
-        opts = OpenStruct.new(trollopts)
-
-        # sanitize options
-        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} and your adapter is #{opts.bridge}" unless opts.quiet
-        VagrantBootstrap::Bootstrap.new opts
-      end
-    end
-  end
-end