vagrant-unbundled 1.9.7.1 → 1.9.8.1

data/test/unit/vagrant/util/downloader_test.rb

@@ -9,8 +9,8 @@ describe Vagrant::Util::Downloader do
 
   let(:subprocess_result) do
     double("subprocess_result").tap do |result|
-      result.stub(exit_code: exit_code)
-      result.stub(stderr: "")
+      allow(result).to receive(:exit_code).and_return(exit_code)
+      allow(result).to receive(:stderr).and_return("")
     end
   end
 
@@ -69,7 +69,7 @@ describe Vagrant::Util::Downloader do
           with("curl", *curl_options).
           and_return(subprocess_result)
 
-        expect(subject.download!).to be_true
+        expect(subject.download!).to be(true)
       end
     end
 
@@ -90,7 +90,7 @@ describe Vagrant::Util::Downloader do
           with("curl", *curl_options).
           and_return(subprocess_result)
 
-        expect(subject.download!).to be_true
+        expect(subject.download!).to be(true)
       end
     end
 
@@ -116,7 +116,7 @@ describe Vagrant::Util::Downloader do
             end
 
             it "should not raise an exception" do
-              expect(subject.download!).to be_true
+              expect(subject.download!).to be(true)
             end
           end
 
@@ -144,7 +144,7 @@ describe Vagrant::Util::Downloader do
           end
 
           it "should not raise an exception" do
-            expect(subject.download!).to be_true
+            expect(subject.download!).to be(true)
           end
         end
 
@@ -199,7 +199,7 @@ describe Vagrant::Util::Downloader do
     }
 
     it "returns the output" do
-      subprocess_result.stub(stdout: "foo")
+      allow(subprocess_result).to receive(:stdout).and_return("foo")
 
       options = curl_options.dup
       options.unshift("-I")

data/test/unit/vagrant/util/ssh_test.rb

@@ -67,7 +67,7 @@ describe Vagrant::Util::SSH do
 
       expect(described_class.exec(ssh_info)).to eq(nil)
       expect(Vagrant::Util::SafeExec).to have_received(:exec)
