vagrant-rimu 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a03f01ba13d87cf66c51b6708cfee445ea83faf
-  data.tar.gz: 967f4fcc6e0f8461e71c3f6509e3378f828407b1
+  metadata.gz: 7bb71155b1d915e134acd0b54427600466968a24
+  data.tar.gz: 92fea11036f014aa61159e4c5f5e56c359835d9a
 SHA512:
-  metadata.gz: ed69f66bd9f6b912a169bf4305ac603eca49ed073f370a81158023b9b48aa8fa0095870d9d018618317888fa01116a9f7f784bdd74d22d8bf32ce119ccb0a12f
-  data.tar.gz: b8b5f0bac476789a3d08759ce1c1911d379b77cfa767e4298e8dda445e4d8f0a65dfd7c7d6b0b99db3085fa33bc2a9ce1cb61c5a71300131f95a415fc3b37a1f
+  metadata.gz: 45df36e60c52b926b9885d6df23764ae3fd33cb43a1bd99c56562327229d70180afd361bcae4aa77bd88f2025bbb9b93a4081326ad769f43fc7d0c426cf8d48c
+  data.tar.gz: 6f2502345025c5c978ee3cf89f42b3b20cdbddf7cf040df3fc5891e0314909934cbd84dd003ea049da267713fedfdff1762304c86f9b516bc0300e555b2b2555

data/.codeclimate.yml

@@ -8,5 +8,6 @@ ratings:
   paths:
   - "**.rb"
 exclude_paths:
-- spec/**/*
-- test/**/*
+    - "**.yml"
+    - spec/**/*
+    - test/**/*

data/.travis.yml

@@ -1,10 +1,12 @@
 language: ruby
-script: bundle exec rspec spec
+script: bundle exec rake
 before_install:
   - rvm @global do gem uninstall bundler --all --force --executables
   - gem uninstall bundler --all --force --executables
   - gem install bundler -v "$BUNDLER_VERSION"
 # bundler_args: --without development
+install:
+  - travis_retry bundle install
 addons:
     code_climate:
         repo_token: 3a5d0d815b7e9bc2c6b4608f74babd935d43fa564cd9041944dfd221f593a4db

data/Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
 
+gemspec
+
 group :test do
   gem 'codecov', :require => false
   gem 'simplecov', :require => false
@@ -14,10 +16,10 @@ group :development do
   else
     gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant.git'
   end
+  gem 'rubocop', '~> 0.29.0', :require => false
 end
 
 group :plugins do
   gem 'bundler', '>= 1.5.2', '< 1.8.0'
   gem 'vagrant-rimu', :path => '.'
-  gemspec
 end

data/README.md

@@ -4,7 +4,6 @@
 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)
-[![codecov.io](https://codecov.io/github/akissa/vagrant-rimu/coverage.svg?branch=master)](https://codecov.io/github/akissa/vagrant-rimu?branch=master)
 [![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)
 [![MPLv2 License](https://img.shields.io/badge/license-MPLv2-blue.svg?style=flat-square)](https://www.mozilla.org/MPL/2.0/)
@@ -92,7 +91,7 @@ The provider supports the following Vagrant sub-commands:
   Rimu VPS.
 - `vagrant ssh` - Logs into the Rimu VPS using the configured user account.
 - `vagrant rimu` - Moves a VPS to a different host and provides info on
-  distributions, servers and billing_methods
+  `distributions`, `servers` and `billing methods`
 
 ## Contributing
 

data/Rakefile

@@ -1,6 +1,9 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+RuboCop::RakeTask.new
+
+task default: %w(rubocop spec)

data/gemfiles/vagrant_1.5.gemfile

@@ -1,7 +1,10 @@
 source 'https://rubygems.org'
 
+gemspec :path => '../'
+
 group :development do
   gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant', :tag => 'v1.5.4'
+  gem 'rubocop', '~> 0.29.0', :require => false
 end
 
 group :test do
@@ -14,5 +17,4 @@ end
 group :plugins do
   gem 'bundler', '= 1.5.2'
   gem 'vagrant-rimu', :path => '../'
-  gemspec :path => '../'
 end

data/gemfiles/vagrant_1.6.gemfile

@@ -1,7 +1,10 @@
 source 'https://rubygems.org'
 
-group :development do
-    gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant', :tag => 'v1.6.5'
+gemspec :path => '../'
+
+group :development do  
+  gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant', :tag => 'v1.6.5'
+  gem 'rubocop', '~> 0.29.0', :require => false
 end
 
 group :test do
@@ -14,5 +17,4 @@ end
 group :plugins do
   gem 'bundler', '>= 1.5.2', '< 1.7.0'
   gem 'vagrant-rimu', :path => '../'
-  gemspec :path => '../'
 end

data/gemfiles/vagrant_1.7.gemfile

@@ -1,18 +1,20 @@
 source 'https://rubygems.org'
 
+gemspec :path => '../'
+
 group :development do
-    gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant', :tag => 'v1.7.1'
+  gem 'vagrant', :git => 'https://github.com/mitchellh/vagrant', :tag => 'v1.7.1'
+  gem 'rubocop', '~> 0.29.0', :require => false
 end
 
 group :test do
-    gem 'codecov', :require => false
-    gem 'simplecov', :require => false
-    gem 'coveralls', :require => false
-    gem 'codeclimate-test-reporter', require: false
+  gem 'codecov', :require => false
+  gem 'simplecov', :require => false
+  gem 'coveralls', :require => false
+  gem 'codeclimate-test-reporter', require: false
 end
 
 group :plugins do
-    gem 'bundler', '>= 1.5.2', '< 1.8.0'
-    gem 'vagrant-rimu', :path => '../'
-    gemspec :path => '../'
+  gem 'bundler', '>= 1.5.2', '< 1.8.0'
+  gem 'vagrant-rimu', :path => '../'
 end

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,23 @@
 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)
+        def execute(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)
+          @app.call(env) unless @app.nil?
         end
       end
     end

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

@@ -1,18 +1,22 @@
 require 'log4r'
 require 'vagrant'
 
+require 'vagrant-rimu/actions/abstract_action'
+
 module VagrantPlugins
   module Rimu
     module Actions
-      class Create
+      class Create < AbstractAction
         include Vagrant::Util::Retryable
+
         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 = {
@@ -70,6 +74,7 @@ module VagrantPlugins
           @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 +88,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,12 +1,14 @@
+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)
+        def execute(env)
           env[:result] = env[:machine].state.id == :stopped
 
           @app.call(env)

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_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/modify_provision_path.rb

@@ -1,16 +1,18 @@
 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)

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

@@ -1,19 +1,42 @@
 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'
+
+          result = client.servers.move(@machine.id.to_i)
+
+          @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' if !@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")
         end
 
-        def call(env)
+        def execute(env)
           client = env[:rimu_api]
           env[:machine_ssh_info] = read_ssh_info(client, @machine)
 

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

@@ -1,16 +1,18 @@
 require 'log4r'
 
+require 'vagrant-rimu/actions/abstract_action'
+
 module VagrantPlugins
   module Rimu
     module Actions
-      class ReadState
+      class ReadState < AbstractAction
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
           @logger = Log4r::Logger.new('vagrant_rimu::action::read_state')
         end
 
-        def call(env)
+        def execute(env)
           client = env[:rimu_api]
           env[:machine_state] = read_state(client, @machine)
           @logger.info "Machine state is '#{env[:machine_state]}'"

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

@@ -3,7 +3,7 @@ require 'log4r'
 module VagrantPlugins
   module Rimu
     module Actions
-      class Rebuild
+      class Rebuild < AbstractAction
         include Vagrant::Util::Retryable
 
         def initialize(app, env)
@@ -12,9 +12,11 @@ module VagrantPlugins
           @logger = Log4r::Logger.new('vagrant::rimu::rebuild')
         end
 
-        def call(env)
+        # rubocop:disable Metrics/AbcSize
+        def execute(env)
           client = env[:rimu_api]
           env[:ui].info I18n.t('vagrant_rimu.rebuilding')
+          
           params = {
             :instantiation_options => {
                 :domain_name => @machine.provider_config.host_name,
@@ -35,7 +37,9 @@ 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)
+          
           switch_user = @machine.provider_config.setup?
           user = @machine.config.ssh.username
           @machine.config.ssh.username = 'root' if switch_user
@@ -44,6 +48,7 @@ module VagrantPlugins
             raise 'not ready' if !@machine.communicate.ready?
           end
           @machine.config.ssh.username = user
+          
           @app.call(env)
         end
       end

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

@@ -1,16 +1,18 @@
 require 'log4r'
 
+require 'vagrant-rimu/actions/abstract_action'
+
 module VagrantPlugins
   module Rimu
     module Actions
-      class Reload
+      class Reload < AbstractAction
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
           @logger = Log4r::Logger.new('vagrant::rimu::reload')
         end
 
-        def call(env)
+        def execute(env)
           client = env[:rimu_api]
           env[:ui].info I18n.t('vagrant_rimu.reloading')
           client.servers.reboot(@machine.id.to_i)