kitchen-softlayer 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 013a71150cbda12647fd0f2e3d6ad97f2850d1f2
-  data.tar.gz: 8f64d3f54079265ed045b44c40e130b9a4746d21
+  metadata.gz: a3406a2f341d68622e159f6b7db81f71b8d382d2
+  data.tar.gz: f4adeec6bd5a53ba3683c12c24aa04691577498f
 SHA512:
-  metadata.gz: 7a8c6226624125539e56202788b6dd9bfc7216da135b5f4e771351be166f332cc8ef0cd7f0ba3c5137109c53c2fcb0a5e80f1d50c1a9b2b0844117d6a29cf019
-  data.tar.gz: 907cd8365b975128a949da19c842832708488440914f7528f0a32b687a932dd0a2c3e2d3773380c212cb633bf96dc59f8876fcb3549445c48b546da38fef48e3
+  metadata.gz: 2fb580fdb8ffe7969fa5efbb8e29fb4c1fae4b461dc7e6504b3e999d8756fc75c226b68791e8a13ed79b792c4edc01cec0c9054bba943d06dbf38c0ed313d07c
+  data.tar.gz: 23a99f6c49e6199b8e2a33cfaeb82117a78cde171be5f9b3ac4c8ac7f30bc95555390e59ef103fcaa1d8c396bc93f8651942bd8124ea06b22421b2fe7063ae3d

data/kitchen-softlayer.gemspec

@@ -1,4 +1,4 @@
-# Encoding: UTF-8
+# frozen_string_literal: false
 
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.files = candidates.sort
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.1.0'
-  spec.add_dependency 'test-kitchen', '~> 1.4'
   spec.add_dependency 'fog', '~> 1.18'
   spec.add_dependency 'fog-softlayer', '~> 1'
+  spec.add_dependency 'test-kitchen', '~> 1.4'
 end

data/lib/kitchen/driver/softlayer.rb

@@ -1,6 +1,5 @@
-# Encoding: utf-8
+# frozen_string_literal: false
 
-#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -87,7 +86,7 @@ module Kitchen
         debug "fqdn: #{config[:fqdn]}"
         debug "server_name: #{config[:server_name]}"
         debug "server_name_prefix: #{config[:server_name_prefix]}"
-        server = create_server unless find_server(config[:fqdn])
+        server = create_server if config[:fqdn].include?(config[:default_name]) || !find_server(config[:fqdn])
         state[:server_id] = server.id
         info "Softlayer instance <#{state[:server_id]}> created."
         server.wait_for do
@@ -131,7 +130,8 @@ module Kitchen
         config[:server_name] = if config[:server_name_prefix]
                                  server_name_prefix(config[:server_name_prefix])
                                else
-                                 default_name
+                                 config[:default_name] = default_name
+                                 config[:default_name].to_s
                                end
       end
 
@@ -154,7 +154,7 @@ module Kitchen
           ssh = Fog::SSH.new(*new_state)
           begin
             ssh.run([%(uname -a)])
-          rescue => e
+          rescue StandardError => e
             info "Server not yet accepting SSH key: #{e.message}"
             sleep 1
           else
@@ -281,7 +281,7 @@ module Kitchen
         when :private_vlan
           find_network(config[c])
         when :image_id
-          return config[c] if config[c].match('^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}')
+          return config[c] if config[c].match?('^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}')
           find_image(config[c])
         else
           config[c]

data/lib/kitchen/driver/softlayer_version.rb

@@ -1,6 +1,5 @@
-# Encoding: UTF-8
+# frozen_string_literal: false
 
-#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -16,6 +15,6 @@
 module Kitchen
   # Version string for Softlayer Kitchen driver
   module Driver
-    SOFTLAYER_VERSION = '1.0.0'.freeze
+    SOFTLAYER_VERSION = '1.1.0'.freeze
   end
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-softlayer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: test-kitchen
+  name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.18'
 - !ruby/object:Gem::Dependency
-  name: fog
+  name: fog-softlayer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: fog-softlayer
+  name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '1.4'
 description: A Test Kitchen Softlayer driver
 email:
 - neillwturner@gmail.com
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Test Kitchen Softlayer driver