vagrant-serverspec 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20db8d889601aa2e8831c7b0906b5c4ba6c0b2b1
-  data.tar.gz: ff944529738e271a2c26bffd25e5b8a7560ce9db
+  metadata.gz: cb21e4c3f8c575336e5a48089c8ae23c43a0a74e
+  data.tar.gz: 3ab6fba636d1eb568979f3d0d53473c2ec78fb85
 SHA512:
-  metadata.gz: 0d38d751424384d513f97be5256fce742785bfcfa23b08bb1dc843b521049039ac6c899e254b68cf48e062c59cc82e41e486e39dd6d27719596eac21cdbfa2c5
-  data.tar.gz: 20975a17b4c6a4666a6f51c95cb3183d9390a78d15f98e829843047020923897659a306cb56ca560fcaec3a7ebb54a232c2b8b9865a6d20946c9a08340dda38d
+  metadata.gz: 4f2c79da25ec1774147767dbf801921bf634923e26b9d77a6112beb9fdd6a63a722882729e302ace87daa0c7d80e21d83d5f34d525504acb89a53eeb13fe1a78
+  data.tar.gz: edc4913c9eafd7ef054d695551496e707dd3b756b2a89216f23f193750c34fb0207339b72cd2a32d04694124090962dd7f19ae981e0a284aab49f0e6961f331e

data/README.md

@@ -77,9 +77,12 @@ describe port(22) do
 end
 ```
 
+##Testing Docker Containers on OSX
+On OSX the Vagrant docker provider runs a Boot2Docker VM, then launches your docker container on that VM. Vagrant does SSH Proxying to send the commands through that VM and have them reach the Docker Container. Vagrant serverspec handles this the same way by getting the container host VM infromation and proxying the commands to the machine through an SSH Proxy. This functionality was introduced in this [PR](https://github.com/jvoorhis/vagrant-serverspec/pull/17) 
+
 ## Versioning
 
-Test Kitchen aims to adhere to [Semantic Versioning 2.0.0][semver].
+vagrant-serverspec aims to adhere to [Semantic Versioning 2.0.0][semver].
 
 ## Development
 

data/lib/vagrant-serverspec/plugin.rb

@@ -3,7 +3,8 @@ require 'serverspec'
 require 'pathname'
 require 'winrm'
 require 'net/ssh'
-
+require 'net/ssh/proxy/command'
+require 'os'
  module VagrantPlugins
   module ServerSpec
     class Plugin < Vagrant.plugin('2')

data/lib/vagrant-serverspec/provisioner.rb

@@ -8,7 +8,7 @@ module VagrantPlugins
         super
         @spec_files = config.spec_files
       end
-      
+
       def provision
         if machine.config.vm.communicator == :winrm
           username = machine.config.winrm.username
@@ -24,7 +24,7 @@ module VagrantPlugins
           Specinfra.configuration.winrm = winrm
         else
           set :backend, :ssh
-          
+
           if ENV['ASK_SUDO_PASSWORD']
             begin
               require 'highline/import'
@@ -35,15 +35,15 @@ module VagrantPlugins
           else
             set :sudo_password, ENV['SUDO_PASSWORD']
           end
-          
+
           host = machine.ssh_info[:host]
-          
           options = Net::SSH::Config.for(host)
-          
-          options[:user] = machine.ssh_info[:username]
-          options[:port] = machine.ssh_info[:port]
-          options[:keys] = machine.ssh_info[:private_key_path]
-          options[:password] = machine.ssh_info[:password]
+
+          options[:proxy]         = setup_provider_proxy if use_jump_provider?
+          options[:user]          = machine.ssh_info[:username]
+          options[:port]          = machine.ssh_info[:port]
+          options[:keys]          = machine.ssh_info[:private_key_path]
+          options[:password]      = machine.ssh_info[:password]
           options[:forward_agent] = machine.ssh_info[:private_key_path]
 
           set :host,        options[:host_name] || host
@@ -54,6 +54,37 @@ module VagrantPlugins
 
         raise Vagrant::Errors::ServerSpecFailed if status != 0
       end
+
+      private
+
+      def setup_provider_proxy
+        ssh_info = machine.provider.host_vm.ssh_info
+        host     = ssh_info[:host]
+        port     = ssh_info[:port]
+        username = ssh_info[:username]
+        key_path = ssh_info[:private_key_path][0]
+
+        proxy_options='-A -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no'
+        Net::SSH::Proxy::Command.new("ssh #{proxy_options} -i #{key_path} -p #{port} #{username}@#{host} nc %h %p")
+      end
+
+      def use_jump_provider?
+        jump_providers = [
+          {
+           name:      "DockerProvider",
+           platforms: ["mac"]
+          }
+        ]
+        current_provider_class = machine.provider.class.name.to_s
+
+        jump_providers.any? do |jump_provider|
+          if current_provider_class.include? jump_provider[:name]
+            jump_provider[:platforms].any? do |platform|
+              OS.send("#{platform}?")
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/vagrant-serverspec/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module ServerSpec
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

data/test/Docker/.rspec

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

data/test/Docker/Docker_Vagrantfile

@@ -0,0 +1,13 @@
+Vagrant.configure("2") do |config|
+  config.vm.box = "mitchellh/boot2docker"
+
+  config.vm.provider "virtualbox" do |v|
+    # On VirtualBox, we don't have guest additions or a functional vboxsf
+    # in TinyCore Linux, so tell Vagrant that so it can be smarter.
+    v.check_guest_additions = false
+    v.functional_vboxsf     = false
+    v.customize ["modifyvm", :id, "--memory", "1024"]
+  end
+
+  config.nfs.functional = false
+end

data/test/Docker/Vagrantfile

@@ -0,0 +1,17 @@
+Vagrant.configure('2') do |config|
+  config.vm.provider "docker" do |d|
+    d.vagrant_vagrantfile = "./Docker_Vagrantfile"
+    d.image = "jjhughes57/docker-vagrant-ubuntu"
+    d.has_ssh = true
+  end
+
+  config.vm.provision :shell, inline: <<-EOF
+    sudo apt-get install -y vim
+    touch /tmp/testfile
+  EOF
+
+  config.vm.provision :serverspec do |spec|
+    spec.pattern = '*_spec.rb'
+    #Specinfra.configuration.sudo_password = 'vagrant'
+  end
+end

data/test/Docker/sample_spec.rb

@@ -0,0 +1,9 @@
+require_relative 'spec_helper'
+
+describe package('vim') do
+  it { should be_installed }
+end
+
+describe file('/tmp/testfile') do
+  it { should be_file }
+end

data/test/Docker/spec_helper.rb

@@ -0,0 +1,13 @@
+#require 'serverspec'
+#require 'net/ssh'
+
+#set :backend, :ssh
+
+# Disable sudo
+# set :disable_sudo, true
+
+# Set environment variables
+# set :env, :LANG => 'C', :LC_MESSAGES => 'C' 
+
+# Set PATH
+# set :path, '/sbin:/usr/local/sbin:$PATH'

data/vagrant-serverspec.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'serverspec', '~> 2.7', '>= 2.7.0'
   gem.add_runtime_dependency 'winrm', '~> 1.1', '>= 1.1.0'
+  gem.add_runtime_dependency 'os', '~> 0.9.6'
   #gem.add_runtime_dependency 'highline', '~> 1.6', '>= 1.6.20'
 
   gem.add_development_dependency 'bundler', '~> 1.6', '>= 1.6.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-serverspec
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeremy Voorhis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: serverspec
@@ -50,6 +50,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: os
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,6 +125,11 @@ files:
 - lib/vagrant-serverspec/provisioner.rb
 - lib/vagrant-serverspec/version.rb
 - locales/en.yml
+- test/Docker/.rspec
+- test/Docker/Docker_Vagrantfile
+- test/Docker/Vagrantfile
+- test/Docker/sample_spec.rb
+- test/Docker/spec_helper.rb
 - test/ubuntu/.rspec
 - test/ubuntu/Vagrantfile
 - test/ubuntu/sample_spec.rb
@@ -145,6 +164,11 @@ signing_key:
 specification_version: 4
 summary: A Vagrant plugin that executes serverspec
 test_files:
+- test/Docker/.rspec
+- test/Docker/Docker_Vagrantfile
+- test/Docker/Vagrantfile
+- test/Docker/sample_spec.rb
+- test/Docker/spec_helper.rb
 - test/ubuntu/.rspec
 - test/ubuntu/Vagrantfile
 - test/ubuntu/sample_spec.rb