occi-cli 4.3.3 → 4.3.4

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: 923576b014280e1810eda84b47b89ea27fe5a239
4
- data.tar.gz: 685817d6dc86d4e3c1c8e1407e5553bed93adf74
3
+ metadata.gz: 3ed4fdb3246ce1cf2f09791a0cdb34102cdbac4f
4
+ data.tar.gz: 66cf0cdcf5d6c519357c834ab78b3f49bd3de419
5
5
  SHA512:
6
- metadata.gz: 5542e7d99378f2ceb4ae38cad6c4bbca6ba715ebb36e4f2ae710655709063db20ffe3d50b647dc073b8cfa71e4ca1fea8f0e4e80f6bb5695f102137e27483665
7
- data.tar.gz: 2860ac0d49267d3040b36dd1fc7d2ba29aaa770cce3796f66379c4bb8df003ad59595bed0204f5b364983ebcf0f7944589351c27c824a5ac5ec726f200ad4095
6
+ metadata.gz: 30499156112eb63ba71a600aed6b689a15a3fc71211754e8193b7ed74e8cc76bec4c3cf36aec7eee275134ec30bbf389721ebc8b81a59926b71570e8d876b5b1
7
+ data.tar.gz: 856b1f6728377740a504adc2c01a4b0b02218b97a221b19f4e1ea1cd55240a0eb3934fa6297b9c72c3673a90bcbf859973de7944c293f0f70c912d002b759fc6
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
@@ -113,7 +113,8 @@ module Occi::Cli::Helpers::CreateHelper
113
113
 
114
114
  case var
115
115
  when 'public_key', :public_key
116
- res.attributes['org.openstack.credentials.publickey.name'] = 'Public SSH key'
116
+ # Not setting `publickey.name` to avoid conflicts with already registered keys
117
+ # res.attributes['org.openstack.credentials.publickey.name'] = 'Public SSH key'
117
118
  res.attributes['org.openstack.credentials.publickey.data'] = val
118
119
  when 'user_data', :user_data
119
120
  res.attributes['org.openstack.compute.user_data'] = val
@@ -123,4 +124,4 @@ module Occi::Cli::Helpers::CreateHelper
123
124
  end
124
125
  end
125
126
 
126
- end
127
+ end
@@ -1,5 +1,5 @@
1
1
  module Occi
2
2
  module Cli
3
- VERSION = "4.3.3" unless defined?(::Occi::Cli::VERSION)
3
+ VERSION = "4.3.4" unless defined?(::Occi::Cli::VERSION)
4
4
  end
5
5
  end
data/occi-cli.gemspec CHANGED
@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
19
19
  gem.test_files = `git ls-files -- {test,spec}/*`.split("\n")
20
20
  gem.require_paths = ['lib']
21
21
 
22
- gem.add_dependency 'occi-api', '~> 4.3', '>= 4.3.4'
22
+ gem.add_dependency 'occi-api', '~> 4.3', '>= 4.3.6'
23
23
  gem.add_dependency 'json', '~> 1.8', '>= 1.8.1'
24
24
  gem.add_dependency 'highline', '~> 1.6', '>= 1.6.21'
25
25
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: occi-cli
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.3.3
4
+ version: 4.3.4
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: 2015-12-15 00:00:00.000000000 Z
13
+ date: 2016-06-24 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: occi-api
@@ -21,7 +21,7 @@ dependencies:
21
21
  version: '4.3'
22
22
  - - ">="
23
23
  - !ruby/object:Gem::Version
24
- version: 4.3.4
24
+ version: 4.3.6
25
25
  type: :runtime
26
26
  prerelease: false
27
27
  version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
31
31
  version: '4.3'
32
32
  - - ">="
33
33
  - !ruby/object:Gem::Version
34
- version: 4.3.4
34
+ version: 4.3.6
35
35
  - !ruby/object:Gem::Dependency
36
36
  name: json
37
37
  requirement: !ruby/object:Gem::Requirement