vagrant-berkshelf 4.1.0 → 5.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +10 -13
  3. data/CHANGELOG.md +94 -68
  4. data/CONTRIBUTING.md +19 -12
  5. data/README.md +23 -21
  6. data/lib/vagrant-berkshelf/action/share.rb +1 -1
  7. data/lib/vagrant-berkshelf/version.rb +1 -1
  8. data/spec/spec_helper.rb +0 -1
  9. data/vagrant-berkshelf.gemspec +2 -2
  10. metadata +6 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: da871969473c790f7900ff5a074eeffc2e70816c
4
- data.tar.gz: 09415633365aef2042d0cd4db427f479232d0dff
3
+ metadata.gz: 1dd01646fee2f73e86d541aa1b246d70364be383
4
+ data.tar.gz: 177e54df5456a4add536fc0fb73ef79e542fef43
5
5
  SHA512:
6
- metadata.gz: dc3c6b8ec524c6be4ca9bf925a37c9f451d7dfcb08057b32a5cd326035d508bb374b0645922479d89d7bbb76b619625fda1c496fcc984361d0e090365c9a3701
7
- data.tar.gz: 70d2d46db5c19f39bea8d8256df0d7ac4436c826961a5eb2fafd3fec0cefeb8f78590fa7a101f61b4dfd89bcbe67965081c68a935aa90e6b40b4a944fd0b4a4a
6
+ metadata.gz: 7423458e847a49477fbe1dcc3d33eea8cf5a547b5d39b47f66edc056da681c38f937a9475e7f6348f5d08bb134d7c24124d2ca506ba76cdecc39472e139f9e03
7
+ data.tar.gz: 468a4eca20812f25bdc6012243243431b3e580d62fb72b95731dbaf430a16348b0b6d42910b70abd14d2200cd90520eb3663b8cedcb8f3a185af8ee2c561fdf8
data/.travis.yml CHANGED
@@ -1,16 +1,13 @@
1
+ sudo: false
1
2
  language: ruby
2
-
3
- rvm:
4
- - 2.0.0
5
- - 2.1
6
-
7
- notifications:
8
- irc:
9
- channels:
10
- - "irc.freenode.org#berkshelf"
11
- skip_join: true
12
- use_notice: true
13
-
14
- bundler_args: --without doc guard --jobs 7
3
+ cache: bundler
4
+
5
+ matrix:
6
+ include:
7
+ - rvm: 2.2.5
8
+ - rvm: 2.3.1
9
+ - rvm: ruby-head
10
+ allow_failures:
11
+ - rvm: ruby-head
15
12
 
16
13
  script: bundle exec rake
data/CHANGELOG.md CHANGED
@@ -1,102 +1,128 @@
1
- # 4.1.0
1
+ # vagrant-berkshelf Changelog
2
2
 
3
- * Bump Berkshelf requirement from `~> 3.2` to `~> 4.0`
3
+ ## 5.0.0
4
4
 
5
- # 4.0.4
5
+ - Bump the Ruby requirement from 1.9 to 2.2
6
+ - Preserve cookbooks_path set in Vagrantfile
6
7
 
7
- * Bug Fixes
8
- * Honor `berksfile_path` configuration option when uploading cookbooks
9
- * Honor `freeze` and `force` options in all berkshelf commands
8
+ ## 4.1.0
10
9
 
11
- # 4.0.3
10
+ - Bump Berkshelf requirement from `~> 3.2` to `~> 4.0`
12
11
 
13
- * Bug Fixes
14
- * Enabled plugin state is only enabled if explicitly set to boolean `true`
15
- * Base setup occurs before Config validate, not after
12
+ ## 4.0.4
16
13
 
17
- # 4.0.2
14
+ ### Bug Fixes
18
15
 
19
- * Bug Fixes
20
- * Don't check Berkshelf version if plugin is disabled
16
+ - Honor `berksfile_path` configuration option when uploading cookbooks
17
+ - Honor `freeze` and `force` options in all berkshelf commands
21
18
 
22
- # 4.0.1
19
+ ## 4.0.3
23
20
 
24
- * Bug Fixes
25
- * Improved ability to find a Berksfile within a project
21
+ ### Bug Fixes
26
22
 
27
- # 4.0.0
23
+ - Enabled plugin state is only enabled if explicitly set to boolean `true`
24
+ - Base setup occurs before Config validate, not after
28
25
 
29
- * Enhancements
30
- * Add support for chef-client local mode
26
+ ## 4.0.2
31
27
 
32
- * Bug Fixes
33
- * Chef Client provider configuration attributes are now properly read from a Berkshelf configuration file
34
- * Shared folder is no longer deleted and recreated on each provision
35
- * `berksfile_path` config option now defaults to CWD of Vagrantfile
36
- * Non-colored terminal output will be used when not available
37
- * VM's Berkshelf share will be cleaned up after destroying a VM
28
+ ### Bug Fixes
38
29
 
39
- # 3.0.1
30
+ - Don't check Berkshelf version if plugin is disabled
40
31
 
41
- * Bug Fixes
42
- * Fix issue loading configuration from a Berkshelf config.json
32
+ ## 4.0.1
43
33
 
44
- # 3.0.0
34
+ ### Bug Fixes
45
35
 
46
- * Enhancements
47
- * Now leverages the Berkshelf version installed by ChefDK
48
- * Installation process of plugin should be many, many times faster
36
+ - Improved ability to find a Berksfile within a project
49
37
 
50
- * Bug Fixes
51
- * Fix many installation issues for Windows users
52
- * Fix warning output of berkshelf path when berkshelf is disabled but a Berksfile is present
53
- * Ensure default values for configuration are properly set
38
+ ## 4.0.0
54
39
 
55
- # 2.0.1
40
+ ### Enhancements
56
41
 
57
- * Bug Fixes
58
- * Fix gem conflict issue when installing as a ruby gem
42
+ - Add support for chef-client local mode
59
43
 
60
- # 2.0.0
44
+ ### Bug Fixes
61
45
 
62
- * Enhancements
63
- * Support Berkshelf 3.0
64
- * Support Vagrant 1.5.x
46
+ - Chef Client provider configuration attributes are now properly read from a Berkshelf configuration file
47
+ - Shared folder is no longer deleted and recreated on each provision
48
+ - `berksfile_path` config option now defaults to CWD of Vagrantfile
49
+ - Non-colored terminal output will be used when not available
50
+ - VM's Berkshelf share will be cleaned up after destroying a VM
65
51
 
66
- # 1.3.4
52
+ ## 3.0.1
67
53
 
68
- * Bug Fixes
69
- * Fix undefined constant error when provisioning with Vagrant AWS
54
+ ### Bug Fixes
70
55
 
71
- # 1.2.0
56
+ - Fix issue loading configuration from a Berkshelf config.json
72
57
 
73
- * Breaking Changes
74
- * Rename to vagrant-berkshelf
58
+ ## 3.0.0
75
59
 
76
- * Enhancements
77
- * Trigger the plugin also on `vagrant reload`
78
- * Check Vagrant version to see if it's supported
79
- * cookbooks uploaded via chef_client will be forced and not frozen
80
- * Respect --no-provision flag
60
+ ### Enhancements
81
61
 
82
- * Bug Fixes
83
- * Fix bug with AWS provisioner
62
+ - Now leverages the Berkshelf version installed by ChefDK
63
+ - Installation process of plugin should be many, many times faster
84
64
 
85
- # 1.1.2
65
+ ### Bug Fixes
86
66
 
87
- * Enhancements
88
- * Support Vagrant 1.2
89
- * Plugin defaults to enabled, if Berksfile exists.
67
+ - Fix many installation issues for Windows users
68
+ - Fix warning output of berkshelf path when berkshelf is disabled but a Berksfile is present
69
+ - Ensure default values for configuration are properly set
90
70
 
91
- # 1.1.0
71
+ ## 2.0.1
92
72
 
93
- * Enhancements
94
- * Plugin defaults to disabled. Set 'config.berkshelf.enabled = true' in Vagrant config
73
+ ### Bug Fixes
95
74
 
96
- # 1.0.0
75
+ - Fix gem conflict issue when installing as a ruby gem
97
76
 
98
- * Breaking Changes
99
- * Separated Berkshelf Vagrant plugin into it's own gem (this one)
77
+ ## 2.0.0
100
78
 
101
- * Enhancements
102
- * Support Vagrant 1.1.x
79
+ ### Enhancements
80
+
81
+ - Support Berkshelf 3.0
82
+ - Support Vagrant 1.5.x
83
+
84
+ ## 1.3.4
85
+
86
+ ### Bug Fixes
87
+
88
+ - Fix undefined constant error when provisioning with Vagrant AWS
89
+
90
+ ## 1.2.0
91
+
92
+ ### Breaking Changes
93
+
94
+ - Rename to vagrant-berkshelf
95
+
96
+ ### Enhancements
97
+
98
+ - Trigger the plugin also on `vagrant reload`
99
+ - Check Vagrant version to see if it's supported
100
+ - cookbooks uploaded via chef_client will be forced and not frozen
101
+ - Respect --no-provision flag
102
+
103
+ ### Bug Fixes
104
+
105
+ - Fix bug with AWS provisioner
106
+
107
+ ## 1.1.2
108
+
109
+ ### Enhancements
110
+
111
+ - Support Vagrant 1.2
112
+ - Plugin defaults to enabled, if Berksfile exists.
113
+
114
+ ## 1.1.0
115
+
116
+ ### Enhancements
117
+
118
+ - Plugin defaults to disabled. Set 'config.berkshelf.enabled = true' in Vagrant config
119
+
120
+ ## 1.0.0
121
+
122
+ ### Breaking Changes
123
+
124
+ - Separated Berkshelf Vagrant plugin into it's own gem (this one)
125
+
126
+ ### Enhancements
127
+
128
+ - Support Vagrant 1.1.x
data/CONTRIBUTING.md CHANGED
@@ -6,11 +6,8 @@ If you'd like to submit a patch:
6
6
 
7
7
  1. Fork the project.
8
8
  2. Make your feature addition or bug fix.
9
- 3. Add [tests](#testing) for it. This is important so that it isn't broken in a
10
- future version unintentionally.
11
- 4. Commit. **Do not touch any unrelated code, such as the gemspec or version.**
12
- If you must change unrelated code, do it in a commit by itself, so that it
13
- can be ignored.
9
+ 3. Add [tests](#testing) for it. This is important so that it isn't broken in a future version unintentionally.
10
+ 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.
14
11
  5. Send a pull request.
15
12
 
16
13
  ## Testing
@@ -19,16 +16,22 @@ If you'd like to submit a patch:
19
16
 
20
17
  Install the latest version of [Bundler](http://gembundler.com)
21
18
 
22
- $ gem install bundler
19
+ ```sh
20
+ $ gem install bundler
21
+ ```
23
22
 
24
23
  Clone the project
25
24
 
26
- $ git clone https://github.com/berkshelf/vagrant-berkshelf.git
25
+ ```sh
26
+ $ git clone https://github.com/berkshelf/vagrant-berkshelf.git
27
+ ```
27
28
 
28
29
  and run:
29
30
 
30
- $ cd vagrant-berkshelf
31
- $ bundle install
31
+ ```sh
32
+ $ cd vagrant-berkshelf
33
+ $ bundle install
34
+ ```
32
35
 
33
36
  Bundler will install all gems and their dependencies required for testing and developing.
34
37
 
@@ -36,9 +39,13 @@ Bundler will install all gems and their dependencies required for testing and de
36
39
 
37
40
  One-time run with Rake
38
41
 
39
- $ bundle exec rake spec
42
+ ```sh
43
+ $ bundle exec rake spec
44
+ ```
40
45
 
41
46
  Or you can setup a quick feedback loop with Guard
42
47
 
43
- $ bundle exec guard start
44
- guard> rspec
48
+ ```sh
49
+ $ bundle exec guard start
50
+ guard> rspec
51
+ ```
data/README.md CHANGED
@@ -1,29 +1,30 @@
1
- Vagrant Berkshelf Plugin
2
- ========================
3
- [![Gem Version](http://img.shields.io/gem/v/vagrant-berkshelf.svg)][gem]
4
- [![Build Status](http://img.shields.io/travis/berkshelf/vagrant-berkshelf.svg)][travis]
1
+ # Vagrant Berkshelf Plugin
5
2
 
6
- [gem]: https://rubygems.org/gems/vagrant-berkshelf
7
- [travis]: http://travis-ci.org/berkshelf/vagrant-berkshelf
3
+ [![Gem Version](http://img.shields.io/gem/v/vagrant-berkshelf.svg)][gem] [![Build Status](http://img.shields.io/travis/berkshelf/vagrant-berkshelf.svg)][travis]
4
+
5
+ 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.
6
+
7
+ ## vagrant-berkshelf vs. Test Kitchen
8
+
9
+ 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.
8
10
 
9
- Vagrant Berkshelf is a Vagrant plugin that adds Berkshelf integration to the
10
- Chef provisioners. Vagrant Berkshelf will automatically download and install
11
- cookbooks onto the Vagrant Virtual Machine.
11
+ See Seth Vargo's blog post for additional information:
12
+ https://sethvargo.com/the-future-of-vagrant-berkshelf/
12
13
 
13
14
 
14
- Installation
15
- ------------
16
- 1. Install the latest version of [Vagrant](http://www.vagrantup.com/downloads.html)
15
+ ## Installation
16
+
17
+ 1. Install the latest version of [Vagrant](https://www.vagrantup.com/downloads.html)
17
18
  2. Install the latest version of [ChefDK](https://downloads.chef.io/chef-dk/)
18
19
  3. Install the Vagrant Berkshelf plugin:
19
20
 
20
- $ vagrant plugin install vagrant-berkshelf
21
+ ```sh
22
+ $ vagrant plugin install vagrant-berkshelf
23
+ ```
21
24
 
25
+ ## Usage
22
26
 
23
- Usage
24
- -----
25
- If the Vagrant Berkshelf plugin is installed, it will intelligently detect when a
26
- Berksfile is present in the same working directory as the Vagrantfile.
27
+ If the Vagrant Berkshelf plugin is installed, it will intelligently detect when a Berksfile is present in the same working directory as the Vagrantfile.
27
28
 
28
29
  Here is an example Vagrantfile configuration section for Vagrant Berkshelf:
29
30
 
@@ -51,9 +52,8 @@ Vagrant.configure("2") do |config|
51
52
  end
52
53
  ```
53
54
 
55
+ ## Contributing
54
56
 
55
- Contributing
56
- ------------
57
57
  Thank you to all of our [Contributors](https://github.com/berkshelf/vagrant-berkshelf/graphs/contributors), testers, and users.
58
58
 
59
59
  - 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
61
61
 
62
62
  If you'd like to contribute, please see our [contribution guidelines](https://github.com/berkshelf/vagrant-berkshelf/blob/master/CONTRIBUTING.md) first.
63
63
 
64
+ ## License & Authors
64
65
 
65
- License & Authors
66
- -----------------
67
66
  - Jamie Winsor (jamie@vialstudios.com)
68
67
  - Michael Ivey (michael.ivey@riotgames.com)
69
68
  - Seth Vargo (sethvargo@gmail.com)
@@ -83,3 +82,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
83
82
  See the License for the specific language governing permissions and
84
83
  limitations under the License.
85
84
  ```
85
+
86
+ [gem]: https://rubygems.org/gems/vagrant-berkshelf
87
+ [travis]: https://travis-ci.org/berkshelf/vagrant-berkshelf
data/lib/vagrant-berkshelf/action/share.rb CHANGED
@@ -22,7 +22,7 @@ module VagrantPlugins
22
22
  value = chef.config.send(:prepare_folders_config, env[:berkshelf].shelf)
23
23
 
24
24
  @logger.debug "Setting cookbooks_path = #{value.inspect}"
25
- chef.config.cookbooks_path = value
25
+ chef.config.cookbooks_path = value + Array(chef.config.cookbooks_path)
26
26
  end
27
27
 
28
28
  @app.call(env)
data/lib/vagrant-berkshelf/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module VagrantPlugins
2
2
  module Berkshelf
3
- VERSION = "4.1.0"
3
+ VERSION = "5.0.0"
4
4
  end
5
5
  end
data/spec/spec_helper.rb CHANGED
@@ -6,7 +6,6 @@ Spork.prefork do
6
6
  require 'rspec'
7
7
 
8
8
  RSpec.configure do |config|
9
- config.treat_symbols_as_metadata_keys_with_true_values = true
10
9
  config.run_all_when_everything_filtered = true
11
10
  config.filter_run focus: true
12
11
 
data/vagrant-berkshelf.gemspec CHANGED
@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
25
25
  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
26
26
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
27
27
  spec.require_paths = ['lib']
28
- spec.required_ruby_version = '>= 1.9.3'
28
+ spec.required_ruby_version = '>= 2.2.0'
29
29
 
30
30
  spec.post_install_message = <<-EOH
31
31
  The Vagrant Berkshelf plugin requires Berkshelf from the Chef Development Kit.
@@ -37,6 +37,6 @@ Installing Berkshelf via other methods is not officially supported.
37
37
  EOH
38
38
 
39
39
  spec.add_development_dependency 'spork', '~> 0.9'
40
- spec.add_development_dependency 'rspec', '~> 2.13'
40
+ spec.add_development_dependency 'rspec', '~> 3.0'
41
41
  spec.add_development_dependency 'rake'
42
42
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: vagrant-berkshelf
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.0
4
+ version: 5.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jamie Winsor
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2015-10-08 00:00:00.000000000 Z
13
+ date: 2016-08-22 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: spork
@@ -32,14 +32,14 @@ dependencies:
32
32
  requirements:
33
33
  - - "~>"
34
34
  - !ruby/object:Gem::Version
35
- version: '2.13'
35
+ version: '3.0'
36
36
  type: :development
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
40
  - - "~>"
41
41
  - !ruby/object:Gem::Version
42
- version: '2.13'
42
+ version: '3.0'
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: rake
45
45
  requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
108
108
  requirements:
109
109
  - - ">="
110
110
  - !ruby/object:Gem::Version
111
- version: 1.9.3
111
+ version: 2.2.0
112
112
  required_rubygems_version: !ruby/object:Gem::Requirement
113
113
  requirements:
114
114
  - - ">="
@@ -116,11 +116,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
116
116
  version: '0'
117
117
  requirements: []
118
118
  rubyforge_project:
119
- rubygems_version: 2.2.2
119
+ rubygems_version: 2.4.8
120
120
  signing_key:
121
121
  specification_version: 4
122
122
  summary: A Vagrant plugin to add Berkshelf integration to the Chef provisioners
123
123
  test_files:
124
124
  - spec/spec_helper.rb
125
125
  - spec/unit/vagrant-berkshelf/config_spec.rb
126
- has_rdoc: