fog-scaleway 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db12bf5472f63d0a82967f353364b030d692aa52
-  data.tar.gz: 0b9b420db0de3ae446a3a8b849de10cc06ed7bec
+  metadata.gz: b1d7d2673388f2dc8e5bfbb0473221e75c85faf0
+  data.tar.gz: 6bcd387f1f0831c3b637f062c4b2d370f4e9e24f
 SHA512:
-  metadata.gz: c7c53503be5dbea85781e6d2a4ac210fb7e95c533c0fa1a721736cc38e0ac9e5b5c9224bed40d5b9c4f8a288c1a5fad7be2d46e70f0a975e07555c6871db913e
-  data.tar.gz: 548432aeeaa06b08871bade39ba2561a47f4c17b09ec6d298ae51405b42d62e45ec498d4db3d0bc72ab90e58ac7829f1b028b2fc42de07e22509009b02fdd1aa
+  metadata.gz: f61d0c7c3aeb85e2af10b5b6673fd87cfbd940c293f382db1e6e174a68b897a0746de80941674a9c46689cbe71c0345c892639b798f53bebe7b39826cc7d2d7b
+  data.tar.gz: 822310176f0921c1bc1eb46aced26550c28ef36efd6fe189c8c13e11cfea95b24e8448b5c825d951de51c381e0d3542a2c513a4b8dc9aecc1b47d9170438bef0

data/fog-scaleway.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'fog/scaleway/version'

data/lib/fog/scaleway/account.rb

@@ -47,8 +47,9 @@ module Fog
         include Fog::Scaleway::RequestHelper
 
         def initialize(options)
-          @token = options[:scaleway_token]
-          @email = options[:scaleway_email]
+          @token              = options[:scaleway_token]
+          @email              = options[:scaleway_email]
+          @connection_options = options[:connection_options] || {}
         end
 
         def request(params)
@@ -73,7 +74,7 @@ module Fog
         private
 
         def client
-          @client ||= Fog::Scaleway::Client.new('https://account.scaleway.com', @token)
+          @client ||= Fog::Scaleway::Client.new('https://account.scaleway.com', @token, @connection_options)
         end
 
         def camelize(str)

data/lib/fog/scaleway/client.rb

@@ -1,9 +1,10 @@
 module Fog
   module Scaleway
     class Client
-      def initialize(endpoint, token)
-        @endpoint = endpoint
-        @token    = token
+      def initialize(endpoint, token, connection_options)
+        @endpoint           = endpoint
+        @token              = token
+        @connection_options = connection_options
       end
 
       def request(params)
@@ -23,7 +24,7 @@ module Fog
       private
 
       def connection
-        @connection ||= Fog::Core::Connection.new(@endpoint)
+        @connection ||= Fog::Core::Connection.new(@endpoint, false, @connection_options)
       end
 
       def encode_body(params)

data/lib/fog/scaleway/compute.rb

@@ -118,9 +118,10 @@ module Fog
         include Fog::Scaleway::RequestHelper
 
         def initialize(options)
-          @token        = options[:scaleway_token]
-          @organization = options[:scaleway_organization]
-          @region       = options[:scaleway_region] || 'par1'
+          @token              = options[:scaleway_token]
+          @organization       = options[:scaleway_organization]
+          @region             = options[:scaleway_region] || 'par1'
+          @connection_options = options[:connection_options] || {}
         end
 
         def request(params)
@@ -145,7 +146,7 @@ module Fog
         private
 
         def client
-          @client ||= Fog::Scaleway::Client.new(endpoint, @token)
+          @client ||= Fog::Scaleway::Client.new(endpoint, @token, @connection_options)
         end
 
         def endpoint
@@ -335,7 +336,7 @@ module Fog
           security_group = lookup(:security_groups, server['security_group']['id'])
           security_group['servers'].reject! { |s| s['id'] == server['id'] }
 
-          server['volumes'].values.each do |volume|
+          server['volumes'].each_value do |volume|
             volume['server'] = nil
             delete_volume(volume['id'])
           end

data/lib/fog/scaleway/models/compute/servers.rb

@@ -28,7 +28,6 @@ module Fog
           defaults = {
             name: name,
             image: '75c28f52-6c64-40fc-bb31-f53ca9d02de9',
-            commercial_type: 'C2S',
             dynamic_ip_required: false,
             public_ip: public_ip
           }

data/lib/fog/scaleway/requests/compute/create_server.rb

@@ -127,7 +127,7 @@ module Fog
 
           data[:volumes][server['volumes']['0']['id']] = server['volumes']['0']
 
-          server['volumes'].each do |_index, volume|
+          server['volumes'].each_value do |volume|
             volume['server'] = {
               'id' => server['id'],
               'name' => server['name']

data/lib/fog/scaleway/requests/compute/delete_image.rb

@@ -13,7 +13,7 @@ module Fog
 
           data[:images].delete(image['id'])
 
-          data[:servers].each do |_id, server|
+          data[:servers].each_value do |server|
             if server['image'] && server['image']['id'] == image['id']
               server['image'] = nil
             end

data/lib/fog/scaleway/requests/compute/delete_volume.rb

@@ -17,7 +17,7 @@ module Fog
 
           data[:volumes].delete(volume_id)
 
-          data[:snapshots].each do |_id, snapshot|
+          data[:snapshots].each_value do |snapshot|
             if snapshot['base_volume'] && snapshot['base_volume']['id'] == volume_id
               snapshot['base_volume'] = nil
             end

data/lib/fog/scaleway/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Scaleway
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-scaleway
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Satoshi Matsumoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-15 00:00:00.000000000 Z
+date: 2018-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler