vagrant-rimu 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d840a350e4933f16c609939b0e47a667fb231e52
-  data.tar.gz: 2d6683d767c52a49ce99ef1a8e037ff7fcf568e5
+  metadata.gz: 66afd16aef93caf2b58833dd8c218f9be014b519
+  data.tar.gz: c1c06699b53ada7335a3cf96f24309a8dce80f1c
 SHA512:
-  metadata.gz: 073c4eee2db28a3dd9c509fbee40535b0785251f194532e3bffb7f42b6a97cc7b3b78e3669a0a96575833d5b3d02f5eb736536aa05428da303fd43dfbc987af4
-  data.tar.gz: b191f23da8e210fb597d9814f79b46930b4d6f1dc7779d0a9e4487acebbf399fe6dc4d88550d70266b4a4cbfa2323b53bc612979bc310b8a2ed49c3d541b4d04
+  metadata.gz: 0d060d6ae54309888091429a985d45e8883050e5d1b4f07ffc306cce8c75fa83b3024a2c803ead5e2ff683430157d552673cb25b267d8423c1315a8e28b41f47
+  data.tar.gz: 575a609d1d24821f625f3cf95ebc99395a26cb5da2f371cf9fc40e92547e176ac46e1d816ce5235fbbe158d3d42d9725f7966cc27b8d24ba82a19499f3f52d1f

data/.gitignore

@@ -9,3 +9,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+/.vagrant
+intial.txt

data/README.md

@@ -35,7 +35,8 @@ The most basic `Vagrantfile` to create a VPS on Rimu is shown below
 ```ruby
 Vagrant.configure('2') do |config|
 
-  config.vm.provider :rimu do |provider|
+  config.vm.provider :rimu do |provider, override|
+    override.ssh.insert_key = true
     override.ssh.private_key_path = '~/.ssh/id_rsa'
 
     provider.api_key = 'YOUR RIMU API KEY'
@@ -91,8 +92,16 @@ The provider supports the following Vagrant sub-commands:
 - `vagrant status` - Outputs the status (active, off, not created) for the
   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`
+- `vagrant rimu` - Rimu provider specific commands
+
+**Rimu Specific Commands**
+
+The Rimu specific commands are available as sub commands of `vagrant rimu`.
+The following `vagrant rimu` command provides the following sub commands:
+- `distributions` - Lists the distributions supported.
+- `servers` - Lists the servers under your account.
+- `billing methods` - Lists the billing methods setup for your account.
+- `move-vps` - Moves your VPS to a different host.
 
 ## Contributing
 

data/Vagrantfile

@@ -1,10 +1,15 @@
-REQUIRED_PLUGINS = %w(vagrant-rimu)
-
-Vagrant.configure('2') do |config|
-  config.vm.provider :rimu do |provider, override|
-    override.ssh.private_key_path = 'test/test_rimu_id_rsa'
-    provider.api_key = ENV['RIMU_API_KEY']
-    provider.host_name = 'rimu.example.com'
-  end
-  config.vm.provision "shell", inline: "echo 'done' > ~/provision"
-end
+REQUIRED_PLUGINS = %w(vagrant-rimu)
+abort "Please set the environment variable RIMU_API_KEY in order to run vagrant with the rimu provider" unless ENV.key? 'RIMU_API_KEY'
+
+Vagrant.configure('2') do |config|
+  config.ssh.insert_key = true
+  config.vm.synced_folder '.', '/vagrant', :disabled => true
+  config.vm.provider :rimu do |provider, override|
+    override.ssh.private_key_path = 'test/test_rimu_id_rsa'
+    override.ssh.insert_key = true
+    provider.api_key = ENV['RIMU_API_KEY']
+    provider.host_name = 'rimu.example.com'
+    provider.disk_space_mb = 4000
+  end
+  config.vm.provision "shell", inline: "echo 'done' > ~/provision"
+end

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

@@ -14,9 +14,13 @@ module VagrantPlugins
         end
 
         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
+          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

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

@@ -1,6 +1,7 @@
 require 'log4r'
 require 'vagrant'
 
+require 'vagrant-rimu/actions/ssh_utils'
 require 'vagrant-rimu/actions/abstract_action'
 
 module VagrantPlugins
@@ -8,6 +9,7 @@ module VagrantPlugins
     module Actions
       class Create < AbstractAction
         include Vagrant::Util::Retryable
+        include VagrantPlugins::Rimu::Actions::SshUtils
 
         def initialize(app, env)
           @app = app
@@ -75,9 +77,13 @@ 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)

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

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

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

@@ -9,7 +9,7 @@ module VagrantPlugins
         end
 
         def execute(env)
-          env[:result] = env[:machine].state.id == :stopped
+          env[:result] = env[:machine].state.id == :off
 
           @app.call(env)
         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_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

@@ -16,7 +16,7 @@ module VagrantPlugins
           # 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

@@ -36,7 +36,7 @@ module VagrantPlugins
 
           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
 
           @machine.config.ssh.username = user

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

@@ -11,7 +11,7 @@ module VagrantPlugins
         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 execute(env)
@@ -34,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

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

@@ -15,7 +15,7 @@ module VagrantPlugins
         def execute(env)
           client = env[:rimu_api]
           env[:machine_state] = read_state(client, @machine)
-          @logger.info "Machine state is '#{env[:machine_state]}'"
+          @logger.info I18n.t('vagrant_rimu.states.current_state', {:state => env[:machine_state]})
           @app.call(env)
         end
 

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

@@ -1,10 +1,13 @@
 require 'log4r'
 
+require 'vagrant-rimu/actions/ssh_utils'
+
 module VagrantPlugins
   module Rimu
     module Actions
       class Rebuild < AbstractAction
         include Vagrant::Util::Retryable
+        include VagrantPlugins::Rimu::Actions::SshUtils
 
         def initialize(app, env)
           @app = app
@@ -37,6 +40,14 @@ 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)
+          if @machine.provider_config.root_password
+            root_pass = @machine.provider_config.root_password
+          else
+            root_pass = Digest::SHA2.new.update(@machine.provider_config.api_key).to_s
+          end
+          if params.has_key?(:instantiation_options)
+            params[:instantiation_options][:password] = root_pass
+          end
 
           begin
             client.servers.reinstall(@machine.id.to_i, params)
@@ -46,11 +57,19 @@ module VagrantPlugins
           
           switch_user = @machine.provider_config.setup?
           user = @machine.config.ssh.username
-          @machine.config.ssh.username = 'root' if switch_user
+          if switch_user
+            @machine.config.ssh.username = 'root'
+            @machine.config.ssh.password = root_pass
+          end
+
           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
+
+          # upload root ssh key
+          upload_key(env)
+
           @machine.config.ssh.username = user
           
           @app.call(env)

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

@@ -1,11 +1,14 @@
 require 'log4r'
 
+require 'vagrant-rimu/actions/ssh_utils'
 require 'vagrant-rimu/actions/abstract_action'
 
 module VagrantPlugins
   module Rimu
     module Actions
       class SetupUser < AbstractAction
+        include VagrantPlugins::Rimu::Actions::SshUtils
+
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
@@ -31,7 +34,7 @@ module VagrantPlugins
           @machine.communicate.execute("su #{user} -c 'mkdir -p ~/.ssh'")
 
           # add the specified key to the authorized keys file
-          upload_key(user)
+          upload_key(env, user)
 
           # reset username
           @machine.config.ssh.username = user
@@ -39,19 +42,19 @@ module VagrantPlugins
           @app.call(env)
         end
         
-        def upload_key(user)
-          path = @machine.config.ssh.private_key_path
-          path = path[0] if path.is_a?(Array)
-          path = File.expand_path(path, @machine.env.root_path)
-          pub_key = public_key(path)
-          @machine.communicate.execute(<<-BASH)
-            if ! grep '#{pub_key}' /home/#{user}/.ssh/authorized_keys; then
-              echo '#{pub_key}' >> /home/#{user}/.ssh/authorized_keys;
-            fi
-
-            chown -R #{user} /home/#{user}/.ssh;
-          BASH
-        end
+        # def upload_key(user)
+        #   path = @machine.config.ssh.private_key_path
+        #   path = path[0] if path.is_a?(Array)
+        #   path = File.expand_path(path, @machine.env.root_path)
+        #   pub_key = public_key(path)
+        #   @machine.communicate.execute(<<-BASH)
+        #     if ! grep '#{pub_key}' /home/#{user}/.ssh/authorized_keys; then
+        #       echo '#{pub_key}' >> /home/#{user}/.ssh/authorized_keys;
+        #     fi
+        #
+        #     chown -R #{user} /home/#{user}/.ssh;
+        #   BASH
+        # end
         
         def create_user(env, user)
           env[:ui].info I18n.t('vagrant_rimu.creating_user', {
@@ -74,11 +77,11 @@ module VagrantPlugins
           BASH
         end
         
-        def public_key(private_key_path)
-          File.read("#{private_key_path}.pub")
-        rescue
-          raise Errors::PublicKeyError, :path => "#{private_key_path}.pub"
-        end
+        # def public_key(private_key_path)
+        #   File.read("#{private_key_path}.pub")
+        # rescue
+        #   raise Errors::PublicKeyError, :path => "#{private_key_path}.pub"
+        # end
       end
     end
   end

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

@@ -0,0 +1,44 @@
+require 'pathname'
+
+module VagrantPlugins
+  module Rimu
+    module Actions
+      module SshUtils
+
+        # rubocop:disable Metrics/AbcSize
+        def upload_key(env, user=nil)
+          path = env[:machine].config.ssh.private_key_path
+          path = path[0] if path.is_a?(Array)
+          path = File.expand_path(path, env[:machine].env.root_path)
+          pub_key = public_key(path)
+          if user.nil?
+            env[:machine].communicate.execute(<<-BASH)
+              if [ ! -d /root/.ssh ]; then
+                mkdir /root/.ssh;
+                chmod 0700 /root/.ssh;
+              fi
+              if ! grep '#{pub_key.chomp}' /root/.ssh/authorized_keys; then
+                echo '#{pub_key}' >> /root/.ssh/authorized_keys;
+              fi
+            BASH
+          else
+            env[:machine].communicate.execute(<<-BASH)
+              if ! grep '#{pub_key.chomp}' /home/#{user}/.ssh/authorized_keys; then
+                echo '#{pub_key}' >> /home/#{user}/.ssh/authorized_keys;
+              fi
+
+              chown -R #{user} /home/#{user}/.ssh;
+            BASH
+          end
+        end
+        
+        def public_key(private_key_path)
+          File.read("#{private_key_path}.pub")
+        rescue
+          raise Errors::PublicKeyError, :path => "#{private_key_path}.pub"
+        end
+      end
+      # rubocop:enable Metrics/AbcSize
+    end
+  end
+end

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

@@ -13,7 +13,7 @@ module VagrantPlugins
         end
 
         def execute(env)
-          if env[:machine].state.id == :stopped
+          if env[:machine].state.id == :off
             env[:ui].info(I18n.t('vagrant_rimu.already_status', :status => env[:machine].state.id))
           else
             shutdown(env)
@@ -25,7 +25,11 @@ module VagrantPlugins
         def shutdown(env)
           env[:ui].info(I18n.t('vagrant_rimu.stopping'))
           client = env[:rimu_api]
-          client.servers.shutdown(env[:machine].id.to_i)
+          begin
+            client.servers.shutdown(env[:machine].id.to_i)
+          rescue ::Rimu::RimuAPI::RimuRequestError, ::Rimu::RimuAPI::RimuResponseError => e
+            raise Errors::ApiError, {:stderr=>e}
+          end
         end
       end
     end

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

@@ -16,8 +16,12 @@ module VagrantPlugins
           if env[:machine].id
             env[:ui].info(I18n.t("vagrant_rimu.terminating"))
             client = env[:rimu_api]
-            client.servers.cancel(env[:machine].id.to_i)
-            env[:machine].id = nil
+            begin
+              client.servers.cancel(env[:machine].id.to_i)
+              env[:machine].id = nil
+            rescue ::Rimu::RimuAPI::RimuRequestError, ::Rimu::RimuAPI::RimuResponseError => e
+              raise Errors::ApiError, {:stderr=>e}
+            end
           end
 
           @app.call(env)