vagrant-tun 0.0.1 → 0.0.2

data/README.md

@@ -47,13 +47,13 @@ $ make test
 ```
 $ make
 rake build
-vagrant-tun 0.0.1 built to pkg/vagrant-tun-0.0.1.gem.
+vagrant-tun 0.0.2 built to pkg/vagrant-tun-0.0.2.gem.
 ```
 
 ### Install the built gemfile
 ```
 $ make install
 find pkg/ -name '*.gem' | head -n 1 | xargs vagrant plugin install
-Installing the 'pkg/vagrant-tun-0.0.1.gem' plugin. This can take a few minutes...
-Installed the plugin 'vagrant-tun (0.0.1)'!
+Installing the 'pkg/vagrant-tun-0.0.2.gem' plugin. This can take a few minutes...
+Installed the plugin 'vagrant-tun (0.0.2)'!
 ```

data/lib/vagrant-tun/command.rb

@@ -7,10 +7,10 @@ module VagrantTun
     end
 
     def call(env)
+      @app.call(env)
       if env[:machine].config.tun.enabled
         ensure_tun_available(env)
       end
-      @app.call(env)
     end
 
     def try_load_tun_kernel_module(env)

data/lib/vagrant-tun/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Tun 
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/vagrant-tun.rb

@@ -13,8 +13,8 @@ module VagrantTun
       Config
     end
 
-    action_hook(:VagrantTun, :machine_action_up) do |hook|
-      hook.append(VagrantTun::Command)
+    action_hook(:VagrantTun) do |hook|
+      hook.before(Vagrant::Action::Builtin::Provision, VagrantTun::Command)
     end
   end
 end

data/spec/unit/command/call_spec.rb

@@ -10,11 +10,7 @@ describe VagrantTun::Command do
   let(:env) { { :machine => machine,  :ui => ui } }
 
   # pretend env contains the Vagrant ui element
-  let(:ui) do
-    double('ui').tap do |ui|
-      allow(ui).to receive(:info) { nil }
-    end
-  end
+  let(:ui) { { } }
 
   # pretend env[:machine].config.tun.enabled is false
   let(:machine) do

data/spec/unit/command/log_success_or_fail_message_spec.rb

@@ -0,0 +1,52 @@
+# -*- encoding: utf-8 -*-
+# vim: set fileencoding=utf-8
+
+require 'spec_helper'
+require "vagrant-tun/command"
+
+describe VagrantTun::Command do
+  # create a fake app and env to pass into the VagrantTun::Command constructor
+  let(:app) { lambda { |env| } }
+  let(:env) { { :ui => ui } }
+
+  # pretend env contains the Vagrant ui element
+  let(:ui) do
+    double('ui').tap do |ui|
+      allow(ui).to receive(:info) { nil }
+      allow(ui).to receive(:error) { nil }
+    end
+  end
+
+  # instantiate class of which a method is to be tested
+  subject { described_class.new(app, env) }
+
+  # the method that we are going to test
+  describe "#log_success_or_fail_message" do
+
+    context "when success is true" do
+      it "logs the success message" do
+        # Check that the success message was logged
+        expect(ui).to receive(:info).once.with("Ensured the TUN module is loaded into the kernel.")
+
+	# Check that the failure message was not logged
+        expect(ui).to receive(:error).never
+
+        # perform the success call
+        subject.log_success_or_fail_message(env, true)
+      end
+    end
+
+    context "when success is false" do
+      it "logs the failure message" do
+        # Check that the failure message was logged
+        expect(ui).to receive(:error).once.with("Failed to load the TUN/TAP adapter. If you are running a custom kernel make sure you have the tun module enabled.")
+
+	# Check that the success message was not logged
+        expect(ui).to receive(:info).never
+
+        # perform the failure call
+        subject.log_success_or_fail_message(env, false)
+      end
+    end
+  end
+end

data/spec/unit/command/reboot_spec.rb

@@ -0,0 +1,68 @@
+# -*- encoding: utf-8 -*-
+# vim: set fileencoding=utf-8
+
+require 'spec_helper'
+require "vagrant-tun/command"
+
+describe VagrantTun::Command do
+  # create a fake app and env to pass into the VagrantTun::Command constructor
+  let(:app) { lambda { |env| } }
+  let(:env) { { :machine => machine,  :ui => ui } }
+
+  # pretend env contains the Vagrant ui element
+  let(:ui) do
+    double('ui').tap do |ui|
+      allow(ui).to receive(:info) { nil }
+    end
+  end
+
+  # pretend env[:machine].action and .communicate can be called
+  let(:machine) do
+    double('machine').tap do |machine|
+      allow(machine).to receive(:action) { action }
+      allow(machine).to receive(:communicate) { communicate }
+    end
+  end
+  let(:action) do
+    double('action').tap do |action|
+      allow(action).to receive(:reload) { reload }
+    end
+  end
+  let(:reload) { nil }
+  let(:communicate) do
+    double('communicate').tap do |communicate|
+      allow(communicate).to receive(:ready?) { ready }
+    end
+  end
+  let(:ready) { true }
+
+  # Stub all sleeps
+  before do
+    allow_any_instance_of(Object).to receive(:sleep)
+  end
+
+  # Call the method under test after every 'it'. Similar to setUp in Python TestCase
+  after do
+    subject.reboot(env)
+  end
+
+  # instantiate class of which a method is to be tested
+  subject { described_class.new(app, env) }
+
+  # the method that we are going to test
+  describe "#reboot" do
+
+    context "when machine is rebooted" do
+      it "logs the reboot message and reboots the machine" do
+        # Check that the reboot message was logged
+        expect(ui).to receive(:info).once.with("Rebooting because we couldn't load the tun module. Maybe the kernel was updated?")
+
+        # Check that the reload command was sent
+        expect(machine).to receive(:action).once.with(:reload)
+
+        # Check that we block wait until ready
+        expect(communicate).to receive(:ready?).once.and_return(false, false, true)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-tun
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,8 @@ files:
 - spec/unit/command/call_spec.rb
 - spec/unit/command/ensure_tun_available_spec.rb
 - spec/unit/command/iter_verify_adapter_spec.rb
+- spec/unit/command/log_success_or_fail_message_spec.rb
+- spec/unit/command/reboot_spec.rb
 - vagrant-tun.gemspec
 homepage: https://github.com/vdloo/vagrant-tun
 licenses: