kitchen-scaleway 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78fa326410f141a5d106a268f94d2d749242b614
-  data.tar.gz: ac1eccc731b39d8332557da657ed7f807dcb92cd
+  metadata.gz: 13a14cf6077996dbdcfee87ab668a5feca61903a
+  data.tar.gz: 5ee82e848805762af0b72b2d4b8ace56c4979eee
 SHA512:
-  metadata.gz: 5c49986c1c711a1551ff7423fac4a39a67781b06f5f62e0c0e94ddbbb370f40449bbe983e87cad11c019b104d1be8dc5f0b9e7f7bda3efbb0a4d1dcb519d9ce7
-  data.tar.gz: 3cb73de2dffb3a97ba50de35cf796db5943938b048f7a4ae3ecc203c98bff54711bc68cc92a5cf40513e28096998a38f99daac9ea22ae1b706727f300caadcbb
+  metadata.gz: 3c45150dfd1cc2e2c3fd037bd2d0d034e66ae83ba541dd577594466efa67d8617254119d9da3a71c92fc00336400274bfa1a77f56e1d4a750b989072e517e8a4
+  data.tar.gz: 401da230ec2c831151d5441cbd51b4566b12920686db3a1cc39966dd3633e5844bd22c0d876b317e976f76775f0c9de54fe0ffba74a2032b50e73758c0f10834

data/lib/kitchen/driver/scaleway.rb

@@ -44,28 +44,28 @@ module Kitchen
 
       def create(state)
         client
-        server = create_server
 
-        state[:server_id] = server.id
-
-        info("Scaleway instance <#{state[:server_id]}> created.")
+        if state[:server_id]
+          server = state[:server_id]
+        else
+          server = create_server
+          state[:server_id] = server.id
+          info("Scaleway instance <#{state[:server_id]}> created.")
+          loop do
+            info("Waiting for Public IP to become available...")
+            sleep 8
+            begin
+              instance = ::Scaleway::Server.find(state[:server_id])
+            rescue ::Scaleway::NotFound
+              info('instance still not ready.')
+            end
 
-        loop do
-          info("Waiting for Public IP to become available...")
-          sleep 8
-          begin
-            instance = ::Scaleway::Server.find(state[:server_id])
-          rescue ::Scaleway::NotFound
-            info('instance still not ready.')
+            break if instance && ! instance.public_ip.nil?
           end
-
-          break if instance && ! instance.public_ip.nil?
+          instance ||= ::Scaleway::Server.find(state[:server_id])
+          state[:hostname] = instance.public_ip[:address]
+          wait_for_sshd(state[:hostname]); print "(ssh ready)\n"
         end
-        instance ||= ::Scaleway::Server.find(state[:server_id])
-
-        state[:hostname] = instance.public_ip[:address]
-
-        wait_for_sshd(state[:hostname]); print "(ssh ready)\n"
       end
 
       def destroy(state)
@@ -149,22 +149,23 @@ module Kitchen
 
       def platform_to_slug_mapping
         {
-          'debian-7.0'    => 'Debian Wheezy (7.8)',
-          'debian-70'     => 'Debian Wheezy (7.8)',
-          'debian-78'     => 'Debian Wheezy (7.8)',
-          'debian-8.1'    => 'Debian Jessie (8.1)',
-          'debian-81'     => 'Debian Jessie (8.1)',
+          'debian-7'      => 'Debian Wheezy',
+          'wheezy'        => 'Debian Wheezy',
+          'debian-8.1'    => 'Debian Jessie',
+          'debian-81'     => 'Debian Jessie',
+          'jessie'        => 'Debian Jessie',
+          'debian-sid'    => 'Debian Sid',
           'fedora-22'     => 'Fedora 22',
           'opensuse-13.2' => 'openSUSE 13.2',
           'opensuse-132'  => 'openSUSE 13.2',
-          'ubuntu-12.04'  => 'Ubuntu Precise (12.04)',
-          'ubuntu-1204'   => 'Ubuntu Precise (12.04)',
-          'ubuntu-14.04'  => 'Ubuntu Trusty (14.04 LTS)',
-          'ubuntu-1404'   => 'Ubuntu Trusty (14.04 LTS)',
-          'ubuntu-14.10'  => 'Ubuntu Utopic (14.10 EOL)',
-          'ubuntu-1410'   => 'Ubuntu Utopic (14.10 EOL)',
-          'ubuntu-15.04'  => 'Ubuntu Vivid (15.04 latest)',
-          'ubuntu-1504'   => 'Ubuntu Vivid (15.04 latest)'
+          'ubuntu-12.04'  => 'Ubuntu Precise',
+          'ubuntu-1204'   => 'Ubuntu Precise',
+          'ubuntu-14.04'  => 'Ubuntu Trusty',
+          'ubuntu-1404'   => 'Ubuntu Trusty',
+          'ubuntu-14.10'  => 'Ubuntu Utopic',
+          'ubuntu-1410'   => 'Ubuntu Utopic',
+          'ubuntu-15.04'  => 'Ubuntu Vivid',
+          'ubuntu-1504'   => 'Ubuntu Vivid'
         }
       end
     end

data/lib/kitchen/driver/scaleway_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for Scaleway Kitchen driver
-    SCALEWAY_VERSION = "0.1.0"
+    SCALEWAY_VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-scaleway
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ryan Hass
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen