vagrant-rimu 0.0.1 → 0.0.6

data/lib/vagrant-rimu/provider.rb

@@ -1,4 +1,6 @@
-require "vagrant-rimu/actions"
+require 'vagrant'
+
+require 'vagrant-rimu/actions'
 
 module VagrantPlugins
   module Rimu
@@ -31,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.1'
+    VERSION = '0.0.6'
   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: |-
@@ -21,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:
@@ -35,25 +42,6 @@ en:
             private_key: "A valid SSH private key path option: [private_key_path] is required"
             missing_private_key: "SSH private key not found: %{key}"
             public_key: "SSH public key not found: %{key}"
-        errors:
-            api_error: |-
-                The API request failed. Please inspect the error message
-                below for more info.
-
-                Error: %{stderr}
-            public_key: |-
-                There was an issue reading the public key at:
-
-                Path: %{path}
-
-                Please check the file's permissions.
-            rsync: |-
-                There was an error when attemping to rsync a share folder.
-                Please inspect the error message below for more info.
-
-                Host path: %{hostpath}
-                Guest path: %{guestpath}
-                Error: %{stderr}
         states:
           short_not_created: |-
             not created
@@ -65,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: |-
@@ -74,6 +66,65 @@ 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
+            root_usage: |-
+              Usage: vagrant rimu <subcommand> [<args>]
+            rebuild_usage: |-
+              Usage: vagrant rebuild [vm-name]
+            available_subcommands: |-
+              Available subcommands:
+            billing_methods: |-
+              List billing methods
+            list_distributions: |-
+              List Distributions
+            list_servers: |-
+              List servers
+            move: |-
+              Moves server to different host
+            rebuild: |-
+              Rebuilds the server, retaining the current IP address
+        errors:
+            global_error: |-
+                An unknown error happened in Vagrant Rimu provider
+
+                To easily debug what happened, we recommend to set the environment
+                variable VAGRANT_RIMU_LOG to debug
+
+                  $ export VAGRANT_RIMU_LOG=debug
+
+                If doing this does not help fixing your issue, there may be a bug
+                in the provider. Please submit an issue on Github at
+                https://github.com/akissa/vagrant-rimu
+                with the stracktrace and the logs.
+            no_args: |-
+                Command '%{cmd}' does not required any argument.
+            api_error: |-
+                The API request failed. Please inspect the error message
+                below for more info.
+
+                Error: %{stderr}
+            public_key: |-
+                There was an issue reading the public key at:
+
+                Path: %{path}
+
+                Please check the file permissions.
+            rsync: |-
+                There was an error when attemping to rsync a share folder.
+                Please inspect the error message below for more info.
+
+                Host path: %{hostpath}
+                Guest path: %{guestpath}
+                Error: %{stderr}

data/spec/spec_helper.rb

@@ -1,14 +1,19 @@
 require 'simplecov'
-require 'coveralls'
-require 'codeclimate-test-reporter'
 
-SimpleCov.start
 if ENV['CI']=='true'
   require 'codecov'
-  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+  require 'coveralls'
+  require 'codeclimate-test-reporter'
+  SimpleCov.formatters = [
+      SimpleCov::Formatter::HTMLFormatter,
+      Coveralls::SimpleCov::Formatter,
+      SimpleCov::Formatter::Codecov,
+      CodeClimate::TestReporter::Formatter,
+  ]
   Coveralls.wear!
   CodeClimate::TestReporter.start
 end
+SimpleCov.start
 
 Dir['lib/**/*.rb'].each do|file|
   require_string = file.match(/lib\/(.*)\.rb/)[1]
@@ -17,8 +22,6 @@ end
 
 require 'rspec/its'
 
-I18n.load_path << File.expand_path('locales/en.yml', Pathname.new(File.expand_path('../../', __FILE__)))
-
 RSpec.configure do |config|
   config.mock_with :rspec do |c|
     c.syntax = [:should, :expect]
@@ -27,3 +30,7 @@ RSpec.configure do |config|
     c.syntax = [:should, :expect]
   end
 end
+
+I18n.load_path << File.expand_path('locales/en.yml', Pathname.new(File.expand_path('../../', __FILE__)))
+
+VagrantPlugins::Rimu::Logging.init

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

@@ -0,0 +1,49 @@
+require 'ostruct'
+require 'pathname'
+
+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::BillingMethods do
+  let(:billing_methods) { double('billing_methods') }
+  let(:machine) { double('machine') }
+  let(:method1) { OpenStruct.new({:billing_oid => 1012, :billing_method_type => 'TS_WIRE', :description => 'Wire Transfer'}) }
+  let(:method2) { OpenStruct.new({:billing_oid => 2000, :billing_method_type => 'TS_CARD', :description => 'Credit Card'}) }
+
+
+  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[:rimu_api] = double('rimu_api').tap do |os|
+        billing_methods.stub(:each).and_yield(method1).and_yield(method2)
+        os.stub(:billing_methods) { billing_methods }
+      end
+    end
+  end
+
+  let(:app) do
+    double('app').tap do |app|
+      app.stub(:call).with(anything)
+    end
+  end
+
+  describe 'call' do
+    it 'return a billing_methods listing' do
+      expect(env[:rimu_api].billing_methods).to receive(:each)
+      rows = []
+      [method1, method2].each do |b|
+        rows << [b.billing_oid, b.billing_method_type, b.description]
+      end
+      table = Terminal::Table.new headings: ['ID', 'Type', 'Description'], rows: rows
+      expect(env[:ui]).to receive(:info).with("\n#{table}")
+      expect(app).to receive(:call)
+      @action = VagrantPlugins::Rimu::Actions::BillingMethods.new(app, env)
+      @action.call(env)
+    end
+  end
+end

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

@@ -0,0 +1,167 @@
+require 'pathname'
+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::Create do
+  let(:dup) { double('dup') }
+  let(:ssh) { double('ssh') }
+  let(:root_path) { '.' }
+  let(:servers) { double('servers') }
+  let(:machine) { double('machine') }
+  let(:create) { double('create') }
+  let(:communicate) { double('communicate') }
+  let(:id) { '200' }
+
+  let(:config) do
+    double.tap do |config|
+      config.stub(:api_url) { nil }
+      config.stub(:api_key) { 'foo' }
+      config.stub(:host_name) { 'rimu.example.com' }
+      config.stub(:root_password) { 'P455w0rd' }
+      config.stub(:distro_code) { nil }
+      config.stub(:control_panel) { nil }
+      config.stub(:vps_to_clone) { nil }
+      config.stub(:minimal_init) { nil }
+      config.stub(:disk_space_mb) { nil }
+      config.stub(:memory_mb) { nil }
+      config.stub(:disk_space_2_mb) { nil }
+      config.stub(:billing_id) { nil }
+      config.stub(:data_centre) { nil }
+      config.stub(:host_server_id) { nil }
+      config.stub(:extra_ip_reason) { nil }
+      config.stub(:num_ips) { nil }
+      config.stub(:private_ips) { nil }
+      config.stub(:vps_type) { nil }
+      config.stub(:setup?) { true }
+      ssh.stub(:username) { 'rimu' }
+      ssh.stub(:username=) { 'rimu' }
+      ssh.stub(:password=).with(anything)
+      ssh.stub(:private_key_path) { 'test/test_rimu_id_rsa' }
+      config.stub(:ssh) { ssh }
+    end
+  end
+
+  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[:rimu_api] = double('rimu_api').tap do |os|
+        create.stub(:order_oid) { id }
+        create.stub(:allocated_ips) { {:primary_ip => '192.168.1.10'} }
+        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') }
+      # dup.stub(:[]=) { double('[]=') }
+      # env.stub(:dup) { dup }
+      # action_runner.stub(:run) { double('run') }
+      # env[:action_runner] = action_runner
+    end
+  end
+
+  let(:app) do
+    double('app').tap do |app|
+      app.stub(:call).with(anything)
+      # app.stub(:terminate).with(anything)
+    end
+  end
+
+  describe 'call' do
+    context 'when vps_to_clone option is not set' do
+      it 'should install the server using instantiation_options' do
+        expect(env[:machine].provider_config).to receive(:setup?)
+        expect(env[:machine].communicate).to receive(:ready?)
+        expect(env[:machine].config.ssh).to receive(:username=).with(ssh.username)
+        expect(env[:rimu_api].servers).to receive(:create).with(
+          {
+            :billing_oid => config.billing_id,
+            :dc_location => config.data_centre,
+            :host_server_oid => config.host_server_id,
+            :instantiation_options=> {
+                                      :domain_name=>config.host_name,
+                                      :password=>config.root_password,
+                                      :distro=>config.distro_code,
+                                      :control_panel=>config.control_panel
+                                      },
+            :ip_request => {
+                :extra_ip_reason => config.extra_ip_reason,
+                :num_ips => config.num_ips,
+                :requested_ips => config.private_ips,
+            },
+            :is_just_minimal_init=>nil,
+            :vps_parameters=>{
+                              :disk_space_mb=>nil,
+                              :memory_mb=>nil,
+                              :disk_space_2_mb=>nil
+                            },
+            :vps_type => config.vps_type,
+          }
+        )
+        expect(app).to receive(:call)
+        @action = VagrantPlugins::Rimu::Actions::Create.new(app, env)
+        @action.call(env)
+      end
+    end
+
+    context 'when vps_to_clone option is set' do
+      it 'should install the server using instantiation_via_clone_options' do
+        vps_clone = 9999
+        env[:machine].provider_config.stub(:vps_to_clone) { vps_clone }
+        expect(env[:machine].provider_config).to receive(:setup?)
+        expect(env[:machine].communicate).not_to receive(:ready?)
+        expect(env[:machine].config.ssh).to receive(:username=).with(ssh.username)
+        expect(env[:rimu_api].servers).to receive(:create).with(
+          {
+            :billing_oid => config.billing_id,
+            :dc_location => config.data_centre,
+            :host_server_oid => config.host_server_id,
+            :instantiation_via_clone_options=> {
+                                      :domain_name=>config.host_name,
+                                      :vps_order_oid_to_clone => vps_clone,
+                                      },
+            :ip_request => {
+                :extra_ip_reason => config.extra_ip_reason,
+                :num_ips => config.num_ips,
+                :requested_ips => config.private_ips,
+            },
+            :is_just_minimal_init=>nil,
+            :vps_parameters=>{
+                              :disk_space_mb=>nil,
+                              :memory_mb=>nil,
+                              :disk_space_2_mb=>nil
+                            },
+            :vps_type => config.vps_type,
+          }
+        )
+        expect(app).to receive(:call)
+        @action = VagrantPlugins::Rimu::Actions::Create.new(app, env)
+        @action.call(env)
+      end
+    end
+    
+    # context 'when terminate is run' do
+    #   it 'should call the destroy action' do
+    #     expect(app.dup).to receive(:[]=).with(:config_validate, false)
+    #     expect(app.dup).to receive(:[]=).with(:force_confirm_destroy, true)
+    #     expect(env[:action_runner]).to receive(:run)
+    #     expect(app).to receive(:terminate)
+    #     @action = VagrantPlugins::Rimu::Actions::Create.new(app, env)
+    #     @action.terminate(env)
+    #   end
+    # end
+  end
+end

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

@@ -0,0 +1,49 @@
+require 'pathname'
+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::IsCreated do
+  let(:state) { double('state') }
+  let(:machine) { double('machine') }
+
+  let(:env) do
+    {}.tap do |env|
+      env[:ui] = double('ui').tap do |ui|
+        ui.stub(:info).with(anything)
+        ui.stub(:error).with(anything)
+      end
+      machine.stub(:state) { state }
+      env[:machine] = machine
+    end
+  end
+
+  let(:app) do
+    double('app').tap do |app|
+      app.stub(:call).with(anything)
+    end
+  end
+
+  describe 'call' do
+    context 'when server is created' do
+      it 'returns true' do
+        env[:machine].state.stub(:id) { :off }
+        expect(app).to receive(:call)
+        @action = VagrantPlugins::Rimu::Actions::IsCreated.new(app, env)
+        @action.call(env)
+        env[:result].should == true
+      end
+    end
+    
+    context 'when server is not created' do
+      it 'returns false' do
+        env[:machine].state.stub(:id) { :not_created }
+        expect(app).to receive(:call)
+        @action = VagrantPlugins::Rimu::Actions::IsCreated.new(app, env)
+        @action.call(env)
+        env[:result].should == false
+      end
+    end
+  end
+end