kitchen-rackspace 0.19.0 → 0.20.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +6 -0
  3. data/Rakefile +1 -4
  4. data/data/images.json +29 -29
  5. data/helpers/dump_image_list.rb +7 -7
  6. data/kitchen-rackspace.gemspec +0 -1
  7. data/lib/kitchen/driver/rackspace_version.rb +2 -1
  8. data/spec/kitchen/driver/rackspace_spec.rb +2 -2
  9. data/spec/spec_helper.rb +8 -6
  10. metadata +3 -17
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8dacbb23877f1f67c30152a721c63f8521854efe
4
- data.tar.gz: ab8811181a0d17553edb3237bd0f4fe3706043f1
3
+ metadata.gz: 07ed5ff4f5fc6cf86f2d29720e367319640b42e9
4
+ data.tar.gz: b9e271c61a4b5ff5b0aee3884b0b08915e12d5a0
5
5
  SHA512:
6
- metadata.gz: 0d822a5e5f0d4c2da1b6c2dab7c0e9f09879cbe09c0737791cef8132367d2d636c785b8fa6a141befa9465eb481c51a3d28bd1fbc0c79219e908c960b0ea4ce1
7
- data.tar.gz: 25aeb6db235c06d7dbe92ab1e3669034c8efff3389eaebee15d60093130278ca65036485e2b8e7d2a2eb716b45dd4a13c49b1e59cb1fda9d2100fd2a8e488128
6
+ metadata.gz: 986b28125f8a07ee166d3e4ea32e8838ff7ae94ebaa2e4014668c8d6aa85810ee59579a775edbff84d2ba8c84f397eee5a76cfb7cd058c09b91fc74344040716
7
+ data.tar.gz: a7b25f83abdda8c440ac5b0180f717e0048baccf8e35b7753c4541f40d709e03d6b9e9dccb9e05c995b5722fcc12f997d92c66a194f037265aa184bd84e702fc
data/CHANGELOG.md CHANGED
@@ -1,3 +1,8 @@
1
+ # 0.20.0 / 2016-01-15
2
+
3
+ * PR [#63][] - Update image IDs, add Ubuntu 15.10, drop Ubuntu 15.04; via
4
+ [@martinb3][]
5
+
1
6
  # 0.19.0 / 2015-10-06
2
7
 
3
8
  * PR [#60][] - Update to latest image IDs
@@ -150,6 +155,7 @@ boot times, via [@coderanger][]
150
155
 
151
156
  * Initial release! Woo!
152
157
 
158
+ [#63]: https://github.com/test-kitchen/kitchen-rackspace/pull/63
153
159
  [#57]: https://github.com/test-kitchen/kitchen-rackspace/pull/57
154
160
  [#56]: https://github.com/test-kitchen/kitchen-rackspace/pull/56
155
161
  [#53]: https://github.com/test-kitchen/kitchen-rackspace/pull/53
data/Rakefile CHANGED
@@ -2,13 +2,10 @@
2
2
 
3
3
  require 'bundler/setup'
4
4
  require 'rubocop/rake_task'
5
- require 'cane/rake_task'
6
5
  require 'rspec/core/rake_task'
7
6
 
8
- Cane::RakeTask.new
9
-
10
7
  RuboCop::RakeTask.new
11
8
 
12
9
  RSpec::Core::RakeTask.new(:spec)
13
10
 
14
- task default: [:cane, :rubocop, :spec]
11
+ task default: [:rubocop, :spec]
data/data/images.json CHANGED
@@ -9,35 +9,35 @@
9
9
  "centos-6.7": "fabe045f-43f8-4991-9e6c-5cabd617538c",
10
10
  "centos-7": "6595f1b7-e825-4bd2-addc-c7b1c803a37f",
11
11
  "centos-7.0": "6595f1b7-e825-4bd2-addc-c7b1c803a37f",
12
- "coreos": "415ca2e6-df92-44e6-ba95-8ee36b436b24",
13
- "coreos-0": "415ca2e6-df92-44e6-ba95-8ee36b436b24",
14
- "coreos-alpha": "2c12f6da-8540-40bc-b974-9a72040173e0",
15
- "coreos-beta": "8dc7d5d8-4ad4-41b6-acf1-958dfeadcb17",
16
- "coreos-stable": "415ca2e6-df92-44e6-ba95-8ee36b436b24",
17
- "debian": "c3aacaf9-8d1e-4d41-bb47-045fbc392a1c",
12
+ "coreos": "40155f16-21d4-4ac1-ad65-c409d94b8c7c",
13
+ "coreos-0": "40155f16-21d4-4ac1-ad65-c409d94b8c7c",
14
+ "coreos-alpha": "c61f3a04-a00e-44c1-9d96-0667cfc7e155",
15
+ "coreos-beta": "6045cb80-52ed-4114-bf9a-7f15a36c65dc",
16
+ "coreos-stable": "40155f16-21d4-4ac1-ad65-c409d94b8c7c",
17
+ "debian": "cf16c435-7bed-4dc3-b76e-57b09987866d",
18
18
  "debian-7": "eaaf94d8-55a6-4bfa-b0a8-473febb012dc",
19
19
  "debian-7.0": "eaaf94d8-55a6-4bfa-b0a8-473febb012dc",
20
- "debian-8": "c3aacaf9-8d1e-4d41-bb47-045fbc392a1c",
21
- "debian-8.0": "c3aacaf9-8d1e-4d41-bb47-045fbc392a1c",
20
+ "debian-8": "081a8b12-515c-41c9-8ce4-13139e1904f7",
21
+ "debian-8.0": "081a8b12-515c-41c9-8ce4-13139e1904f7",
22
22
  "debian-testing": "081a8b12-515c-41c9-8ce4-13139e1904f7",
23
23
  "debian-unstable": "498c59a0-3c26-4357-92c0-dd938baca3db",
24
- "fedora": "0976b31e-f6d7-4d74-81e9-007fca25067e",
25
- "fedora-21": "46975098-7799-4e72-8ae0-d6ef9d2d26a1",
26
- "fedora-21.0": "46975098-7799-4e72-8ae0-d6ef9d2d26a1",
27
- "fedora-22": "0976b31e-f6d7-4d74-81e9-007fca25067e",
28
- "fedora-22.0": "0976b31e-f6d7-4d74-81e9-007fca25067e",
24
+ "fedora": "8ffcfdcd-7e44-4e84-92f7-e11e04401642",
25
+ "fedora-21": "79f41a1d-ed68-40bc-84d5-e7a36dabcb44",
26
+ "fedora-21.0": "79f41a1d-ed68-40bc-84d5-e7a36dabcb44",
27
+ "fedora-22": "8ffcfdcd-7e44-4e84-92f7-e11e04401642",
28
+ "fedora-22.0": "8ffcfdcd-7e44-4e84-92f7-e11e04401642",
29
29
  "freebsd": "7a1cf8de-7721-4d56-900b-1e65def2ada5",
30
30
  "freebsd-10": "7a1cf8de-7721-4d56-900b-1e65def2ada5",
31
31
  "freebsd-10.1": "7a1cf8de-7721-4d56-900b-1e65def2ada5",
32
- "gentoo": "7451d607-426d-416f-8d29-97e57f6f3ad5",
33
- "gentoo-15": "7451d607-426d-416f-8d29-97e57f6f3ad5",
34
- "gentoo-15.3": "7451d607-426d-416f-8d29-97e57f6f3ad5",
32
+ "gentoo": "c6693b8d-1e99-4112-b2a0-ceefd18a55ca",
33
+ "gentoo-15": "c6693b8d-1e99-4112-b2a0-ceefd18a55ca",
34
+ "gentoo-15.3": "c6693b8d-1e99-4112-b2a0-ceefd18a55ca",
35
35
  "opensuse": "79436148-753f-41b7-aee9-5acbde16582c",
36
36
  "opensuse-13": "79436148-753f-41b7-aee9-5acbde16582c",
37
37
  "opensuse-13.2": "79436148-753f-41b7-aee9-5acbde16582c",
38
38
  "redhat": "92f8a8b8-6019-4c27-949b-cf9910b84ffb",
39
- "redhat-5": "05dd965d-84ce-451b-9ca1-83a134e523c3",
40
- "redhat-5.11": "05dd965d-84ce-451b-9ca1-83a134e523c3",
39
+ "redhat-5": "6f984613-2b58-4596-b898-4e6e662dbd59",
40
+ "redhat-5.11": "6f984613-2b58-4596-b898-4e6e662dbd59",
41
41
  "redhat-6": "5176fde9-e9d6-4611-9069-1eecd55df440",
42
42
  "redhat-6.7": "5176fde9-e9d6-4611-9069-1eecd55df440",
43
43
  "redhat-7": "92f8a8b8-6019-4c27-949b-cf9910b84ffb",
@@ -47,23 +47,23 @@
47
47
  "scientific-6.6": "36076d08-3e8b-4436-9253-7a8868e4f4d7",
48
48
  "scientific-7": "6118e449-3149-475f-bcbb-99d204cedd56",
49
49
  "scientific-7.0": "6118e449-3149-475f-bcbb-99d204cedd56",
50
- "ubuntu": "658a7d3b-4c58-4e29-b339-2509cca0de10",
50
+ "ubuntu": "59a3fadd-93e7-4674-886a-64883e17115f",
51
51
  "ubuntu-12": "973775ab-0653-4ef8-a571-7a2777787735",
52
52
  "ubuntu-12.04": "973775ab-0653-4ef8-a571-7a2777787735",
53
53
  "ubuntu-14": "09de0a66-3156-48b4-90a5-1cf25a905207",
54
54
  "ubuntu-14.04": "09de0a66-3156-48b4-90a5-1cf25a905207",
55
- "ubuntu-15": "658a7d3b-4c58-4e29-b339-2509cca0de10",
56
- "ubuntu-15.04": "658a7d3b-4c58-4e29-b339-2509cca0de10",
55
+ "ubuntu-15": "59a3fadd-93e7-4674-886a-64883e17115f",
56
+ "ubuntu-15.10": "59a3fadd-93e7-4674-886a-64883e17115f",
57
57
  "vyatta": "faad95b7-396d-483e-b4ae-77afec7e7097",
58
58
  "vyatta-6": "faad95b7-396d-483e-b4ae-77afec7e7097",
59
59
  "vyatta-6.7": "faad95b7-396d-483e-b4ae-77afec7e7097",
60
60
  "vyatta-6.7R9": "faad95b7-396d-483e-b4ae-77afec7e7097",
61
- "windows": "444a8d19-c99e-424a-8ffc-0d3d75a2f166",
62
- "windows-2008": "ee71e392-12b0-4050-b097-8f75b4071831",
63
- "windows-2008.2": "ee71e392-12b0-4050-b097-8f75b4071831",
64
- "windows-2008R2": "ee71e392-12b0-4050-b097-8f75b4071831",
65
- "windows-2008R2SP1": "ee71e392-12b0-4050-b097-8f75b4071831",
66
- "windows-2012": "444a8d19-c99e-424a-8ffc-0d3d75a2f166",
67
- "windows-2012.2": "444a8d19-c99e-424a-8ffc-0d3d75a2f166",
68
- "windows-2012R2": "444a8d19-c99e-424a-8ffc-0d3d75a2f166"
61
+ "windows": "ca6b1d10-b681-4196-842d-6a23350340ab",
62
+ "windows-2008": "535800bf-942b-4734-a6a4-a9793d8c7896",
63
+ "windows-2008.2": "535800bf-942b-4734-a6a4-a9793d8c7896",
64
+ "windows-2008R2": "535800bf-942b-4734-a6a4-a9793d8c7896",
65
+ "windows-2008R2SP1": "535800bf-942b-4734-a6a4-a9793d8c7896",
66
+ "windows-2012": "ca6b1d10-b681-4196-842d-6a23350340ab",
67
+ "windows-2012.2": "ca6b1d10-b681-4196-842d-6a23350340ab",
68
+ "windows-2012R2": "ca6b1d10-b681-4196-842d-6a23350340ab"
69
69
  }
data/helpers/dump_image_list.rb CHANGED
@@ -30,7 +30,7 @@ i_care_about = {
30
30
  'Red Hat Enterprise Linux 5 (PV)' => %w(redhat-5),
31
31
  'Scientific Linux 7 (PVHVM)' => %w(scientific scientific-7),
32
32
  'Scientific Linux 6 (PVHVM)' => %w(scientific-6),
33
- 'Ubuntu 15.04 (Vivid Vervet) (PVHVM)' => %w(ubuntu ubuntu-15 ubuntu-15.04),
33
+ 'Ubuntu 15.10 (Wily Werewolf) (PVHVM)' => %w(ubuntu ubuntu-15 ubuntu-15.10),
34
34
  'Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)' => %w(ubuntu-14 ubuntu-14.04),
35
35
  'Ubuntu 12.04 LTS (Precise Pangolin) (PVHVM)' => %w(ubuntu-12 ubuntu-12.04),
36
36
  'Vyatta Network OS 6.7R9' => %w(vyatta vyatta-6 vyatta-6.7 vyatta-6.7R9),
@@ -55,7 +55,7 @@ compute = Fog::Compute.new(provider: 'Rackspace',
55
55
  aliases = i_care_about.values.flatten
56
56
  res = aliases.each_with_object({}) do |a, hsh|
57
57
  fail "Alias '#{a}' was listed twice" if hsh.include?(a)
58
- hsh.merge!(a => nil)
58
+ hsh[a] = nil
59
59
  hsh
60
60
  end
61
61
 
@@ -68,11 +68,11 @@ compute.images.select { |i| i_care_about.keys.include?(i.name) }.each do |img|
68
68
  distro_id = image_metadata['org.openstack__1__os_distro']
69
69
  version = image_metadata['org.openstack__1__os_version']
70
70
 
71
- if names_to_clean.include?(distro_id)
72
- distro = names_to_clean[distro_id]
73
- else
74
- distro = distro_id.split('.').last
75
- end
71
+ distro = if names_to_clean.include?(distro_id)
72
+ names_to_clean[distro_id]
73
+ else
74
+ distro_id.split('.').last
75
+ end
76
76
 
77
77
  res["#{distro}-#{version}"] = img.id
78
78
 
data/kitchen-rackspace.gemspec CHANGED
@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
27
27
  spec.add_development_dependency 'bundler', '~> 1.0'
28
28
  spec.add_development_dependency 'rake', '~> 10.0'
29
29
  spec.add_development_dependency 'rubocop', '~> 0.29'
30
- spec.add_development_dependency 'cane', '~> 2.6'
31
30
  spec.add_development_dependency 'rspec', '~> 3.0'
32
31
  spec.add_development_dependency 'simplecov', '~> 0.9'
33
32
  spec.add_development_dependency 'simplecov-console', '~> 0.2'
data/lib/kitchen/driver/rackspace_version.rb CHANGED
@@ -1,4 +1,5 @@
1
1
  # Encoding: UTF-8
2
+ # frozen_string_literal: true
2
3
  #
3
4
  # Author:: Jonathan Hartman (<j@p4nt5.com>)
4
5
  #
@@ -21,6 +22,6 @@ module Kitchen
21
22
  #
22
23
  # @author Jonathan Hartman <j@p4nt5.com>
23
24
  module Driver
24
- RACKSPACE_VERSION = '0.19.0'
25
+ RACKSPACE_VERSION = '0.20.0'.freeze
25
26
  end
26
27
  end
data/spec/kitchen/driver/rackspace_spec.rb CHANGED
@@ -113,7 +113,7 @@ describe Kitchen::Driver::Rackspace do
113
113
  platforms = {
114
114
  'ubuntu-12.04' => '973775ab-0653-4ef8-a571-7a2777787735',
115
115
  'ubuntu-12' => '973775ab-0653-4ef8-a571-7a2777787735',
116
- 'ubuntu' => '658a7d3b-4c58-4e29-b339-2509cca0de10',
116
+ 'ubuntu' => '59a3fadd-93e7-4674-886a-64883e17115f',
117
117
  'centos-5' => 'fdaf64c7-d9f3-446c-bd7c-70349305ae91',
118
118
  'centos' => '6595f1b7-e825-4bd2-addc-c7b1c803a37f'
119
119
  }
@@ -577,7 +577,7 @@ describe Kitchen::Driver::Rackspace do
577
577
  let(:hostname) { 'ab.c' * 20 }
578
578
 
579
579
  it 'limits the generated name to 63 characters' do
580
- expect(driver.send(:default_name).length).to be <= (63)
580
+ expect(driver.send(:default_name).length).to be <= 63
581
581
  end
582
582
  end
583
583
 
data/spec/spec_helper.rb CHANGED
@@ -5,12 +5,14 @@ require 'simplecov'
5
5
  require 'simplecov-console'
6
6
  require 'coveralls'
7
7
 
8
- SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
9
- Coveralls::SimpleCov::Formatter,
10
- SimpleCov::Formatter::HTMLFormatter,
11
- SimpleCov::Formatter::Console
12
- ]
13
- SimpleCov.minimum_coverage 90
8
+ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
9
+ [
10
+ Coveralls::SimpleCov::Formatter,
11
+ SimpleCov::Formatter::HTMLFormatter,
12
+ SimpleCov::Formatter::Console
13
+ ]
14
+ )
15
+ SimpleCov.minimum_coverage(90)
14
16
  SimpleCov.start do
15
17
  add_filter '/vendor/'
16
18
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kitchen-rackspace
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.19.0
4
+ version: 0.20.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonathan Hartman
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-10-07 00:00:00.000000000 Z
11
+ date: 2016-01-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: test-kitchen
@@ -80,20 +80,6 @@ dependencies:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0.29'
83
- - !ruby/object:Gem::Dependency
84
- name: cane
85
- requirement: !ruby/object:Gem::Requirement
86
- requirements:
87
- - - "~>"
88
- - !ruby/object:Gem::Version
89
- version: '2.6'
90
- type: :development
91
- prerelease: false
92
- version_requirements: !ruby/object:Gem::Requirement
93
- requirements:
94
- - - "~>"
95
- - !ruby/object:Gem::Version
96
- version: '2.6'
97
83
  - !ruby/object:Gem::Dependency
98
84
  name: rspec
99
85
  requirement: !ruby/object:Gem::Requirement
@@ -192,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
192
178
  version: '0'
193
179
  requirements: []
194
180
  rubyforge_project:
195
- rubygems_version: 2.4.5.1
181
+ rubygems_version: 2.5.1
196
182
  signing_key:
197
183
  specification_version: 4
198
184
  summary: A Test Kitchen Rackspace driver built on Fog