chef-provisioning-vagrant 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f5391ad07acd823c4e855d727bca5422460994c
-  data.tar.gz: 1cec32bc37d9cde64d727445e00080ffa4eca951
+  metadata.gz: a70be7cfd7be15988ef1d9ec3037d9bab25400ac
+  data.tar.gz: e08a613b0fee6542b061736d8e7ae80f8b4da4bc
 SHA512:
-  metadata.gz: 83ab80f85009ea0ae000d0270a7a4d73410dc446816c2d37569854e4491d951e228238906075bdfc24ab6202fec7064693c1e6df5198cab097f3b0a39e0227ff
-  data.tar.gz: cff66da7a46a3e4d39d58f2d95a1f03583c2dcf5cd90bf9c50f4fffa93f59ef9e3d59215ac186876cc2bbe0e472d6f24f5728f7c1ab5808ffa6c787ecb771a3c
+  metadata.gz: 4f35ed9accff44e6c20abc6584b984277691c4c7aa861d0e6ca4062fc86b6e394671b9cc66d89b203f05760fe663b023639f39b0b7d3e5080f1673330cf81e6e
+  data.tar.gz: b9c8668ea605e09cb1c5619f73f8b9a333b32cc3f6bb54eae6f54aad3f2b262d71a8cc55860da3c84259f2738482dc98d0024f455aec0cafcaad89e02d3929c8

data/Gemfile

@@ -1,2 +1,3 @@
 source "https://rubygems.org"
+gemfile
 gemspec

data/README.md

@@ -1,41 +1,64 @@
 # chef-provisioning-vagrant
 
+[![Gem Version](https://badge.fury.io/rb/chef-provisioning-vagrant.svg)](https://badge.fury.io/rb/chef-provisioning-vagrant) [![Build Status](https://travis-ci.org/chef/chef-provisioning-vagrant.svg?branch=master)](https://travis-ci.org/chef/chef-provisioning-vagrant)
+
 This is the Vagrant driver for chef-provisioning.
 
 # Resources
 
 ## vagrant_box
 
-Specifying this resource will verify that the correct vagrant box is downloaded to the box directory (default of ```~/.chefdk/vms``` when using the chefdk) for the correct vagrant provider. The vagrant provider defaults to virtualbox.
+Specifying this resource will verify that the correct vagrant box is downloaded to the box directory (default of `~/.chefdk/vms` when using the chefdk) for the correct vagrant provider. The vagrant provider defaults to virtualbox.
 
-This example will ```vagrant box add``` the box if it is not currently on your system.
-```
+This example will `vagrant box add` the box if it is not currently on your system.
+
+```ruby
 vagrant_box 'opscode-centos-6.4' do
   url 'http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_centos-6.4_chef-provisionerless.box'
   vagrant_provider 'vmware_desktop'
 end
 ```
+
 This example will ensure that the vmware_desktop/fusion based box exists on your system, and will fail if the box does not exist. If this fails, you can always add the URL source as per the previous example. **Note: since bento boxes appear as 'vmware_desktop', 'vmware_fusion' will not work here**
-```
+
+```ruby
 vagrant_box 'custom_box' do
   vagrant_provider 'vmware_desktop'
 end
 ```
+
 This example will ensure that the virtualbox based box already exists on your system, and will fail if the box does not exist. As before, adding the URL will cause it to download the box.
-```
+
+```ruby
 vagrant_box 'custom_box'
 ```
+
 # Machine Options
 
 An example of machine options would be as follows:
-```
+
+```ruby
 options = {
   vagrant_options: {
     'vm.box' => 'opscode-centos-6.4',
-    # becomes vm.network(:forwarded_port, guest: 80, host: 8080) in
-    # Vagrantfile:
-    'vm.network' => ':forwarded_port, guest: 80, host: 8080'
+    # becomes
+    # config.vm.network(:private_network, {ip: "22.22.22.22"})
+    # config.vm.network(:forwarded_port, guest: 4001, host: 4001)
+    # config.vm.network(:forwarded_port, guest: 3001, host: 3001)
+    # in Vagrantfile:
+    'vm.network' => [
+      ':private_network, {ip: "22.22.22.22"}',
+      ':forwarded_port, guest: 4001, host: 4001',
+      ':forwarded_port, guest: 3001, host: 3001'
+    ]
   },
+  # `vagrant_config` gets appended to the Vagrantfile
+  vagrant_config: <<EOF
+    config.vm.provider 'virtualbox' do |v|
+      v.memory = 4096
+      v.cpus = 2
+    end
+  EOF
 }
 
 machine 'marley' do
@@ -43,8 +66,10 @@ machine 'marley' do
   converge true
 end
 ```
-You can also add a ```vagrant_provider``` attribute to override the default virtualbox provider:
-```
+
+You can also add a `vagrant_provider` attribute to override the default virtualbox provider:
+
+```ruby
 options = {
   vagrant_provider: 'vmware_fusion'
   vagrant_options: {
@@ -57,7 +82,25 @@ machine 'marley' do
   converge true
 end
 ```
+
 **Note: even though the bento based boxes appear as 'vmware_desktop', 'vmware_fusion' is required here, as it is the name of the vagrant provider**
 
+You can also add a `vagrant_config` attribute to specify provider specific options. For example, to specify a memory setting of 1536 MB in a virtual box provider:
+
+```ruby
+options = {
+  vagrant_config: "config.vm.provider \"virtualbox\" do |vb|\n  vb.memory = 1536\nend\n",
+  vagrant_options: {
+    'vm.box' => 'opscode-centos-6.4'
+  }
+}
+
+machine 'marley' do
+  machine_options options
+  converge true
+end
+```
+
 # Known Issues
+
 It would be really nice to do some magic to make the vmware_fusion vs vmware_desktop providers match in the machine_options and the vagrant_box resource, but some magic would happen there...

data/Rakefile

@@ -4,3 +4,12 @@ require 'bundler/gem_tasks'
 task :spec do
   require File.expand_path('spec/run')
 end
+
+require "github_changelog_generator/task"
+
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+  config.future_release = Chef::Provisioning::VagrantDriver::VERSION
+  config.enhancement_labels = "enhancement,Enhancement,New Feature,Improvement".split(",")
+  config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(",")
+  config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog,Exclude From Changelog,Question".split(",")
+end

data/chef-provisioning-vagrant.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.summary = 'Driver for creating Vagrant instances in Chef Provisioning.'
   s.description = s.summary
   s.author = 'John Keiser'
-  s.email = 'jkeiser@getchef.com'
+  s.email = 'jkeiser@chef.io'
   s.homepage = 'https://github.com/chef/chef-provisioning-vagrant'
 
   s.add_dependency 'chef-provisioning'
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'chef'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'github_changelog_generator'
 
   s.bindir       = "bin"
   s.executables  = %w( )

data/lib/chef/provider/vagrant_box.rb

@@ -2,7 +2,7 @@ require 'chef/provider/lwrp_base'
 require 'chef/mixin/shell_out'
 
 class Chef::Provider::VagrantBox < Chef::Provider::LWRPBase
-
+  provides :vagrant_box
   use_inline_resources
 
   include Chef::Mixin::ShellOut
@@ -50,7 +50,8 @@ class Chef::Provider::VagrantBox < Chef::Provider::LWRPBase
   # the box name to make sure we have the correct box already installed.
   def box_exists?(new_resource)
     boxes = list_boxes
-    boxes[new_resource.vagrant_provider].has_key?(new_resource.name)
+    provider = new_resource.vagrant_provider
+    boxes.has_key?(provider) && boxes[provider].has_key?(new_resource.name)
   end
 
   def load_current_resource

data/lib/chef/provider/vagrant_cluster.rb

@@ -2,7 +2,7 @@ require 'chef/provider/lwrp_base'
 require 'cheffish'
 
 class Chef::Provider::VagrantCluster < Chef::Provider::LWRPBase
-
+  provides :vagrant_cluster
   use_inline_resources
 
   def whyrun_supported?

data/lib/chef/provisioning/vagrant_driver/driver.rb

@@ -4,6 +4,7 @@ require 'chef/provisioning/machine/windows_machine'
 require 'chef/provisioning/machine/unix_machine'
 require 'chef/provisioning/convergence_strategy/install_msi'
 require 'chef/provisioning/convergence_strategy/install_cached'
+require 'chef/provisioning/convergence_strategy/install_sh'
 require 'chef/provisioning/transport/winrm'
 require 'chef/provisioning/transport/ssh'
 require 'chef/provisioning/vagrant_driver/version'
@@ -61,7 +62,7 @@ class Chef
             }
             machine_spec.location['needs_reload'] = true if vm_file_updated
             if machine_options[:vagrant_options]
-              %w(vm.guest winrm.host winrm.port winrm.username winrm.password).each do |key|
+              %w(vm.guest winrm.host winrm.port winrm.transport winrm.username winrm.password).each do |key|
                 machine_spec.location[key] = machine_options[:vagrant_options][key] if machine_options[:vagrant_options][key]
               end
             end
@@ -381,9 +382,12 @@ class Chef
           if machine_spec.location['vm.guest'].to_s == 'windows'
             Chef::Provisioning::ConvergenceStrategy::InstallMsi.
                                                 new(machine_options[:convergence_options], config)
-          else
+          elsif machine_options[:cached_installer] == true
             Chef::Provisioning::ConvergenceStrategy::InstallCached.
                                              new(machine_options[:convergence_options], config)
+          else
+            Chef::Provisioning::ConvergenceStrategy::InstallSh.
+                                            new(machine_options[:convergence_options], config)
           end
         end
 
@@ -412,14 +416,14 @@ class Chef
           port = machine_spec.location['winrm.port'] || 5985
           port = forwarded_ports[port] if forwarded_ports[port]
           endpoint = "http://#{hostname}:#{port}/wsman"
-          type = :plaintext
+          type = machine_spec.location['winrm.transport'] || :plaintext
           options = {
             :user => machine_spec.location['winrm.username'] || 'vagrant',
             :pass => machine_spec.location['winrm.password'] || 'vagrant',
             :disable_sspi => true
           }
 
-          Chef::Provisioning::Transport::WinRM.new(endpoint, type, options)
+          Chef::Provisioning::Transport::WinRM.new(endpoint, type, options, config)
         end
 
         def create_ssh_transport(machine_spec)

data/lib/chef/provisioning/vagrant_driver/version.rb

@@ -1,7 +1,7 @@
 class Chef
   module Provisioning
     module VagrantDriver
-      VERSION = '0.11.0'
+      VERSION = '0.12.0'
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'vagrant_support'
+require 'chef/provisioning'
 
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-21 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-provisioning
@@ -66,8 +66,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Driver for creating Vagrant instances in Chef Provisioning.
-email: jkeiser@getchef.com
+email: jkeiser@chef.io
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -109,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Driver for creating Vagrant instances in Chef Provisioning.