vagrant-berkshelf 4.0.3 → 4.0.4

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 05db87ebc609977e91ad60fcf341d077982a333b
4
- data.tar.gz: 974eb20f7e742d57367e4c87e9e405a466ba7542
3
+ metadata.gz: ab746a1864bd7007a1e41c641c6360d1eb523f5e
4
+ data.tar.gz: 5c96052355e65411366d9c6b60712a53d01dec7b
5
5
  SHA512:
6
- metadata.gz: bc90fadd03253d91c3a8d5c549ed3e8f4f032a4c6cddc1fef42051c8d9760de2f7d5ce05fcc8134708134e14d36da693177d5ab9a54f8f18bc3b02d35831744f
7
- data.tar.gz: c2e100908198ba25cc457b577b233c84a1466b734c0bdfb7c52944074fe123beccfcdd34f2380c94ffac5629f546f358dd6fc528084162850ff6a865bba67865
6
+ metadata.gz: 17d6ae7b3bf39c54cf61502c30bb8e8a5f5982cd7e20f97bf57f0ed0d3ef8be8f5936be6dbdf56e8ca649ede0cfe7c9f4296aaaab6d368bea5d08005ab4e7ac4
7
+ data.tar.gz: 659326959c6491b8c9c03ef1f2ac982842b5aac696e5fa5f99abee222965ad5cf2f37e74b8399db5d71f3367b4640b9da554336bbeeaa6a0293ade4724b10701
data/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ # 4.0.4
2
+
3
+ * Bug Fixes
4
+ * Honor `berksfile_path` configuration option when uploading cookbooks
5
+ * Honor `freeze` and `force` options in all berkshelf commands
6
+
1
7
  # 4.0.3
2
8
 
3
9
  * Bug Fixes
data/README.md CHANGED
@@ -14,7 +14,7 @@ cookbooks onto the Vagrant Virtual Machine.
14
14
  Installation
15
15
  ------------
16
16
  1. Install the latest version of [Vagrant](http://www.vagrantup.com/downloads.html)
17
- 2. Install the latest version of [ChefDK](http://getchef.com/downloads/chef-dk)
17
+ 2. Install the latest version of [ChefDK](https://downloads.chef.io/chef-dk/)
18
18
  3. Install the Vagrant Berkshelf plugin:
19
19
 
20
20
  $ vagrant plugin install vagrant-berkshelf
@@ -85,10 +85,10 @@ module VagrantPlugins
85
85
  with_provision_berkshelf_config(provisioner) do |config|
86
86
  env[:machine].ui.info "Uploading cookbooks to #{provisioner.config.chef_server_url}"
87
87
  berks("upload",
88
- config: config,
89
- berksfile: env[:machine].config.berkshelf.berksfile_path,
90
- force: true,
91
- freeze: false,
88
+ config: config,
89
+ berksfile_path: env[:machine].config.berkshelf.berksfile_path,
90
+ force: true,
91
+ freeze: false,
92
92
  )
93
93
  end
94
94
  end
@@ -45,6 +45,14 @@ module VagrantPlugins
45
45
  args += options[:only]
46
46
  end
47
47
 
48
+ if options[:freeze] == false
49
+ args << "--no-freeze"
50
+ end
51
+
52
+ if options[:force]
53
+ args << "--force"
54
+ end
55
+
48
56
  if !options.fetch(:args, []).empty?
49
57
  args += options[:args]
50
58
  end
@@ -1,5 +1,5 @@
1
1
  module VagrantPlugins
2
2
  module Berkshelf
3
- VERSION = "4.0.3"
3
+ VERSION = "4.0.4"
4
4
  end
5
5
  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.0.3
4
+ version: 4.0.4
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-02-15 00:00:00.000000000 Z
13
+ date: 2015-05-11 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: spork