vagrant-rimu 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bb71155b1d915e134acd0b54427600466968a24
-  data.tar.gz: 92fea11036f014aa61159e4c5f5e56c359835d9a
+  metadata.gz: d840a350e4933f16c609939b0e47a667fb231e52
+  data.tar.gz: 2d6683d767c52a49ce99ef1a8e037ff7fcf568e5
 SHA512:
-  metadata.gz: 45df36e60c52b926b9885d6df23764ae3fd33cb43a1bd99c56562327229d70180afd361bcae4aa77bd88f2025bbb9b93a4081326ad769f43fc7d0c426cf8d48c
-  data.tar.gz: 6f2502345025c5c978ee3cf89f42b3b20cdbddf7cf040df3fc5891e0314909934cbd84dd003ea049da267713fedfdff1762304c86f9b516bc0300e555b2b2555
+  metadata.gz: 073c4eee2db28a3dd9c509fbee40535b0785251f194532e3bffb7f42b6a97cc7b3b78e3669a0a96575833d5b3d02f5eb736536aa05428da303fd43dfbc987af4
+  data.tar.gz: b191f23da8e210fb597d9814f79b46930b4d6f1dc7779d0a9e4487acebbf399fe6dc4d88550d70266b4a4cbfa2323b53bc612979bc310b8a2ed49c3d541b4d04

data/README.md

@@ -6,6 +6,7 @@ management of [Rimuhosting](https://www.rimuhosting.com/) VPS's.
 [![Build Status](https://travis-ci.org/akissa/vagrant-rimu.svg?branch=master)](https://travis-ci.org/akissa/vagrant-rimu)
 [![Code Climate](https://codeclimate.com/github/akissa/vagrant-rimu/badges/gpa.svg)](https://codeclimate.com/github/akissa/vagrant-rimu)
 [![Test Coverage](https://codeclimate.com/github/akissa/vagrant-rimu/badges/coverage.svg)](https://codeclimate.com/github/akissa/vagrant-rimu/coverage)
+[![Gem Version](https://badge.fury.io/rb/vagrant-rimu.svg)](https://badge.fury.io/rb/vagrant-rimu)
 [![MPLv2 License](https://img.shields.io/badge/license-MPLv2-blue.svg?style=flat-square)](https://www.mozilla.org/MPL/2.0/)
 
 Current Features include:

data/lib/vagrant-rimu/actions.rb

@@ -203,10 +203,17 @@ module VagrantPlugins
       end
 
       def self.action_move
-        new_builder.tap do |b|
-          b.use ConfigValidate
-          b.use ConnectToRimu
-          b.use Move
+        return new_builder.tap do |builder|
+          builder.use ConfigValidate
+          builder.use ConnectToRimu
+          builder.use Call, IsCreated do |env, b|
+            case env[:machine_state]
+            when :active, :off
+              b.use Move
+            when :not_created
+              b.use MessageNotCreated
+            end
+          end
         end
       end
 

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

@@ -56,9 +56,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
@@ -72,6 +79,7 @@ module VagrantPlugins
             end
           end
           @machine.config.ssh.username = user
+
           @app.call(env)
         end
         # rubocop:enable Metrics/AbcSize

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

@@ -19,9 +19,13 @@ module VagrantPlugins
         def execute(env)
           client = env[:rimu_api]
 
-          env[:ui].info I18n.t('vagrant_rimu.move')
+          env[:ui].info I18n.t('vagrant_rimu.moving')
 
-          result = client.servers.move(@machine.id.to_i)
+          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"]})

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

@@ -38,7 +38,11 @@ module VagrantPlugins
           params.delete(:instantiation_via_clone_options) if @machine.provider_config.vps_to_clone.nil?
           params.delete(:instantiation_options) if params.has_key?(:instantiation_via_clone_options)
 
-          client.servers.reinstall(@machine.id.to_i, params)
+          begin
+            client.servers.reinstall(@machine.id.to_i, params)
+          rescue ::Rimu::RimuAPI::RimuRequestError, ::Rimu::RimuAPI::RimuResponseError => e
+            raise Errors::ApiError, {:stderr=>e}
+          end
           
           switch_user = @machine.provider_config.setup?
           user = @machine.config.ssh.username

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

@@ -15,7 +15,12 @@ module VagrantPlugins
         def execute(env)
           client = env[:rimu_api]
           env[:ui].info I18n.t('vagrant_rimu.reloading')
-          client.servers.reboot(@machine.id.to_i)
+
+          begin
+            client.servers.reboot(@machine.id.to_i)
+          rescue ::Rimu::RimuAPI::RimuRequestError, ::Rimu::RimuAPI::RimuResponseError => e
+            raise Errors::ApiError, {:stderr=>e}
+          end
 
           @app.call(env)
         end

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

@@ -24,7 +24,7 @@ module VagrantPlugins
         rescue Errors::ApiError, SystemExit, Interrupt => e
           raise e
         rescue Exception => e
-          puts I18n.t('vagrant_rimu.errors.global_error').red unless e.message && e.message.start_with?('Catched Error:')
+          puts I18n.t('vagrant_rimu.errors.global_error').red unless e.message
           raise e
         end
         # rubocop:enable Lint/RescueException

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

@@ -11,7 +11,7 @@ module VagrantPlugins
 
       class Root < Vagrant.plugin('2', :command)
         def self.synopsis
-          I18n.t('vagrant_rimu.command.root_synopsis')
+          I18n.t('vagrant_rimu.commands.root_synopsis')
         end
 
         def initialize(argv, env)

data/lib/vagrant-rimu/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Rimu
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   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: |-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-rimu
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Andrew Colin Kissa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-29 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rimu