kitchen-digitalocean 0.2.0 → 0.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +6 -14
  2. data/.rubocop.yml +5 -0
  3. data/.travis.yml +0 -1
  4. data/CHANGELOG.md +6 -0
  5. data/README.md +39 -35
  6. data/Rakefile +7 -5
  7. data/kitchen-digitalocean.gemspec +3 -5
  8. data/lib/kitchen/driver/digitalocean.rb +1 -1
  9. data/lib/kitchen/driver/digitalocean_version.rb +1 -1
  10. data/spec/kitchen/driver/digitalocean_spec.rb +3 -3
  11. metadata +27 -54
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- NDdiZTUzMjdkZGE0NjNjY2IwM2Q4M2RhNzhlMjk1YmUyYmJhN2JlZQ==
5
- data.tar.gz: !binary |-
6
- ODA4ZTE4MzYzYjQxNDM4YTIxM2QxY2YzZjExOGNmNDM4ZTA5YTc4NQ==
7
- !binary "U0hBNTEy":
8
- metadata.gz: !binary |-
9
- ZjhkZGM2YTZjODkyN2YzM2MzZDBmNTYwN2JmNWYwNDEzNjAxMDk5MDRhNjI3
10
- NzgwMWU4MGIzNjA1ZDgwNTYzYmViMjdjNTc1N2RmYTk1MTMwMjY1MTEzZDAy
11
- MWJkOTkzMjgwZGIxODU2ZDFmZGRjZmUzNWFlYzIyMTIzM2I0YjM=
12
- data.tar.gz: !binary |-
13
- MDUxYTZjYjA2YTkyMDgxNzgyNjc2OWNkYTI5NmMxZTJlOTVhZDAxMjZlOTRl
14
- Y2YwZWU1Zjc3NmU0NjgxZmJmNzhjOTVlMDIyMzU4NGM3MmNiOGFkMTNkMzc2
15
- MWY2Y2NkZDNhZjU0MmYyNTMyMDFiMzk3NGNkZjkzMTllNjBlYmY=
2
+ SHA1:
3
+ metadata.gz: c8a8fc53ad14a8281c01d1d54e7a924421185b44
4
+ data.tar.gz: e4f56a04aa2d1d2a73ad4ba266742dbce1c133cc
5
+ SHA512:
6
+ metadata.gz: 019059631b488ec6b978f39b732f69243304db1dab1101cd16ccfa5f7f0b1ec80d4ad05d617d68cde038558e8f57a167e6b8c66b7d1f7ba327065dfc425651d4
7
+ data.tar.gz: c13729b9a2bd3416bb645601c853693faae5642e9e0d390830e0ab0cf090f734607bf1853085c9f8665ce074155c57d096227b8e1fafb5aad258144e45a31bac
data/.rubocop.yml ADDED
@@ -0,0 +1,5 @@
1
+ Documentation:
2
+ Enabled: false
3
+
4
+ Semicolon:
5
+ Enabled: false
data/.travis.yml CHANGED
@@ -4,7 +4,6 @@ gemfile:
4
4
  - Gemfile
5
5
 
6
6
  rvm:
7
- - 1.9.2
8
7
  - 1.9.3
9
8
  - 2.0.0
10
9
 
data/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
1
+ # 0.2.1 / 2013-10-31
2
+
3
+ * Update example tables in the readme
4
+ * Fix warning for public_ip_address
5
+ * [@dpetzel](https://github.com/dpetzel) [PR #1] flip flavor and image
6
+
1
7
  # 0.2.0 / 2013-06-19
2
8
 
3
9
  * Provide debug output for test-kitchen
data/README.md CHANGED
@@ -47,46 +47,50 @@ ID Name
47
47
  1 New York 1
48
48
  2 Amsterdam 1
49
49
  3 San Francisco 1
50
+ 4 New York 2
50
51
  ```
51
52
 
52
- ### List of Flavors
53
+ ### List of Images
53
54
  ```shell
54
- ID Distribution Name Global
55
- 249545 Arch Linux Arch Linux 2013.03 x32 +
56
- 249546 Arch Linux Arch Linux 2013.03 x64 +
57
- 1602 CentOS CentOS 5.8 x32 +
58
- 1601 CentOS CentOS 5.8 x64 +
59
- 1605 CentOS CentOS 6.0 x32 +
60
- 1611 CentOS CentOS 6.2 x64 +
61
- 12578 CentOS CentOS 6.3 x32 +
62
- 12574 CentOS CentOS 6.3 x64 +
63
- 196798 CentOS Centos 6.4 x32 Server +
64
- 197088 CentOS Centos 6.4 x64 Server +
65
- 12575 Debian Debian 6.0 x32 +
66
- 12573 Debian Debian 6.0 x64 +
67
- 1606 Fedora Fedora 15 x64 +
68
- 1618 Fedora Fedora 16 x64 Desktop +
69
- 1615 Fedora Fedora 16 x64 Server +
70
- 32399 Fedora Fedora 17 x32 Desktop +
71
- 32387 Fedora Fedora 17 x32 Server +
72
- 32419 Fedora Fedora 17 x64 Desktop +
73
- 32428 Fedora Fedora 17 x64 Server +
74
- 46964 Ubuntu LAMP on Ubuntu 12.04 +
75
- 14098 Ubuntu Ubuntu 10.04 x32 Server +
76
- 14097 Ubuntu Ubuntu 10.04 x64 Server +
77
- 43462 Ubuntu Ubuntu 11.04x32 Desktop +
78
- 43458 Ubuntu Ubuntu 11.04x64 Server +
79
- 1609 Ubuntu Ubuntu 11.10 x32 Server +
80
- 42735 Ubuntu Ubuntu 12.04 x32 Server +
81
- 14218 Ubuntu Ubuntu 12.04 x64 Desktop +
82
- 2676 Ubuntu Ubuntu 12.04 x64 Server +
83
- 25485 Ubuntu Ubuntu 12.10 x32 Desktop +
84
- 25306 Ubuntu Ubuntu 12.10 x32 Server +
85
- 25493 Ubuntu Ubuntu 12.10 x64 Desktop +
86
- 25489 Ubuntu Ubuntu 12.10 x64 Server +
55
+ ID Distribution Name
56
+ 361740 Arch Linux Arch Linux 2013.05 x32
57
+ 350424 Arch Linux Arch Linux 2013.05 x64
58
+ 1602 CentOS CentOS 5.8 x32
59
+ 1601 CentOS CentOS 5.8 x64
60
+ 376568 CentOS CentOS 6.4 x32
61
+ 562354 CentOS CentOS 6.4 x64
62
+ 12575 Debian Debian 6.0 x32
63
+ 12573 Debian Debian 6.0 x64
64
+ 303619 Debian Debian 7.0 x32
65
+ 308287 Debian Debian 7.0 x64
66
+ 32387 Fedora Fedora 17 x32
67
+ 32399 Fedora Fedora 17 x32 Desktop
68
+ 32428 Fedora Fedora 17 x64
69
+ 32419 Fedora Fedora 17 x64 Desktop
70
+ 697056 Fedora Fedora 19 x86
71
+ 696598 Fedora Fedora 19 x86-64
72
+ 1004145 Ubuntu Docker on Ubuntu 13.04 x64
73
+ 959207 Ubuntu Ghost 0.3.3 on Ubuntu 12.04
74
+ 459444 Ubuntu LAMP on Ubuntu 12.04
75
+ 483575 Ubuntu Redmine on Ubuntu 12.04
76
+ 464235 Ubuntu Ruby on Rails on Ubuntu 12.10 (Nginx + Unicorn)
77
+ 14098 Ubuntu Ubuntu 10.04 x32
78
+ 14097 Ubuntu Ubuntu 10.04 x64
79
+ 284211 Ubuntu Ubuntu 12.04 x32
80
+ 284203 Ubuntu Ubuntu 12.04 x64
81
+ 1015250 Ubuntu Ubuntu 12.04.3 x32
82
+ 1015253 Ubuntu Ubuntu 12.04.3 x64
83
+ 433240 Ubuntu Ubuntu 12.10 x32
84
+ 473123 Ubuntu Ubuntu 12.10 x64
85
+ 473136 Ubuntu Ubuntu 12.10 x64 Desktop
86
+ 345791 Ubuntu Ubuntu 13.04 x32
87
+ 350076 Ubuntu Ubuntu 13.04 x64
88
+ 962304 Ubuntu Ubuntu 13.10 x32
89
+ 961965 Ubuntu Ubuntu 13.10 x64
90
+ 1061995 Ubuntu Wordpress on Ubuntu 12.10
87
91
  ```
88
92
 
89
- ### List of Sizes
93
+ ### List of Flavors (Sizes)
90
94
  ```shell
91
95
  ID Name
92
96
  63 1GB
data/Rakefile CHANGED
@@ -1,14 +1,16 @@
1
1
  require 'bundler/gem_tasks'
2
- require 'tailor/rake_task'
2
+ require 'rubocop/rake_task'
3
3
  require 'cane/rake_task'
4
4
  require 'rspec/core/rake_task'
5
5
 
6
6
  desc 'Run Cane to check quality metrics'
7
7
  Cane::RakeTask.new
8
8
 
9
- desc 'Run Tailor to lint check code'
10
- Tailor::RakeTask.new do |task|
11
- task.file_set '**/**/*.rb'
9
+ desc 'Run RuboCop on the lib directory'
10
+ Rubocop::RakeTask.new(:rubocop) do |task|
11
+ task.patterns = ['lib/**/*.rb']
12
+ # don't abort rake on failure
13
+ task.fail_on_error = false
12
14
  end
13
15
 
14
16
  desc 'Display LOC stats'
@@ -20,6 +22,6 @@ end
20
22
  desc 'Run RSpec unit tests'
21
23
  RSpec::Core::RakeTask.new(:spec)
22
24
 
23
- task :default => [ :cane, :tailor, :loc, :spec ]
25
+ task :default => [ :cane, :rubocop, :loc, :spec ]
24
26
 
25
27
  # vim: ai et ts=2 sts=2 sw=2 ft=ruby fdm=marker
data/kitchen-digitalocean.gemspec CHANGED
@@ -18,16 +18,14 @@ Gem::Specification.new do |spec|
18
18
  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
19
19
  spec.require_paths = ['lib']
20
20
 
21
- spec.add_dependency 'test-kitchen', '~> 1.0.0.alpha'
22
- spec.add_dependency 'fog', '~> 1.12'
21
+ spec.add_dependency 'test-kitchen', '~> 1.0.0.beta.3'
22
+ spec.add_dependency 'fog'
23
23
 
24
- spec.add_development_dependency 'bundler'
24
+ spec.add_development_dependency 'rubocop'
25
25
  spec.add_development_dependency 'rake'
26
- spec.add_development_dependency 'tailor'
27
26
  spec.add_development_dependency 'cane'
28
27
  spec.add_development_dependency 'countloc'
29
28
  spec.add_development_dependency 'rspec'
30
- spec.add_development_dependency 'multi_json'
31
29
  end
32
30
 
33
31
  # vim: ai et ts=2 sts=2 sw=2 ft=ruby
data/lib/kitchen/driver/digitalocean.rb CHANGED
@@ -44,7 +44,7 @@ module Kitchen
44
44
 
45
45
  info("Digital Ocean instance <#{state[:server_id]}> created.")
46
46
  server.wait_for { print '.'; ready? } ; print '(server ready)'
47
- state[:hostname] = server.ip_address
47
+ state[:hostname] = server.public_ip_address
48
48
  wait_for_sshd(state[:hostname]) ; print "(ssh ready)\n"
49
49
  debug("digitalocean:create #{state[:hostname]}")
50
50
  rescue Fog::Errors::Error, Excon::Errors::Error => ex
data/lib/kitchen/driver/digitalocean_version.rb CHANGED
@@ -19,7 +19,7 @@
19
19
  module Kitchen
20
20
  module Driver
21
21
  # Version string for Digital Ocean Kitchen driver
22
- DIGITALOCEAN_VERSION = '0.2.0'
22
+ DIGITALOCEAN_VERSION = '0.2.1'
23
23
  end
24
24
  end
25
25
 
data/spec/kitchen/driver/digitalocean_spec.rb CHANGED
@@ -90,8 +90,8 @@ describe Kitchen::Driver::Digitalocean do
90
90
 
91
91
  describe '#create' do
92
92
  let(:server) do
93
- stub(id: 'test123', wait_for: true,
94
- ip_address: '1.2.3.4')
93
+ stub('id' => 'test123', 'wait_for' => true,
94
+ 'public_ip_address' => '1.2.3.4')
95
95
  end
96
96
  let(:driver) do
97
97
  d = Kitchen::Driver::Digitalocean.new(config)
@@ -193,7 +193,7 @@ describe Kitchen::Driver::Digitalocean do
193
193
  context 'all requirements provided' do
194
194
  it 'creates a new compute connection' do
195
195
  Fog::Compute.stub(:new) { |arg| arg }
196
- res = config.merge({ provider: :digitalocean })
196
+ res = config.merge(provider: :digitalocean)
197
197
  expect(driver.send(:compute)).to eq(res)
198
198
  end
199
199
  end
metadata CHANGED
@@ -1,139 +1,111 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kitchen-digitalocean
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.0
4
+ version: 0.2.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Greg Fitzgerald
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-06-19 00:00:00.000000000 Z
11
+ date: 2013-11-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: test-kitchen
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 1.0.0.alpha
19
+ version: 1.0.0.beta.3
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 1.0.0.alpha
26
+ version: 1.0.0.beta.3
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: fog
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
32
- - !ruby/object:Gem::Version
33
- version: '1.12'
34
- type: :runtime
35
- prerelease: false
36
- version_requirements: !ruby/object:Gem::Requirement
37
- requirements:
38
- - - ~>
39
- - !ruby/object:Gem::Version
40
- version: '1.12'
41
- - !ruby/object:Gem::Dependency
42
- name: bundler
43
- requirement: !ruby/object:Gem::Requirement
44
- requirements:
45
- - - ! '>='
31
+ - - ">="
46
32
  - !ruby/object:Gem::Version
47
33
  version: '0'
48
- type: :development
34
+ type: :runtime
49
35
  prerelease: false
50
36
  version_requirements: !ruby/object:Gem::Requirement
51
37
  requirements:
52
- - - ! '>='
38
+ - - ">="
53
39
  - !ruby/object:Gem::Version
54
40
  version: '0'
55
41
  - !ruby/object:Gem::Dependency
56
- name: rake
42
+ name: rubocop
57
43
  requirement: !ruby/object:Gem::Requirement
58
44
  requirements:
59
- - - ! '>='
45
+ - - ">="
60
46
  - !ruby/object:Gem::Version
61
47
  version: '0'
62
48
  type: :development
63
49
  prerelease: false
64
50
  version_requirements: !ruby/object:Gem::Requirement
65
51
  requirements:
66
- - - ! '>='
52
+ - - ">="
67
53
  - !ruby/object:Gem::Version
68
54
  version: '0'
69
55
  - !ruby/object:Gem::Dependency
70
- name: tailor
56
+ name: rake
71
57
  requirement: !ruby/object:Gem::Requirement
72
58
  requirements:
73
- - - ! '>='
59
+ - - ">="
74
60
  - !ruby/object:Gem::Version
75
61
  version: '0'
76
62
  type: :development
77
63
  prerelease: false
78
64
  version_requirements: !ruby/object:Gem::Requirement
79
65
  requirements:
80
- - - ! '>='
66
+ - - ">="
81
67
  - !ruby/object:Gem::Version
82
68
  version: '0'
83
69
  - !ruby/object:Gem::Dependency
84
70
  name: cane
85
71
  requirement: !ruby/object:Gem::Requirement
86
72
  requirements:
87
- - - ! '>='
73
+ - - ">="
88
74
  - !ruby/object:Gem::Version
89
75
  version: '0'
90
76
  type: :development
91
77
  prerelease: false
92
78
  version_requirements: !ruby/object:Gem::Requirement
93
79
  requirements:
94
- - - ! '>='
80
+ - - ">="
95
81
  - !ruby/object:Gem::Version
96
82
  version: '0'
97
83
  - !ruby/object:Gem::Dependency
98
84
  name: countloc
99
85
  requirement: !ruby/object:Gem::Requirement
100
86
  requirements:
101
- - - ! '>='
87
+ - - ">="
102
88
  - !ruby/object:Gem::Version
103
89
  version: '0'
104
90
  type: :development
105
91
  prerelease: false
106
92
  version_requirements: !ruby/object:Gem::Requirement
107
93
  requirements:
108
- - - ! '>='
94
+ - - ">="
109
95
  - !ruby/object:Gem::Version
110
96
  version: '0'
111
97
  - !ruby/object:Gem::Dependency
112
98
  name: rspec
113
99
  requirement: !ruby/object:Gem::Requirement
114
100
  requirements:
115
- - - ! '>='
116
- - !ruby/object:Gem::Version
117
- version: '0'
118
- type: :development
119
- prerelease: false
120
- version_requirements: !ruby/object:Gem::Requirement
121
- requirements:
122
- - - ! '>='
123
- - !ruby/object:Gem::Version
124
- version: '0'
125
- - !ruby/object:Gem::Dependency
126
- name: multi_json
127
- requirement: !ruby/object:Gem::Requirement
128
- requirements:
129
- - - ! '>='
101
+ - - ">="
130
102
  - !ruby/object:Gem::Version
131
103
  version: '0'
132
104
  type: :development
133
105
  prerelease: false
134
106
  version_requirements: !ruby/object:Gem::Requirement
135
107
  requirements:
136
- - - ! '>='
108
+ - - ">="
137
109
  - !ruby/object:Gem::Version
138
110
  version: '0'
139
111
  description: A Test Kitchen Digital Ocean driver
@@ -143,8 +115,9 @@ executables: []
143
115
  extensions: []
144
116
  extra_rdoc_files: []
145
117
  files:
146
- - .gitignore
147
- - .travis.yml
118
+ - ".gitignore"
119
+ - ".rubocop.yml"
120
+ - ".travis.yml"
148
121
  - CHANGELOG.md
149
122
  - Gemfile
150
123
  - LICENSE.txt
@@ -165,17 +138,17 @@ require_paths:
165
138
  - lib
166
139
  required_ruby_version: !ruby/object:Gem::Requirement
167
140
  requirements:
168
- - - ! '>='
141
+ - - ">="
169
142
  - !ruby/object:Gem::Version
170
143
  version: '0'
171
144
  required_rubygems_version: !ruby/object:Gem::Requirement
172
145
  requirements:
173
- - - ! '>='
146
+ - - ">="
174
147
  - !ruby/object:Gem::Version
175
148
  version: '0'
176
149
  requirements: []
177
150
  rubyforge_project:
178
- rubygems_version: 2.0.3
151
+ rubygems_version: 2.1.9
179
152
  signing_key:
180
153
  specification_version: 4
181
154
  summary: A Test Kitchen Digital Ocean driver