vagrant-rimu 0.0.1 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6c675f9671332b0e50e5fd18569609f0b24798f7
-  data.tar.gz: f78da593a48552622d63927c7622d434c6c0ce0a
+SHA256:
+  metadata.gz: b72c29d0587540ea39b084634d97352f70e74e2f1b1f8a3b501eaa14322db90a
+  data.tar.gz: 0dc31d0bb2eccd623bc34ba83be3cb574970a75477892b296e1139ab2e940c6d
 SHA512:
-  metadata.gz: bed1ab227be52d43cadffc554a37ca9d5976686b76247ed57eb690f15d8bdaefef4cb4c2b76ccd83a2896a523b746d3ab4c7232cc79d9e8be37dd36865ff8064
-  data.tar.gz: 4423dff4fad2fa4d33cf717613ad89a5433269da657629fb7ebf3cbb24a6742290e45945248d2479cb413cbb660994ad52632acd0a9bc33c4f0278a29624a159
+  metadata.gz: a150d07523a6c9b0d5e2be0aa5202fd1c7a7f71d1fdc40d44a58f8a3e852eb2b8c378b5e4ddb50f9a11ea408973c65a58e14fb093c466b99ba568a639a9e74b8
+  data.tar.gz: 171a02b5a4832f2fd979c276490dfeb8242e8d86ac12abb779791b4c77f8d5f59b2ec05a3a1a3bbda85ef915c5c224d586182624629e5719eeea3a28922665d7

data/.codeclimate.yml

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

data/.gitignore

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

data/.travis.yml

@@ -1,51 +1,21 @@
 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
 matrix:
   include:
     - gemfile: Gemfile
-      rvm: 2.2.1
+      rvm: 2.3.0
       env:
-        BUNDLER_VERSION='>= 1.5.2, < 1.8.0'
-    - gemfile: Gemfile
-      rvm: 2.1.4
-      env:
-        BUNDLER_VERSION='>= 1.5.2, < 1.8.0'
-    - gemfile: Gemfile
-      rvm: 2.0.0
-      env:
-        BUNDLER_VERSION='>= 1.5.2, < 1.8.0'
-    - gemfile: gemfiles/vagrant_1.6.gemfile
-      rvm: 2.2.1
-      env:
-        BUNDLER_VERSION='>= 1.5.2, < 1.7.0'
-    - gemfile: gemfiles/vagrant_1.6.gemfile
-      rvm: 2.1.4
-      env:
-        BUNDLER_VERSION='>= 1.5.2, < 1.7.0'
-    - gemfile: gemfiles/vagrant_1.6.gemfile
-      rvm: 2.0.0
-      env:
-        BUNDLER_VERSION='>= 1.5.2, < 1.7.0'
-    # - gemfile: gemfiles/vagrant_1.5.gemfile
-    #   rvm: 2.2.1
-    #   env:
-    #       BUNDLER_VERSION='= 1.5.2'
-    - gemfile: gemfiles/vagrant_1.5.gemfile
-      rvm: 2.1.4
-      env:
-          BUNDLER_VERSION='= 1.5.2'
-    - gemfile: gemfiles/vagrant_1.5.gemfile
-      rvm: 2.0.0
-      env:
-          BUNDLER_VERSION='= 1.5.2'
+        BUNDLER_VERSION='1.7.9'
 
 notifications:
   email:

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.49.0', :require => false
 end
 
 group :plugins do
-  gem 'bundler', '>= 1.5.2', '< 1.8.0'
+  gem 'bundler', '1.7.9'
   gem 'vagrant-rimu', :path => '.'
-  gemspec
 end

data/README.md

@@ -4,9 +4,9 @@
 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)
