vagrant-rimu 0.0.2 → 0.0.7

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

@@ -0,0 +1,20 @@
+require 'colorize'
+
+module VagrantPlugins
+  module Rimu
+    module Actions
+      class AbstractAction
+        def call(env)
+          execute(env)
+        # 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 && e.message.start_with?('Caught Error:')
+          raise $!, "Caught Error: #{$!}", $!.backtrace
+        end
+        # rubocop:enable Lint/RescueException
+      end
+    end
+  end
+end

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

@@ -1,16 +1,23 @@
+require 'vagrant-rimu/commands/utils'
+require 'vagrant-rimu/actions/abstract_action'
+
 module VagrantPlugins
   module Rimu
     module Actions
-      class BillingMethods
+      class BillingMethods < AbstractAction
+        include VagrantPlugins::Rimu::Commands::Utils
+
         def initialize(app, _env)
           @app = app
         end
 
-        def call(env)
-          env[:ui].info '%-20s %-20s %s' % ['ID', 'Type', 'Description']
+        def execute(env)
+          rows = []
           env[:rimu_api].billing_methods.each do |b|
-            env[:ui].info '%-20s %-20s %s' % [b.billing_oid, b.billing_method_type, b.description]
+            rows << [b.billing_oid, b.billing_method_type, b.description]
           end
+          display_table(env, ['ID', 'Type', 'Description'], rows)
+
           @app.call(env)
         end
       end

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

@@ -1,21 +1,27 @@
 require 'log4r'
 require 'rimu'
 
+require 'vagrant-rimu/actions/abstract_action'
+
 module VagrantPlugins
   module Rimu
     module Actions
-      class ConnectToRimu
+      class ConnectToRimu < AbstractAction
         def initialize(app, env)
           @app = app
           @config = env[:machine].provider_config
           @logger = Log4r::Logger.new('vagrant_rimu::action::connect_to_rimu')
         end
 
-        def call(env)
-          @logger.info('Connecting to Rimu api_url...')
-          rimu = ::Rimu::RimuAPI.new({:api_url => @config.api_url, :api_key=> @config.api_key})
-          env[:rimu_api] = rimu
-          @app.call(env)
+        def execute(env)
+          if env[:rimu_api].nil? || ! env[:rimu_api].respond_to?(:api_key)
+            @logger.info('Connecting to Rimu api_url...')
+            rimu = ::Rimu::RimuAPI.new({:api_url => @config.api_url, :api_key=> @config.api_key})
+            env[:rimu_api] = rimu
+          else
+            @logger.info('Not creating a new client object...')
+          end
+          @app.call(env) unless @app.nil?
         end
       end
     end

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

@@ -1,18 +1,24 @@
 require 'log4r'
 require 'vagrant'
 
+require 'vagrant-rimu/actions/ssh_utils'
+require 'vagrant-rimu/actions/abstract_action'
+
 module VagrantPlugins
   module Rimu
     module Actions
-      class Create
+      class Create < AbstractAction
         include Vagrant::Util::Retryable
+        include VagrantPlugins::Rimu::Actions::SshUtils
+
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
           @logger = Log4r::Logger.new('vagrant::rimu::create')
         end
 
-        def call(env)
+        # rubocop:disable Metrics/AbcSize
+        def execute(env)
           client = env[:rimu_api]
           env[:ui].info I18n.t('vagrant_rimu.creating')
           params = {
@@ -52,9 +58,16 @@ module VagrantPlugins
           if params.has_key?(:instantiation_options)
             params[:instantiation_options][:password] = root_pass
           end
-          result = client.servers.create(params)
+
+          begin
+            result = client.servers.create(params)
+          rescue ::Rimu::RimuAPI::RimuRequestError, ::Rimu::RimuAPI::RimuResponseError => e
+            raise Errors::ApiError, {:stderr=>e}
+          end
+
           @machine.id = result.order_oid
           env[:ui].info I18n.t('vagrant_rimu.ip_address', {:ip => result.allocated_ips["primary_ip"]})
+
           switch_user = @machine.provider_config.setup?
           user = @machine.config.ssh.username
           if switch_user
@@ -64,12 +77,18 @@ module VagrantPlugins
           if params.has_key?(:instantiation_options)
             retryable(:tries => 120, :sleep => 10) do
               next if env[:interrupted]
-              raise 'not ready' if !@machine.communicate.ready?
+              raise 'not ready' unless @machine.communicate.ready?
             end
           end
+
+          # upload root ssh key
+          upload_key(env)
+
           @machine.config.ssh.username = user
+
           @app.call(env)
         end
+        # rubocop:enable Metrics/AbcSize
 
         def recover(env)
           return if env['vagrant.error'].is_a?(Vagrant::Errors::VagrantError)
@@ -83,7 +102,7 @@ module VagrantPlugins
           destroy_env.delete(:interrupted)
           destroy_env[:config_validate] = false
           destroy_env[:force_confirm_destroy] = true
-          env[:action_runner].run(Actions.destroy, destroy_env)
+          env[:action_runner].run(Actions.action_destroy, destroy_env)
         end
       end
     end

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

@@ -1,12 +1,14 @@
+require 'vagrant-rimu/actions/abstract_action'
+
 module VagrantPlugins
   module Rimu
     module Actions
-      class IsCreated
+      class IsCreated < AbstractAction
         def initialize(app, _env)
           @app = app
         end
 
-        def call(env)
+        def execute(env)
           env[:result] = env[:machine].state.id != :not_created
           @app.call(env)
         end

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

@@ -1,13 +1,15 @@
+require 'vagrant-rimu/actions/abstract_action'
+
 module VagrantPlugins
   module Rimu
     module Actions
-      class IsStopped
+      class IsStopped < AbstractAction
         def initialize(app, _env)
           @app = app
         end
 
-        def call(env)
-          env[:result] = env[:machine].state.id == :stopped
+        def execute(env)
+          env[:result] = env[:machine].state.id == :off
 
           @app.call(env)
         end

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

@@ -1,16 +1,23 @@
+require 'vagrant-rimu/commands/utils'
+require 'vagrant-rimu/actions/abstract_action'
+
 module VagrantPlugins
   module Rimu
     module Actions
-      class ListDistributions
+      class ListDistributions < AbstractAction
+        include VagrantPlugins::Rimu::Commands::Utils
+
         def initialize(app, _env)
           @app = app
         end
 
-        def call(env)
-          env[:ui].info '%-15s %s' % ['Distro Code', 'Distro Description']
+        def execute(env)
+          rows = []
           env[:rimu_api].distributions.each do |dist|
-            env[:ui].info '%-15s %s' % [dist.distro_code, dist.distro_description]
+            rows << [dist.distro_code, dist.distro_description]
           end
+          display_table(env, ['Distro Code', 'Distro Description'], rows)
+
           @app.call(env)
         end
       end

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

@@ -1,18 +1,23 @@
+require 'vagrant-rimu/commands/utils'
+require 'vagrant-rimu/actions/abstract_action'
+
 module VagrantPlugins
   module Rimu
     module Actions
-      class ListServers
+      class ListServers < AbstractAction
+        include VagrantPlugins::Rimu::Commands::Utils
+
         def initialize(app, _env)
           @app = app
         end
 
-        def call(env)
-          heading = '%-10s %-30s %-20s %-15s %-15s' % ['ID', 'Hostname', 'Data Centre', 'Host Server', 'Status']
-          env[:ui].info heading
+        def execute(env)
+          rows = []
           env[:rimu_api].orders.orders.each do |o|
-            row = '%-10s %-30s %-20s %-15s %-15s' % [o.order_oid, o.domain_name, o.location["data_center_location_code"], o.host_server_oid, o.running_state]
-            env[:ui].info row
+            rows << [o.order_oid, o.domain_name, o.location["data_center_location_code"], o.host_server_oid, o.running_state]
           end
+          display_table(env, ['ID', 'Hostname', 'Data Centre', 'Host Server', 'Status'], rows)
+
           @app.call(env)
         end
       end

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

@@ -0,0 +1,19 @@
+require 'vagrant-rimu/actions/abstract_action'
+
+module VagrantPlugins
+  module Rimu
+    module Actions
+      class MessageActionNotSupported < AbstractAction
+        def initialize(app, _env)
+          @app = app
+        end
+
+        def execute(env)
+          env[:ui].info(I18n.t('vagrant_rimu.action_not_supported'))
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -1,12 +1,14 @@
+require 'vagrant-rimu/actions/abstract_action'
+
 module VagrantPlugins
   module Rimu
     module Actions
-      class MessageAlreadyCreated
+      class MessageAlreadyCreated < AbstractAction
         def initialize(app, _env)
           @app = app
         end
 
-        def call(env)
+        def execute(env)
           env[:ui].info(I18n.t('vagrant_rimu.already_status', :status => 'created'))
           @app.call(env)
         end

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

@@ -1,12 +1,14 @@
+require 'vagrant-rimu/actions/abstract_action'
+
 module VagrantPlugins
   module Rimu
     module Actions
-      class MessageAlreadyOff
+      class MessageAlreadyOff < AbstractAction
         def initialize(app, _env)
           @app = app
         end
 
-        def call(env)
+        def execute(env)
           env[:ui].info(I18n.t("vagrant_rimu.already_status", :status => :off))
           @app.call(env)
         end

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

@@ -1,12 +1,14 @@
+require 'vagrant-rimu/actions/abstract_action'
+
 module VagrantPlugins
   module Rimu
     module Actions
-      class MessageNotCreated
+      class MessageNotCreated < AbstractAction
         def initialize(app, _env)
           @app = app
         end
 
-        def call(env)
+        def execute(env)
           env[:ui].info(I18n.t('vagrant_rimu.not_created'))
           @app.call(env)
         end

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

@@ -1,13 +1,15 @@
+require 'vagrant-rimu/actions/abstract_action'
+
 module VagrantPlugins
   module Rimu
     module Actions
-      class MessageWillNotDestroy
+      class MessageWillNotDestroy < AbstractAction
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
         end
 
-        def call(env)
+        def execute(env)
           env[:ui].info(I18n.t('vagrant_rimu.will_not_destroy', {:name => @machine.name}))
           @app.call(env)
         end

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

@@ -0,0 +1,19 @@
+require 'vagrant-rimu/actions/abstract_action'
+
+module VagrantPlugins
+  module Rimu
+    module Actions
+      class MessageWillNotStop < AbstractAction
+        def initialize(app, env)
+          @app = app
+          @machine = env[:machine]
+        end
+
+        def execute(env)
+          env[:ui].info(I18n.t('vagrant_rimu.will_not_stop', {:name => @machine.name}))
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

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

@@ -1,20 +1,22 @@
 require 'log4r'
 
+require 'vagrant-rimu/actions/abstract_action'
+
 module VagrantPlugins
   module Rimu
     module Actions
-      class ModifyProvisionPath
+      class ModifyProvisionPath < AbstractAction
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
           @logger = Log4r::Logger.new('vagrant::rimu::modify_provision_path')
         end
 
-        def call(env)
+        def execute(env)
           # check if provisioning is enabled
           enabled = true
           enabled = env[:provision_enabled] if env.has_key?(:provision_enabled)
-          return @app.call(env) if !enabled
+          return @app.call(env) unless enabled
 
           username = @machine.ssh_info()[:username]
 

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

@@ -1,19 +1,46 @@
 require 'log4r'
+require 'vagrant'
+
+require 'vagrant-rimu/actions/abstract_action'
 
 module VagrantPlugins
   module Rimu
     module Actions
-      class Move
+      class Move < AbstractAction
+        include Vagrant::Util::Retryable
+
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
           @logger = Log4r::Logger.new('vagrant::rimu::move')
         end
 
-        def call(env)
+        # rubocop:disable Metrics/AbcSize
+        def execute(env)
           client = env[:rimu_api]
-          env[:ui].info I18n.t('vagrant_rimu.move')
-          fail 'not implemented'
+
+          env[:ui].info I18n.t('vagrant_rimu.moving')
+
+          begin
+            result = client.servers.move(@machine.id.to_i)
+          rescue ::Rimu::RimuAPI::RimuRequestError, ::Rimu::RimuAPI::RimuResponseError => e
+            raise Errors::ApiError, {:stderr=>e}
+          end
+
+          @machine.id = result.order_oid
+          env[:ui].info I18n.t('vagrant_rimu.ip_address', {:ip => result.allocated_ips["primary_ip"]})
+
+          switch_user = @machine.provider_config.setup?
+          user = @machine.config.ssh.username
+          @machine.config.ssh.username = 'root' if switch_user
+
+          retryable(:tries => 120, :sleep => 10) do
+            next if env[:interrupted]
+            raise 'not ready' unless @machine.communicate.ready?
+          end
+
+          @machine.config.ssh.username = user
+
           @app.call(env)
         end
       end

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

@@ -1,18 +1,20 @@
 require 'log4r'
 
+require 'vagrant-rimu/actions/abstract_action'
+
 module VagrantPlugins
   module Rimu
     module Actions
       # This action reads the SSH info for the machine and puts it into the
       # `:machine_ssh_info` key in the environment.
-      class ReadSSHInfo
+      class ReadSSHInfo < AbstractAction
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
-          @logger = Log4r::Logger.new("vagrant_rimu::action::read_ssh_info")
+          @logger = Log4r::Logger.new('vagrant_rimu::action::read_ssh_info')
         end
 
-        def call(env)
+        def execute(env)
           client = env[:rimu_api]
           env[:machine_ssh_info] = read_ssh_info(client, @machine)
 
@@ -32,9 +34,10 @@ module VagrantPlugins
           end
 
           return {
-            :host => server.allocated_ips["primary_ip"],
+            :host => server.allocated_ips['primary_ip'],
             :port => 22,
-            :username => "root"
+            :username => 'root',
+            :private_key_path => machine.config.ssh.private_key_path,
           }
         end
       end