kitchen-vagrant 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0217562d1cdfdc41b66c913b4fd79cf11719b457
-  data.tar.gz: 6d99a767f3dc6154a3b5019c2bc72cf5525acbb1
+  metadata.gz: aa2fafbce94824f6ab027a6c789c348f632b1f73
+  data.tar.gz: 8c9e54c05057b57e46906e737c7a04c20101ede1
 SHA512:
-  metadata.gz: 5fe5750855c7efd561e4643886213a8855d8bbeee9e2755b8bd7fd1c394d60cc677e34dabc403afa14f47b9a93c77d4541dda6fd3b3676b83d9fceaa294ea09d
-  data.tar.gz: f124d452f8d77fec21cb7f2b9ded0ebde8035dc7e30b324325978ebcb4ca02db1912a0e1888229da2f72c35f8f7b8f52e96e2a936769784ddea720bddd21f8b2
+  metadata.gz: 21d53d3e3fa7bb48da1bf39d2af83cffeecea6c2d1fbf444ba188eaeb52650a6db05fdb19b552f3e27b3f2d61a2061c4059919a77fb9a3d30d9077345edee5ae
+  data.tar.gz: abacc35c6a871434db004664a72d88547d008ec9f5b9d3154ba404003233bfbf0e812ac4d1ebf82aa0c4f8ae0d35429ba4fabd995ce32e6142167fed6e430f92

data/.rspec

@@ -0,0 +1,2 @@
+--color
+-fd

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+## 0.19.0 / 2015-09-18
+
+### Bug fixes
+
+* Pull request [#163][]: Properly quote `config[:ssh]` values. ([@zuazo][])
+* Pull request [#191][], pull request [#197][], issue [#190][]: Escape Bundler environment when shelling out to `vagrant` command. ([@ksubrama][], [@tknerr][])
+
+### New features
+
+* Pull request 172, issue [#171][]: Add support for OpenStack provider. ([@xmik][])
+
+### Improvements
+
+* Pull request [#174][]: Correct grammer error in README. ([@albsOps][])
+* Support running unit test suite on Windows ([@ksubrama][])
+
+
 ## 0.18.0 / 2015-05-07
 
 ### Bug fixes
@@ -72,7 +89,7 @@
 
 ### New features
 
-* Pull request $84: Add support for Parallels provider. ([@jhx][])
+* Pull request [#84][]: Add support for Parallels provider. ([@jhx][])
 * Pull request [#107][]: Add support for libvirt provider. ([@bradleyd][])
 * Pull request [#128][]: Add support for LXC provider. ([@tknerr][])
 * Pull request [#142][]: Add support for managed-servers provider. ([@kbruner][])
@@ -314,12 +331,19 @@ The initial release.
 [#157]: https://github.com/test-kitchen/kitchen-vagrant/issues/157
 [#158]: https://github.com/test-kitchen/kitchen-vagrant/issues/158
 [#161]: https://github.com/test-kitchen/kitchen-vagrant/issues/161
+[#163]: https://github.com/test-kitchen/kitchen-vagrant/issues/163
 [#166]: https://github.com/test-kitchen/kitchen-vagrant/issues/166
+[#171]: https://github.com/test-kitchen/kitchen-vagrant/issues/171
+[#174]: https://github.com/test-kitchen/kitchen-vagrant/issues/174
+[#190]: https://github.com/test-kitchen/kitchen-vagrant/issues/190
+[#191]: https://github.com/test-kitchen/kitchen-vagrant/issues/191
+[#197]: https://github.com/test-kitchen/kitchen-vagrant/issues/197
 [@Annih]: https://github.com/Annih
 [@Igorshp]: https://github.com/Igorshp
 [@RobertRehberg]: https://github.com/RobertRehberg
 [@TheDude05]: https://github.com/TheDude05
 [@albertsj1]: https://github.com/albertsj1
+[@albsOps]: https://github.com/albsOps
 [@alex-slynko-wonga]: https://github.com/alex-slynko-wonga
 [@antonio-osorio]: https://github.com/antonio-osorio
 [@arangamani]: https://github.com/arangamani
@@ -338,6 +362,7 @@ The initial release.
 [@josephholsten]: https://github.com/josephholsten
 [@kbruner]: https://github.com/kbruner
 [@keiths-osc]: https://github.com/keiths-osc
+[@ksubrama]: https://github.com/ksubrama
 [@manul]: https://github.com/manul
 [@martinisoft]: https://github.com/martinisoft
 [@mattray]: https://github.com/mattray
@@ -352,3 +377,5 @@ The initial release.
 [@tmatilai]: https://github.com/tmatilai
 [@vinyar]: https://github.com/vinyar
 [@whiteley]: https://github.com/whiteley
+[@xmik]: https://github.com/xmik
+[@zuazo]: https://github.com/zuazo

data/README.md

@@ -129,7 +129,7 @@ Many host wide defaults for Vagrant can be set using `$HOME/.vagrant.d/Vagrantfi
 details, please read the Vagrant [machine settings][vagrant_machine_settings]
 page.
 
-The default will be computed from the platform name of the instance. Howver, for a small number of common/known platforms in the [Bento][bento] project, the default will prepend `"opscode-"` to the start to match the downloadable `box_url` (see below).
+The default will be computed from the platform name of the instance. However, for a small number of common/known platforms in the [Bento][bento] project, the default will prepend `"opscode-"` to the start to match the downloadable `box_url` (see below).
 
 For example, a platform with a Bento box called "ubuntu-14.04" will produce a
 default `box` value of `"opscode-ubuntu-14.04"`. Alternatively, a box called

data/lib/kitchen/driver/vagrant.rb

@@ -310,11 +310,36 @@ module Kitchen
       # * `:log_subject` defaults to a String representation of the Driver's
       #   class name
       #
+      # Since vagrant does not support being run through bundler, we escape
+      # any bundler environment should we detect one.  Otherwise, subcommands
+      # will inherit our bundled environment.
+      # @see https://github.com/test-kitchen/kitchen-vagrant/issues/190
       # @see Kitchen::ShellOut#run_command
       def run_command(cmd, options = {})
         merged = {
-          :use_sudo => config[:use_sudo], :log_subject => name
+          :use_sudo => config[:use_sudo],
+          :log_subject => name,
+          :environment => {}
         }.merge(options)
+
+        # Attempt to extract bundler and associated GEM related values.
+        # TODO: To this accurately, we'd need to create a test-kitchen
+        # launch wrapper that serializes the existing environment before
+        # bundler touches it so that we can go back to it. Since that is
+        # "A Hard Problem"(TM), we simply blow away all known bundler
+        # related changes.
+        env = merged[:environment]
+        %w[BUNDLE_BIN_PATH BUNDLE_GEMFILE GEM_HOME GEM_PATH GEM_ROOT RUBYLIB
+           RUBYOPT _ORIGINAL_GEM_PATH].each do |var|
+          env[var] = nil
+        end
+        gem_home = ENV["GEM_HOME"]
+        if gem_home && (env["PATH"] || ENV["PATH"])
+          env["PATH"] ||= ENV["PATH"].dup if ENV["PATH"]
+          gem_bin = File.join(gem_home, "bin") + File::PATH_SEPARATOR
+          env["PATH"][gem_bin] = "" if env["PATH"].include?(gem_bin)
+        end
+
         super(cmd, merged)
       end
 

data/lib/kitchen/driver/vagrant_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Vagrant Kitchen driver
-    VAGRANT_VERSION = "0.18.0"
+    VAGRANT_VERSION = "0.19.0"
   end
 end

data/spec/kitchen/driver/vagrant_spec.rb

@@ -61,7 +61,17 @@ describe Kitchen::Driver::Vagrant do
     )
   end
 
-  before { stub_const("ENV", env) }
+  module RunCommandStub
+    def run_command(_cmd, options = {})
+      options
+    end
+  end
+
+  before(:all) do
+    Kitchen::Driver::Vagrant.instance_eval { include RunCommandStub }
+  end
+
+  before(:each) { stub_const("ENV", env) }
 
   after do
     driver_object.class.send(:winrm_plugin_passed=, nil)
@@ -77,6 +87,64 @@ describe Kitchen::Driver::Vagrant do
       Kitchen::Driver::VAGRANT_VERSION)
   end
 
+  describe "#run_command" do
+
+    context "when invoked from a clean environment" do
+
+      it "passes through environment variables" do
+        options = driver.send(
+          :run_command,
+          "cmd",
+          :environment => { "EV1" => "Val1", "EV2" => "Val2" })
+        expect(options[:environment]["EV1"]).to eq("Val1")
+        expect(options[:environment]["EV2"]).to eq("Val2")
+      end
+
+      it "leaves path alone" do
+        path = "/foo/#{File::PATH_SEPARATOR}/bar"
+        options = driver.send(
+          :run_command,
+          "cmd",
+          :environment => { "PATH" => path })
+        expect(options[:environment]["PATH"]).to eq(path)
+      end
+
+    end
+
+    context "when invoked from a bundler[:environment]" do
+
+      let(:bundler_env) do
+        {
+          "BUNDLE_BIN_PATH" => "bundle_bin_path",
+          "BUNDLE_GEMFILE" => "bundle_gem_file",
+          "GEM_HOME" => "gem_home",
+          "GEM_PATH" => "gem_path",
+          "GEM_ROOT" => "gem_root",
+          "RUBYLIB" => "ruby_lib",
+          "RUBYOPT" => "ruby_opt",
+          "_ORIGINAL_GEM_PATH" => "original_gem_path"
+        }
+      end
+
+      it "removes all bundler related variables" do
+        env.merge!(bundler_env)
+        options = driver.send(:run_command, "cmd")
+        bundler_env.each do |k, _v|
+          expect(options[:environment]).to include(k)
+          expect(options[:environment][k]).to eq(nil)
+        end
+      end
+
+      it "fixes path if it notices gem_home in it" do
+        env.merge!(bundler_env)
+        env["PATH"] = "gem_home/bin#{File::PATH_SEPARATOR}/something/else"
+        options = driver.send(:run_command, "cmd")
+        puts(options)
+        expect(options[:environment]["PATH"]).to eq("/something/else")
+      end
+    end
+  end
+
   describe "configuration" do
 
     %W[centos debian fedora opensuse ubuntu].each do |name|
@@ -252,7 +320,7 @@ describe Kitchen::Driver::Vagrant do
       ]
 
       expect(driver[:synced_folders]).to eq([
-        ["/host_path", "/vm_path", "create: true, type: :nfs"]
+        [File.expand_path("/host_path"), "/vm_path", "create: true, type: :nfs"]
       ])
     end
 
@@ -262,7 +330,7 @@ describe Kitchen::Driver::Vagrant do
       ]
 
       expect(driver[:synced_folders]).to eq([
-        ["/root/suitey-fooos-99", "/vm_path", "stuff"]
+        [File.expand_path("/root/suitey-fooos-99"), "/vm_path", "stuff"]
       ])
     end
 
@@ -272,7 +340,7 @@ describe Kitchen::Driver::Vagrant do
       ]
 
       expect(driver[:synced_folders]).to eq([
-        ["/kroot/a", "/vm_path", "stuff"]
+        [File.expand_path("/kroot/a"), "/vm_path", "stuff"]
       ])
     end
 
@@ -282,7 +350,7 @@ describe Kitchen::Driver::Vagrant do
       ]
 
       expect(driver[:synced_folders]).to eq([
-        ["/host_path", "/vm_path", "nil"]
+        [File.expand_path("/host_path"), "/vm_path", "nil"]
       ])
     end
 
@@ -295,13 +363,15 @@ describe Kitchen::Driver::Vagrant do
     it "sets :vagrantfile_erb to a default value" do
       config[:vagrantfile_erb] = "/a/Vagrantfile.erb"
 
-      expect(driver[:vagrantfile_erb]).to eq("/a/Vagrantfile.erb")
+      expect(driver[:vagrantfile_erb]).to eq(
+        File.expand_path("/a/Vagrantfile.erb"))
     end
 
     it "expands path for :vagrantfile_erb" do
       config[:vagrantfile_erb] = "Yep.erb"
 
-      expect(driver[:vagrantfile_erb]).to eq("/kroot/Yep.erb")
+      expect(driver[:vagrantfile_erb]).to eq(
+        File.expand_path("/kroot/Yep.erb"))
     end
 
     it "sets :vagrantfiles to an empty array by default" do
@@ -312,7 +382,7 @@ describe Kitchen::Driver::Vagrant do
       config[:vagrantfiles] = %W[one two three]
 
       expect(driver[:vagrantfiles]).to eq(
-        %W[/kroot/one /kroot/two /kroot/three]
+        %W[/kroot/one /kroot/two /kroot/three].map { |f| File.expand_path(f) }
       )
     end
 
@@ -972,9 +1042,9 @@ describe Kitchen::Driver::Vagrant do
 
     it "adds a vm.ssh line for each key/value pair in :ssh" do
       config[:ssh] = {
-        :username => %{"jdoe"},
-        :password => %{"secret"},
-        :private_key_path => %{"/key"}
+        :username => %{jdoe},
+        :password => %{secret},
+        :private_key_path => %{/key}
       }
       cmd
 
@@ -1365,6 +1435,28 @@ describe Kitchen::Driver::Vagrant do
         RUBY
       end
     end
+
+    context "for openstack provider" do
+
+      before { config[:provider] = "openstack" }
+
+      it "adds a line for each element in :customize" do
+        config[:customize] = {
+          :key1 => "some string value",
+          :key2 => 22,
+          :key3 => false
+        }
+        cmd
+
+        expect(vagrantfile).to match(regexify(<<-RUBY.gsub(/^ {8}/, "").chomp))
+          c.vm.provider :openstack do |p|
+            p.key1 = "some string value"
+            p.key2 = 22
+            p.key3 = false
+          end
+        RUBY
+      end
+    end
   end
 
   def debug_lines

data/templates/Vagrantfile.erb

@@ -50,7 +50,7 @@ Vagrant.configure("2") do |c|
   c.ssh.private_key_path = "<%= config[:ssh_key] %>"
 <% end %>
 <% config[:ssh].each do |key, value| %>
-  c.ssh.<%= key %> = <%= value %>
+  c.ssh.<%= key %> = "<%= value %>"
 <% end %>
 <% if config[:winrm] %>
   <% config[:winrm].each do |key, value| %>
@@ -118,6 +118,12 @@ Vagrant.configure("2") do |c|
     <% else %>
     p.vmx["<%= key %>"] = "<%= value %>"
     <% end %>
+  <% when "openstack" %>
+    <% if value.is_a? String %>
+    p.<%= key %> = "<%= value%>"
+    <% else  %>
+    p.<%= key %> = <%= value%>
+    <% end  %>
   <% end %>
 <% end %>
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -116,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -149,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Kitchen::Driver::Vagrant - A Vagrant Driver for Test Kitchen.