+[![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:
@@ -36,6 +36,7 @@ The most basic `Vagrantfile` to create a VPS on Rimu is shown below
 Vagrant.configure('2') do |config|
 
   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 `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/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/Vagrantfile

@@ -1,6 +1,15 @@
 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::Config.run do |config|
-Vagrant.configure(2) do |config|
-    config.vm.box = "precise64"
+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/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.rb

@@ -1,11 +1,21 @@
 require 'pathname'
 
 require 'vagrant-rimu/plugin'
+require 'vagrant-rimu/logging'
 
 module VagrantPlugins
   module Rimu
     lib_path = Pathname.new(File.expand_path("../vagrant-rimu", __FILE__))
     autoload :Errors, lib_path.join('errors')
+    
+    def self.init_i18n
+      I18n.load_path << File.expand_path('locales/en.yml', source_root)
+      I18n.reload!
+    end
+
+    def self.init_logging
+      Logging.init
+    end
 
     def self.source_root
       @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))

data/lib/vagrant-rimu/actions.rb

@@ -4,25 +4,26 @@ require 'vagrant/action/builder'
 
 module VagrantPlugins
   module Rimu
+    # rubocop:disable Metrics/ModuleLength
     module Actions
       include Vagrant::Action::Builtin
 
       # This action is called to terminate the remote machine.
       def self.action_destroy
-        Vagrant::Action::Builder.new.tap do |b|
-          b.use Call, DestroyConfirm do |env, b2|
+        new_builder.tap do |b|
+          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
@@ -32,7 +33,7 @@ module VagrantPlugins
       # resulting state is expected to be put into the `:machine_ssh_info`
       # key.
       def self.action_read_ssh_info
-        Vagrant::Action::Builder.new.tap do |b|
+        new_builder.tap do |b|
           b.use ConfigValidate
           b.use ConnectToRimu
           b.use ReadSSHInfo
@@ -40,10 +41,10 @@ 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
-        Vagrant::Action::Builder.new.tap do |b|
+        new_builder.tap do |b|
           b.use ConfigValidate
           b.use ConnectToRimu
           b.use ReadState
@@ -52,69 +53,69 @@ module VagrantPlugins
 
       # This action is called to SSH into the machine.
       def self.action_ssh
-        Vagrant::Action::Builder.new.tap do |b|
+        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
 
       def self.action_ssh_run
-        Vagrant::Action::Builder.new.tap do |b|
+        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 Vagrant::Action::Builder.new.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 Vagrant::Action::Builder.new.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
@@ -122,63 +123,61 @@ module VagrantPlugins
 
       # This action is called to halt the remote machine.
       def self.action_halt
-        Vagrant::Action::Builder.new.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 Vagrant::Action::Builder.new.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 Vagrant::Action::Builder.new.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
       end
 
       def self.action_list_distributions
-        Vagrant::Action::Builder.new.tap do |b|
+        new_builder.tap do |b|
           b.use ConfigValidate
           b.use ConnectToRimu
           b.use ListDistributions
@@ -186,7 +185,7 @@ module VagrantPlugins
       end
 
       def self.action_list_servers
-        Vagrant::Action::Builder.new.tap do |b|
+        new_builder.tap do |b|
           b.use ConfigValidate
           b.use ConnectToRimu
           b.use ListServers
@@ -194,7 +193,7 @@ module VagrantPlugins
       end
 
       def self.action_billing_methods
-        Vagrant::Action::Builder.new.tap do |b|
+        new_builder.tap do |b|
           b.use ConfigValidate
           b.use ConnectToRimu
           b.use BillingMethods
@@ -202,10 +201,31 @@ module VagrantPlugins
       end
 
       def self.action_move
-        Vagrant::Action::Builder.new.tap do |b|
+        new_builder.tap do |b|
           b.use ConfigValidate
           b.use ConnectToRimu
-          b.use Move
+          b.use Call, ReadState do |env, b1|
+            case env[:machine_state]
+            when :active, :off
+              b1.use Move
+            when :not_created
+              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
 
@@ -213,8 +233,8 @@ module VagrantPlugins
       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')
@@ -232,6 +252,14 @@ 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
+
+      def self.new_builder
+        Vagrant::Action::Builder.new
+      end
     end
   end
 end