vagrant-unbundled 1.8.4.2 → 1.8.5.1

data/test/unit/plugins/guests/redhat/cap/configure_networks_test.rb

@@ -7,13 +7,12 @@ describe "VagrantPlugins::GuestRedHat::Cap::ConfigureNetworks" do
       .guest_capabilities[:redhat]
   end
 
-  let(:machine) { double("machine") }
+  let(:guest) { double("guest") }
+  let(:machine) { double("machine", guest: guest) }
   let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
 
   before do
     allow(machine).to receive(:communicate).and_return(comm)
-    comm.stub_command("ifconfig -a | grep -o ^[0-9a-z]* | grep -v '^lo'",
-      stdout: "eth1\neth2")
   end
 
   after do
@@ -23,6 +22,16 @@ describe "VagrantPlugins::GuestRedHat::Cap::ConfigureNetworks" do
   describe ".configure_networks" do
     let(:cap) { caps.get(:configure_networks) }
 
+    before do
+      allow(guest).to receive(:capability)
+        .with(:network_scripts_dir)
+        .and_return("/scripts")
+
+      allow(guest).to receive(:capability)
+        .with(:network_interfaces)
+        .and_return(["eth1", "eth2"])
+    end
+
     let(:network_1) do
       {
         interface: 0,
@@ -40,41 +49,16 @@ describe "VagrantPlugins::GuestRedHat::Cap::ConfigureNetworks" do
       }
     end
 
-    let(:network_scripts_dir) { "/" }
-
-    let(:capability) { double("capability") }
-
-    before do
-      allow(machine).to receive(:guest).and_return(capability)
-      allow(capability).to receive(:capability)
-        .with(:network_scripts_dir)
-        .and_return(network_scripts_dir)
-    end
-
-    it "uses fedora for rhel7 configuration" do
-      require_relative "../../../../../../plugins/guests/fedora/cap/configure_networks"
-
-      allow(capability).to receive(:capability)
-        .with(:flavor)
-        .and_return(:rhel_7)
-      allow(VagrantPlugins::GuestFedora::Cap::ConfigureNetworks)
-        .to receive(:configure_networks)
-
-      expect(VagrantPlugins::GuestFedora::Cap::ConfigureNetworks)
-        .to receive(:configure_networks).once
-      cap.configure_networks(machine, [network_1, network_2])
-    end
-
     it "creates and starts the networks" do
-      allow(capability).to receive(:capability)
+      allow(guest).to receive(:capability)
         .with(:flavor)
         .and_return(:rhel)
 
       cap.configure_networks(machine, [network_1, network_2])
-      expect(comm.received_commands[1]).to match(/\/sbin\/ifdown 'eth1'/)
-      expect(comm.received_commands[1]).to match(/\/sbin\/ifup 'eth1'/)
-      expect(comm.received_commands[1]).to match(/\/sbin\/ifdown 'eth2'/)
-      expect(comm.received_commands[1]).to match(/\/sbin\/ifup 'eth2'/)
+      expect(comm.received_commands[0]).to match(/\/sbin\/ifdown 'eth1'/)
+      expect(comm.received_commands[0]).to match(/\/sbin\/ifup 'eth1'/)
+      expect(comm.received_commands[0]).to match(/\/sbin\/ifdown 'eth2'/)
+      expect(comm.received_commands[0]).to match(/\/sbin\/ifup 'eth2'/)
     end
   end
 end

data/test/unit/plugins/guests/slackware/cap/change_host_name_test.rb

@@ -24,7 +24,7 @@ describe "VagrantPlugins::GuestSlackware::Cap::ChangeHostName" do
     let(:name) { "banana-rama.example.com" }
 
     it "sets the hostname" do
-      comm.stub_command("hostname -f | grep -w '#{name}'", exit_code: 1)
+      comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 1)
 
       cap.change_host_name(machine, name)
       expect(comm.received_commands[1]).to match(/echo '#{name}' > \/etc\/hostname/)
@@ -32,7 +32,7 @@ describe "VagrantPlugins::GuestSlackware::Cap::ChangeHostName" do
     end
 
     it "does not change the hostname if already set" do
-      comm.stub_command("hostname -f | grep -w '#{name}'", exit_code: 0)
+      comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 0)
       cap.change_host_name(machine, name)
       expect(comm.received_commands.size).to eq(1)
     end

data/test/unit/plugins/guests/slackware/cap/configure_networks_test.rb

@@ -7,13 +7,12 @@ describe "VagrantPlugins::GuestSlackware::Cap::ConfigureNetworks" do
       .guest_capabilities[:slackware]
   end
 
-  let(:machine) { double("machine") }
+  let(:guest) { double("guest") }
+  let(:machine) { double("machine", guest: guest) }
   let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
 
   before do
     allow(machine).to receive(:communicate).and_return(comm)
-    comm.stub_command("ip -o -0 addr | grep -v LOOPBACK | awk '{print $2}' | sed 's/://'",
-      stdout: "eth1\neth2")
   end
 
   after do
@@ -23,6 +22,11 @@ describe "VagrantPlugins::GuestSlackware::Cap::ConfigureNetworks" do
   describe ".configure_networks" do
     let(:cap) { caps.get(:configure_networks) }
 
+    before do
+      allow(guest).to receive(:capability).with(:network_interfaces)
+        .and_return(["eth1", "eth2"])
+    end
+
     let(:network_1) do
       {
         interface: 0,
@@ -42,7 +46,7 @@ describe "VagrantPlugins::GuestSlackware::Cap::ConfigureNetworks" do
 
     it "creates and starts the networks" do
       cap.configure_networks(machine, [network_1, network_2])
-      expect(comm.received_commands[1]).to match(/\/etc\/rc.d\/rc.inet1/)
+      expect(comm.received_commands[0]).to match(/\/etc\/rc.d\/rc.inet1/)
     end
   end
 end

data/test/unit/plugins/guests/suse/cap/change_host_name_test.rb

@@ -24,7 +24,7 @@ describe "VagrantPlugins::GuestSUSE::Cap::ChangeHostName" do
     let(:name) { "banana-rama.example.com" }
 
     it "sets the hostname" do
-      comm.stub_command("hostname -f | grep -w '#{name}'", exit_code: 1)
+      comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 1)
 
       cap.change_host_name(machine, name)
       expect(comm.received_commands[1]).to match(/echo '#{name}' > \/etc\/HOSTNAME/)
@@ -32,7 +32,7 @@ describe "VagrantPlugins::GuestSUSE::Cap::ChangeHostName" do
     end
 
     it "does not change the hostname if already set" do
-      comm.stub_command("hostname -f | grep -w '#{name}'", exit_code: 0)
+      comm.stub_command("hostname -f | grep '^#{name}$'", exit_code: 0)
       cap.change_host_name(machine, name)
       expect(comm.received_commands.size).to eq(1)
     end

data/test/unit/plugins/guests/suse/cap/configure_networks_test.rb

@@ -7,13 +7,12 @@ describe "VagrantPlugins::GuestSUSE::Cap::ConfigureNetworks" do
       .guest_capabilities[:suse]
   end
 
-  let(:machine) { double("machine") }
+  let(:guest) { double("guest") }
+  let(:machine) { double("machine", guest: guest) }
   let(:comm) { VagrantTests::DummyCommunicator::Communicator.new(machine) }
 
   before do
     allow(machine).to receive(:communicate).and_return(comm)
-    comm.stub_command("ip -o -0 addr | grep -v LOOPBACK | awk '{print $2}' | sed 's/://'",
-      stdout: "eth1\neth2")
   end
 
   after do
@@ -23,6 +22,13 @@ describe "VagrantPlugins::GuestSUSE::Cap::ConfigureNetworks" do
   describe ".configure_networks" do
     let(:cap) { caps.get(:configure_networks) }
 
+    before do
+      allow(guest).to receive(:capability).with(:network_scripts_dir)
+        .and_return("/scripts")
+      allow(guest).to receive(:capability).with(:network_interfaces)
+        .and_return(["eth1", "eth2"])
+    end
+
     let(:network_1) do
       {
         interface: 0,
@@ -40,21 +46,12 @@ describe "VagrantPlugins::GuestSUSE::Cap::ConfigureNetworks" do
       }
     end
 
-    let(:guest) { double("guest") }
-
-    before do
-      allow(machine).to receive(:guest).and_return(guest)
-      allow(guest).to receive(:capability)
-        .with(:network_scripts_dir)
-        .and_return("/scripts")
-    end
-
     it "creates and starts the networks" do
       cap.configure_networks(machine, [network_1, network_2])
-      expect(comm.received_commands[1]).to match(/\/sbin\/ifdown 'eth1'/)
-      expect(comm.received_commands[1]).to match(/\/sbin\/ifup 'eth1'/)
-      expect(comm.received_commands[1]).to match(/\/sbin\/ifdown 'eth2'/)
-      expect(comm.received_commands[1]).to match(/\/sbin\/ifup 'eth2'/)
+      expect(comm.received_commands[0]).to match(/\/sbin\/ifdown 'eth1'/)
+      expect(comm.received_commands[0]).to match(/\/sbin\/ifup 'eth1'/)
+      expect(comm.received_commands[0]).to match(/\/sbin\/ifdown 'eth2'/)
+      expect(comm.received_commands[0]).to match(/\/sbin\/ifup 'eth2'/)
     end
   end
 end

data/test/unit/plugins/kernel_v2/config/vm_test.rb

@@ -75,9 +75,17 @@ describe VagrantPlugins::Kernel_V2::VMConfig do
 
   context "#box_check_update" do
     it "defaults to true" do
-      subject.finalize!
+      with_temp_env("VAGRANT_BOX_UPDATE_CHECK_DISABLE" => "") do
+        subject.finalize!
+        expect(subject.box_check_update).to be(true)
+      end
+    end
 
-      expect(subject.box_check_update).to be_true
+    it "is false if VAGRANT_BOX_UPDATE_CHECK_DISABLE is set" do
+      with_temp_env("VAGRANT_BOX_UPDATE_CHECK_DISABLE" => "1") do
+        subject.finalize!
+        expect(subject.box_check_update).to be(false)
+      end
     end
   end
 

data/test/unit/templates/guests/arch/network_static_test.rb

@@ -7,8 +7,9 @@ describe "templates/guests/arch/network_static" do
 
   it "renders the template" do
     result = Vagrant::Util::TemplateRenderer.render(template, options: {
-      device: "eth1",
-      ip:     "1.1.1.1",
+      device:  "eth1",
+      ip:      "1.1.1.1",
+      netmask: "24",
     })
     expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
       Connection=ethernet
@@ -24,6 +25,7 @@ describe "templates/guests/arch/network_static" do
       device:  "eth1",
       ip:      "1.1.1.1",
       gateway: "1.2.3.4",
+      netmask: "24",
     })
     expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
       Connection=ethernet

data/test/unit/templates/guests/gentoo/network_dhcp_test.rb

@@ -7,12 +7,12 @@ describe "templates/guests/gentoo/network_dhcp" do
 
   it "renders the template" do
     result = Vagrant::Util::TemplateRenderer.render(template, options: {
-      interface: "en0",
+      device: "en0",
     })
     expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
       #VAGRANT-BEGIN
       # The contents below are automatically generated by Vagrant. Do not modify.
-      config_ethen0="dhcp"
+      config_en0="dhcp"
       #VAGRANT-END
     EOH
   end

data/test/unit/templates/guests/gentoo/network_static_test.rb

@@ -7,30 +7,30 @@ describe "templates/guests/gentoo/network_static" do
 
   it "renders the template" do
     result = Vagrant::Util::TemplateRenderer.render(template, options: {
-      interface: "en0",
-      ip:        "1.1.1.1",
-      netmask:   "255.255.0.0",
+      device:  "en0",
+      ip:      "1.1.1.1",
+      netmask: "255.255.0.0",
     })
     expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
       #VAGRANT-BEGIN
       # The contents below are automatically generated by Vagrant. Do not modify.
-      config_ethen0=("1.1.1.1 netmask 255.255.0.0")
+      config_en0=("1.1.1.1 netmask 255.255.0.0")
       #VAGRANT-END
     EOH
   end
 
   it "includes the gateway" do
     result = Vagrant::Util::TemplateRenderer.render(template, options: {
-      interface: "en0",
-      ip:        "1.1.1.1",
-      netmask:   "255.255.0.0",
-      gateway:   "1.2.3.4",
+      device:  "en0",
+      ip:      "1.1.1.1",
+      netmask: "255.255.0.0",
+      gateway: "1.2.3.4",
     })
     expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
       #VAGRANT-BEGIN
       # The contents below are automatically generated by Vagrant. Do not modify.
-      config_ethen0=("1.1.1.1 netmask 255.255.0.0")
-      gateways_ethen0="1.2.3.4"
+      config_en0=("1.1.1.1 netmask 255.255.0.0")
+      gateways_en0="1.2.3.4"
       #VAGRANT-END
     EOH
   end

data/test/unit/templates/guests/redhat/network_dhcp_test.rb

@@ -7,14 +7,14 @@ describe "templates/guests/redhat/network_dhcp" do
 
   it "renders the template" do
     result = Vagrant::Util::TemplateRenderer.render(template, options: {
-      interface: "en0",
+      device: "en0",
     })
     expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
       #VAGRANT-BEGIN
       # The contents below are automatically generated by Vagrant. Do not modify.
       BOOTPROTO=dhcp
       ONBOOT=yes
-      DEVICE=ethen0
+      DEVICE=en0
       #VAGRANT-END
     EOH
   end

data/test/unit/templates/guests/redhat/network_static_test.rb

@@ -7,9 +7,9 @@ describe "templates/guests/redhat/network_static" do
 
   it "renders the template" do
     result = Vagrant::Util::TemplateRenderer.render(template, options: {
-      interface: "en0",
-      ip:        "1.1.1.1",
-      netmask:   "255.255.0.0",
+      device:  "en0",
+      ip:      "1.1.1.1",
+      netmask: "255.255.0.0",
     })
     expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
       #VAGRANT-BEGIN
@@ -19,7 +19,7 @@ describe "templates/guests/redhat/network_static" do
       ONBOOT=yes
       IPADDR=1.1.1.1
       NETMASK=255.255.0.0
-      DEVICE=ethen0
+      DEVICE=en0
       PEERDNS=no
       #VAGRANT-END
     EOH
@@ -27,10 +27,10 @@ describe "templates/guests/redhat/network_static" do
 
   it "includes the gateway" do
     result = Vagrant::Util::TemplateRenderer.render(template, options: {
-      interface:  "en0",
-      ip:         "1.1.1.1",
-      gateway:    "1.2.3.4",
-      netmask:    "255.255.0.0",
+      device:   "en0",
+      ip:       "1.1.1.1",
+      gateway:  "1.2.3.4",
+      netmask:  "255.255.0.0",
     })
     expect(result).to eq <<-EOH.gsub(/^ {6}/, "")
       #VAGRANT-BEGIN
@@ -40,7 +40,7 @@ describe "templates/guests/redhat/network_static" do
       ONBOOT=yes
       IPADDR=1.1.1.1
       NETMASK=255.255.0.0
-      DEVICE=ethen0
+      DEVICE=en0
       GATEWAY=1.2.3.4
       PEERDNS=no
       #VAGRANT-END

data/vagrant.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary       = "Build and distribute virtualized development environments."
   s.description   = "Vagrant is a tool for building and distributing virtualized development environments."
 
-  s.required_ruby_version     = ">= 2.0.0"
+  s.required_ruby_version     = "~> 2.2"
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "vagrant"
 
@@ -24,14 +24,14 @@ Gem::Specification.new do |s|
   s.add_dependency "childprocess", "~> 0.5.0"
   s.add_dependency "erubis", "~> 2.7.0"
   s.add_dependency "i18n", ">= 0.6.0", "<= 0.8.0"
-  s.add_dependency "listen", "~> 3.0.2"
+  s.add_dependency "listen", "~> 3.1.5"
   s.add_dependency "hashicorp-checkpoint", "~> 0.1.1"
   s.add_dependency "log4r", "~> 1.1.9", "< 1.1.11"
   s.add_dependency "net-ssh", "~> 3.0.1"
   s.add_dependency "net-sftp", "~> 2.1"
   s.add_dependency "net-scp", "~> 1.2.1"
   s.add_dependency "rb-kqueue", "~> 0.2.0"
-  s.add_dependency "rest-client", ">= 1.6.0", "< 2.0"
+  s.add_dependency "rest-client", ">= 1.6.0", "< 3.0"
   s.add_dependency "wdm", "~> 0.1.0"
   s.add_dependency "winrm", "~> 1.6"
   s.add_dependency "winrm-fs", "~> 0.3.0"

data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/CHANGELOG.md

@@ -0,0 +1 @@
+# Moved to [GitHub releases](https://github.com/guard/listen/releases) page.

data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/CONTRIBUTING.md

@@ -0,0 +1,38 @@
+Contribute to Listen
+===================
+
+File an issue
+-------------
+
+If you haven't already, first see [TROUBLESHOOTING](https://github.com/guard/listen/wiki/Troubleshooting) for known issues, solutions and workarounds.
+
+You can report bugs and feature requests to [GitHub Issues](https://github.com/guard/listen/issues).
+
+**Please don't ask question in the issue tracker**, instead ask them in our
+[Google group](http://groups.google.com/group/guard-dev) or on `#guard` (irc.freenode.net).
+
+Try to figure out where the issue belongs to: Is it an issue with Listen itself or with Guard?
+
+
+**It's most likely that your bug gets resolved faster if you provide as much information as possible!**
+
+The MOST useful information is debugging output from Listen (`LISTEN_GEM_DEBUGGING=1`) - see [TROUBLESHOOTING](https://github.com/guard/listen/wiki/Troubleshooting) for details.
+
+
+Development
+-----------
+
+* Documentation hosted at [RubyDoc](http://rubydoc.info/github/guard/listen/master/frames).
+* Source hosted at [GitHub](https://github.com/guard/listen).
+
+Pull requests are very welcome! Please try to follow these simple rules if applicable:
+
+* Please create a topic branch for every separate change you make.
+* Make sure your patches are well tested. All specs run with `rake spec` must pass.
+* Update the [Yard](http://yardoc.org/) documentation.
+* Update the [README](https://github.com/guard/listen/blob/master/README.md).
+* Update the [CHANGELOG](https://github.com/guard/listen/blob/master/CHANGELOG.md) for noteworthy changes.
+* Please **do not change** the version number.
+
+For questions please join us in our [Google group](http://groups.google.com/group/guard-dev) or on
+`#guard` (irc.freenode.net).

data/vendor/bundle/ruby/2.3.0/gems/listen-3.1.5/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Thibaud Guillaume-Gentil
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.