occi-core 4.3.2 → 4.3.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +10 -25
- data/Gemfile +0 -12
- data/lib/occi/parser/text.rb +10 -2
- data/lib/occi/version.rb +1 -1
- data/occi-core.gemspec +10 -0
- metadata +193 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 00755f065a770437556d3a96fd2e8dbf744f4333
|
|
4
|
+
data.tar.gz: 731e4398866924ea72f3df5b5c8fcbdfef327611
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a7df17c216d3760ba26baf15cc04c7ae8ab860686fde8e91e6e2ae2ed9e5b8712475e1a6a191ad14a79d8d3986700dea79e1532275cf8ae75ba2353555ba8190
|
|
7
|
+
data.tar.gz: 9bf239a985658ebf04762d91cd5ddd8a61f11524fc0b61eddcb186f76c1614a77875009766fc7f32fe49e31782bde416ac653de785da2615c24f5918279b3714
|
data/.travis.yml
CHANGED
|
@@ -4,36 +4,14 @@ rvm:
|
|
|
4
4
|
- 1.9.3
|
|
5
5
|
- 2.0.0
|
|
6
6
|
- 2.1
|
|
7
|
+
- 2.2
|
|
8
|
+
- 2.3
|
|
7
9
|
- ruby-head
|
|
8
|
-
- jruby-19mode
|
|
9
|
-
- jruby-head
|
|
10
|
-
|
|
11
|
-
jdk:
|
|
12
|
-
- openjdk7
|
|
13
|
-
- oraclejdk7
|
|
14
|
-
- openjdk6
|
|
15
10
|
|
|
16
11
|
matrix:
|
|
17
12
|
allow_failures:
|
|
13
|
+
- rvm: 2.3
|
|
18
14
|
- rvm: ruby-head
|
|
19
|
-
- rvm: jruby-head
|
|
20
|
-
exclude:
|
|
21
|
-
- rvm: 1.9.3
|
|
22
|
-
jdk: openjdk7
|
|
23
|
-
- rvm: 1.9.3
|
|
24
|
-
jdk: oraclejdk7
|
|
25
|
-
- rvm: 2.0.0
|
|
26
|
-
jdk: openjdk7
|
|
27
|
-
- rvm: 2.0.0
|
|
28
|
-
jdk: oraclejdk7
|
|
29
|
-
- rvm: 2.1
|
|
30
|
-
jdk: openjdk7
|
|
31
|
-
- rvm: 2.1
|
|
32
|
-
jdk: oraclejdk7
|
|
33
|
-
- rvm: ruby-head
|
|
34
|
-
jdk: openjdk7
|
|
35
|
-
- rvm: ruby-head
|
|
36
|
-
jdk: oraclejdk7
|
|
37
15
|
fast_finish: true
|
|
38
16
|
|
|
39
17
|
branches:
|
|
@@ -43,3 +21,10 @@ branches:
|
|
|
43
21
|
- 4.1.x
|
|
44
22
|
- 4.2.x
|
|
45
23
|
- 4.3.x
|
|
24
|
+
|
|
25
|
+
install: 'gem install bundler -v ">= 1.7.12" && bundle install --retry=10'
|
|
26
|
+
|
|
27
|
+
env:
|
|
28
|
+
- ON_TRAVIS_CI=yes
|
|
29
|
+
|
|
30
|
+
sudo: false
|
data/Gemfile
CHANGED
|
@@ -1,15 +1,3 @@
|
|
|
1
1
|
source "https://rubygems.org/"
|
|
2
2
|
|
|
3
3
|
gemspec
|
|
4
|
-
|
|
5
|
-
group :development do
|
|
6
|
-
gem 'rubygems-tasks', :git => 'git://github.com/postmodern/rubygems-tasks.git'
|
|
7
|
-
gem 'json_spec', :git => "https://github.com/collectiveidea/json_spec", :branch => "master"
|
|
8
|
-
gem 'rspec'
|
|
9
|
-
gem 'rake'
|
|
10
|
-
gem 'builder'
|
|
11
|
-
gem 'simplecov'
|
|
12
|
-
gem 'yard'
|
|
13
|
-
gem 'yard-rspec'
|
|
14
|
-
gem 'debugger', :platforms => :ruby if RUBY_VERSION == '1.9.3'
|
|
15
|
-
end
|
data/lib/occi/parser/text.rb
CHANGED
|
@@ -36,9 +36,11 @@ module Occi
|
|
|
36
36
|
category = category(line)
|
|
37
37
|
|
|
38
38
|
if category.kind_of? Occi::Core::Kind
|
|
39
|
-
resource = Occi::Core::Resource.new
|
|
39
|
+
resource = Occi::Core::Resource.new category.type_identifier
|
|
40
|
+
resource.id = nil
|
|
40
41
|
resource.kind = category
|
|
41
42
|
end
|
|
43
|
+
|
|
42
44
|
resource.mixins << category if category.kind_of? Occi::Core::Mixin
|
|
43
45
|
when /^X-OCCI-Attribute:/
|
|
44
46
|
resource.attributes.merge! attribute(line)
|
|
@@ -76,7 +78,13 @@ module Occi
|
|
|
76
78
|
case line
|
|
77
79
|
when /^Category:/
|
|
78
80
|
category = category(line)
|
|
79
|
-
|
|
81
|
+
|
|
82
|
+
if category.kind_of? Occi::Core::Kind
|
|
83
|
+
link = Occi::Core::Link.new category.type_identifier
|
|
84
|
+
link.id = nil
|
|
85
|
+
link.kind = category
|
|
86
|
+
end
|
|
87
|
+
|
|
80
88
|
link.mixins << category if category.kind_of? Occi::Core::Mixin
|
|
81
89
|
when /^X-OCCI-Attribute:/
|
|
82
90
|
link.attributes.merge! attribute(line)
|
data/lib/occi/version.rb
CHANGED
data/occi-core.gemspec
CHANGED
|
@@ -24,5 +24,15 @@ Gem::Specification.new do |gem|
|
|
|
24
24
|
gem.add_dependency 'activesupport', '~> 4.0', '>= 4.0.0'
|
|
25
25
|
gem.add_dependency 'settingslogic', '~> 2.0', '>= 2.0.9'
|
|
26
26
|
|
|
27
|
+
gem.add_development_dependency 'rubygems-tasks'
|
|
28
|
+
gem.add_development_dependency 'json_spec'
|
|
29
|
+
gem.add_development_dependency 'rspec'
|
|
30
|
+
gem.add_development_dependency 'rake'
|
|
31
|
+
gem.add_development_dependency 'builder'
|
|
32
|
+
gem.add_development_dependency 'simplecov'
|
|
33
|
+
gem.add_development_dependency 'yard'
|
|
34
|
+
gem.add_development_dependency 'yard-rspec'
|
|
35
|
+
gem.add_development_dependency 'pry'
|
|
36
|
+
|
|
27
37
|
gem.required_ruby_version = '>= 1.9.3'
|
|
28
38
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: occi-core
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 4.3.
|
|
4
|
+
version: 4.3.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Florian Feldhaus
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date:
|
|
13
|
+
date: 2017-01-24 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: json
|
|
@@ -112,6 +112,132 @@ dependencies:
|
|
|
112
112
|
- - ">="
|
|
113
113
|
- !ruby/object:Gem::Version
|
|
114
114
|
version: 2.0.9
|
|
115
|
+
- !ruby/object:Gem::Dependency
|
|
116
|
+
name: rubygems-tasks
|
|
117
|
+
requirement: !ruby/object:Gem::Requirement
|
|
118
|
+
requirements:
|
|
119
|
+
- - ">="
|
|
120
|
+
- !ruby/object:Gem::Version
|
|
121
|
+
version: '0'
|
|
122
|
+
type: :development
|
|
123
|
+
prerelease: false
|
|
124
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
125
|
+
requirements:
|
|
126
|
+
- - ">="
|
|
127
|
+
- !ruby/object:Gem::Version
|
|
128
|
+
version: '0'
|
|
129
|
+
- !ruby/object:Gem::Dependency
|
|
130
|
+
name: json_spec
|
|
131
|
+
requirement: !ruby/object:Gem::Requirement
|
|
132
|
+
requirements:
|
|
133
|
+
- - ">="
|
|
134
|
+
- !ruby/object:Gem::Version
|
|
135
|
+
version: '0'
|
|
136
|
+
type: :development
|
|
137
|
+
prerelease: false
|
|
138
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
139
|
+
requirements:
|
|
140
|
+
- - ">="
|
|
141
|
+
- !ruby/object:Gem::Version
|
|
142
|
+
version: '0'
|
|
143
|
+
- !ruby/object:Gem::Dependency
|
|
144
|
+
name: rspec
|
|
145
|
+
requirement: !ruby/object:Gem::Requirement
|
|
146
|
+
requirements:
|
|
147
|
+
- - ">="
|
|
148
|
+
- !ruby/object:Gem::Version
|
|
149
|
+
version: '0'
|
|
150
|
+
type: :development
|
|
151
|
+
prerelease: false
|
|
152
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
153
|
+
requirements:
|
|
154
|
+
- - ">="
|
|
155
|
+
- !ruby/object:Gem::Version
|
|
156
|
+
version: '0'
|
|
157
|
+
- !ruby/object:Gem::Dependency
|
|
158
|
+
name: rake
|
|
159
|
+
requirement: !ruby/object:Gem::Requirement
|
|
160
|
+
requirements:
|
|
161
|
+
- - ">="
|
|
162
|
+
- !ruby/object:Gem::Version
|
|
163
|
+
version: '0'
|
|
164
|
+
type: :development
|
|
165
|
+
prerelease: false
|
|
166
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
167
|
+
requirements:
|
|
168
|
+
- - ">="
|
|
169
|
+
- !ruby/object:Gem::Version
|
|
170
|
+
version: '0'
|
|
171
|
+
- !ruby/object:Gem::Dependency
|
|
172
|
+
name: builder
|
|
173
|
+
requirement: !ruby/object:Gem::Requirement
|
|
174
|
+
requirements:
|
|
175
|
+
- - ">="
|
|
176
|
+
- !ruby/object:Gem::Version
|
|
177
|
+
version: '0'
|
|
178
|
+
type: :development
|
|
179
|
+
prerelease: false
|
|
180
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
181
|
+
requirements:
|
|
182
|
+
- - ">="
|
|
183
|
+
- !ruby/object:Gem::Version
|
|
184
|
+
version: '0'
|
|
185
|
+
- !ruby/object:Gem::Dependency
|
|
186
|
+
name: simplecov
|
|
187
|
+
requirement: !ruby/object:Gem::Requirement
|
|
188
|
+
requirements:
|
|
189
|
+
- - ">="
|
|
190
|
+
- !ruby/object:Gem::Version
|
|
191
|
+
version: '0'
|
|
192
|
+
type: :development
|
|
193
|
+
prerelease: false
|
|
194
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
195
|
+
requirements:
|
|
196
|
+
- - ">="
|
|
197
|
+
- !ruby/object:Gem::Version
|
|
198
|
+
version: '0'
|
|
199
|
+
- !ruby/object:Gem::Dependency
|
|
200
|
+
name: yard
|
|
201
|
+
requirement: !ruby/object:Gem::Requirement
|
|
202
|
+
requirements:
|
|
203
|
+
- - ">="
|
|
204
|
+
- !ruby/object:Gem::Version
|
|
205
|
+
version: '0'
|
|
206
|
+
type: :development
|
|
207
|
+
prerelease: false
|
|
208
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
209
|
+
requirements:
|
|
210
|
+
- - ">="
|
|
211
|
+
- !ruby/object:Gem::Version
|
|
212
|
+
version: '0'
|
|
213
|
+
- !ruby/object:Gem::Dependency
|
|
214
|
+
name: yard-rspec
|
|
215
|
+
requirement: !ruby/object:Gem::Requirement
|
|
216
|
+
requirements:
|
|
217
|
+
- - ">="
|
|
218
|
+
- !ruby/object:Gem::Version
|
|
219
|
+
version: '0'
|
|
220
|
+
type: :development
|
|
221
|
+
prerelease: false
|
|
222
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
223
|
+
requirements:
|
|
224
|
+
- - ">="
|
|
225
|
+
- !ruby/object:Gem::Version
|
|
226
|
+
version: '0'
|
|
227
|
+
- !ruby/object:Gem::Dependency
|
|
228
|
+
name: pry
|
|
229
|
+
requirement: !ruby/object:Gem::Requirement
|
|
230
|
+
requirements:
|
|
231
|
+
- - ">="
|
|
232
|
+
- !ruby/object:Gem::Version
|
|
233
|
+
version: '0'
|
|
234
|
+
type: :development
|
|
235
|
+
prerelease: false
|
|
236
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
237
|
+
requirements:
|
|
238
|
+
- - ">="
|
|
239
|
+
- !ruby/object:Gem::Version
|
|
240
|
+
version: '0'
|
|
115
241
|
description: OCCI is a collection of classes to simplify the implementation of the
|
|
116
242
|
Open Cloud Computing API in Ruby
|
|
117
243
|
email:
|
|
@@ -277,8 +403,71 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
277
403
|
version: '0'
|
|
278
404
|
requirements: []
|
|
279
405
|
rubyforge_project:
|
|
280
|
-
rubygems_version: 2.
|
|
406
|
+
rubygems_version: 2.4.8
|
|
281
407
|
signing_key:
|
|
282
408
|
specification_version: 4
|
|
283
409
|
summary: OCCI toolkit
|
|
284
|
-
test_files:
|
|
410
|
+
test_files:
|
|
411
|
+
- spec/helpers/to_plain.rb
|
|
412
|
+
- spec/helpers/yaml_hash.rb
|
|
413
|
+
- spec/occi-core_spec.rb
|
|
414
|
+
- spec/occi/collection_samples/collection1.json
|
|
415
|
+
- spec/occi/collection_samples/directory2/collection2.json
|
|
416
|
+
- spec/occi/collection_spec.rb
|
|
417
|
+
- spec/occi/core/action_instance_spec.rb
|
|
418
|
+
- spec/occi/core/action_spec.rb
|
|
419
|
+
- spec/occi/core/attributes_spec.rb
|
|
420
|
+
- spec/occi/core/categories_spec.rb
|
|
421
|
+
- spec/occi/core/category_spec.rb
|
|
422
|
+
- spec/occi/core/entities_spec.rb
|
|
423
|
+
- spec/occi/core/entity_spec.rb
|
|
424
|
+
- spec/occi/core/kind_spec.rb
|
|
425
|
+
- spec/occi/core/link_spec.rb
|
|
426
|
+
- spec/occi/core/links_spec.rb
|
|
427
|
+
- spec/occi/core/mixin_spec.rb
|
|
428
|
+
- spec/occi/core/mixins_spec.rb
|
|
429
|
+
- spec/occi/core/properties_spec.rb
|
|
430
|
+
- spec/occi/core/resource_spec.rb
|
|
431
|
+
- spec/occi/core_spec.rb
|
|
432
|
+
- spec/occi/infrastructure/compute_spec.rb
|
|
433
|
+
- spec/occi/infrastructure/network_spec.rb
|
|
434
|
+
- spec/occi/infrastructure/networkinterface_spec.rb
|
|
435
|
+
- spec/occi/infrastructure/storage_spec.rb
|
|
436
|
+
- spec/occi/infrastructure/storagelink_spec.rb
|
|
437
|
+
- spec/occi/log_spec.rb
|
|
438
|
+
- spec/occi/model_spec.rb
|
|
439
|
+
- spec/occi/parser/json_samples/test.json
|
|
440
|
+
- spec/occi/parser/text_samples/occi_categories.body_plain.expected
|
|
441
|
+
- spec/occi/parser/text_samples/occi_categories.expected
|
|
442
|
+
- spec/occi/parser/text_samples/occi_categories.parse_headers.expected
|
|
443
|
+
- spec/occi/parser/text_samples/occi_categories.text
|
|
444
|
+
- spec/occi/parser/text_samples/occi_compute_rocci_server.expected
|
|
445
|
+
- spec/occi/parser/text_samples/occi_compute_rocci_server.text
|
|
446
|
+
- spec/occi/parser/text_samples/occi_link_resource_instance.body_plain.expected
|
|
447
|
+
- spec/occi/parser/text_samples/occi_link_resource_instance.expected
|
|
448
|
+
- spec/occi/parser/text_samples/occi_link_resource_instance.parse.expected
|
|
449
|
+
- spec/occi/parser/text_samples/occi_link_resource_instance.text
|
|
450
|
+
- spec/occi/parser/text_samples/occi_link_simple.expected
|
|
451
|
+
- spec/occi/parser/text_samples/occi_link_simple.text
|
|
452
|
+
- spec/occi/parser/text_samples/occi_link_w_attributes.expected
|
|
453
|
+
- spec/occi/parser/text_samples/occi_link_w_attributes.text
|
|
454
|
+
- spec/occi/parser/text_samples/occi_link_w_category.expected
|
|
455
|
+
- spec/occi/parser/text_samples/occi_link_w_category.text
|
|
456
|
+
- spec/occi/parser/text_samples/occi_model_categories.expected
|
|
457
|
+
- spec/occi/parser/text_samples/occi_model_rocci_server.text
|
|
458
|
+
- spec/occi/parser/text_samples/occi_network_rocci_server.body_plain.expected
|
|
459
|
+
- spec/occi/parser/text_samples/occi_network_rocci_server.expected
|
|
460
|
+
- spec/occi/parser/text_samples/occi_network_rocci_server.resource.header.expected
|
|
461
|
+
- spec/occi/parser/text_samples/occi_network_rocci_server.resource.rack.expected
|
|
462
|
+
- spec/occi/parser/text_samples/occi_network_rocci_server.text
|
|
463
|
+
- spec/occi/parser/text_samples/occi_resource_custom_class_w_attributes.parse.expected
|
|
464
|
+
- spec/occi/parser/text_samples/occi_resource_custom_class_w_attributes.text
|
|
465
|
+
- spec/occi/parser/text_samples/occi_resource_w_attributes.text
|
|
466
|
+
- spec/occi/parser/text_samples/occi_resource_w_inline_links.expected
|
|
467
|
+
- spec/occi/parser/text_samples/occi_resource_w_inline_links.text
|
|
468
|
+
- spec/occi/parser/text_samples/occi_resource_w_inline_links_only.text
|
|
469
|
+
- spec/occi/parser/text_samples/occi_storage_rocci_server.expected
|
|
470
|
+
- spec/occi/parser/text_samples/occi_storage_rocci_server.text
|
|
471
|
+
- spec/occi/parser/text_spec.rb
|
|
472
|
+
- spec/occi/parser_spec.rb
|
|
473
|
+
- spec/spec_helper.rb
|