vagrant-berkshelf 4.1.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da871969473c790f7900ff5a074eeffc2e70816c
-  data.tar.gz: 09415633365aef2042d0cd4db427f479232d0dff
+  metadata.gz: 1dd01646fee2f73e86d541aa1b246d70364be383
+  data.tar.gz: 177e54df5456a4add536fc0fb73ef79e542fef43
 SHA512:
-  metadata.gz: dc3c6b8ec524c6be4ca9bf925a37c9f451d7dfcb08057b32a5cd326035d508bb374b0645922479d89d7bbb76b619625fda1c496fcc984361d0e090365c9a3701
-  data.tar.gz: 70d2d46db5c19f39bea8d8256df0d7ac4436c826961a5eb2fafd3fec0cefeb8f78590fa7a101f61b4dfd89bcbe67965081c68a935aa90e6b40b4a944fd0b4a4a
+  metadata.gz: 7423458e847a49477fbe1dcc3d33eea8cf5a547b5d39b47f66edc056da681c38f937a9475e7f6348f5d08bb134d7c24124d2ca506ba76cdecc39472e139f9e03
+  data.tar.gz: 468a4eca20812f25bdc6012243243431b3e580d62fb72b95731dbaf430a16348b0b6d42910b70abd14d2200cd90520eb3663b8cedcb8f3a185af8ee2c561fdf8

data/.travis.yml

@@ -1,16 +1,13 @@
+sudo: false
 language: ruby
-
-rvm:
-  - 2.0.0
-  - 2.1
-
-notifications:
-  irc:
-    channels:
-      - "irc.freenode.org#berkshelf"
-    skip_join: true
-    use_notice: true
-
-bundler_args: --without doc guard --jobs 7
+cache: bundler
+
+matrix:
+  include:
+    - rvm: 2.2.5
+    - rvm: 2.3.1
+    - rvm: ruby-head
+  allow_failures:
+    - rvm: ruby-head
 
 script: bundle exec rake

data/CHANGELOG.md

@@ -1,102 +1,128 @@
-# 4.1.0
+# vagrant-berkshelf Changelog
 
-* Bump Berkshelf requirement from `~> 3.2` to `~> 4.0`
+## 5.0.0
 
-# 4.0.4
+- Bump the Ruby requirement from 1.9 to 2.2
+- Preserve cookbooks_path set in Vagrantfile
 
-* Bug Fixes
-  * Honor `berksfile_path` configuration option when uploading cookbooks
-  * Honor `freeze` and `force` options in all berkshelf commands
+## 4.1.0
 
-# 4.0.3
+- Bump Berkshelf requirement from `~> 3.2` to `~> 4.0`
 
-* Bug Fixes
-  * Enabled plugin state is only enabled if explicitly set to boolean `true`
-  * Base setup occurs before Config validate, not after
+## 4.0.4
 
-# 4.0.2
+### Bug Fixes
 
-* Bug Fixes
-  * Don't check Berkshelf version if plugin is disabled
+- Honor `berksfile_path` configuration option when uploading cookbooks
+- Honor `freeze` and `force` options in all berkshelf commands
 
-# 4.0.1
+## 4.0.3
 
-* Bug Fixes
-  * Improved ability to find a Berksfile within a project
+### Bug Fixes
 
-# 4.0.0
+- Enabled plugin state is only enabled if explicitly set to boolean `true`
+- Base setup occurs before Config validate, not after
 
-* Enhancements
-  * Add support for chef-client local mode
+## 4.0.2
 
-* Bug Fixes
-  * Chef Client provider configuration attributes are now properly read from a Berkshelf configuration file
-  * Shared folder is no longer deleted and recreated on each provision
-  * `berksfile_path` config option now defaults to CWD of Vagrantfile
-  * Non-colored terminal output will be used when not available
-  * VM's Berkshelf share will be cleaned up after destroying a VM
+### Bug Fixes
 
-# 3.0.1
+- Don't check Berkshelf version if plugin is disabled
 
-* Bug Fixes
-  * Fix issue loading configuration from a Berkshelf config.json
+## 4.0.1
 
-# 3.0.0
+### Bug Fixes
 
-* Enhancements
-  * Now leverages the Berkshelf version installed by ChefDK
-  * Installation process of plugin should be many, many times faster
+- Improved ability to find a Berksfile within a project
 
-* Bug Fixes
-  * Fix many installation issues for Windows users
-  * Fix warning output of berkshelf path when berkshelf is disabled but a Berksfile is present
-  * Ensure default values for configuration are properly set
+## 4.0.0
 
-# 2.0.1
+### Enhancements
 
-* Bug Fixes
-  * Fix gem conflict issue when installing as a ruby gem
+- Add support for chef-client local mode
 
-# 2.0.0
+### Bug Fixes
 
-* Enhancements
-  * Support Berkshelf 3.0
-  * Support Vagrant 1.5.x
+- Chef Client provider configuration attributes are now properly read from a Berkshelf configuration file
+- Shared folder is no longer deleted and recreated on each provision
+- `berksfile_path` config option now defaults to CWD of Vagrantfile
+- Non-colored terminal output will be used when not available
+- VM's Berkshelf share will be cleaned up after destroying a VM
 
-# 1.3.4
+## 3.0.1
 
-* Bug Fixes
-  * Fix undefined constant error when provisioning with Vagrant AWS
+### Bug Fixes
 
-# 1.2.0
+- Fix issue loading configuration from a Berkshelf config.json
 
-* Breaking Changes
-  * Rename to vagrant-berkshelf
+## 3.0.0
 
-* Enhancements
-  * Trigger the plugin also on `vagrant reload`
-  * Check Vagrant version to see if it's supported
-  * cookbooks uploaded via chef_client will be forced and not frozen
-  * Respect --no-provision flag
+### Enhancements
 
-* Bug Fixes
-  * Fix bug with AWS provisioner
+- Now leverages the Berkshelf version installed by ChefDK
+- Installation process of plugin should be many, many times faster
 
-# 1.1.2
+### Bug Fixes
 
-* Enhancements
-  * Support Vagrant 1.2
-  * Plugin defaults to enabled, if Berksfile exists.
+- Fix many installation issues for Windows users
+- Fix warning output of berkshelf path when berkshelf is disabled but a Berksfile is present
+- Ensure default values for configuration are properly set
 
-# 1.1.0
+## 2.0.1
 
-* Enhancements
-  * Plugin defaults to disabled. Set 'config.berkshelf.enabled = true' in Vagrant config
+### Bug Fixes
 
-# 1.0.0
+- Fix gem conflict issue when installing as a ruby gem
 
-* Breaking Changes
-  * Separated Berkshelf Vagrant plugin into it's own gem (this one)
+## 2.0.0
 
-* Enhancements
-  * Support Vagrant 1.1.x
+### Enhancements
+
+- Support Berkshelf 3.0
+- Support Vagrant 1.5.x
+
+## 1.3.4
+
+### Bug Fixes
+
+- Fix undefined constant error when provisioning with Vagrant AWS
+
+## 1.2.0
+
+### Breaking Changes
+
+- Rename to vagrant-berkshelf
+
+### Enhancements
+
+- Trigger the plugin also on `vagrant reload`
+- Check Vagrant version to see if it's supported
+- cookbooks uploaded via chef_client will be forced and not frozen
+- Respect --no-provision flag
+
+### Bug Fixes
+
+- Fix bug with AWS provisioner
+
+## 1.1.2
+
+### Enhancements
+
+- Support Vagrant 1.2
+- Plugin defaults to enabled, if Berksfile exists.
+
+## 1.1.0
+
+### Enhancements
+
+- Plugin defaults to disabled. Set 'config.berkshelf.enabled = true' in Vagrant config
+
+## 1.0.0
+
+### Breaking Changes
+
+- Separated Berkshelf Vagrant plugin into it's own gem (this one)
+
+### Enhancements
+
+- Support Vagrant 1.1.x

data/CONTRIBUTING.md

@@ -6,11 +6,8 @@ If you'd like to submit a patch:
 
 1. Fork the project.
 2. Make your feature addition or bug fix.
-3. Add [tests](#testing) for it. This is important so that it isn't broken in a
-   future version unintentionally.
-4. Commit. **Do not touch any unrelated code, such as the gemspec or version.**
-   If you must change unrelated code, do it in a commit by itself, so that it
-   can be ignored.
+3. Add [tests](#testing) for it. This is important so that it isn't broken in a future version unintentionally.
+4. Commit. **Do not touch any unrelated code, such as the gemspec or version.** If you must change unrelated code, do it in a commit by itself, so that it can be ignored.
 5. Send a pull request.
 
 ## Testing
@@ -19,16 +16,22 @@ If you'd like to submit a patch:
 
 Install the latest version of [Bundler](http://gembundler.com)
 
-    $ gem install bundler
+```sh
+$ gem install bundler
+```
 
 Clone the project
 
-    $ git clone https://github.com/berkshelf/vagrant-berkshelf.git
+```sh
+$ git clone https://github.com/berkshelf/vagrant-berkshelf.git
+```
 
 and run:
 
-    $ cd vagrant-berkshelf
-    $ bundle install
+```sh
+$ cd vagrant-berkshelf
+$ bundle install
+```
 
 Bundler will install all gems and their dependencies required for testing and developing.
 
@@ -36,9 +39,13 @@ Bundler will install all gems and their dependencies required for testing and de
 
 One-time run with Rake
 
-    $ bundle exec rake spec
+```sh
+$ bundle exec rake spec
+```
 
 Or you can setup a quick feedback loop with Guard
 
-    $ bundle exec guard start
-    guard> rspec
+```sh
+$ bundle exec guard start
+guard> rspec
+```

data/README.md

@@ -1,29 +1,30 @@
-Vagrant Berkshelf Plugin
-========================
-[![Gem Version](http://img.shields.io/gem/v/vagrant-berkshelf.svg)][gem]
-[![Build Status](http://img.shields.io/travis/berkshelf/vagrant-berkshelf.svg)][travis]
+# Vagrant Berkshelf Plugin
 
-[gem]: https://rubygems.org/gems/vagrant-berkshelf
-[travis]: http://travis-ci.org/berkshelf/vagrant-berkshelf
+[![Gem Version](http://img.shields.io/gem/v/vagrant-berkshelf.svg)][gem] [![Build Status](http://img.shields.io/travis/berkshelf/vagrant-berkshelf.svg)][travis]
+
+Vagrant Berkshelf is a Vagrant plugin that adds Berkshelf integration to the Chef provisioners. Vagrant Berkshelf will automatically download and install cookbooks onto the Vagrant Virtual Machine.
+
+## vagrant-berkshelf vs. Test Kitchen
+
+This plugin was created before the development of Test Kitchen and its usefulness in a post-Test Kitchen world is questionable. We believe Test Kitchen provides a robust and stable platform for testing cookbooks and we *highly* recommend using Test Kitchen instead of Vagrant for your cookbook testing workflows.
 
-Vagrant Berkshelf is a Vagrant plugin that adds Berkshelf integration to the
-Chef provisioners. Vagrant Berkshelf will automatically download and install
-cookbooks onto the Vagrant Virtual Machine.
+See Seth Vargo's blog post for additional information:
+https://sethvargo.com/the-future-of-vagrant-berkshelf/
 
 
-Installation
-------------
-1. Install the latest version of [Vagrant](http://www.vagrantup.com/downloads.html)
+## Installation
+
+1. Install the latest version of [Vagrant](https://www.vagrantup.com/downloads.html)
 2. Install the latest version of [ChefDK](https://downloads.chef.io/chef-dk/)
 3. Install the Vagrant Berkshelf plugin:
 
-        $ vagrant plugin install vagrant-berkshelf
+  ```sh
+  $ vagrant plugin install vagrant-berkshelf
+  ```
 
+## Usage
 
-Usage
------
-If the Vagrant Berkshelf plugin is installed, it will intelligently detect when a
-Berksfile is present in the same working directory as the Vagrantfile.
+If the Vagrant Berkshelf plugin is installed, it will intelligently detect when a Berksfile is present in the same working directory as the Vagrantfile.
 
 Here is an example Vagrantfile configuration section for Vagrant Berkshelf:
 
@@ -51,9 +52,8 @@ Vagrant.configure("2") do |config|
 end
 ```
 
+## Contributing
 
-Contributing
-------------
 Thank you to all of our [Contributors](https://github.com/berkshelf/vagrant-berkshelf/graphs/contributors), testers, and users.
 
 - Please report issues [on the GitHub issue tracker](https://github.com/berkshelf/berkshelf/issues)
@@ -61,9 +61,8 @@ Thank you to all of our [Contributors](https://github.com/berkshelf/vagrant-berk
 
 If you'd like to contribute, please see our [contribution guidelines](https://github.com/berkshelf/vagrant-berkshelf/blob/master/CONTRIBUTING.md) first.
 
+## License & Authors
 
-License & Authors
------------------
 - Jamie Winsor (jamie@vialstudios.com)
 - Michael Ivey (michael.ivey@riotgames.com)
 - Seth Vargo (sethvargo@gmail.com)
@@ -83,3 +82,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ```
+
+[gem]: https://rubygems.org/gems/vagrant-berkshelf
+[travis]: https://travis-ci.org/berkshelf/vagrant-berkshelf

data/lib/vagrant-berkshelf/action/share.rb

@@ -22,7 +22,7 @@ module VagrantPlugins
             value = chef.config.send(:prepare_folders_config, env[:berkshelf].shelf)
 
             @logger.debug "Setting cookbooks_path = #{value.inspect}"
-            chef.config.cookbooks_path = value
+            chef.config.cookbooks_path = value + Array(chef.config.cookbooks_path)
           end
 
           @app.call(env)

data/lib/vagrant-berkshelf/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Berkshelf
-    VERSION = "4.1.0"
+    VERSION = "5.0.0"
   end
 end

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@ Spork.prefork do
   require 'rspec'
 
   RSpec.configure do |config|
-    config.treat_symbols_as_metadata_keys_with_true_values = true
     config.run_all_when_everything_filtered = true
     config.filter_run focus: true
 

data/vagrant-berkshelf.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = '>= 2.2.0'
 
   spec.post_install_message = <<-EOH
 The Vagrant Berkshelf plugin requires Berkshelf from the Chef Development Kit.
@@ -37,6 +37,6 @@ Installing Berkshelf via other methods is not officially supported.
 EOH
 
   spec.add_development_dependency 'spork', '~> 0.9'
-  spec.add_development_dependency 'rspec', '~> 2.13'
+  spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rake'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-berkshelf
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spork
@@ -32,14 +32,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -116,11 +116,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A Vagrant plugin to add Berkshelf integration to the Chef provisioners
 test_files:
 - spec/spec_helper.rb
 - spec/unit/vagrant-berkshelf/config_spec.rb
-has_rdoc: