vagrant-rimu 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c675f9671332b0e50e5fd18569609f0b24798f7
-  data.tar.gz: f78da593a48552622d63927c7622d434c6c0ce0a
+  metadata.gz: 3a03f01ba13d87cf66c51b6708cfee445ea83faf
+  data.tar.gz: 967f4fcc6e0f8461e71c3f6509e3378f828407b1
 SHA512:
-  metadata.gz: bed1ab227be52d43cadffc554a37ca9d5976686b76247ed57eb690f15d8bdaefef4cb4c2b76ccd83a2896a523b746d3ab4c7232cc79d9e8be37dd36865ff8064
-  data.tar.gz: 4423dff4fad2fa4d33cf717613ad89a5433269da657629fb7ebf3cbb24a6742290e45945248d2479cb413cbb660994ad52632acd0a9bc33c4f0278a29624a159
+  metadata.gz: ed69f66bd9f6b912a169bf4305ac603eca49ed073f370a81158023b9b48aa8fa0095870d9d018618317888fa01116a9f7f784bdd74d22d8bf32ce119ccb0a12f
+  data.tar.gz: b8b5f0bac476789a3d08759ce1c1911d379b77cfa767e4298e8dda445e4d8f0a65dfd7c7d6b0b99db3085fa33bc2a9ce1cb61c5a71300131f95a415fc3b37a1f

data/README.md

@@ -35,7 +35,7 @@ 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, override|
+  config.vm.provider :rimu do |provider|
     override.ssh.private_key_path = '~/.ssh/id_rsa'
 
     provider.api_key = 'YOUR RIMU API KEY'

data/Vagrantfile

@@ -1,6 +1,10 @@
 REQUIRED_PLUGINS = %w(vagrant-rimu)
 
-# Vagrant::Config.run do |config|
-Vagrant.configure(2) do |config|
-    config.vm.box = "precise64"
+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

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

@@ -9,7 +9,7 @@ module VagrantPlugins
 
       # This action is called to terminate the remote machine.
       def self.action_destroy
-        Vagrant::Action::Builder.new.tap do |b|
+        new_builder.tap do |b|
           b.use Call, DestroyConfirm do |env, b2|
             if env[:result]
               b2.use ConfigValidate
@@ -32,7 +32,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
@@ -43,7 +43,7 @@ module VagrantPlugins
       # resulting state is expected to be put into the `:machine_state_id`
       # 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,7 +52,7 @@ 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]
@@ -66,7 +66,7 @@ module VagrantPlugins
       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]
@@ -81,7 +81,7 @@ module VagrantPlugins
 
       # This action is called when `vagrant provision` is called.
       def self.action_provision
-        return Vagrant::Action::Builder.new.tap do |builder|
+        return new_builder.tap do |builder|
           builder.use ConfigValidate
           builder.use ConnectToRimu
           builder.use Call, IsCreated do |env, b|
@@ -100,7 +100,7 @@ module VagrantPlugins
       end
 
       def self.action_up
-        return Vagrant::Action::Builder.new.tap do |builder|
+        return new_builder.tap do |builder|
           builder.use ConfigValidate
           builder.use ConnectToRimu
           builder.use Call, IsCreated do |env, b|
@@ -122,7 +122,7 @@ module VagrantPlugins
 
       # This action is called to halt the remote machine.
       def self.action_halt
-        Vagrant::Action::Builder.new.tap do |builder|
+        new_builder.tap do |builder|
           builder.use ConfigValidate
           builder.use Call, IsCreated do |env, b1|
             if env[:result]
@@ -142,7 +142,7 @@ module VagrantPlugins
       end
 
       def self.action_reload
-        return Vagrant::Action::Builder.new.tap do |builder|
+        return new_builder.tap do |builder|
           builder.use ConfigValidate
           builder.use ConnectToRimu
           builder.use Call, IsCreated do |env, b|
@@ -160,7 +160,7 @@ module VagrantPlugins
       end
 
       def self.action_rebuild
-        return Vagrant::Action::Builder.new.tap do |builder|
+        return new_builder.tap do |builder|
           builder.use ConfigValidate
           builder.use ConnectToRimu
           builder.use Call, IsCreated do |env, b|
@@ -178,7 +178,7 @@ module VagrantPlugins
       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 +186,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 +194,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,7 +202,7 @@ 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
@@ -232,6 +232,12 @@ 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')
+      
+      private
+
+      def self.new_builder
+        Vagrant::Action::Builder.new
+      end
     end
   end
 end

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

@@ -2,15 +2,14 @@ module VagrantPlugins
   module Rimu
     module Actions
       class BillingMethods
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
-          @client = env[:rimu_api]
         end
 
         def call(env)
-          env[:ui].info '%-6s %-6s %s' % ['ID', 'Type', 'Description']
-          @client.billing_methods.each do |b|
-            env[:ui].info '%-6s %-6s %s' % [b.billing_oid, b.billing_method_type, b.description]
+          env[:ui].info '%-20s %-20s %s' % ['ID', 'Type', 'Description']
+          env[:rimu_api].billing_methods.each do |b|
+            env[:ui].info '%-20s %-20s %s' % [b.billing_oid, b.billing_method_type, b.description]
           end
           @app.call(env)
         end

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

@@ -13,7 +13,7 @@ module VagrantPlugins
 
         def call(env)
           @logger.info('Connecting to Rimu api_url...')
-          rimu = ::Rimu.new({:api_url => @config.api_url, :api_key=> @config.api_key})
+          rimu = ::Rimu::RimuAPI.new({:api_url => @config.api_url, :api_key=> @config.api_key})
           env[:rimu_api] = rimu
           @app.call(env)
         end

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

@@ -8,12 +8,12 @@ module VagrantPlugins
         include Vagrant::Util::Retryable
         def initialize(app, env)
           @app = app
-          @client = env[:rimu_api]
           @machine = env[:machine]
           @logger = Log4r::Logger.new('vagrant::rimu::create')
         end
 
         def call(env)