-        .with("ssh", "vagrant@localhost", "-p", "2222", "-o", "LogLevel=FATAL","-o", "Compression=yes", "-o", "DSAAuthentication=yes", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null", "-i", anything)
+        .with("ssh", "vagrant@localhost", "-p", "2222", "-o", "LogLevel=FATAL","-o", "Compression=yes", "-o", "DSAAuthentication=yes", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null", "-o", "IdentityFile=#{ssh_info[:private_key_path][0]}")
     end
 
     context "when disabling compression or dsa_authentication flags" do
@@ -85,7 +85,7 @@ describe Vagrant::Util::SSH do
 
         expect(described_class.exec(ssh_info)).to eq(nil)
         expect(Vagrant::Util::SafeExec).to have_received(:exec)
-          .with("ssh", "vagrant@localhost", "-p", "2222", "-o", "LogLevel=FATAL", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null", "-i", anything)
+          .with("ssh", "vagrant@localhost", "-p", "2222", "-o", "LogLevel=FATAL", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null", "-o", "IdentityFile=#{ssh_info[:private_key_path][0]}")
       end
     end
 
@@ -103,7 +103,7 @@ describe Vagrant::Util::SSH do
 
         expect(described_class.exec(ssh_info)).to eq(nil)
         expect(Vagrant::Util::SafeExec).to have_received(:exec)
-          .with("ssh", "vagrant@localhost", "-p", "2222", "-o", "LogLevel=FATAL", "-i", anything)
+          .with("ssh", "vagrant@localhost", "-p", "2222", "-o", "LogLevel=FATAL", "-o", "IdentityFile=#{ssh_info[:private_key_path][0]}")
       end
     end
 
@@ -140,7 +140,7 @@ describe Vagrant::Util::SSH do
 
         expect(described_class.exec(ssh_info)).to eq(nil)
         expect(Vagrant::Util::SafeExec).to have_received(:exec)
-          .with("ssh", "vagrant@localhost", "-p", "2222", "-o", "LogLevel=FATAL", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null", "-i", anything,"-o", "ForwardX11=yes", "-o", "ForwardX11Trusted=yes")
+          .with("ssh", "vagrant@localhost", "-p", "2222", "-o", "LogLevel=FATAL", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null", "-o", "IdentityFile=#{ssh_info[:private_key_path][0]}","-o", "ForwardX11=yes", "-o", "ForwardX11Trusted=yes")
       end
     end
 
@@ -158,7 +158,43 @@ describe Vagrant::Util::SSH do
 
         expect(described_class.exec(ssh_info)).to eq(nil)
         expect(Vagrant::Util::SafeExec).to have_received(:exec)
-          .with("ssh", "vagrant@localhost", "-p", "2222", "-o", "LogLevel=FATAL", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null", "-i", anything,"-o", "ForwardAgent=yes")
+          .with("ssh", "vagrant@localhost", "-p", "2222", "-o", "LogLevel=FATAL", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null", "-o", "IdentityFile=#{ssh_info[:private_key_path][0]}","-o", "ForwardAgent=yes")
+      end
+    end
+
+    context "when extra_args is provided as an array" do
+      let(:ssh_info) {{
+        host: "localhost",
+        port: 2222,
+        username: "vagrant",
+        private_key_path: [temporary_file],
+        extra_args: ["-L", "8008:localhost:80"]
+      }}
+
+      it "enables agent forwarding options" do
+        allow(Vagrant::Util::SafeExec).to receive(:exec).and_return(nil)
+
+        expect(described_class.exec(ssh_info)).to eq(nil)
+        expect(Vagrant::Util::SafeExec).to have_received(:exec)
+          .with("ssh", "vagrant@localhost", "-p", "2222", "-o", "LogLevel=FATAL", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null", "-o", "IdentityFile=#{ssh_info[:private_key_path][0]}", "-L", "8008:localhost:80")
+      end
+    end
+
+    context "when extra_args is provided as a string" do
+      let(:ssh_info) {{
+        host: "localhost",
+        port: 2222,
+        username: "vagrant",
+        private_key_path: [temporary_file],
+        extra_args: "-6"
+      }}
+
+      it "enables agent forwarding options" do
+        allow(Vagrant::Util::SafeExec).to receive(:exec).and_return(nil)
+
+        expect(described_class.exec(ssh_info)).to eq(nil)
+        expect(Vagrant::Util::SafeExec).to have_received(:exec)
+          .with("ssh", "vagrant@localhost", "-p", "2222", "-o", "LogLevel=FATAL", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null", "-o", "IdentityFile=#{ssh_info[:private_key_path][0]}", "-6")
       end
     end
 

data/test/unit/vagrant/util/subprocess_test.rb

@@ -52,14 +52,14 @@ describe Vagrant::Util::Subprocess do
     context "when subprocess has not been started" do
       it "should return false" do
         sp = described_class.new("ls")
-        expect(sp.running?).to be_false
+        expect(sp.running?).to be(false)
       end
     end
     context "when subprocess has completed" do
       it "should return false" do
         sp = described_class.new("ls")
         sp.execute
-        expect(sp.running?).to be_false
+        expect(sp.running?).to be(false)
       end
     end
     context "when subprocess is running" do
@@ -67,7 +67,7 @@ describe Vagrant::Util::Subprocess do
         sp = described_class.new("sleep", "5")
         thread = Thread.new{ sp.execute }
         sleep(0.3)
-        expect(sp.running?).to be_true
+        expect(sp.running?).to be(true)
         sp.stop
         thread.join
       end
@@ -78,7 +78,7 @@ describe Vagrant::Util::Subprocess do
     context "when subprocess has not been started" do
       it "should return false" do
         sp = described_class.new("ls")
-        expect(sp.stop).to be_false
+        expect(sp.stop).to be(false)
       end
     end
 
@@ -86,7 +86,7 @@ describe Vagrant::Util::Subprocess do
       it "should return false" do
         sp = described_class.new("ls")
         sp.execute
-        expect(sp.stop).to be_false
+        expect(sp.stop).to be(false)
       end
     end
 
@@ -95,7 +95,7 @@ describe Vagrant::Util::Subprocess do
       it "should return true" do
         thread = Thread.new{ sp.execute }
         sleep(0.1)
-        expect(sp.stop).to be_true
+        expect(sp.stop).to be(true)
         thread.join
       end
 
@@ -103,7 +103,7 @@ describe Vagrant::Util::Subprocess do
         thread = Thread.new{ sp.execute }
         sleep(0.1)
         sp.stop
-        expect(sp.running?).to be_false
+        expect(sp.running?).to be(false)
         thread.join
       end
     end

data/test/unit/vagrant_test.rb

@@ -59,31 +59,31 @@ describe Vagrant do
         name "i_am_installed"
       end
 
-      expect(described_class.has_plugin?("i_am_installed")).to be_true
+      expect(described_class.has_plugin?("i_am_installed")).to be(true)
     end
 
     it "should return false if the plugin is not installed" do
-      expect(described_class.has_plugin?("i_dont_exist")).to be_false
+      expect(described_class.has_plugin?("i_dont_exist")).to be(false)
     end
 
     it "finds plugins by gem name" do
       specs = [Gem::Specification.new]
       specs[0].name = "foo"
-      Vagrant::Plugin::Manager.instance.stub(installed_specs: specs)
+      allow(Vagrant::Plugin::Manager.instance).to receive(:installed_specs).and_return(specs)
 
-      expect(described_class.has_plugin?("foo")).to be_true
-      expect(described_class.has_plugin?("bar")).to be_false
+      expect(described_class.has_plugin?("foo")).to be(true)
+      expect(described_class.has_plugin?("bar")).to be(false)
     end
 
     it "finds plugins by gem name and version" do
       specs = [Gem::Specification.new]
       specs[0].name = "foo"
       specs[0].version = "1.2.3"
-      Vagrant::Plugin::Manager.instance.stub(installed_specs: specs)
+      allow(Vagrant::Plugin::Manager.instance).to receive(:installed_specs).and_return(specs)
 
-      expect(described_class.has_plugin?("foo", "~> 1.2.0")).to be_true
-      expect(described_class.has_plugin?("foo", "~> 1.0.0")).to be_false
-      expect(described_class.has_plugin?("bar", "~> 1.2.0")).to be_false
+      expect(described_class.has_plugin?("foo", "~> 1.2.0")).to be(true)
+      expect(described_class.has_plugin?("foo", "~> 1.0.0")).to be(false)
+      expect(described_class.has_plugin?("bar", "~> 1.2.0")).to be(false)
     end
   end
 

data/vagrant.gemspec

@@ -39,10 +39,11 @@ Gem::Specification.new do |s|
 
   # Constraint rake to properly handle deprecated method usage
   # from within rspec
-  s.add_development_dependency "rake", "~> 11.3.0"
+  s.add_development_dependency "rake", "~> 12.0.0"
   s.add_development_dependency "rspec", "~> 3.5.0"
+  s.add_development_dependency "rspec-its", "~> 1.2.0"
   s.add_development_dependency "webmock", "~> 1.20"
-  s.add_development_dependency "fake_ftp", "~> 0.1"
+  s.add_development_dependency "fake_ftp", "~> 0.1.1"
 
   # The following block of code determines the files that should be included
   # in the gem. It does this by reading all the files in the directory where

data/vendor/bundle/ruby/2.4.0/bundler/gems/vagrant-spec-af86757912f7/vagrant-spec.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Mitchell Hashimoto".freeze]
-  s.date = "2017-08-14"
+  s.date = "2017-08-31"
   s.description = "Tool and library for testing Vagrant plugins".freeze
   s.email = ["mitchell.hashimoto@gmail.com".freeze]
   s.executables = ["vagrant-spec".freeze]

data/vendor/bundle/ruby/2.4.0/gems/fake_ftp-0.1.1/.gitignore

@@ -0,0 +1,7 @@
+.idea
+pkg/*
+*.gem
+.bundle
+.DS_Store
+.rbenv-version
+.rbenv-gemsets

data/vendor/bundle/ruby/2.4.0/gems/fake_ftp-0.1.1/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/vendor/bundle/ruby/2.4.0/gems/fake_ftp-0.1.1/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - 1.8.7

data/vendor/bundle/ruby/2.4.0/gems/fake_ftp-0.1.1/CONTRIBUTORS.md

@@ -0,0 +1,19 @@
+Contributors
+============
+
+* Eric Saxby - @sax
+
+* Ben Ashford
+* Colin Shield
+* Eirik Lied
+* Eric Oestrich
+* Jacob Maine
+* John Maxwell
+* Kevin Thompson
+* liehann
+* mdalton
+* Nick Rowe
+* Pranas Kiziela
+* Puneet Goyal
+* Steve Thompson
+* Thomas Sonntag

data/vendor/bundle/ruby/2.4.0/gems/fake_ftp-0.1.1/Gemfile

@@ -0,0 +1,12 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in fake_ftp.gemspec
+gemspec
+
+group :test do
+  gem "rspec", '>2'
+  gem "rake", '>=0.8.7'
+
+  gem "guard-rspec"
+  gem 'pry-nav'
+end

data/vendor/bundle/ruby/2.4.0/gems/fake_ftp-0.1.1/Gemfile.lock

@@ -0,0 +1,44 @@
+PATH
+  remote: .
+  specs:
+    fake_ftp (0.1.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    coderay (1.0.9)
+    diff-lcs (1.2.4)
+    ffi (1.0.11)
+    guard (1.0.1)
+      ffi (>= 0.5.0)
+      thor (~> 0.14.6)
+    guard-rspec (0.6.0)
+      guard (>= 0.10.0)
+    method_source (0.8.2)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry-nav (0.2.3)
+      pry (~> 0.9.10)
+    rake (0.9.2.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    slop (3.4.6)
+    thor (0.14.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fake_ftp!
+  guard-rspec
+  pry-nav
+  rake (>= 0.8.7)
+  rspec (> 2)

data/vendor/bundle/ruby/2.4.0/gems/fake_ftp-0.1.1/Guardfile

@@ -0,0 +1,10 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec', :version => 2 do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+end
+

data/vendor/bundle/ruby/2.4.0/gems/fake_ftp-0.1.1/README.md

@@ -0,0 +1,134 @@
+FakeFtp
+=======
+
+[![Build status](https://secure.travis-ci.org/livinginthepast/fake_ftp.png)](http://travis-ci.org/livinginthepast/fake_ftp)
+
+This is a gem that allows you to test FTP implementations in ruby. It is 
+a minimal single-client FTP server that can be bound to any arbitrary 
+port on localhost.
+
+
+## Why?
+
+We want to ensure that our code works, in a way that is agnostic to the 
+implementation used (unlike with stubs or mocks).
+
+
+## How
+
+FakeFtp is a simple FTP server that fakes out enough of the protocol to 
+get us by, allowing us to test that files get to their intended destination 
+rather than testing how our code does so.
+
+
+## Usage
+
+To test passive upload:
+``` ruby
+require 'fake_ftp'
+require 'net/ftp'
+
+server = FakeFtp::Server.new(21212, 21213)
+## 21212 is the control port, which is used by FTP for the primary connection
+## 21213 is the data port, used in FTP passive mode to send file contents
+server.start
+
+ftp = Net::FTP.new
+ftp.connect('127.0.0.1', 21212)
+ftp.login('user', 'password')
+ftp.passive = true
+ftp.put('some_file.txt')
+ftp.close
+
+server.files.should include('some_file.txt')
+server.file('some_file.txt').bytes.should == 25
+server.file('some_file.txt').should be_passive
+server.file('some_file.txt').should_not be_active
+
+server.stop
+```
+
+To test active upload:
+``` ruby
+server = FakeFtp::Server.new(21212)
+## 21212 is the control port, which is used by FTP for the primary connection
+## 21213 is the data port, used in FTP passive mode to send file contents
+server.start
+
+ftp = Net::FTP.new
+ftp.connect('127.0.0.1', 21212)
+ftp.login('user', 'password')
+ftp.passive = false
+ftp.put('some_file.txt')
+ftp.close
+
+server.files.should include('some_file.txt')
+server.file('some_file.txt').bytes.should == 25
+server.file('some_file.txt').should be_active
+server.file('some_file.txt').should_not be_passive
+
+server.stop
+```
+
+Note that many FTP clients default to active, unless specified otherwise.
+
+
+## Caveats
+
+This is *not* a real FTP server and should not be treated as one. The goal 
+of this gem is not to create a thread-safe multi-client implementation.
+It is best used to unit test models that generate files and transfer
+them to an FTP server.
+
+As such, there are some things that won't be accepted upstream from pull
+requests:
+* simultaneous multi-client code
+* support for long term file persistence
+* binding to arbitrary IPs
+* global state beyond that required to pass the minimum required to
+  generate passing tests
+
+
+## Recommendations for testing patterns
+
+*Separate configuration from code.* Do not hard code the IP address,
+FQDN or port of an FTP server in your classes. It introduces fragility
+into your tests. Also, the default FTP port of 21 is a privileged port,
+and should be avoided.
+
+*Separate the code that generates files from the code that uploads
+files.* You tests will run much more quickly if you only try to upload
+small files. If you have tests showing that you generate correct files
+from your data, then you can trust that. Why do you need to upload a 20M
+file in your tests if you can stub out your file generation method and
+test file upload against 10 bytes? Fast fast fast.
+
+
+## References
+
+* http://rubyforge.org/projects/ftpd/ - a simple ftp daemon written by Chris Wanstrath
+* http://ruby-doc.org/stdlib/libdoc/gserver/rdoc/index.html - a generic server in the Ruby standard library, by John W Small
+
+## License
+
+The MIT License
+
+Copyright (c) 2011 Eric Saxby
+
+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.