vagrant-rimu 0.0.2 → 0.0.7

data/lib/vagrant-rimu/commands/abstract_command.rb

@@ -0,0 +1,47 @@
+require 'colorize'
+
+module VagrantPlugins
+  module Rimu
+    module Commands
+      class AbstractCommand < Vagrant.plugin('2', :command)
+        def initialize(argv, env)
+          @env = env
+          super(normalize_args(argv), env)
+        end
+
+        def execute(name)
+          env = {}
+          with_target_vms(nil, provider: :rimu) do |machine|
+            env[:machine] = machine
+            env[:ui] = @env.ui
+          end
+
+          before_cmd(name, @argv, env)
+
+          cmd(name, @argv, env)
+          @env.ui.info('')
+        # rubocop:disable Lint/RescueException
+        rescue Errors::RimuError, SystemExit, Interrupt => e
+          raise e
+        rescue Exception => e
+          puts I18n.t('vagrant_rimu.errors.global_error').red unless e.message
+          raise e
+        end
+        # rubocop:enable Lint/RescueException
+
+        def normalize_args(args)
+          return args if args.nil?
+          args.pop if args.size > 0 && args.last == '--'
+          args
+        end
+
+        def before_cmd(_name, _argv, _env)
+        end
+
+        def cmd(_name, _argv, _env)
+          fail 'Command not implemented. \'cmd\' method must be overridden in all subclasses'
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rimu/commands/billing_methods.rb

@@ -1,16 +1,16 @@
+require 'vagrant-rimu/commands/rimu_command'
+
 module VagrantPlugins
   module Rimu
     module Commands
-      class BillingMethods < Vagrant.plugin('2', :command)
-        def execute
-          opts = OptionParser.new do |o|
-            o.banner = 'Usage: vagrant rimu billing_methods [options]'
-          end
-          argv = parse_options(opts)
-          return unless argv
-          with_target_vms(argv, provider: :rimu) do |machine|
-            machine.action('billing_methods')
-          end
+      class BillingMethods < RimuCommand
+        def self.synopsis
+          I18n.t('vagrant_rimu.commands.billing_methods')
+        end
+
+        def cmd(name, argv, env)
+          fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 0
+          env[:machine].action('billing_methods')
         end
       end
     end

data/lib/vagrant-rimu/commands/distributions.rb

@@ -1,16 +1,16 @@
+require 'vagrant-rimu/commands/rimu_command'
+
 module VagrantPlugins
   module Rimu
     module Commands
-      class Distributions < Vagrant.plugin('2', :command)
-        def execute
-          opts = OptionParser.new do |o|
-            o.banner = 'Usage: vagrant rimu distributions [options]'
-          end
-          argv = parse_options(opts)
-          return unless argv
-          with_target_vms(argv, provider: :rimu) do |machine|
-            machine.action('list_distributions')
-          end
+      class Distributions < RimuCommand
+        def self.synopsis
+          I18n.t('vagrant_rimu.commands.list_distributions')
+        end
+
+        def cmd(name, argv, env)
+          fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 0
+          env[:machine].action('list_distributions')
         end
       end
     end

data/lib/vagrant-rimu/commands/list_servers.rb

@@ -1,16 +1,16 @@
+require 'vagrant-rimu/commands/rimu_command'
+
 module VagrantPlugins
   module Rimu
     module Commands
-      class ListServers < Vagrant.plugin('2', :command)
-        def execute
-          opts = OptionParser.new do |o|
-            o.banner = 'Usage: vagrant rimu servers [options]'
-          end
-          argv = parse_options(opts)
-          return unless argv
-          with_target_vms(argv, provider: :rimu) do |machine|
-            machine.action('list_servers')
-          end
+      class ListServers < RimuCommand
+        def self.synopsis
+          I18n.t('vagrant_rimu.commands.list_servers')
+        end
+
+        def cmd(name, argv, env)
+          fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 0
+          env[:machine].action('list_servers')
         end
       end
     end

data/lib/vagrant-rimu/commands/move.rb

@@ -1,16 +1,16 @@
+require 'vagrant-rimu/commands/abstract_command'
+
 module VagrantPlugins
   module Rimu
     module Commands
-      class Move < Vagrant.plugin('2', :command)
-        def execute
-          opts = OptionParser.new do |o|
-            o.banner = 'Usage: vagrant rimu move [options]'
-          end
-          argv = parse_options(opts)
-          return unless argv
-          with_target_vms(argv, provider: :rimu) do |machine|
-            machine.action('move')
-          end
+      class Move < AbstractCommand
+        def self.synopsis
+          I18n.t('vagrant_rimu.commands.move')
+        end
+
+        def cmd(name, argv, env)
+          fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 0
+          env[:machine].action('move')
         end
       end
     end

data/lib/vagrant-rimu/commands/rebuild.rb

@@ -1,15 +1,13 @@
-require 'optparse'
-
 module VagrantPlugins
   module Rimu
     module Commands
       class Rebuild < Vagrant.plugin('2', :command)
+        def self.synopsis
+          I18n.t('vagrant_rimu.commands.rebuild')
+        end
+
         def execute
-          opts = OptionParser.new do |o|
-            o.banner = 'Usage: vagrant rebuild [vm-name]'
-          end
-          argv = parse_options(opts)
-          with_target_vms(argv) do |machine|
+          with_target_vms(nil, provider: :rimu) do |machine|
             machine.action(:rebuild)
           end
           0

data/lib/vagrant-rimu/commands/rimu_command.rb

@@ -0,0 +1,13 @@
+require 'vagrant-rimu/commands/abstract_command'
+
+module VagrantPlugins
+  module Rimu
+    module Commands
+      class RimuCommand < AbstractCommand
+        def before_cmd(_name, _argv, env)
+          VagrantPlugins::Rimu::Actions::ConnectToRimu.new(nil, env).call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rimu/commands/root.rb

@@ -1,65 +1,48 @@
-require 'optparse'
-
 module VagrantPlugins
   module Rimu
     module Commands
+      COMMANDS = [
+        { name: :'billing-methods', file: 'billing_methods', clazz: 'BillingMethods' },
+        { name: :'distributions', file: 'distributions', clazz: 'Distributions' },
+        { name: :'servers', file: 'list_servers', clazz: 'ListServers' },
+        { name: :'move-vps', file: 'move', clazz: 'Move' },
+        # { name: :'rebuild', file: 'rebuild', clazz: 'Rebuild' },
+      ]
+
       class Root < Vagrant.plugin('2', :command)
         def self.synopsis
-          'query Rimu for various options'
+          I18n.t('vagrant_rimu.commands.root_synopsis')
         end
 
         def initialize(argv, env)
+          @env = env
           @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
+          @commands = Vagrant::Registry.new
 
-          @subcommands = Vagrant::Registry.new
-
-          @subcommands.register(:distributions) do
-            require File.expand_path('../distributions', __FILE__)
-            Distributions
-          end
-
-          @subcommands.register(:move) do
-            require File.expand_path('../move', __FILE__)
-            Move
-          end
-
-          @subcommands.register(:billing_methods) do
-            require File.expand_path('../billing_methods', __FILE__)
-            BillingMethods
-          end
-
-          @subcommands.register(:servers) do
-            require File.expand_path('../list_servers', __FILE__)
-            ListServers
+          COMMANDS.each do |cmd|
+            @commands.register(cmd[:name]) do
+              require_relative cmd[:file]
+              Commands.const_get(cmd[:clazz])
+            end
           end
 
           super(argv, env)
         end
 
         def execute
-          if @main_args.include?('-h') || @main_args.include?('--help')
-            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}")
-          command_class.new(@sub_args, @env).execute
+          command_class = @commands.get(@sub_command.to_sym) if @sub_command
+          return usage unless command_class && @sub_command
+          command_class.new(@sub_args, @env).execute(@sub_command)
         end
 
-        def help
-          opts = OptionParser.new do |o|
-            o.banner = 'Usage: vagrant rimu <subcommand> [<args>]'
-            o.separator ''
-            o.separator 'Available subcommands:'
-            keys = []
-            @subcommands.each { |key, _value| keys << key.to_s }
-            keys.sort.each do |key|
-              o.separator "     #{key}"
-            end
-            o.separator ''
-            o.separator 'For help on any individual subcommand run `vagrant rimu <subcommand> -h`'
+        def usage
+          @env.ui.info I18n.t('vagrant_rimu.commands.root_usage')
+          @env.ui.info ''
+          @env.ui.info I18n.t('vagrant_rimu.commands.available_subcommands')
+          @commands.each do |key, value|
+            @env.ui.info "     #{key.to_s.ljust(20)} #{value.synopsis}"
           end
-          @env.ui.info(opts.help, prefix: false)
+          @env.ui.info ''
         end
       end
     end

data/lib/vagrant-rimu/commands/utils.rb

@@ -0,0 +1,22 @@
+require 'terminal-table'
+
+module VagrantPlugins
+  module Rimu
+    module Commands
+      module Utils
+        # def display_item_list(env, items)
+        #   rows = []
+        #   items.each do |item|
+        #     rows << [item.id, item.name]
+        #   end
+        #   display_table(env, %w(ID Name), rows)
+        # end
+
+        def display_table(env, headers, rows)
+          table = Terminal::Table.new headings: headers, rows: rows
+          env[:ui].info("\n#{table}")
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rimu/config.rb

@@ -137,6 +137,7 @@ module VagrantPlugins
         @data_centre = UNSET_VALUE
       end
 
+      # rubocop:disable Metrics/AbcSize
       def finalize!
         @api_key = ENV['RIMU_API_KEY'] if @api_key == UNSET_VALUE
         @api_url = ENV['RIMU_URL'] if @api_url == UNSET_VALUE
@@ -164,8 +165,8 @@ module VagrantPlugins
 
       def validate(machine)
         errors = []
-        errors << I18n.t('vagrant_rimu.config.api_key') if !@api_key
-        errors << I18n.t('vagrant_rimu.config.host_name') if !@host_name
+        errors << I18n.t('vagrant_rimu.config.api_key') unless @api_key
+        errors << I18n.t('vagrant_rimu.config.host_name') unless @host_name
         if @host_name
           errors << I18n.t('vagrant_rimu.config.invalid_host_name', {:host_name => @host_name}) \
             unless @host_name.match(/\b((?=[a-z0-9-]{1,63}\.)(xn--)?[a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,63}\b/)

data/lib/vagrant-rimu/errors.rb

@@ -18,6 +18,10 @@ module VagrantPlugins
       class ApiError < RimuError
         error_key(:api_error)
       end
+
+      class NoArgRequiredForCommand < RimuError
+        error_key(:no_args)
+      end
     end
   end
 end

data/lib/vagrant-rimu/plugin.rb

@@ -45,7 +45,7 @@ module VagrantPlugins
         # Setup logging and i18n
         Rimu.init_i18n
         Rimu.init_logging
-        
+
         require_relative "commands/rebuild"
         Commands::Rebuild
       end

data/lib/vagrant-rimu/provider.rb

@@ -33,7 +33,7 @@ module VagrantPlugins
         # key in the environment.
         env = @machine.action("read_state")
 
-        state_id = env[:machine_state_id]
+        state_id = env[:machine_state]
 
         # Get the short and long description
         short = I18n.t("vagrant_rimu.states.short_#{state_id}")

data/lib/vagrant-rimu/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Rimu
-    VERSION = '0.0.2'
+    VERSION = '0.0.7'
   end
 end

data/locales/en.yml

@@ -14,6 +14,8 @@ en:
             Starting the VPS...
         stopping: |-
             Stopping the VPS...
+        moving: |-
+            Moving the VPS to different host...
         terminating: |-
             Terminating the VPS...
         waiting_for_ready: |-
@@ -21,10 +23,15 @@ en:
         will_not_destroy: |-
             The VPS '%{name}' will not be destroyed, since the confirmation
             was declined.
+        will_not_stop: |-
+          The VPS '%{name}' will not be stopped, as the Rimu API does not
+          support this action. To stop your VPS run `vagrant ssh` and then
+          `halt` on the VPS console.
         ip_address: |-
             Assigned IP address: %{ip}
         creating_user: "Creating user account: %{user}..."
         modifying_sudo: "Modifying sudoers file to remove tty requirement..."
+        action_not_supported: "The requested command is not supported by this provider"
         reloading: "Rebooting the VPS..."
         rebuilding: "Rebuilding the VPS..."
         config:
@@ -35,25 +42,6 @@ en:
             private_key: "A valid SSH private key path option: [private_key_path] is required"
             missing_private_key: "SSH private key not found: %{key}"
             public_key: "SSH public key not found: %{key}"
-        errors:
-            api_error: |-
-                The API request failed. Please inspect the error message
-                below for more info.
-
-                Error: %{stderr}
-            public_key: |-
-                There was an issue reading the public key at:
-
-                Path: %{path}
-
-                Please check the file's permissions.
-            rsync: |-
-                There was an error when attemping to rsync a share folder.
-                Please inspect the error message below for more info.
-
-                Host path: %{hostpath}
-                Guest path: %{guestpath}
-                Error: %{stderr}
         states:
           short_not_created: |-
             not created
@@ -65,8 +53,12 @@ en:
             The VPS is starting.
           short_stopped: |-
             stopped
+          short_off: |-
+            stopped
           long_stopped: |-
             The VPS is stopped. Run `vagrant up` to start it.
+          long_off: |-
+            The VPS is stopped. Run `vagrant up` to start it.
           short_stopping: |-
             stopping
           long_stopping: |-
@@ -74,6 +66,65 @@ en:
             run `vagrant up` and start it.
           short_running: |-
             running
+          short_active: |-
+            running
           long_running: |-
             The VPS is running. To stop this machine, you can run
             `vagrant halt`. To destroy the machine, you can run `vagrant destroy`.
+          long_active: |-
+            The VPS is running. To stop this machine, you can run
+            `vagrant halt`. To destroy the machine, you can run `vagrant destroy`.
+          current_state: |-
+            Machine state is `%{state}`
+        commands:
+            root_synopsis: |-
+              Rimu provider specific commands
+            root_usage: |-
+              Usage: vagrant rimu <subcommand> [<args>]
+            rebuild_usage: |-
+              Usage: vagrant rebuild [vm-name]
+            available_subcommands: |-
+              Available subcommands:
+            billing_methods: |-
+              List billing methods
+            list_distributions: |-
+              List Distributions
+            list_servers: |-
+              List servers
+            move: |-
+              Moves server to different host
+            rebuild: |-
+              Rebuilds the server, retaining the current IP address
+        errors:
+            global_error: |-
+                An unknown error happened in Vagrant Rimu provider
+
+                To easily debug what happened, we recommend to set the environment
+                variable VAGRANT_RIMU_LOG to debug
+
+                  $ export VAGRANT_RIMU_LOG=debug
+
+                If doing this does not help fixing your issue, there may be a bug
+                in the provider. Please submit an issue on Github at
+                https://github.com/akissa/vagrant-rimu
+                with the stracktrace and the logs.
+            no_args: |-
+                Command '%{cmd}' does not required any argument.
+            api_error: |-
+                The API request failed. Please inspect the error message
+                below for more info.
+
+                Error: %{stderr}
+            public_key: |-
+                There was an issue reading the public key at:
+
+                Path: %{path}
+
+                Please check the file permissions.
+            rsync: |-
+                There was an error when attemping to rsync a share folder.
+                Please inspect the error message below for more info.
+
+                Host path: %{hostpath}
+                Guest path: %{guestpath}
+                Error: %{stderr}