occi-cli 4.3.3 → 4.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 923576b014280e1810eda84b47b89ea27fe5a239
-  data.tar.gz: 685817d6dc86d4e3c1c8e1407e5553bed93adf74
+  metadata.gz: 3ed4fdb3246ce1cf2f09791a0cdb34102cdbac4f
+  data.tar.gz: 66cf0cdcf5d6c519357c834ab78b3f49bd3de419
 SHA512:
-  metadata.gz: 5542e7d99378f2ceb4ae38cad6c4bbca6ba715ebb36e4f2ae710655709063db20ffe3d50b647dc073b8cfa71e4ca1fea8f0e4e80f6bb5695f102137e27483665
-  data.tar.gz: 2860ac0d49267d3040b36dd1fc7d2ba29aaa770cce3796f66379c4bb8df003ad59595bed0204f5b364983ebcf0f7944589351c27c824a5ac5ec726f200ad4095
+  metadata.gz: 30499156112eb63ba71a600aed6b689a15a3fc71211754e8193b7ed74e8cc76bec4c3cf36aec7eee275134ec30bbf389721ebc8b81a59926b71570e8d876b5b1
+  data.tar.gz: 856b1f6728377740a504adc2c01a4b0b02218b97a221b19f4e1ea1cd55240a0eb3934fa6297b9c72c3673a90bcbf859973de7944c293f0f70c912d002b759fc6

data/.travis.yml

@@ -4,36 +4,14 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1
+  - 2.2
+  - 2.3
   - ruby-head
-  - jruby-19mode
-  - jruby-head
-
-jdk:
-  - openjdk7
-  - oraclejdk7
-  - openjdk6
 
 matrix:
   allow_failures:
+    - rvm: 2.3
     - rvm: ruby-head
-    - rvm: jruby-head
-  exclude:
-    - rvm: 1.9.3
-      jdk: openjdk7
-    - rvm: 1.9.3
-      jdk: oraclejdk7
-    - rvm: 2.0.0
-      jdk: openjdk7
-    - rvm: 2.0.0
-      jdk: oraclejdk7
-    - rvm: 2.1
-      jdk: openjdk7
-    - rvm: 2.1
-      jdk: oraclejdk7
-    - rvm: ruby-head
-      jdk: openjdk7
-    - rvm: ruby-head
-      jdk: oraclejdk7
   fast_finish: true
 
 branches:
@@ -43,3 +21,10 @@ branches:
     - 4.1.x
     - 4.2.x
     - 4.3.x
+
+install: 'gem install bundler -v ">= 1.7.12" && bundle install --retry=10'
+
+env:
+  - ON_TRAVIS_CI=yes
+
+sudo: false

data/lib/occi/cli/helpers/create_helper.rb

@@ -113,7 +113,8 @@ module Occi::Cli::Helpers::CreateHelper
 
       case var
       when 'public_key', :public_key
-        res.attributes['org.openstack.credentials.publickey.name'] = 'Public SSH key'
+        # Not setting `publickey.name` to avoid conflicts with already registered keys
+        # res.attributes['org.openstack.credentials.publickey.name'] = 'Public SSH key'
         res.attributes['org.openstack.credentials.publickey.data'] = val
       when 'user_data', :user_data
         res.attributes['org.openstack.compute.user_data'] = val
@@ -123,4 +124,4 @@ module Occi::Cli::Helpers::CreateHelper
     end
   end
 
-end
+end

data/lib/occi/cli/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Cli
-    VERSION = "4.3.3" unless defined?(::Occi::Cli::VERSION)
+    VERSION = "4.3.4" unless defined?(::Occi::Cli::VERSION)
   end
 end

data/occi-cli.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec}/*`.split("\n")
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'occi-api', '~> 4.3', '>= 4.3.4'
+  gem.add_dependency 'occi-api', '~> 4.3', '>= 4.3.6'
   gem.add_dependency 'json', '~> 1.8', '>= 1.8.1'
   gem.add_dependency 'highline', '~> 1.6', '>= 1.6.21'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-cli
 version: !ruby/object:Gem::Version
-  version: 4.3.3
+  version: 4.3.4
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
@@ -21,7 +21,7 @@ dependencies:
         version: '4.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.4
+        version: 4.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
         version: '4.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.4
+        version: 4.3.6
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement