vagrant_bootstrap 0.2.0 → 0.2.1

data/lib/vagrant_bootstrap/action/destroy.rb

@@ -0,0 +1,30 @@
+require 'optparse'
+require 'vagrant'
+require 'chef/knife'
+require 'chef/api_client'
+require 'chef/node'
+
+module VagrantBootstrap
+  module Action
+    class Destroy
+      def initialize(app, env)
+        @app = app
+      end
+
+      def call(env)
+        @client_name = env[:vm].config.keys[:vm].host_name
+        remove_chef_client_and_node!
+      end
+
+      private
+
+      def remove_chef_client_and_node!
+        knife = Chef::Knife.new
+        knife.configure_chef
+        knife.config[:yes] = true
+        knife.delete_object Chef::ApiClient, @client_name
+        knife.delete_object Chef::Node,      @client_name
+      end
+    end
+  end
+end

data/lib/vagrant_bootstrap/bootstrap.rb

@@ -1,7 +1,6 @@
 require 'erb'
 require 'fileutils'
 require 'ostruct'
-require 'log4r'
 
 module VagrantBootstrap
   class Bootstrap
@@ -10,12 +9,33 @@ module VagrantBootstrap
     end
 
     def setup
+      puts "Setting up a Vagrant environment with"
+      puts
+      puts "  directory: #{@opts[:name]}"
+      puts "  bridge:    #{@opts[:bridge]}"
+      puts
       make_directory
       render
+      full_path = File.expand_path @opts[:name]
+      puts HELP_TEXT % {name: @opts[:name]}
     end
 
     private
 
+    HELP_TEXT = <<-HELP
+You're ready to go.
+
+  cd %{name}
+  vagrant up
+
+When you're finished with the VM for good, remember to
+
+  cd %{name}
+  vagrant destroy
+
+This also deletes the node and client from Chef.
+    HELP
+
     def make_directory
       dir = @opts[:name]
       FileUtils.rm_rf dir if @opts[:force]

data/lib/vagrant_bootstrap/commands/bootstrap.rb

@@ -14,7 +14,7 @@ module VagrantBootstrap
           o.separator ''
 
           o.on('-b', '--bridge BRIDGE',
-            "Specify a bridge interface. Default is tap-#{whoami}") do |b|
+            "Specify a bridge interface. Default is tap-#{VagrantBootstrap.whoami}") do |b|
             options[:bridge] = b
           end
 
@@ -29,16 +29,10 @@ module VagrantBootstrap
 
         options[:template] ||= 'default.erb'
         options[:bridge]   ||= VagrantBootstrap::TapBridge.new.iface
-        options[:name]       = "vagrant-#{whoami}-#{argv[0].strip}"
+        options[:name]       = "vagrant-#{VagrantBootstrap.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

@@ -1,3 +1,5 @@
+require 'vagrant_bootstrap'
+
 module VagrantBootstrap
   class TapBridge
 
@@ -11,7 +13,7 @@ module VagrantBootstrap
     end
 
     def iface
-      @iface ||= "tap-#{me}"
+      @iface ||= "tap-#{VagrantBootstrap.whoami}"
     end
 
     private
@@ -25,17 +27,13 @@ module VagrantBootstrap
       end
     end
 
-    def me
-      @me ||= `whoami`.strip
-    end
-
     def iface_exists?
       `ip tuntap|grep "#{iface}" 2>&1 > /dev/null`
       $?.exitstatus == 0
     end
 
     def create_iface
-      `sudo ip tuntap add mode tap user #{me} #{iface}`
+      `sudo ip tuntap add mode tap user #{VagrantBootstrap.whoami} #{iface}`
     end
 
     def bridge_exists?

data/lib/vagrant_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module VagrantBootstrap
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/vagrant_bootstrap.rb

@@ -7,5 +7,9 @@ module VagrantBootstrap
       name = "-#{name}" if name
       "vagrant-#{`whoami`.strip}#{name}"
     end
+
+    def whoami
+      @@whoami ||= `whoami`.strip
+    end
   end
 end

data/lib/vagrant_init.rb

@@ -1,4 +1,10 @@
 require 'vagrant'
 require 'vagrant_bootstrap/commands/bootstrap'
+require 'vagrant_bootstrap/action/destroy'
 
 Vagrant.commands.register(:bootstrap) { VagrantBootstrap::Commands::Bootstrap }
+
+Vagrant.actions[:destroy].insert_after(
+  Vagrant::Action::VM::Destroy,
+  VagrantBootstrap::Action::Destroy
+)

data/vagrant_bootstrap.gemspec

@@ -14,8 +14,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = VagrantBootstrap::VERSION
 
-  gem.add_dependency 'vagrant'
-  gem.add_dependency 'log4r'
+  gem.add_dependency 'vagrant', '~> 1.0'
+  gem.add_dependency 'chef',    '~> 10.12'
 
+  gem.requirements << 'Ubuntu 10.10 or greater'
   gem.requirements << 'brctl binary'
+  gem.requirements << 'admin on your chef repo'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-28 00:00:00.000000000 Z
+date: 2012-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: log4r
+  name: chef
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.12'
 description: Easily generate a Vagrantfile in a namespaced directory
 email:
 - justin.force@gmail.com
@@ -58,6 +58,7 @@ files:
 - Rakefile
 - bin/vagrant_bootstrap
 - lib/vagrant_bootstrap.rb
+- lib/vagrant_bootstrap/action/destroy.rb
 - lib/vagrant_bootstrap/bootstrap.rb
 - lib/vagrant_bootstrap/commands/bootstrap.rb
 - lib/vagrant_bootstrap/tap_bridge.rb
@@ -84,7 +85,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
+- Ubuntu 10.10 or greater
 - brctl binary
+- admin on your chef repo
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: