vagrant-scaleway 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd75bdfdd4882cdab032133e1d2fb774aa575e16
-  data.tar.gz: 19b03b5498e88328ba42a6028e8be1d22a3a3cfb
+  metadata.gz: 7193eabc56d0f452064f85e342b7b845557d25b7
+  data.tar.gz: 5250b4df9ae07cc85c570480a715949edd45acab
 SHA512:
-  metadata.gz: 99bd7fc3bdb655ba213880457fa284db2aca08fee2336beacf0fbf0f86a6c63e1f5ea852285c6beb94b949ef7bf4ad077b385d271a4943927b10af6a07b9a907
-  data.tar.gz: 40690821c51c739ef925a71d07b72c2ebafdc49c16d1c0510dd2e4e415d16f79059fdd2177453ed1388b05a13f349a03a2c402ce8062f8b59107bc8c2f28d0fa
+  metadata.gz: 7d38faaa297dbd510c2ece0380451b9613c2d3cec29b3d7ed258a3843661468c0aa9707d9cf1e34b10718ca923faa8374ea9108ff949af2c4e6b516815a8e7a5
+  data.tar.gz: 4b6f758fbddbb7da3c3982d4a8637264b241e62ea36f321d2a0ccb1a7c143b5847ac20eb8f88dcab24dd10801abdb19fd52688a27d6f454eb89f69456ee18a77

data/README.md

@@ -1,10 +1,11 @@
 # Vagrant Scaleway Provider
 
 [![Gem](https://img.shields.io/gem/v/vagrant-scaleway.svg?style=flat-square)](https://rubygems.org/gems/vagrant-scaleway)
+[![Gemnasium](https://img.shields.io/gemnasium/kaorimatz/vagrant-scaleway.svg?style=flat-square)](https://gemnasium.com/kaorimatz/vagrant-scaleway)
 
-This is a [Vagrant](http://www.vagrantup.com/) plugin that adds a Scaleway
-provider to Vagrant, allowing Vagrant to control and provision machines in
-Scaleway.
+This is a [Vagrant](http://www.vagrantup.com/) plugin that adds a
+[Scaleway](https://www.scaleway.com/) provider to Vagrant, allowing Vagrant to
+control and provision machines in Scaleway.
 
 ## Features
 
@@ -16,7 +17,8 @@ Scaleway.
 ## Prerequisites
 
 Prior to using this plugin, you will first need to create an API token and
-identify your organization ID. Please see the following help for instructions.
+identify your organization ID. Please see the following help pages for
+instructions.
 
 - [How to generate an API token](https://www.scaleway.com/docs/generate-an-api-token/)
 - [How to retrieve my organization ID through the API](https://www.scaleway.com/docs/retrieve-my-organization-id-throught-the-api/)
@@ -46,6 +48,11 @@ And then run `vagrant up` and specify the `scaleway` provider:
 
     $ vagrant up --provider=scaleway
 
+## Configurations
+
+Please see the [RubyDoc](http://www.rubydoc.info/gems/vagrant-scaleway/VagrantPlugins/Scaleway/Config)
+for the list of provider-specific configuration options.
+
 ## Development
 
 To work on the `vagrant-scaleway` plugin, clone this repository out, and use

data/lib/vagrant-scaleway/action.rb

@@ -159,12 +159,40 @@ module VagrantPlugins
         end
       end
 
+      # This action is called to list available bootscripts.
+      def self.action_list_bootscripts
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConnectScaleway
+          b.use ListBootscripts
+        end
+      end
+
+      # This action is called to list available images.
+      def self.action_list_images
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConnectScaleway
+          b.use ListImages
+        end
+      end
+
+      # This action is called to list available security groups.
+      def self.action_list_security_groups
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConnectScaleway
+          b.use ListSecurityGroups
+        end
+      end
+
       # The autoload farm
       action_root = Pathname.new(File.expand_path('../action', __FILE__))
       autoload :ConnectScaleway, action_root.join('connect_scaleway')
       autoload :CreateServer, action_root.join('create_server')
+      autoload :DestroyServer, action_root.join('destroy_server')
       autoload :IsCreated, action_root.join('is_created')
       autoload :IsStopped, action_root.join('is_stopped')
+      autoload :ListBootscripts, action_root.join('list_bootscripts')
+      autoload :ListImages, action_root.join('list_images')
+      autoload :ListSecurityGroups, action_root.join('list_security_groups')
       autoload :MessageAlreadyCreated, action_root.join('message_already_created')
       autoload :MessageNotCreated, action_root.join('message_not_created')
       autoload :MessageWillNotDestroy, action_root.join('message_will_not_destroy')
@@ -173,7 +201,6 @@ module VagrantPlugins
       autoload :StartServer, action_root.join('start_server')
       autoload :StopServer, action_root.join('stop_server')
       autoload :WarnNetworks, action_root.join('warn_networks')
-      autoload :DestroyServer, action_root.join('destroy_server')
     end
   end
 end

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

@@ -54,20 +54,29 @@ module VagrantPlugins
                   response: e.response.body
           end
 
+          @logger.info("Machine '#{name}' created.")
+
           # Immediately save the ID since it is created at this point.
           env[:machine].id = server.id
 
-          begin
-            @app.call(env)
-          rescue Exception => e
-            # Delete the server
-            terminate(env)
+          # destroy the server if we were interrupted
+          destroy(env) if env[:interrupted]
 
-            raise e
-          end
+          @app.call(env)
+        end
+
+        def recover(env)
+          return if env['vagrant.error'].is_a?(Vagrant::Errors::VagrantError)
+
+          destroy(env) if env[:machine].provider.state.id != :not_created
+        end
 
-          # Terminate the server if we were interrupted
-          terminate(env) if env[:interrupted]
+        def destroy(env)
+          destroy_env = env.dup
+          destroy_env.delete(:interrupted)
+          destroy_env[:config_validate] = false
+          destroy_env[:force_confirm_destroy] = true
+          env[:action_runner].run(Action.action_destroy, destroy_env)
         end
       end
     end

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

@@ -4,8 +4,7 @@ module VagrantPlugins
       # This destroys the running server.
       class DestroyServer
         def initialize(app, _env)
-          @app    = app
-          @logger = Log4r::Logger.new('vagrant_scaleway::action::destroy_server')
+          @app = app
         end
 
         def call(env)

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

@@ -0,0 +1,22 @@
+module VagrantPlugins
+  module Scaleway
+    module Action
+      class ListBootscripts
+        def initialize(app, _env)
+          @app = app
+        end
+
+        def call(env)
+          compute = env[:scaleway_compute]
+
+          env[:ui].info('%-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)
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module VagrantPlugins
+  module Scaleway
+    module Action
+      class ListImages
+        def initialize(app, _env)
+          @app = app
+        end
+
+        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)
+          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)
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+module VagrantPlugins
+  module Scaleway
+    module Action
+      class ListSecurityGroups
+        def initialize(app, _env)
+          @app = app
+        end
+
+        def call(env)
+          compute = env[:scaleway_compute]
+
+          env[:ui].info('%-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)
+          end
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -4,8 +4,7 @@ module VagrantPlugins
       # This stops the running server.
       class StopServer
         def initialize(app, _env)
-          @app    = app
-          @logger = Log4r::Logger.new('vagrant_scaleway::action::stop_server')
+          @app = app
         end
 
         def call(env)

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

@@ -0,0 +1,21 @@
+module VagrantPlugins
+  module Scaleway
+    module Command
+      class Bootscripts < Vagrant.plugin('2', :command)
+        def execute
+          options = {}
+          opts = OptionParser.new do |o|
+            o.banner = 'Usage: vagrant scaleway bootscripts [options]'
+          end
+
+          argv = parse_options(opts)
+          return unless argv
+
+          with_target_vms(argv, provider: :scaleway) do |machine|
+            machine.action('list_bootscripts')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module VagrantPlugins
+  module Scaleway
+    module Command
+      class Images < Vagrant.plugin('2', :command)
+        def execute
+          options = {}
+          opts = OptionParser.new do |o|
+            o.banner = 'Usage: vagrant scaleway images [options]'
+          end
+
+          argv = parse_options(opts)
+          return unless argv
+
+          with_target_vms(argv, provider: :scaleway) do |machine|
+            machine.action('list_images')
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,69 @@
+require 'vagrant-scaleway/action'
+
+module VagrantPlugins
+  module Scaleway
+    module Command
+      class Root < Vagrant.plugin('2', :command)
+        def self.synopsis
+          'queries Scaleway for available resources'
+        end
+
+        def initialize(argv, env)
+          @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
+
+          @subcommands = Vagrant::Registry.new
+          @subcommands.register(:bootscripts) do
+            require File.expand_path('../bootscripts', __FILE__)
+            Bootscripts
+          end
+          @subcommands.register(:images) do
+            require File.expand_path('../images', __FILE__)
+            Images
+          end
+          @subcommands.register(:'security-groups') do
+            require File.expand_path('../security_groups', __FILE__)
+            SecurityGroups
+          end
+
+          super(argv, env)
+        end
+
+        def execute
+          if @main_args.include?('-h') || @main_args.include?('--help')
+            # Print the help for all the scaleway commands.
+            return help
+          end
+
+          command_class = @subcommands.get(@sub_command.to_sym) if @sub_command
+          return help if !command_class || !@sub_command
+          @logger.debug("Invoking command class: #{command_class} #{@sub_args.inspect}")
+
+          # Initialize and execute the command class
+          command_class.new(@sub_args, @env).execute
+        end
+
+        def help
+          opts = OptionParser.new do |opts|
+            opts.banner = 'Usage: vagrant scaleway <subcommand> [<args>]'
+            opts.separator ''
+            opts.separator 'Available subcommands:'
+
+            # Add the available subcommands as separators in order to print them
+            # out as well.
+            keys = []
+            @subcommands.each { |key, _value| keys << key.to_s }
+
+            keys.sort.each do |key|
+              opts.separator "     #{key}"
+            end
+
+            opts.separator ''
+            opts.separator 'For help on any individual subcommand run `vagrant scaleway <subcommand> -h`'
+          end
+
+          @env.ui.info(opts.help, prefix: false)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module VagrantPlugins
+  module Scaleway
+    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
+
+          argv = parse_options(opts)
+          return unless argv
+
+          with_target_vms(argv, provider: :scaleway) do |machine|
+            machine.action('list_security_groups')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-scaleway/config.rb

@@ -28,8 +28,8 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :organization
 
-      # The security group to associate with the server. If nil, organization's
-      # default security group will be used.
+      # The security group ID to associate with the server. If nil,
+      # organization's default security group will be used.
       #
       # @return [String]
       attr_accessor :security_group
@@ -101,7 +101,7 @@ module VagrantPlugins
       end
     end
 
-    def validate(machine)
+    def validate(_machine)
       errors = _detected_errors
 
       errors << I18n.t('vagrant_scaleway.config.organization_required') if @organization.nil?

data/lib/vagrant-scaleway/plugin.rb

@@ -34,6 +34,11 @@ module VagrantPlugins
         Provider
       end
 
+      command(:scaleway, primary: false) do
+        require_relative 'command/root'
+        Command::Root
+      end
+
       # This initializes the internationalization strings.
       def self.setup_i18n
         I18n.load_path << File.expand_path('locales/en.yml', Scaleway.source_root)

data/lib/vagrant-scaleway/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-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-28 00:00:00.000000000 Z
+date: 2016-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,7 +79,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- dummy.box
 - example_box/metadata.json
 - lib/vagrant-scaleway.rb
 - lib/vagrant-scaleway/action.rb
@@ -88,6 +87,9 @@ files:
 - lib/vagrant-scaleway/action/destroy_server.rb
 - lib/vagrant-scaleway/action/is_created.rb
 - lib/vagrant-scaleway/action/is_stopped.rb
+- lib/vagrant-scaleway/action/list_bootscripts.rb
+- lib/vagrant-scaleway/action/list_images.rb
+- lib/vagrant-scaleway/action/list_security_groups.rb
 - lib/vagrant-scaleway/action/message_already_created.rb
 - lib/vagrant-scaleway/action/message_not_created.rb
 - lib/vagrant-scaleway/action/message_will_not_destroy.rb
@@ -96,6 +98,10 @@ files:
 - lib/vagrant-scaleway/action/start_server.rb
 - lib/vagrant-scaleway/action/stop_server.rb
 - lib/vagrant-scaleway/action/warn_networks.rb
+- lib/vagrant-scaleway/command/bootscripts.rb
+- lib/vagrant-scaleway/command/images.rb
+- lib/vagrant-scaleway/command/root.rb
+- lib/vagrant-scaleway/command/security_groups.rb
 - lib/vagrant-scaleway/config.rb
 - lib/vagrant-scaleway/errors.rb
 - lib/vagrant-scaleway/plugin.rb
@@ -103,6 +109,7 @@ files:
 - lib/vagrant-scaleway/util/timer.rb
 - lib/vagrant-scaleway/version.rb
 - locales/en.yml
+- scaleway.box
 - vagrant-scaleway.gemspec
 homepage: https://github.com/kaorimatz/vagrant-scaleway
 licenses: