kitchen-environment 0.1.4 → 0.1.5

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6f89ec359097e43f99818ed5d0c40add63a51455
4
- data.tar.gz: 2bc8a291666e7767fcb401989423d3034cd65898
3
+ metadata.gz: d5b34db0f65a630a2c7dc95857b19ca6c0b90c55
4
+ data.tar.gz: 6f8af51011199a70244320af9094aa88e5d9d374
5
5
  SHA512:
6
- metadata.gz: 5049d92b21e95bfc42f9dc627f087402ed8c23b7d9ccc6b822ddcc69b510f3a38ae72a2e908d503904f8c7fe0b3a88b83b3b00ea0c3eac2ffb9abcca5f24c377
7
- data.tar.gz: 7084a57eefaf247a627ebd803b81290340f29be528aceffaa252c91e782bf9a50f10cc4569a6621cc1902a96a4493a14b7083ae5d8e2458f16b215b86eb17b3c
6
+ metadata.gz: 7f63f2c493e690d6ade80274f8ea815f5f29832d6bb3f6d8f97df2167889730b69d20934c131d6ed430b0b45d0c19540612bcb6c517f256b0e56907cabb18d77
7
+ data.tar.gz: 18efced15dca24bf991f9b61c2563093a7d68c3fa1c86ad2648df2371cb3e31bc46e07d709a36fdaf66bc7a17a9c198b8fb3c1751b3b6361bcf1bb8361a98adb
@@ -36,6 +36,7 @@ module Kitchen
36
36
  "../#{config[:environment_cookbook]}/Berksfile",
37
37
  config[:kitchen_root])
38
38
 
39
+ this_cookbook = File.basename(config[:kitchen_root])
39
40
  info("Vendoring environment cookbook")
40
41
  ::Berkshelf.set_format :null
41
42
 
@@ -48,7 +49,7 @@ module Kitchen
48
49
 
49
50
  Dir.glob(File.join(tmpbooks_dir, "*")).each do | dir |
50
51
  cookbook = File.basename(dir)
51
- if cookbook != tmp_env
52
+ if cookbook != tmp_env && cookbook != this_cookbook
52
53
  env_cookbook = File.join(path, cookbook)
53
54
  if File.exist?(env_cookbook)
54
55
  debug("copying #{env_cookbook} to #{dir}")
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kitchen-environment
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.4
4
+ version: 0.1.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - CenturyLink Cloud
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-10-23 00:00:00.000000000 Z
11
+ date: 2014-12-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: berkshelf
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
98
98
  version: '0'
99
99
  requirements: []
100
100
  rubyforge_project:
101
- rubygems_version: 2.2.1
101
+ rubygems_version: 2.4.1
102
102
  signing_key:
103
103
  specification_version: 4
104
104
  summary: Adds all cookbook dependencies of an environment cookbook.