vagrant-rimu 0.0.1 → 0.0.6

data/lib/vagrant-rimu/actions/terminate_instance.rb

@@ -1,21 +1,27 @@
 require 'log4r'
 
+require 'vagrant-rimu/actions/abstract_action'
+
 module VagrantPlugins
   module Rimu
     module Actions
       # This terminates the running server, if there is one.
-      class TerminateInstance
-        def initialize(app, env)
+      class TerminateInstance < AbstractAction
+        def initialize(app, _env)
           @app = app
-          @client = env[:rimu_api]
           @logger = Log4r::Logger.new("vagrant_rimu::action::terminate_instance")
         end
 
-        def call(env)
+        def execute(env)
           if env[:machine].id
             env[:ui].info(I18n.t("vagrant_rimu.terminating"))
-            @client.servers.cancel(env[:machine].id.to_i)
-            env[:machine].id = nil
+            client = env[:rimu_api]
+            begin
+              client.servers.cancel(env[:machine].id.to_i)
+              env[:machine].id = nil
+            rescue ::Rimu::RimuAPI::RimuRequestError, ::Rimu::RimuAPI::RimuResponseError => e
+              raise Errors::ApiError, {:stderr=>e}
+            end
           end
 
           @app.call(env)

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

@@ -1,3 +1,5 @@
+require 'vagrant'
+
 module VagrantPlugins
   module Rimu
     class Config < Vagrant.plugin('2', :config)
@@ -135,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
@@ -162,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

@@ -1,3 +1,5 @@
+require 'vagrant'
+
 module VagrantPlugins
   module Rimu
     module Errors
@@ -16,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/logging.rb

@@ -0,0 +1,28 @@
+module VagrantPlugins
+  module Rimu
+    module Logging
+      def self.init
+        level = nil
+        begin
+          level = Log4r.const_get(ENV['VAGRANT_LOG'].upcase)
+        rescue NameError
+          begin
+            level = Log4r.const_get(ENV['VAGRANT_RIMU_LOG'].upcase)
+          rescue NameError
+            level = nil
+          end
+        end
+
+        level = nil unless level.is_a?(Integer)
+
+        if level
+          logger = Log4r::Logger.new('vagrant_rimu')
+          out = Log4r::Outputter.stdout
+          out.formatter = Log4r::PatternFormatter.new(pattern: '%d | %5l | %m', date_pattern: '%Y-%m-%d %H:%M')
+          logger.outputters = out
+          logger.level = level
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rimu/plugin.rb

@@ -24,57 +24,31 @@ module VagrantPlugins
 
       provider(:rimu, {:box_optional => true, :parallel => true}) do
         # Setup logging and i18n
-        setup_logging
-        setup_i18n
+        Rimu.init_i18n
+        Rimu.init_logging
+        
         # Return the provider
         require_relative "provider"
         Provider
       end
 
       command(:rimu) do
+        # Setup logging and i18n
+        Rimu.init_i18n
+        Rimu.init_logging
+        
         require_relative "commands/root"
         Commands::Root
       end
 
       command(:rebuild) do
+        # Setup logging and i18n
+        Rimu.init_i18n
+        Rimu.init_logging
+
         require_relative "commands/rebuild"
         Commands::Rebuild
       end
-
-      # This initializes the internationalization strings.
-      def self.setup_i18n
-        I18n.load_path << File.expand_path("locales/en.yml", Rimu.source_root)
-        I18n.reload!
-      end
-
-      # This sets up our log level to be whatever VAGRANT_LOG is.
-      def self.setup_logging
-        require "log4r"
-
-        level = nil
-        begin
-          level = Log4r.const_get(ENV["VAGRANT_LOG"].upcase)
-        rescue NameError
-          # This means that the logging constant wasn't found,
-          # which is fine. We just keep `level` as `nil`. But
-          # we tell the user.
-          level = nil
-        end
-
-        # Some constants, such as "true" resolve to booleans, so the
-        # above error checking doesn't catch it. This will check to make
-        # sure that the log level is an integer, as Log4r requires.
-        level = nil if !level.is_a?(Integer)
-
-        # Set the logging level on all "vagrant" namespaced
-        # logs as long as we have a valid level.
-        if level
-          logger = Log4r::Logger.new("vagrant_rimu")
-          logger.outputters = Log4r::Outputter.stderr
-          logger.level = level
-          logger = nil
-        end
-      end
     end
   end
 end