fog-scaleway 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5303513c33ef6ae3857f4151f5ca012fa86d2c47
-  data.tar.gz: 9a223682b88e327c3e9cd08d296eb35ba71e7da2
+  metadata.gz: 51b03e240e9f4cd20d0e1fa7720d3f7ee8ba5bb3
+  data.tar.gz: 16d35624f89537158d15e49f1f234ec6435c9ad6
 SHA512:
-  metadata.gz: 6320bec3011290491e7afee7e0ce68a3431f04efa20c8a8c2d439bb7c21f06fc0515570d8ef0964faff0b20bc184ca390bbcfbdbb03a493a4e8e44710de50cc0
-  data.tar.gz: 8714c0dc342be29bb5ff57fd359fd3706b6d43778f2674687ab4fc3538bc2702e20ede17e48495aaf4155f6e015d509bc65515531ce61bcb930c99ed80399a41
+  metadata.gz: dcc876f2188e9e01af2598617028b98d7b6306bcbcf5851272402773e5d5dca816071b4d68ce539b0a44d1da3e1e853c53830cd3b04f2a0faa365719d17012d9
+  data.tar.gz: d500fe46c3a918d3e67fddd2a9d25d369ce6c2cb03f5f70e02fee0527fad556fe4aeec9a49bc0b589037b3f1254219320ab1f75312b687d6379787ef39e9956a

data/.rubocop.yml

@@ -0,0 +1,7 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  DisplayCopNames: true
+
+Style/GuardClause:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,23 @@
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/LineLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false

data/.travis.yml

@@ -7,3 +7,4 @@ before_install:
 script:
   - bundle exec rake test:units FOG_MOCK=true COVERAGE=true
   - bundle exec rake test:integration FOG_MOCK=true
+  - bundle exec rake rubocop

data/README.md

@@ -1,7 +1,9 @@
 # Fog::Scaleway
 
+[![Gem](https://img.shields.io/gem/v/fog-scaleway.svg?style=flat-square)](https://rubygems.org/gems/fog-scaleway)
 [![Travis](https://img.shields.io/travis/kaorimatz/fog-scaleway.svg?style=flat-square)](https://travis-ci.org/kaorimatz/fog-scaleway)
 [![Coveralls](https://img.shields.io/coveralls/kaorimatz/fog-scaleway.svg?style=flat-square)](https://coveralls.io/github/kaorimatz/fog-scaleway)
+[![Gemnasium](https://img.shields.io/gemnasium/kaorimatz/fog-scaleway.svg?style=flat-square)](https://gemnasium.com/kaorimatz/fog-scaleway)
 
 Fog provider gem to support [Scaleway](https://www.scaleway.com/).
 
@@ -10,7 +12,7 @@ Fog provider gem to support [Scaleway](https://www.scaleway.com/).
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'fog-scaleway', git: 'https://github.com/kaorimatz/fog-scaleway.git'
+gem 'fog-scaleway'
 ```
 
 And then execute:
@@ -23,8 +25,9 @@ Put your credentials to the fog configuration file:
 
 ```yaml
 default:
-  scaleway_organization: <YOUR_ORGANIZATION_UUID>
-  scaleway_token: <YOUR_TOKEN>
+  scaleway_organization: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx # Your organization ID
+  scaleway_token: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx        # Your token
+  scaleway_region: par1                                       # par1 or ams1
 ```
 
 Create a connection to the service:
@@ -45,7 +48,7 @@ server.terminate
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test:integration` to run the integration tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test FOG_MOCK=true` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 

data/Rakefile

@@ -2,20 +2,23 @@ require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'rubocop/rake_task'
 
-Rake::TestTask.new do |t|
+Rake::TestTask.new('test:units') do |t|
   t.libs << 'test'
-  t.name = 'test:units'
   t.description = 'Run unit tests'
   t.test_files = FileList['test/units/**/test_*.rb']
   t.warning = false
 end
 
-Rake::TestTask.new do |t|
+Rake::TestTask.new('test:integration') do |t|
   t.libs << 'test'
-  t.name = 'test:integration'
   t.description = 'Run integration tests'
   t.test_files = FileList['test/integration/**/test_*.rb']
   t.warning = false
 end
 
-RuboCop::RakeTask.new
+desc 'Run all tests'
+task test: ['test:units', 'test:integration']
+
+RuboCop::RakeTask.new(:rubocop)
+
+task default: [:test, :rubocop]

data/lib/fog/scaleway/compute.rb

@@ -12,9 +12,10 @@ module Fog
       class Conflict < Error; end
       class APIError < Error; end
 
-      requires :scaleway_token
-      requires :scaleway_organization
-      secrets  :scaleway_token
+      requires   :scaleway_token
+      requires   :scaleway_organization
+      recognizes :scaleway_region
+      secrets    :scaleway_token
 
       model_path 'fog/scaleway/models/compute'
 
@@ -114,6 +115,7 @@ module Fog
         def initialize(options)
           @token        = options[:scaleway_token]
           @organization = options[:scaleway_organization]
+          @region       = options[:scaleway_region] || 'par1'
         end
 
         def request(params)
@@ -138,7 +140,11 @@ module Fog
         private
 
         def client
-          @client ||= Fog::Scaleway::Client.new('https://api.scaleway.com', @token)
+          @client ||= Fog::Scaleway::Client.new(endpoint, @token)
+        end
+
+        def endpoint
+          "https://cp-#{@region}.scaleway.com"
         end
 
         def camelize(str)

data/lib/fog/scaleway/models/account/token.rb

@@ -30,7 +30,7 @@ module Fog
 
         def create
           options = {}
-          options[:expires] = !!expires unless expires.nil?
+          options[:expires] = expires != false unless expires.nil?
 
           if (token = service.create_token(options).body['token'])
             merge_attributes(token)
@@ -45,7 +45,7 @@ module Fog
 
           options = {}
           options[:description] = description unless description.nil?
-          options[:expires] = !!expires unless expires.nil?
+          options[:expires] = expires != false unless expires.nil?
 
           if (token = service.update_token(identity, options).body['token'])
             merge_attributes(token)

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

@@ -106,49 +106,34 @@ module Fog
         def poweron(async = true)
           requires :identity
 
-          if (task = service.execute_server_action(identity, 'poweron').body['task'])
-            service.tasks.new(task).tap do |task|
-              unless async
-                task.wait_for { task.success? }
-                reload
-              end
-            end
-          end
+          execute_action('poweron', async)
         end
 
         def poweroff(async = true)
           requires :identity
 
-          if (task = service.execute_server_action(identity, 'poweroff').body['task'])
-            service.tasks.new(task).tap do |task|
-              unless async
-                task.wait_for { task.success? }
-                reload
-              end
-            end
-          end
+          execute_action('poweroff', async)
         end
 
         def reboot(async = true)
           requires :identity
 
-          if (task = service.execute_server_action(identity, 'reboot').body['task'])
-            service.tasks.new(task).tap do |task|
-              unless async
-                task.wait_for { task.success? }
-                reload
-              end
-            end
-          end
+          execute_action('reboot', async)
         end
 
         def terminate(async = true)
           requires :identity
 
-          if (task = service.execute_server_action(identity, 'terminate').body['task'])
-            service.tasks.new(task).tap do |task|
+          execute_action('terminate', async)
+        end
+
+        def execute_action(action, async = true)
+          requires :identity
+
+          if (task = service.execute_server_action(identity, action).body['task'])
+            service.tasks.new(task).tap do |t|
               unless async
-                task.wait_for { task.success? }
+                t.wait_for { t.success? }
                 reload
               end
             end

data/lib/fog/scaleway/requests/account/create_token.rb

@@ -31,8 +31,8 @@ module Fog
 
           body = jsonify(body)
 
-          user = data[:users].values.find do |user|
-            user['email'] == body['email']
+          user = data[:users].values.find do |u|
+            u['email'] == body['email']
           end
 
           raise_invalid_auth('Invalid credentials') unless user

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

@@ -11,7 +11,7 @@ module Fog
         def delete_security_group_rule(security_group_id, rule_id)
           security_group = lookup(:security_groups, security_group_id)
 
-          unless data[:security_group_rules][security_group_id].delete(rule_id)
+          unless data[:security_group_rules][security_group['id']].delete(rule_id)
             raise_unknown_resource(rule_id)
           end
 

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

@@ -41,6 +41,7 @@ module Fog
               'platform_id' => Fog::Mock.random_numbers(2),
               'node_id' => Fog::Mock.random_numbers(2),
               'cluster_id' => Fog::Mock.random_numbers(2),
+              'zone_id' => @region,
               'chassis_id' => Fog::Mock.random_numbers(2)
             }
 

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

@@ -2,13 +2,13 @@ module Fog
   module Scaleway
     class Compute
       class Real
-        def get_dashboard
+        def get_dashboard # rubocop:disable Style/AccessorMethodName
           get('/dashboard')
         end
       end
 
       class Mock
-        def get_dashboard
+        def get_dashboard # rubocop:disable Style/AccessorMethodName
           running_servers = data[:servers].select do |_id, s|
             s['state'] == 'running'
           end

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

@@ -11,7 +11,7 @@ module Fog
         def get_security_group_rule(security_group_id, rule_id)
           security_group = lookup(:security_groups, security_group_id)
 
-          rule = data[:security_group_rules][security_group_id][rule_id]
+          rule = data[:security_group_rules][security_group['id']][rule_id]
 
           raise_unknown_resource(rule_id) unless rule
 

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

@@ -11,7 +11,7 @@ module Fog
         def list_security_group_rules(security_group_id)
           security_group = lookup(:security_groups, security_group_id)
 
-          rules = data[:security_group_rules][security_group_id].values
+          rules = data[:security_group_rules][security_group['id']].values
 
           response(status: 200, body: { 'rules' => rules })
         end

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

@@ -17,7 +17,7 @@ module Fog
                          lookup(:bootscripts, body['bootscript']['id'])
                        elsif body['bootscript'].is_a?(String)
                          lookup(:bootscripts, body['bootscript'])
-                      end
+                       end
 
           volumes = {}
           body['volumes'].each do |index, volume|

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

@@ -15,7 +15,7 @@ module Fog
         def update_user_data(server_id, key, value)
           server = lookup(:servers, server_id)
 
-          data[:user_data][server_id][key] = value
+          data[:user_data][server['id']][key] = value
 
           response(status: 204)
         end

data/lib/fog/scaleway/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Scaleway
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-scaleway
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Satoshi Matsumoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-27 00:00:00.000000000 Z
+date: 2016-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,6 +158,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rubocop.yml
+- .rubocop_todo.yml
 - .ruby-version
 - .travis.yml
 - Gemfile
@@ -278,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Fog provider for Scaleway