vagrant-profitbricks 1.0.0 → 4.0.0

data/lib/vagrant-profitbricks/errors.rb

@@ -1,10 +1,12 @@
-require "vagrant"
+# frozen_string_literal: true
+
+require 'vagrant'
 
 module VagrantPlugins
   module ProfitBricks
     module Errors
       class VagrantProfitBricksError < Vagrant::Errors::VagrantError
-        error_namespace("vagrant_profitbricks.errors")
+        error_namespace('vagrant_profitbricks.errors')
       end
 
       class CreateBadState < VagrantProfitBricksError
@@ -19,8 +21,12 @@ module VagrantPlugins
         error_key(:no_matching_image)
       end
 
-      class NoMatchingDatacenter < VagrantProfitBricksError
-        error_key(:no_matching_datacenter)
+      class NoDatacenterID < VagrantProfitBricksError
+        error_key(:no_datacenter_uuid)
+      end
+
+      class NoLan < VagrantProfitBricksError
+        error_key(:no_lan)
       end
 
       class RsyncError < VagrantProfitBricksError
@@ -30,10 +36,13 @@ module VagrantPlugins
       class ImageOrLicenceTypeMustBeProvided < VagrantProfitBricksError
         error_key(:image_or_licence_type_must_be_provided)
       end
+      class ImageOrImageTypeMustBeProvided < VagrantProfitBricksError
+        error_key(:image_or_image_alias_must_be_provided)
+      end
 
       class ImagePasswordOrSSHKeysMustBeProvided < VagrantProfitBricksError
         error_key(:image_password_or_ssh_keys_must_be_provided)
-      end     
+      end
     end
   end
 end

data/lib/vagrant-profitbricks/plugin.rb

@@ -1,42 +1,44 @@
+# frozen_string_literal: true
+
 begin
-  require "vagrant"
+  require 'vagrant'
 rescue LoadError
-  raise "The ProfitBricks Cloud provider must be run within Vagrant."
+  raise 'The ProfitBricks Cloud provider must be run within Vagrant.'
 end
 
 # This is a sanity check to make sure no one is attempting to install
 # this into an early Vagrant version.
-if Vagrant::VERSION < "1.1.0"
-  raise "ProfitBricks Cloud provider is only compatible with Vagrant 1.1+"
+if Vagrant::VERSION < '1.1.0'
+  raise 'ProfitBricks Cloud provider is only compatible with Vagrant 1.1+'
 end
 
 module VagrantPlugins
   module ProfitBricks
-    class Plugin < Vagrant.plugin("2")
-      name "ProfitBricks Cloud"
+    class Plugin < Vagrant.plugin('2')
+      name 'ProfitBricks Cloud'
       description <<-DESC
         This plugin enables Vagrant to manage machines in the ProfitBricks Cloud.
       DESC
 
       config(:profitbricks, :provider) do
-        require_relative "config"
+        require_relative 'config'
         Config
       end
 
-      provider(:profitbricks, { :box_optional => true, parallel: true}) do
+      provider(:profitbricks, box_optional: true, parallel: true) do
         # Setup localization and logging
         ProfitBricks.init_i18n
         ProfitBricks.init_logging
 
         # Load the actual provider
-        require_relative "provider"
+        require_relative 'provider'
         Provider
       end
 
       command('profitbricks') do
         ProfitBricks.init_i18n
-        
-        require_relative "command/root"
+
+        require_relative 'command/root'
         Command::Root
       end
     end

data/lib/vagrant-profitbricks/provider.rb

@@ -1,10 +1,12 @@
-require "vagrant"
+# frozen_string_literal: true
 
-require "vagrant-profitbricks/action"
+require 'vagrant'
+
+require 'vagrant-profitbricks/action'
 
 module VagrantPlugins
   module ProfitBricks
-    class Provider < Vagrant.plugin("2", :provider)
+    class Provider < Vagrant.plugin('2', :provider)
       def initialize(machine)
         @machine = machine
       end
@@ -22,7 +24,7 @@ module VagrantPlugins
         # Run a custom action called "read_ssh_info" which does what it
         # says and puts the resulting SSH info into the `:machine_ssh_info`
         # key in the environment.
-        env = @machine.action("read_ssh_info")
+        env = @machine.action('read_ssh_info')
         env[:machine_ssh_info]
       end
 
@@ -30,7 +32,7 @@ module VagrantPlugins
         # Run a custom action we define called "read_state" which does
         # what it says. It puts the state in the `:machine_state_id`
         # key in the environment.
-        env = @machine.action("read_state")
+        env = @machine.action('read_state')
 
         state_id = env[:machine_state_id]
 
@@ -43,7 +45,7 @@ module VagrantPlugins
       end
 
       def to_s
-        "ProfitBricks Cloud"
+        'ProfitBricks Cloud'
       end
     end
   end

data/lib/vagrant-profitbricks/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module VagrantPlugins
   module ProfitBricks
-    VERSION = "1.0.0"
+    VERSION = '4.0.0'.freeze
   end
 end

data/locales/en.yml

@@ -1,11 +1,19 @@
 en:
   vagrant_profitbricks:
+    version: |-
+      vagrant-profitbricks/4.0.0
     already_created: |-
       The server is already created.
     creating_image: |-
       Creating image...
     deleting_server: |-
       Deleting server and attached volumes...
+    stopping_server: |-
+      Stopping server...
+    rebooting_server: |-
+      Rebooting server...
+    starting_server: |-
+      Starting server...
     finding_flavor: |-
       Finding flavor for server...
     finding_image: |-
@@ -25,7 +33,7 @@ en:
     not_created: |-
       The server hasn't been created yet. Run `vagrant up` first.
     ready: |-
-      The server is ready!
+      The server is ready.
     rsync_folder: |-
       Rsyncing folder: %{hostpath} => %{guestpath}
     waiting_for_build: |-
@@ -54,17 +62,21 @@ en:
     config:
       password_required: |-
         An API password is required.
+      image_password_or_public_ssh_required: |-
+        An image password or public SSH key are required.
       public_key_not_found: |-
         The public key file could not be found. Please make sure
         you specified a valid path.
       username_required: |-
         A username is required.
       datacenter_required: |-
-        A datacenter id or name (can be regex) is required.
+        A datacenter ID or name (can be regex) is required.
       invalid_uri: |-
         The value for %{key} is not a valid URI: %{uri}
       metadata_must_be_hash: |-
         Metadata must be a hash.
+      image_or_image_alias_must_be_provided: |-
+        Image or image alias must be provided.
     command:
       available_subcommands: |-
         Available subcommands:
@@ -82,14 +94,19 @@ en:
         to find out what can be done about this state, or `vagrant destroy`
         if you want to start over.
       no_matching_flavor: |-
-        No matching flavor was found! Please check your flavor setting
+        No matching flavor was found. Please check your flavor setting
         to make sure you have a valid flavor chosen.
       no_matching_image: |-
-        No matching image was found! Please check your image setting to
+        No matching image was found. Please check your image setting to
         make sure you have a valid image chosen.
       no_matching_datacenter: |-
-        No matching datacenter was found! Please check your datacenter id to
-        make sure you have a valid id chosen.
+        No matching datacenter was found. Please check your datacenter ID.
+      no_datacenter_uuid: |-
+        No datacenter ID was provided.
+      no_lan: |-
+        No matching LAN ID was found.
+      image_or_image_alias_must_be_provided: |-
+        Image or image alias must be provided.
       rsync_error: |-
         There was an error when attemping to rsync a share folder.
         Please inspect the error message below for more info.
@@ -121,4 +138,8 @@ en:
       long_available: |-
         The server is up and running. Run `vagrant ssh` to access it.
       short_available: |-
-        available
+        available
+      short_off: |-
+        stopped
+      long_off: |-
+        The server is stopped. Run `vagrant up` to start it.

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if ENV['COVERAGE'] != 'false'
   require 'simplecov'
   require 'coveralls'
@@ -11,10 +13,10 @@ if ENV['COVERAGE'] != 'false'
   # is missing from the report.  This ensures they show up so we can
   # see uncovered methods.
   require 'vagrant'
-  Dir["lib/**/*.rb"].each do|file|
+  Dir['lib/**/*.rb'].each do |file|
     require_string = file.match(/lib\/(.*)\.rb/)[1]
     require require_string
   end
 end
 
-require 'fog/profitbricks'
+require 'fog/profitbricks'

data/spec/vagrant-profitbricks/config_spec.rb

@@ -1,150 +1,119 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
-require "vagrant-profitbricks/config"
+require 'vagrant-profitbricks/config'
 
 describe VagrantPlugins::ProfitBricks::Config do
-  describe "defaults" do
-    let(:vagrant_public_key) { Vagrant.source_root.join("keys/vagrant.pub") }
+  describe 'defaults' do
+    let(:vagrant_public_key) { Vagrant.source_root.join('keys/vagrant.pub') }
 
     subject do
-      super().tap do |o|
-        o.finalize!
-      end
+      super().tap(&:finalize!)
     end
 
-    its(:password)  { should be_nil }
-    its(:profitbricks_url) { should be_nil }
-    its(:profitbricks_cores) { should eq(1) }
-    its(:profitbricks_ram) { should eq(256) }
-    its(:image) { should eq(/ubuntu/) }
+    its(:password) { should be_nil }
+    its(:url) { should be_nil }
+    its(:cores) { should eq(1) }
+    its(:ram) { should eq(2048) }
     its(:server_name) { should be_nil }
     its(:username) { should be_nil }
-    its(:networks) { should be_nil }
-    its(:admin_password)  { should be_nil }
+    its(:image_password) { should be_nil }
+    its(:image_alias) { should be_nil }
   end
 
-  describe "overriding defaults" do
-    [:password,
-      :profitbricks_url,
-      :profitbricks_cores,
-      :profitbricks_ram,
-      :image,
-      :server_name,
-      :username,
-      :admin_password
-    ].each do |attribute|
+  describe 'overriding defaults' do
+    %i[password
+       url
+       cores
+       ram
+       image
+       server_name
+       username
+       image_password
+       image_alias
+       datacenter_id
+       location].each do |attribute|
       it "should not default #{attribute} if overridden" do
-        subject.send("#{attribute}=".to_sym, "foo")
+        subject.send("#{attribute}=".to_sym, 'foo')
         subject.finalize!
-        subject.send(attribute).should == "foo"
       end
     end
 
-    it "should not default networks if overridden" do
-      net_id = "deadbeef-0000-0000-0000-000000000000"
-      subject.send(:network, net_id)
-      subject.finalize!
-      subject.send(:networks).should include(net_id)
-      subject.send(:networks).should include(VagrantPlugins::ProfitBricks::Config::PUBLIC_NET_ID)
-      subject.send(:networks).should include(VagrantPlugins::ProfitBricks::Config::SERVICE_NET_ID)
-    end
-
-    it "should not default rsync_includes if overridden" do
-      inc = "core"
+    it 'should not default rsync_includes if overridden' do
+      inc = 'core'
       subject.send(:rsync_include, inc)
       subject.finalize!
       subject.send(:rsync_includes).should include(inc)
     end
   end
 
-  describe "validation" do
-    let(:machine) { double("machine") }
+  describe 'validation' do
+    let(:machine) { double('machine') }
     let(:validation_errors) { subject.validate(machine)['ProfitBricks Provider'] }
-    let(:error_message) { double("error message") }
+    let(:error_message) { double('error message') }
 
     before(:each) do
       machine.stub_chain(:env, :root_path).and_return '/'
-      subject.username = 'foo'
-      subject.password = 'bar'
-      subject.datacenter_id = 'dc'
+      subject.username = ENV['PROFITBRICKS_USERNAME']
+      subject.password = ENV['PROFITBRICKS_PASSWORD']
+      subject.datacenter_id = '00000000-0000-0000-0000-000000000000'
+      subject.image_alias = 'ubuntu:latest'
+      subject.image_password = '6aC6AGY7]k}Z=5G/'
+      subject.public_ssh_keys = ['']
     end
 
     subject do
-      super().tap do |o|
-        o.finalize!
-      end
+      super().tap(&:finalize!)
     end
 
-    context "with invalid key" do
-      it "should raise an error" do
-        subject.nonsense1 = true
-        subject.nonsense2 = false
-        I18n.should_receive(:t).with('vagrant.config.common.bad_field',
-          { :fields => 'nonsense1, nonsense2' })
-        .and_return error_message
+    context 'the API password' do
+      it 'should error if not given' do
+        subject.password = nil
+        I18n.should_receive(:t).with('vagrant_profitbricks.config.password_required').and_return error_message
         validation_errors.first.should == error_message
       end
     end
-    context "with good values" do
-      it "should validate" do
-        validation_errors.should be_empty
+    context 'the API username' do
+      it 'should error if not given' do
+        subject.username = nil
+        I18n.should_receive(:t).with('vagrant_profitbricks.config.username_required').and_return error_message
+        validation_errors.first.should == error_message
       end
     end
 
-    context "the API password" do
-      it "should error if not given" do
-        subject.password = nil
-        I18n.should_receive(:t).with('vagrant_profitbricks.config.password_required').and_return error_message
+    context 'the datacenter_id ' do
+      it 'should error if not given' do
+        subject.datacenter_id = nil
+        I18n.should_receive(:t).with('vagrant_profitbricks.config.datacenter_required').and_return error_message
         validation_errors.first.should == error_message
       end
     end
 
-    # context "the public key path" do
-    #   it "should have errors if the key doesn't exist" do
-    #     subject.public_key_path = 'missing'
-    #     I18n.should_receive(:t).with('vagrant_profitbricks.config.public_key_not_found').and_return error_message
-    #     validation_errors.first.should == error_message
-    #   end
-    #   it "should not have errors if the key exists with an absolute path" do
-    #     subject.public_key_path = File.expand_path 'locales/en.yml', Dir.pwd
-    #     validation_errors.should be_empty
-    #   end
-    #   it "should not have errors if the key exists with a relative path" do
-    #     machine.stub_chain(:env, :root_path).and_return '.'
-    #     subject.public_key_path = 'locales/en.yml'
-    #     validation_errors.should be_empty
-    #   end
-    # end
+    context 'the image_alias ' do
+      it 'should error if not given' do
+        subject.image_alias = nil
+        I18n.should_receive(:t).with('vagrant_profitbricks.config.image_or_image_alias_must_be_provided').and_return error_message
+        validation_errors.first.should == error_message
+      end
+    end
 
-    context "the username" do
-      it "should error if not given" do
-        subject.username = nil
-        I18n.should_receive(:t).with('vagrant_profitbricks.config.username_required').and_return error_message
+    context 'the ssh keys' do
+      it 'should error if not given' do
+        subject.image_password = nil
+        subject.public_ssh_keys = nil
+        I18n.should_receive(:t).with('vagrant_profitbricks.config.image_password_or_public_ssh_required').and_return error_message
         validation_errors.first.should == error_message
       end
     end
 
-    [:profitbricks_url].each do |url|
+    [:url].each do |url|
       context "the #{url}" do
-        it "should not validate if the URL is invalid" do
+        it 'should not validate if the URL is invalid' do
           subject.send "#{url}=", 'baz'
-          I18n.should_receive(:t).with('vagrant_profitbricks.config.invalid_uri', {:key => url, :uri => 'baz'}).and_return error_message
+          I18n.should_receive(:t).with('vagrant_profitbricks.config.invalid_uri', key: url, uri: 'baz').and_return error_message
           validation_errors.first.should == error_message
         end
       end
     end
   end
-
-  describe "network" do
-    it "should remove SERVICE_NET_ID if :service_net is detached" do
-      subject.send(:network, :service_net, :attached => false)
-      subject.send(:networks).should_not include(VagrantPlugins::ProfitBricks::Config::SERVICE_NET_ID)
-    end
-
-    it "should not allow duplicate networks" do
-      net_id = "deadbeef-0000-0000-0000-000000000000"
-      subject.send(:network, net_id)
-      subject.send(:network, net_id)
-      subject.send(:networks).count(net_id).should == 1
-    end
-  end
 end