upgrade tnargav, vagrant-shell

and the rest needed for ~/Vagrantfile to refer to localhost with the static provider
br · Nov 20, 2013 · 1ec17f7 · 1ec17f7
1 parent 4d13dbe
commit 1ec17f7
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -97,3 +97,4 @@
 /.kerl
 /pkgsrc
 /pkg
+/*.box
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -45,7 +45,7 @@ GEM
     faraday (0.8.6)
       multipart-post (~> 1.1)
     fastercsv (1.5.5)
-    ffi (1.9.0)
+    ffi (1.9.3)
     foreman (0.63.0)
       dotenv (>= 0.7)
       thor (>= 0.13.6)
@@ -59,7 +59,7 @@ GEM
     highline (1.6.18)
     htmlentities (4.3.1)
     http_parser.rb (0.5.3)
-    i18n (0.6.4)
+    i18n (0.6.5)
     interactive_editor (0.0.10)
       spoon (>= 0.0.1)
     ipaddress (0.8.0)
@@ -78,9 +78,9 @@ GEM
     multipart-post (1.2.0)
     nanoc (3.4.3)
       cri (~> 2.2)
-    net-scp (1.1.1)
+    net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.7)
+    net-ssh (2.6.8)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     net-ssh-multi (1.1)
@@ -117,11 +117,10 @@ GEM
       twitter (~> 4.4)
     terminal-notifier (1.4.2)
     thor (0.17.0)
-    tnargav (1.2.2)
+    tnargav (1.2.3)
       childprocess (~> 0.3.7)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
-      json (>= 1.5.1, < 1.8.0)
       log4r (~> 1.1.9)
       net-scp (~> 1.1.0)
       net-ssh (~> 2.6.6)
@@ -139,7 +138,7 @@ GEM
       faraday (~> 0.8, < 0.10)
       multi_json (~> 1.0)
       simple_oauth (~> 0.2)
-    vagrant-shell (0.2.7)
+    vagrant-shell (0.2.13)
     wirble (0.1.3)
     yajl-ruby (1.1.0)
 

diff --git a/Vagrantfile b/Vagrantfile
@@ -1,13 +1,12 @@
-require 'socket'
-
-ENV['SHELL_SCRIPT'] = 'static'
-
 require "vagrant-shell"
 require "vagrant-shell/ssh-agent"
-require "vagrant-shell/env-config"
+
+VagrantPlugins::Shell::Plugin.make_provider(:static)
+
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'static'
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "home"
+  config.vm.box = "static"
   config.ssh.username = ENV['LOGNAME']
 
   config.vm.provision :shell, :path => File.expand_path("../libexec/self-init", __FILE__)

diff --git a/bin/vagrant b/bin/vagrant
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+exec bundle exec vagrant "$@"
diff --git a/home.box b/home.box
diff --git a/vendor/cache/ffi-1.9.0.gem b/vendor/cache/ffi-1.9.0.gem
diff --git a/vendor/cache/ffi-1.9.3.gem b/vendor/cache/ffi-1.9.3.gem
diff --git a/vendor/cache/i18n-0.6.4.gem b/vendor/cache/i18n-0.6.4.gem
diff --git a/vendor/cache/i18n-0.6.5.gem b/vendor/cache/i18n-0.6.5.gem
diff --git a/vendor/cache/net-scp-1.1.1.gem b/vendor/cache/net-scp-1.1.1.gem
diff --git a/vendor/cache/net-scp-1.1.2.gem b/vendor/cache/net-scp-1.1.2.gem
diff --git a/vendor/cache/net-ssh-2.6.7.gem b/vendor/cache/net-ssh-2.6.7.gem
diff --git a/vendor/cache/net-ssh-2.6.8.gem b/vendor/cache/net-ssh-2.6.8.gem
diff --git a/vendor/cache/tnargav-1.2.2.gem b/vendor/cache/tnargav-1.2.2.gem
diff --git a/vendor/cache/tnargav-1.2.3.gem b/vendor/cache/tnargav-1.2.3.gem
diff --git a/vendor/cache/vagrant-shell-0.2.13.gem b/vendor/cache/vagrant-shell-0.2.13.gem
diff --git a/vendor/cache/vagrant-shell-0.2.7.gem b/vendor/cache/vagrant-shell-0.2.7.gem
-Original file line number
+Diff line change
@@ Expand Up / @@ -97,3 +97,4 @@ @@
     /.kerl
     /pkgsrc
     /pkg
+    /*.box
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/usr/bin/env bash

		exec bundle exec vagrant "$@"