vagrant-rimu 0.0.4 → 0.0.5

data/lib/vagrant-rimu/actions.rb

@@ -11,19 +11,19 @@ module VagrantPlugins
       # This action is called to terminate the remote machine.
       def self.action_destroy
         new_builder.tap do |b|
-          b.use Call, DestroyConfirm do |env, b2|
+          b.use Call, DestroyConfirm do |env, b1|
             if env[:result]
-              b2.use ConfigValidate
-              b.use Call, IsCreated do |env2, b3|
-                if !env2[:result]
-                  b3.use MessageNotCreated
-                  next
+              b1.use ConfigValidate
+              b1.use ConnectToRimu
+              b1.use Call, ReadState do |env1, b2|
+                if env1[:machine_state] == :not_created
+                  b2.use MessageNotCreated
+                else
+                  b2.use TerminateInstance
                 end
               end
-              b2.use ConnectToRimu
-              b2.use TerminateInstance
             else
-              b2.use MessageWillNotDestroy
+              b1.use MessageWillNotDestroy
             end
           end
         end
@@ -41,7 +41,7 @@ module VagrantPlugins
       end
 
       # This action is called to read the state of the machine. The
-      # resulting state is expected to be put into the `:machine_state_id`
+      # resulting state is expected to be put into the `:machine_state`
       # key.
       def self.action_read_state
         new_builder.tap do |b|
@@ -55,13 +55,13 @@ module VagrantPlugins
       def self.action_ssh
         new_builder.tap do |b|
           b.use ConfigValidate
-          b.use Call, IsCreated do |env, b2|
-            if !env[:result]
-              b2.use MessageNotCreated
-              next
+          b.use ConnectToRimu
+          b.use Call, ReadState do |env, b1|
+            if env[:machine_state] == :not_created
+              b1.use MessageNotCreated
+            else
+              b1.use SSHExec
             end
-
-            b2.use SSHExec
           end
         end
       end
@@ -69,53 +69,53 @@ module VagrantPlugins
       def self.action_ssh_run
         new_builder.tap do |b|
           b.use ConfigValidate
-          b.use Call, IsCreated do |env, b2|
-            if !env[:result]
-              b2.use MessageNotCreated
-              next
+          b.use ConnectToRimu
+          b.use Call, ReadState do |env, b1|
+            if env[:machine_state] == :not_created
+              b1.use MessageNotCreated
+            else
+              b1.use SSHRun
             end
-
-            b2.use SSHRun
           end
         end
       end
 
       # This action is called when `vagrant provision` is called.
       def self.action_provision
-        return new_builder.tap do |builder|
-          builder.use ConfigValidate
-          builder.use ConnectToRimu
-          builder.use Call, IsCreated do |env, b|
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectToRimu
+          b.use Call, ReadState do |env, b1|
             case env[:machine_state]
             when :active
-              b.use Provision
-              b.use ModifyProvisionPath
-              b.use SyncedFolders
+              b1.use Provision
+              b1.use ModifyProvisionPath
+              b1.use SyncedFolders
             when :off
               env[:ui].info I18n.t('vagrant_rimu.off')
             when :not_created
-              b.use MessageNotCreated
+              b1.use MessageNotCreated
             end
           end
         end
       end
 
       def self.action_up
-        return new_builder.tap do |builder|
-          builder.use ConfigValidate
-          builder.use ConnectToRimu
-          builder.use Call, IsCreated do |env, b|
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectToRimu
+          b.use Call, ReadState do |env, b1|
             case env[:machine_state]
-            when :active
-              b.use MessageAlreadyCreated
-            when :off
-              b.use StartInstance
-              b.use action_provision
             when :not_created
-              b.use Create
-              b.use SetupSudo
-              b.use SetupUser
-              b.use action_provision
+              b1.use Create
+              b1.use SetupSudo
+              b1.use SetupUser
+              b1.use action_provision
+            when :off
+              b1.use StartInstance
+              b1.use action_provision
+            else
+              b1.use MessageAlreadyCreated
             end
           end
         end
@@ -123,56 +123,54 @@ module VagrantPlugins
 
       # This action is called to halt the remote machine.
       def self.action_halt
-        new_builder.tap do |builder|
-          builder.use ConfigValidate
-          builder.use Call, IsCreated do |env, b1|
-            if env[:result]
-              b1.use Call, IsStopped do |env2, b2|
-                if env2[:result]
-                  b2.use MessageAlreadyOff
-                else
-                  b2.use ConnectToRimu
-                  b2.use PowerOff
-                end
-              end
-            else
-              b1.use MessageNotCreated
-            end
-          end
+        new_builder.tap do |b|
+          b.use MessageWillNotStop
+          # b.use ConfigValidate
+          # b.use ConnectToRimu
+          # b.use Call, ReadState do |env, b1|
+          #   case env[:machine_state]
+          #     when :not_created
+          #       b1.use MessageNotCreated
+          #     when :off
+          #       b1.use MessageAlreadyOff
+          #     else
+          #       b1.use StopInstance
+          #   end
+          # end
         end
       end
 
       def self.action_reload
-        return new_builder.tap do |builder|
-          builder.use ConfigValidate
-          builder.use ConnectToRimu
-          builder.use Call, IsCreated do |env, b|
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectToRimu
+          b.use Call, ReadState do |env, b1|
             case env[:machine_state]
-            when :active
-              b.use Reload
-              b.use action_provision
+            when :not_created
+              b1.use MessageNotCreated
             when :off
               env[:ui].info I18n.t('vagrant_rimu.off')
-            when :not_created
-              b.use MessageNotCreated
+            else
+              b1.use Reload
+              b1.use action_provision
             end
           end
         end
       end
 
       def self.action_rebuild
-        return new_builder.tap do |builder|
-          builder.use ConfigValidate
-          builder.use ConnectToRimu
-          builder.use Call, IsCreated do |env, b|
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectToRimu
+          b.use Call, ReadState do |env, b1|
             case env[:machine_state]
             when :active, :off
-              b.use Rebuild
-              b.use SetupSudo
-              b.use SetupUser
-              b.use action_provision
+              b1.use Rebuild
+              b1.use SetupSudo
+              b1.use SetupUser
+              b1.use action_provision
             when :not_created
-              b.use MessageNotCreated
+              b1.use MessageNotCreated
             end
           end
         end
@@ -203,26 +201,40 @@ module VagrantPlugins
       end
 
       def self.action_move
-        return new_builder.tap do |builder|
-          builder.use ConfigValidate
-          builder.use ConnectToRimu
-          builder.use Call, IsCreated do |env, b|
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use ConnectToRimu
+          b.use Call, ReadState do |env, b1|
             case env[:machine_state]
             when :active, :off
-              b.use Move
+              b1.use Move
             when :not_created
-              b.use MessageNotCreated
+              b1.use MessageNotCreated
             end
           end
         end
       end
 
+      def self.action_suspend
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use MessageActionNotSupported
+        end
+      end
+
+      def self.action_resume
+        new_builder.tap do |b|
+          b.use ConfigValidate
+          b.use MessageActionNotSupported
+        end
+      end
+
       action_root = Pathname.new(File.expand_path('../actions', __FILE__))
       autoload :ConnectToRimu, action_root.join('connect_to_rimu')
       autoload :StopInstance, action_root.join('stop_instance')
       autoload :TerminateInstance, action_root.join('terminate_instance')
-      autoload :IsCreated, action_root.join('is_created')
-      autoload :IsStopped, action_root.join('is_stopped')
+      # autoload :IsCreated, action_root.join('is_created')
+      # autoload :IsStopped, action_root.join('is_stopped')
       autoload :ReadSSHInfo, action_root.join('read_ssh_info')
       autoload :ReadState, action_root.join('read_state')
       autoload :StartInstance, action_root.join('start_instance')
@@ -240,6 +252,8 @@ module VagrantPlugins
       autoload :MessageNotCreated, action_root.join('message_not_created')
       autoload :MessageWillNotDestroy, action_root.join('message_will_not_destroy')
       autoload :MessageAlreadyCreated, action_root.join('message_already_created')
+      autoload :MessageWillNotStop, action_root.join('message_will_not_stop')
+      autoload :MessageActionNotSupported, action_root.join('message_action_not_supported')
       
       private
 

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

@@ -21,7 +21,7 @@ module VagrantPlugins
           cmd(name, @argv, env)
           @env.ui.info('')
         # rubocop:disable Lint/RescueException
-        rescue Errors::ApiError, SystemExit, Interrupt => e
+        rescue Errors::RimuError, SystemExit, Interrupt => e
           raise e
         rescue Exception => e
           puts I18n.t('vagrant_rimu.errors.global_error').red unless e.message

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

@@ -1,17 +1,16 @@
-require 'optparse'
-require 'vagrant-rimu/commands/abstract_command'
-
 module VagrantPlugins
   module Rimu
     module Commands
-      class Rebuild < AbstractCommand
+      class Rebuild < Vagrant.plugin('2', :command)
         def self.synopsis
           I18n.t('vagrant_rimu.commands.rebuild')
         end
 
-        def cmd(name, argv, env)
-          fail Errors::NoArgRequiredForCommand, cmd: name unless argv.size == 0
-          env[:machine].action('rebuild')
+        def execute
+          with_target_vms(nil, provider: :rimu) do |machine|
+            machine.action(:rebuild)
+          end
+          0
         end
       end
     end

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

@@ -6,7 +6,7 @@ module VagrantPlugins
         { 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' },
+        # { name: :'rebuild', file: 'rebuild', clazz: 'Rebuild' },
       ]
 
       class Root < Vagrant.plugin('2', :command)

data/lib/vagrant-rimu/config.rb

@@ -165,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/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.4'
+    VERSION = '0.0.5'
   end
 end

data/locales/en.yml

@@ -23,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:
@@ -48,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: |-
@@ -57,26 +66,35 @@ 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
+              Rimu provider specific commands
             root_usage: |-
-                Usage: vagrant rimu <subcommand> [<args>]
+              Usage: vagrant rimu <subcommand> [<args>]
+            rebuild_usage: |-
+              Usage: vagrant rebuild [vm-name]
             available_subcommands: |-
-                Available subcommands:
+              Available subcommands:
             billing_methods: |-
-                List billing methods
+              List billing methods
             list_distributions: |-
-                List Distributions
+              List Distributions
             list_servers: |-
-                List servers
+              List servers
             move: |-
-                Moves server to different host
+              Moves server to different host
             rebuild: |-
-                Rebuilds the server, retaining the current IP address
+              Rebuilds the server, retaining the current IP address
         errors:
             global_error: |-
                 An unknown error happened in Vagrant Rimu provider

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ if ENV['CI']=='true'
   require 'codecov'
   require 'coveralls'
   require 'codeclimate-test-reporter'
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov.formatters = [
       SimpleCov::Formatter::HTMLFormatter,
       Coveralls::SimpleCov::Formatter,
       SimpleCov::Formatter::Codecov,

data/spec/vagrant-rimu/actions/connect_to_rimu_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe VagrantPlugins::Rimu::Actions::ConnectToRimu do
+  let(:rimu_api) { double('rimu_api') }
   let(:app) do
     double.tap do |app|
       app.stub(:call)
@@ -21,7 +22,7 @@ describe VagrantPlugins::Rimu::Actions::ConnectToRimu do
       env[:ui].stub(:warn).with(anything)
       env[:machine] = double('machine')
       env[:machine].stub(:provider_config) { config }
-      env[:rimu_api] = double('rimu_api')
+      env[:rimu_api] = rimu_api
     end
   end
 

data/spec/vagrant-rimu/actions/create_spec.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 describe VagrantPlugins::Rimu::Actions::Create do
   let(:dup) { double('dup') }
   let(:ssh) { double('ssh') }
-  # let(:action_runner) { double('action_runner') }
+  let(:root_path) { '.' }
   let(:servers) { double('servers') }
   let(:machine) { double('machine') }
   let(:create) { double('create') }
@@ -55,11 +55,14 @@ describe VagrantPlugins::Rimu::Actions::Create do
         servers.stub(:create) { create }
         os.stub(:servers) { servers }
       end
+      env.stub(:root_path) { root_path }
       machine.stub(:id) { id }
       machine.stub(:id=) { id }
+      machine.stub(:env) { env }
       env[:machine] = machine
       env[:machine].stub(:config) { config }
       env[:machine].stub(:provider_config) { config }
+      communicate.stub(:execute).with(anything)
       communicate.stub(:ready?) { true }
       env[:machine].stub(:communicate) { communicate }
       # dup.stub(:delete) { double('delete') }

data/spec/vagrant-rimu/actions/is_created_spec.rb

@@ -28,7 +28,7 @@ describe VagrantPlugins::Rimu::Actions::IsCreated do
   describe 'call' do
     context 'when server is created' do
       it 'returns true' do
-        env[:machine].state.stub(:id) { :stopped }
+        env[:machine].state.stub(:id) { :off }
         expect(app).to receive(:call)
         @action = VagrantPlugins::Rimu::Actions::IsCreated.new(app, env)
         @action.call(env)

data/spec/vagrant-rimu/actions/is_stopped_spec.rb

@@ -28,7 +28,7 @@ describe VagrantPlugins::Rimu::Actions::IsStopped do
   describe 'call' do
     context 'when server is stopped' do
       it 'returns true' do
-        env[:machine].state.stub(:id) { :stopped }
+        env[:machine].state.stub(:id) { :off }
         expect(app).to receive(:call)
         @action = VagrantPlugins::Rimu::Actions::IsStopped.new(app, env)
         @action.call(env)
@@ -38,7 +38,7 @@ describe VagrantPlugins::Rimu::Actions::IsStopped do
     
     context 'when server is running' do
       it 'returns false' do
-        env[:machine].state.stub(:id) { :running }
+        env[:machine].state.stub(:id) { :active }
         expect(app).to receive(:call)
         @action = VagrantPlugins::Rimu::Actions::IsStopped.new(app, env)
         @action.call(env)

data/spec/vagrant-rimu/actions/message_action_not_supported_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+# action_root = Pathname.new(File.expand_path('../../../../lib/vagrant-rimu/actions', __FILE__))
+# autoload :StopInstance, action_root.join('stop_instance')
+
+describe VagrantPlugins::Rimu::Actions::MessageActionNotSupported do  
+  let(:env) do
+    {}.tap do |env|
+      env[:ui] = double('ui').tap do |ui|
+        ui.stub(:info).with(anything)
+        ui.stub(:error).with(anything)
+      end
+    end
+  end
+
+  let(:app) do
+    double('app').tap do |app|
+      app.stub(:call).with(anything)
+    end
+  end
+
+  describe 'call' do
+    it 'sets info variable' do
+      expect(I18n).to receive(:t).with('vagrant_rimu.action_not_supported')
+      expect(app).to receive(:call)
+      @action = VagrantPlugins::Rimu::Actions::MessageActionNotSupported.new(app, env)
+      @action.call(env)
+    end
+  end
+end

data/spec/vagrant-rimu/actions/message_already_created_spec.rb

@@ -1,6 +1,3 @@
-require 'ostruct'
-require 'pathname'
-
 require 'spec_helper'
 
 # action_root = Pathname.new(File.expand_path('../../../../lib/vagrant-rimu/actions', __FILE__))
@@ -30,4 +27,4 @@ describe VagrantPlugins::Rimu::Actions::MessageAlreadyCreated do
       @action.call(env)
     end
   end
-end
+end

data/spec/vagrant-rimu/actions/message_will_not_destroy_spec.rb

@@ -1,5 +1,4 @@
 require 'ostruct'
-require 'pathname'
 
 require 'spec_helper'
 
@@ -33,4 +32,4 @@ describe VagrantPlugins::Rimu::Actions::MessageWillNotDestroy do
       @action.call(env)
     end
   end
-end
+end

data/spec/vagrant-rimu/actions/message_will_not_stop_spec.rb

@@ -0,0 +1,35 @@
+require 'ostruct'
+
+require 'spec_helper'
+
+# action_root = Pathname.new(File.expand_path('../../../../lib/vagrant-rimu/actions', __FILE__))
+# autoload :StopInstance, action_root.join('stop_instance')
+
+describe VagrantPlugins::Rimu::Actions::MessageWillNotStop do  
+  let(:env) do
+    {}.tap do |env|
+      env[:ui] = double('ui').tap do |ui|
+        ui.stub(:info).with(anything)
+        ui.stub(:error).with(anything)
+      end
+      env[:machine] = OpenStruct.new
+    end
+  end
+
+  let(:app) do
+    double('app').tap do |app|
+      app.stub(:call).with(anything)
+    end
+  end
+
+  describe 'call' do
+    it 'sets info variable' do
+      name = 'rimu.example.com'
+      env[:machine].name = name
+      expect(I18n).to receive(:t).with('vagrant_rimu.will_not_stop', {:name => name})
+      expect(app).to receive(:call)
+      @action = VagrantPlugins::Rimu::Actions::MessageWillNotStop.new(app, env)
+      @action.call(env)
+    end
+  end
+end

data/spec/vagrant-rimu/actions/read_ssh_info_spec.rb

@@ -5,12 +5,19 @@ require 'spec_helper'
 # autoload :StopInstance, action_root.join('stop_instance')
 
 describe VagrantPlugins::Rimu::Actions::ReadSSHInfo do
+  let(:ssh) { double('ssh') }
   let(:orders) { double('orders') }
   let(:machine) { double('machine') }
   let(:order) { double('order') }
   let(:allocated_ips) { {:primary_ip=>'192.168.1.1'} }
   let(:id) { '200' }
 
+  let(:config) do
+    double.tap do |config|
+      ssh.stub(:private_key_path) { 'test/test_rimu_id_rsa' }
+      config.stub(:ssh) { ssh }
+    end
+  end
 
   let(:env) do
     {}.tap do |env|
@@ -24,6 +31,7 @@ describe VagrantPlugins::Rimu::Actions::ReadSSHInfo do
         os.stub(:orders) { orders }
       end
       machine.stub(:id) { id }
+      machine.stub(:config) { config }
       env[:machine] = machine
     end
   end