+          client = env[:rimu_api]
           env[:ui].info I18n.t('vagrant_rimu.creating')
           params = {
             :billing_oid => @machine.provider_config.billing_id,
@@ -52,7 +52,7 @@ module VagrantPlugins
           if params.has_key?(:instantiation_options)
             params[:instantiation_options][:password] = root_pass
           end
-          result = @client.servers.create(params)
+          result = client.servers.create(params)
           @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?

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

@@ -2,15 +2,14 @@ module VagrantPlugins
   module Rimu
     module Actions
       class ListDistributions
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
-          @client = env[:rimu_api]
         end
 
         def call(env)
-          env[:ui].info '%-6s %s' % ['Distro Code', 'Distro Description']
-          @client.distributions.each do |dist|
-            env[:ui].info '%-6s %s' % [dist.distro_code, dist.distro_description]
+          env[:ui].info '%-15s %s' % ['Distro Code', 'Distro Description']
+          env[:rimu_api].distributions.each do |dist|
+            env[:ui].info '%-15s %s' % [dist.distro_code, dist.distro_description]
           end
           @app.call(env)
         end

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

@@ -2,15 +2,16 @@ module VagrantPlugins
   module Rimu
     module Actions
       class ListServers
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
-          @client = env[:rimu_api]
         end
 
         def call(env)
-          env[:ui].info '%-8s %-30s %-20s %-10s %-9s' % ['ID', 'Hostname', 'Data Centre', 'Host Server', 'Status']
-          @client.orders.orders.each do |o|
-            env[:ui].info '%-8s %-30s %-20s %-10s %-9s' % [o.order_oid, o.domain_name, o.location["data_center_location_code"], o.host_server_oid, o.running_state]
+          heading = '%-10s %-30s %-20s %-15s %-15s' % ['ID', 'Hostname', 'Data Centre', 'Host Server', 'Status']
+          env[:ui].info heading
+          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
           end
           @app.call(env)
         end

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

@@ -7,11 +7,11 @@ module VagrantPlugins
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
-          @client = client
           @logger = Log4r::Logger.new('vagrant::rimu::move')
         end
 
         def call(env)
+          client = env[:rimu_api]
           env[:ui].info I18n.t('vagrant_rimu.move')
           fail 'not implemented'
           @app.call(env)

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

@@ -9,12 +9,12 @@ module VagrantPlugins
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
-          @client = env[:rimu_api]
           @logger = Log4r::Logger.new("vagrant_rimu::action::read_ssh_info")
         end
 
         def call(env)
-          env[:machine_ssh_info] = read_ssh_info(@client, @machine)
+          client = env[:rimu_api]
+          env[:machine_ssh_info] = read_ssh_info(client, @machine)
 
           @app.call(env)
         end

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

@@ -7,12 +7,12 @@ module VagrantPlugins
         def initialize(app, env)
           @app = app
           @machine = env[:machine]
-          @client = env[:rimu_api]
           @logger = Log4r::Logger.new('vagrant_rimu::action::read_state')
         end
 
         def call(env)
-          env[:machine_state] = read_state(@client, @machine)
+          client = env[:rimu_api]
+          env[:machine_state] = read_state(client, @machine)
           @logger.info "Machine state is '#{env[:machine_state]}'"
           @app.call(env)
         end

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

@@ -8,12 +8,12 @@ module VagrantPlugins
 
         def initialize(app, env)
           @app = app
-          @client = env[:rimu_api]
           @machine = env[:machine]
           @logger = Log4r::Logger.new('vagrant::rimu::rebuild')
         end
 
         def call(env)
+          client = env[:rimu_api]
           env[:ui].info I18n.t('vagrant_rimu.rebuilding')
           params = {
             :instantiation_options => {
@@ -35,7 +35,7 @@ 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)
+          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

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

@@ -6,14 +6,14 @@ module VagrantPlugins
       class Reload
         def initialize(app, env)
           @app = app
-          @client = env[:rimu_api]
           @machine = env[:machine]
           @logger = Log4r::Logger.new('vagrant::rimu::reload')
         end
 
         def call(env)
+          client = env[:rimu_api]
           env[:ui].info I18n.t('vagrant_rimu.reloading')
-          @client.servers.reboot(@machine.id.to_i)
+          client.servers.reboot(@machine.id.to_i)
 
           @app.call(env)
         end

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

@@ -48,7 +48,7 @@ module VagrantPlugins
           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 = Rimu.public_key(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;
@@ -62,6 +62,12 @@ module VagrantPlugins
 
           @app.call(env)
         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/start_instance.rb

@@ -6,15 +6,15 @@ module VagrantPlugins
       class StartInstance
         def initialize(app, env)
           @app = app
-          @client = env[:rimu_api]
           @machine = env[:machine]
           @logger = Log4r::Logger.new("vagrant_rimu::action::start_instance")
         end
 
         def call(env)
+          client = env[:rimu_api]
           env[:ui].info I18n.t('vagrant_rimu.starting')
           begin
-            result = @client.servers.start(@machine.id.to_i)
+            result = client.servers.start(@machine.id.to_i)
             raise StandardError, "No response from the API" if result.nil?
             raise StandardError, "VPS is not be running" if result.running_state != 'RUNNING'
           rescue StandardError => e

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

@@ -5,9 +5,8 @@ module VagrantPlugins
     module Actions
       # This stops the running instance.
       class StopInstance
-        def initialize(app, env)
+        def initialize(app, _env)
           @app    = app
-          @client = env[:rimu_api]
           @logger = Log4r::Logger.new('vagrant_rimu::action::stop_instance')
         end
 
@@ -16,8 +15,10 @@ module VagrantPlugins
             env[:ui].info(I18n.t('vagrant_rimu.already_status', :status => env[:machine].state.id))
           else
             env[:ui].info(I18n.t('vagrant_rimu.stopping'))
-            @client.servers.shutdown(env[:machine].id.to_i)
+            client = env[:rimu_api]
+            client.servers.shutdown(env[:machine].id.to_i)
           end
+          
           @app.call(env)
         end
       end

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

@@ -5,16 +5,16 @@ module VagrantPlugins
     module Actions
       # This terminates the running server, if there is one.
       class TerminateInstance
-        def initialize(app, env)
+        def initialize(app, _env)
           @app = app
-          @client = env[:rimu_api]
           @logger = Log4r::Logger.new("vagrant_rimu::action::terminate_instance")
         end
 
         def call(env)
           if env[:machine].id
             env[:ui].info(I18n.t("vagrant_rimu.terminating"))
-            @client.servers.cancel(env[:machine].id.to_i)
+            client = env[:rimu_api]
+            client.servers.cancel(env[:machine].id.to_i)
             env[:machine].id = nil
           end
 

data/lib/vagrant-rimu/config.rb

@@ -1,3 +1,5 @@
+require 'vagrant'
+
 module VagrantPlugins
   module Rimu
     class Config < Vagrant.plugin('2', :config)

data/lib/vagrant-rimu/errors.rb

@@ -1,3 +1,5 @@
+require 'vagrant'
+
 module VagrantPlugins
   module Rimu
     module Errors

data/lib/vagrant-rimu/logging.rb

@@ -0,0 +1,28 @@
+module VagrantPlugins
+  module Rimu
+    module Logging
+      def self.init
+        level = nil
+        begin
+          level = Log4r.const_get(ENV['VAGRANT_LOG'].upcase)
+        rescue NameError
+          begin
+            level = Log4r.const_get(ENV['VAGRANT_RIMU_LOG'].upcase)
+          rescue NameError
+            level = nil
+          end
+        end
+
+        level = nil unless level.is_a?(Integer)
+
+        if level
+          logger = Log4r::Logger.new('vagrant_rimu')
+          out = Log4r::Outputter.stdout
+          out.formatter = Log4r::PatternFormatter.new(pattern: '%d | %5l | %m', date_pattern: '%Y-%m-%d %H:%M')
+          logger.outputters = out
+          logger.level = level
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-rimu/plugin.rb

@@ -24,57 +24,31 @@ module VagrantPlugins
 
       provider(:rimu, {:box_optional => true, :parallel => true}) do
         # Setup logging and i18n
-        setup_logging
-        setup_i18n
+        Rimu.init_i18n
+        Rimu.init_logging
+        
         # Return the provider
         require_relative "provider"
         Provider
       end
 
       command(:rimu) do
+        # Setup logging and i18n
+        Rimu.init_i18n
+        Rimu.init_logging
+        
         require_relative "commands/root"
         Commands::Root
       end
 
       command(:rebuild) do
+        # Setup logging and i18n
+        Rimu.init_i18n
+        Rimu.init_logging
+        
         require_relative "commands/rebuild"
         Commands::Rebuild
       end
-
-      # This initializes the internationalization strings.
-      def self.setup_i18n
-        I18n.load_path << File.expand_path("locales/en.yml", Rimu.source_root)
-        I18n.reload!
-      end
-
-      # This sets up our log level to be whatever VAGRANT_LOG is.
-      def self.setup_logging
-        require "log4r"
-
-        level = nil
-        begin
-          level = Log4r.const_get(ENV["VAGRANT_LOG"].upcase)
-        rescue NameError
-          # This means that the logging constant wasn't found,
-          # which is fine. We just keep `level` as `nil`. But
-          # we tell the user.
-          level = nil
-        end
-
-        # Some constants, such as "true" resolve to booleans, so the
-        # above error checking doesn't catch it. This will check to make
-        # sure that the log level is an integer, as Log4r requires.
-        level = nil if !level.is_a?(Integer)
-
-        # Set the logging level on all "vagrant" namespaced
-        # logs as long as we have a valid level.
-        if level
-          logger = Log4r::Logger.new("vagrant_rimu")
-          logger.outputters = Log4r::Outputter.stderr
-          logger.level = level
-          logger = nil
-        end
-      end
     end
   end
 end

data/lib/vagrant-rimu/provider.rb

@@ -1,4 +1,6 @@
-require "vagrant-rimu/actions"
+require 'vagrant'
+
+require 'vagrant-rimu/actions'
 
 module VagrantPlugins
   module Rimu

data/lib/vagrant-rimu/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Rimu
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

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.formatter = SimpleCov::Formatter::MultiFormatter[
+      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)
+      heading = '%-20s %-20s %s' % ['ID', 'Type', 'Description']
+      expect(env[:ui]).to receive(:info).with(heading)
+      [method1, method2].each do |b|
+        row = '%-20s %-20s %s' % [b.billing_oid, b.billing_method_type, b.description]
+        expect(env[:ui]).to receive(:info).with(row)
+      end
+      expect(app).to receive(:call)
+      @action = VagrantPlugins::Rimu::Actions::BillingMethods.new(app, env)
+      @action.call(env)
+    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) { :stopped }
+        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

data/spec/vagrant-rimu/actions/is_stopped_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::IsStopped 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 stopped' do
+      it 'returns true' do
+        env[:machine].state.stub(:id) { :stopped }
+        expect(app).to receive(:call)
+        @action = VagrantPlugins::Rimu::Actions::IsStopped.new(app, env)
+        @action.call(env)
+        env[:result].should == true
+      end
+    end
+    
+    context 'when server is running' do
+      it 'returns false' do
+        env[:machine].state.stub(:id) { :running }
+        expect(app).to receive(:call)
+        @action = VagrantPlugins::Rimu::Actions::IsStopped.new(app, env)
+        @action.call(env)
+        env[:result].should == false
+      end
+    end
+  end
+end

data/spec/vagrant-rimu/actions/list_distributions_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::ListDistributions do
+  let(:distributions) { double('distributions') }
+  let(:machine) { double('machine') }
+  let(:distro1) { OpenStruct.new({:distro_code => 'jessie.64', :distro_description => 'Debian 8.0 64-bit (aka Jessie, RimuHosting recommended distro)'}) }
+  let(:distro2) { OpenStruct.new({:distro_code => 'centos6.64', :distro_description => 'Centos6 64-bit'}) }
+
+
+  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|
+        distributions.stub(:each).and_yield(distro1).and_yield(distro2)
+        os.stub(:distributions) { distributions }
+      end
+    end
+  end
+
+  let(:app) do
+    double('app').tap do |app|
+      app.stub(:call).with(anything)
+    end
+  end
+
+  describe 'call' do
+    it 'return a distribution listing' do
+      expect(env[:rimu_api].distributions).to receive(:each)
+      heading = '%-15s %s' % ['Distro Code', 'Distro Description']
+      expect(env[:ui]).to receive(:info).with(heading)
+      [distro1, distro2].each do |o|
+        row = '%-15s %s' % [o.distro_code, o.distro_description]
+        expect(env[:ui]).to receive(:info).with(row)
+      end
+      expect(app).to receive(:call)
+      @action = VagrantPlugins::Rimu::Actions::ListDistributions.new(app, env)
+      @action.call(env)
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+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::ListServers do
+  let(:orders) { double('orders') }
+  let(:ordersm) { double('ordersm') }
+  let(:machine) { double('machine') }
+  let(:server1) { OpenStruct.new({:order_oid => 1, :domain_name => 'rimu01.example.com', :location => {:data_center_location_code => 'DCDALLAS'}, :host_server_oid => 200, :running_state => 'RUNNING'}) }
+  let(:server2) { OpenStruct.new({:order_oid => 2, :domain_name => 'rimu02.example.com', :location => {:data_center_location_code => 'DCDALLAS'}, :host_server_oid => 200, :running_state => 'NOTRUNNING'}) }
+
+
+  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|
+        orders.stub(:each).and_yield(server1).and_yield(server2)
+        ordersm.stub(:orders) { orders }
+        os.stub(:orders) { ordersm }
+      end
+    end
+  end
+
+  let(:app) do
+    double('app').tap do |app|
+      app.stub(:call).with(anything)
+    end
+  end
+
+  describe 'call' do
+    it 'return a server listing' do
+      expect(env[:rimu_api].orders.orders).to receive(:each)
+      heading = '%-10s %-30s %-20s %-15s %-15s' % ['ID', 'Hostname', 'Data Centre', 'Host Server', 'Status']
+      expect(env[:ui]).to receive(:info).with(heading)
+      [server1, server2].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]
+        expect(env[:ui]).to receive(:info).with(row)
+      end
+      expect(app).to receive(:call)
+      @action = VagrantPlugins::Rimu::Actions::ListServers.new(app, env)
+      @action.call(env)
+    end
+  end
+end

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

@@ -20,12 +20,7 @@ describe VagrantPlugins::Rimu::Actions::ModifyProvisionPath do
   
   let(:config) do
     double.tap do |config|
-      provisioners.stub(:each) {
-        [
-            provisioner,
-            provisioner,
-        ]
-      }
+      provisioners.stub(:each).and_yield(provisioner).and_yield(provisioner)
       vm.stub(:provisioners) { provisioners }
       config.stub(:vm) { vm }
     end
@@ -72,7 +67,7 @@ describe VagrantPlugins::Rimu::Actions::ModifyProvisionPath do
         expect(env).to receive(:has_key?).with(:provision_enabled)
         expect(env[:machine]).to receive(:ssh_info)
         expect(env[:machine].config.vm.provisioners).to receive(:each)
-        # expect(env[:machine].communicate).to receive(:sudo)
+        expect(env[:machine].communicate).to receive(:sudo)
         @action = VagrantPlugins::Rimu::Actions::ModifyProvisionPath.new(app, env)
         @action.call(env)
       end

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

@@ -58,5 +58,18 @@ describe VagrantPlugins::Rimu::Actions::ReadSSHInfo do
         @action.call(env)
       end
     end
+    
+    context 'when api call returns nil' do
+      it 'should return nil machine id' do
+        env[:machine].id.stub(:nil?) { false }
+        expect(env[:machine].id).to receive(:nil?)
+        expect(order).not_to receive(:allocated_ips)
+        expect(env[:rimu_api].orders).to receive(:order).with(id.to_i).and_return(nil)
+        expect(env[:machine]).to receive(:id=).with(nil)
+        expect(app).to receive(:call)
+        @action = VagrantPlugins::Rimu::Actions::ReadSSHInfo.new(app, env)
+        @action.call(env)
+      end
+    end
   end
 end

data/spec/vagrant-rimu/config_spec.rb

@@ -10,7 +10,7 @@ describe VagrantPlugins::Rimu::Config do
       super().tap(&:finalize!)
     end
 
-    its(:api_key) { should be_nil }
+    its(:api_key) { should eq(ENV['RIMU_API_KEY']) }
     its(:api_url) { should be_nil }
     its(:distro_code) { should eq("centos6.64") }
     its(:data_centre) { should be_nil }

data/vagrant-rimu.gemspec

@@ -14,9 +14,11 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = 'vagrant-rimu'
   gem.require_paths = ['lib']
+  gem.required_ruby_version = '>= 2.0.0'
+  gem.extra_rdoc_files = ['README.md']
   gem.version       = VagrantPlugins::Rimu::VERSION
 
-  gem.add_runtime_dependency 'rimu', '~> 0.0.3'
+  gem.add_runtime_dependency 'rimu', '~> 0.0.6'
   gem.add_development_dependency 'bundler', '~> 1.5'
   gem.add_development_dependency 'rspec', '~> 3.1.0'
   gem.add_development_dependency 'rspec-its', '~> 1.0.1'

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-rimu
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andrew Colin Kissa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2015-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rimu
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Rimuhosting provider for Vagrant.
@@ -99,13 +99,14 @@ email:
 - andrew@topdog.za.net
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
 files:
-- .codeclimate.yml
-- .gitignore
-- .rspec
-- .rubocop.yml
-- .travis.yml
+- ".codeclimate.yml"
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -146,12 +147,18 @@ files:
 - lib/vagrant-rimu/commands/root.rb
 - lib/vagrant-rimu/config.rb
 - lib/vagrant-rimu/errors.rb
+- lib/vagrant-rimu/logging.rb
 - lib/vagrant-rimu/plugin.rb
 - lib/vagrant-rimu/provider.rb
 - lib/vagrant-rimu/version.rb
 - locales/en.yml
 - spec/spec_helper.rb
+- spec/vagrant-rimu/actions/billing_methods_spec.rb
 - spec/vagrant-rimu/actions/connect_to_rimu_spec.rb
+- spec/vagrant-rimu/actions/is_created_spec.rb
+- spec/vagrant-rimu/actions/is_stopped_spec.rb
+- spec/vagrant-rimu/actions/list_distributions_spec.rb
+- spec/vagrant-rimu/actions/list_servers_spec.rb
 - spec/vagrant-rimu/actions/message_already_created_spec.rb
 - spec/vagrant-rimu/actions/message_already_off_spec.rb
 - spec/vagrant-rimu/actions/message_not_created_spec.rb
@@ -191,23 +198,28 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Rimuhosting provider for Vagrant.
 test_files:
 - spec/spec_helper.rb
+- spec/vagrant-rimu/actions/billing_methods_spec.rb
 - spec/vagrant-rimu/actions/connect_to_rimu_spec.rb
+- spec/vagrant-rimu/actions/is_created_spec.rb
+- spec/vagrant-rimu/actions/is_stopped_spec.rb
+- spec/vagrant-rimu/actions/list_distributions_spec.rb
+- spec/vagrant-rimu/actions/list_servers_spec.rb
 - spec/vagrant-rimu/actions/message_already_created_spec.rb
 - spec/vagrant-rimu/actions/message_already_off_spec.rb
 - spec/vagrant-rimu/actions/message_not_created_spec.rb