vagrant-scaleway 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7193eabc56d0f452064f85e342b7b845557d25b7
-  data.tar.gz: 5250b4df9ae07cc85c570480a715949edd45acab
+  metadata.gz: 61f5f7e845b0e2168edf395b77e31b1f41ec36c7
+  data.tar.gz: 6313e0795f46e6deedea82f019e58b03b221ea4a
 SHA512:
-  metadata.gz: 7d38faaa297dbd510c2ece0380451b9613c2d3cec29b3d7ed258a3843661468c0aa9707d9cf1e34b10718ca923faa8374ea9108ff949af2c4e6b516815a8e7a5
-  data.tar.gz: 4b6f758fbddbb7da3c3982d4a8637264b241e62ea36f321d2a0ccb1a7c143b5847ac20eb8f88dcab24dd10801abdb19fd52688a27d6f454eb89f69456ee18a77
+  metadata.gz: eec720edb8fca36ea608cb2c37cf781d92fa2fc52b2dcdcb457e4ca71db6eedd7a54266524d3b1dc98bdaff56c2e2728e61ddd6496f9c5ace59db2028bb5cc2f
+  data.tar.gz: 7ab318e49ba82de3eccb8c5a09a4675785a2eac3b7826c051e3c1408dfdc508f9f2e1af9a4c57a0dd8cb38538302124ac00ce8d9145ad4497777d29407d0222b

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,20 @@
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/LineLength:
+  Enabled: false
+
+Metrics/MethodLength:
+  Enabled: false
+
+Metrics/ModuleLength:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false

data/Rakefile

@@ -1,9 +1,6 @@
 require 'bundler/gem_tasks'
-require 'rake/testtask'
+require 'rubocop/rake_task'
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.test_files = FileList['test/**/*_test.rb']
-end
+RuboCop::RakeTask.new(:rubocop)
 
-task default: :test
+task default: :rubocop

data/lib/vagrant-scaleway.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Style/FileName
 require 'pathname'
 require 'vagrant-scaleway/plugin'
 

data/lib/vagrant-scaleway/action/connect_scaleway.rb

@@ -20,7 +20,8 @@ module VagrantPlugins
           fog_config = {
             provider:              :scaleway,
             scaleway_organization: provider_config.organization,
-            scaleway_token:        provider_config.token
+            scaleway_token:        provider_config.token,
+            scaleway_region:       provider_config.region
           }
 
           @logger.info('Connecting to Scaleway...')

data/lib/vagrant-scaleway/action/list_bootscripts.rb

@@ -9,9 +9,9 @@ module VagrantPlugins
         def call(env)
           compute = env[:scaleway_compute]
 
-          env[:ui].info('%-37s %-7s %s' % ['Bootscript ID', 'Arch', 'Bootscript Title'], prefix: false)
+          env[:ui].info(format('%-37s %-7s %s', 'Bootscript ID', 'Arch', 'Bootscript Title'), prefix: false)
           compute.bootscripts.sort_by(&:title).each do |bootscript|
-            env[:ui].info('%-37s %-7s %s' % [bootscript.id, bootscript.architecture, bootscript.title], prefix: false)
+            env[:ui].info(format('%-37s %-7s %s', bootscript.id, bootscript.architecture, bootscript.title), prefix: false)
           end
 
           @app.call(env)

data/lib/vagrant-scaleway/action/list_images.rb

@@ -9,11 +9,11 @@ module VagrantPlugins
         def call(env)
           compute = env[:scaleway_compute]
 
-          env[:ui].info('%-37s %-26s %-7s %-36s %s' % ['Image ID', 'Created At', 'Arch', 'Default Bootscript', 'Image Name'], prefix: false)
+          env[:ui].info(format('%-37s %-26s %-7s %-36s %s', 'Image ID', 'Created At', 'Arch', 'Default Bootscript', 'Image Name'), prefix: false)
           compute.images.sort_by(&:name).each do |image|
             created_at = Time.parse(image.creation_date)
             bootscript = image.default_bootscript.title
-            env[:ui].info('%-37s %-26s %-7s %-36s %s' % [image.id, created_at, image.arch, bootscript, image.name], prefix: false)
+            env[:ui].info(format('%-37s %-26s %-7s %-36s %s', image.id, created_at, image.arch, bootscript, image.name), prefix: false)
           end
 
           @app.call(env)

data/lib/vagrant-scaleway/action/list_security_groups.rb

@@ -9,9 +9,9 @@ module VagrantPlugins
         def call(env)
           compute = env[:scaleway_compute]
 
-          env[:ui].info('%-37s %s' % ['Security Group ID', 'Security Group Name'], prefix: false)
+          env[:ui].info(format('%-37s %s', 'Security Group ID', 'Security Group Name'), prefix: false)
           compute.security_groups.sort_by(&:name).each do |security_group|
-            env[:ui].info('%-37s %s' % [security_group.id, security_group.name], prefix: false)
+            env[:ui].info(format('%-37s %s', security_group.id, security_group.name), prefix: false)
           end
 
           @app.call(env)

data/lib/vagrant-scaleway/action/start_server.rb

@@ -64,12 +64,12 @@ module VagrantPlugins
                 # the time we connect.
                 begin
                   break if env[:machine].communicate.ready?
-                rescue Exception => e
+                rescue
                   if network_ready_retries < network_ready_retries_max
                     network_ready_retries += 1
                     @logger.warn(I18n.t('vagrant_scaleway.waiting_for_ssh, retrying'))
                   else
-                    raise e
+                    raise
                   end
                 end
                 sleep 2

data/lib/vagrant-scaleway/command/bootscripts.rb

@@ -3,7 +3,6 @@ module VagrantPlugins
     module Command
       class Bootscripts < Vagrant.plugin('2', :command)
         def execute
-          options = {}
           opts = OptionParser.new do |o|
             o.banner = 'Usage: vagrant scaleway bootscripts [options]'
           end

data/lib/vagrant-scaleway/command/images.rb

@@ -3,7 +3,6 @@ module VagrantPlugins
     module Command
       class Images < Vagrant.plugin('2', :command)
         def execute
-          options = {}
           opts = OptionParser.new do |o|
             o.banner = 'Usage: vagrant scaleway images [options]'
           end

data/lib/vagrant-scaleway/command/root.rb

@@ -43,10 +43,10 @@ module VagrantPlugins
         end
 
         def help
-          opts = OptionParser.new do |opts|
-            opts.banner = 'Usage: vagrant scaleway <subcommand> [<args>]'
-            opts.separator ''
-            opts.separator 'Available subcommands:'
+          opts = OptionParser.new do |o|
+            o.banner = 'Usage: vagrant scaleway <subcommand> [<args>]'
+            o.separator ''
+            o.separator 'Available subcommands:'
 
             # Add the available subcommands as separators in order to print them
             # out as well.
@@ -54,11 +54,11 @@ module VagrantPlugins
             @subcommands.each { |key, _value| keys << key.to_s }
 
             keys.sort.each do |key|
-              opts.separator "     #{key}"
+              o.separator "     #{key}"
             end
 
-            opts.separator ''
-            opts.separator 'For help on any individual subcommand run `vagrant scaleway <subcommand> -h`'
+            o.separator ''
+            o.separator 'For help on any individual subcommand run `vagrant scaleway <subcommand> -h`'
           end
 
           @env.ui.info(opts.help, prefix: false)

data/lib/vagrant-scaleway/command/security_groups.rb

@@ -3,7 +3,6 @@ module VagrantPlugins
     module Command
       class SecurityGroups < Vagrant.plugin('2', :command)
         def execute
-          options = {}
           opts = OptionParser.new do |o|
             o.banner = 'Usage: vagrant scaleway security-groups [options]'
           end

data/lib/vagrant-scaleway/config.rb

@@ -28,6 +28,12 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :organization
 
+      # The name of the Scaleway region to create the server in. It can also be
+      # configured with SCW_REGION environment variable. Defaults to par1.
+      #
+      # @return [String]
+      attr_accessor :region
+
       # The security group ID to associate with the server. If nil,
       # organization's default security group will be used.
       #
@@ -74,6 +80,7 @@ module VagrantPlugins
         @image                 = UNSET_VALUE
         @name                  = UNSET_VALUE
         @organization          = UNSET_VALUE
+        @region                = UNSET_VALUE
         @server_check_interval = UNSET_VALUE
         @server_ready_timeout  = UNSET_VALUE
         @security_group        = UNSET_VALUE
@@ -93,6 +100,7 @@ module VagrantPlugins
         end
 
         @organization          = ENV['SCW_ORGANIZATION'] if @organization == UNSET_VALUE
+        @region                = (ENV['SCW_REGION'] || 'par1') if @region == UNSET_VALUE
         @server_check_interval = 2 if @server_check_interval == UNSET_VALUE
         @server_ready_timeout  = 120 if @server_ready_timeout == UNSET_VALUE
         @security_group        = nil if @security_group == UNSET_VALUE

data/lib/vagrant-scaleway/plugin.rb

@@ -70,7 +70,6 @@ module VagrantPlugins
           logger = Log4r::Logger.new('vagrant_scaleway')
           logger.outputters = Log4r::Outputter.stderr
           logger.level = level
-          logger = nil
         end
       end
     end

data/lib/vagrant-scaleway/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Scaleway
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

data/vagrant-scaleway.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rubocop'
 
-  spec.add_dependency 'fog-scaleway', '~> 0.1'
+  spec.add_dependency 'fog-scaleway', '~> 0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-scaleway
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Satoshi Matsumoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-25 00:00:00.000000000 Z
+date: 2016-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 description: Enables Vagrant to manage machines in Scaleway.
 email:
 - kaorimatz@gmail.com
@@ -74,6 +74,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".ruby-version"
 - Gemfile
 - LICENSE.txt