vagrant-profitbricks 1.0.0 → 4.0.0

data/lib/vagrant-profitbricks/command/datacenters.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'vagrant-profitbricks/command/utils'
+
+module VagrantPlugins
+  module ProfitBricks
+    module Command
+      class ListDatacenters < Vagrant.plugin('2', :command)
+        include VagrantPlugins::ProfitBricks::Command::Utils
+        def execute
+          opts = OptionParser.new do |o|
+            o.banner = 'Usage: vagrant profitbricks datacenters [options]'
+          end
+
+          argv = parse_options(opts)
+          return unless argv
+
+          compute = fog_pb(argv[0])
+
+          rows = []
+
+          compute.datacenters.sort_by(&:id).each do |dc|
+            rows << [
+              dc.id,
+              dc.name
+            ]
+          end
+
+          display_table(@env, %w[ID Name], rows)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-profitbricks/command/flavors.rb

@@ -1,19 +1,32 @@
+# frozen_string_literal: true
+
+require 'vagrant-profitbricks/command/utils'
+
 module VagrantPlugins
   module ProfitBricks
     module Command
-      class Flavors < Vagrant.plugin("2", :command)
+      class ListFlavors < Vagrant.plugin('2', :command)
+        include VagrantPlugins::ProfitBricks::Command::Utils
         def execute
-          options = {}
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant profitbricks flavors [options]"
+            o.banner = 'Usage: vagrant profitbricks flavors [options]'
           end
 
           argv = parse_options(opts)
-          return if !argv
+          return unless argv
+
+          compute = fog_pb(argv[0])
 
-          with_target_vms(argv, :provider => :profitbricks) do |machine|
-            machine.action('list_flavors')
+          rows = []
+
+          compute.flavors.sort_by(&:id).each do |flavor|
+            rows << [
+              flavor.id,
+              flavor.name
+            ]
           end
+
+          display_table(@env, %w[ID Name], rows)
         end
       end
     end

data/lib/vagrant-profitbricks/command/images.rb

@@ -1,31 +1,32 @@
+# frozen_string_literal: true
+
+require 'vagrant-profitbricks/command/utils'
+
 module VagrantPlugins
   module ProfitBricks
     module Command
-      class Images < Vagrant.plugin("2", :command)
-        def initialize(argv, env)
-          @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
-
-          @subcommands = Vagrant::Registry.new
-          @subcommands.register(:list) do
-            require File.expand_path("../list_images", __FILE__)
-            ListImages
+      class ListImages < Vagrant.plugin('2', :command)
+        include VagrantPlugins::ProfitBricks::Command::Utils
+        def execute
+          opts = OptionParser.new do |o|
+            o.banner = 'Usage: vagrant profitbricks images'
           end
 
-          super(argv, env)
-        end
+          argv = parse_options(opts)
+          return unless argv
 
-        def execute
-          if @main_args.include?("-h") || @main_args.include?("--help")
-            # Print the help for all the profitbricks commands.
-            return help
-          end
+          compute = fog_pb(argv[0])
 
-          command_class = @subcommands.get(@sub_command.to_sym) if @sub_command
-          return help if !command_class || !@sub_command
-          @logger.debug("Invoking command class: #{command_class} #{@sub_args.inspect}")
+          rows = []
+          compute.images.each do |image|
+            rows << [
+              image.id,
+              image.name,
+              image.location
+            ]
+          end
 
-          # Initialize and execute the command class
-          command_class.new(@sub_args, @env).execute
+          display_table(@env, %w[ID Name Location], rows)
         end
       end
     end

data/lib/vagrant-profitbricks/command/locations.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'vagrant-profitbricks/command/utils'
+
+module VagrantPlugins
+  module ProfitBricks
+    module Command
+      class ListLocations < Vagrant.plugin('2', :command)
+        include VagrantPlugins::ProfitBricks::Command::Utils
+        def execute
+          opts = OptionParser.new do |o|
+            o.banner = 'Usage: vagrant profitbricks locations [options]'
+          end
+
+          argv = parse_options(opts)
+          return unless argv
+
+          compute = fog_pb(argv[0])
+
+          rows = []
+
+          compute.locations.sort_by(&:id).each do |location|
+            rows << [
+              location.id,
+              location.name
+            ]
+          end
+
+          display_table(@env, %w[ID Name], rows)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-profitbricks/command/root.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'vagrant-profitbricks/action'
 
 module VagrantPlugins
   module ProfitBricks
     module Command
-      class Root < Vagrant.plugin("2", :command)
+      class Root < Vagrant.plugin('2', :command)
         def self.synopsis
           I18n.t('vagrant_profitbricks.command.synopsis')
         end
@@ -13,32 +15,35 @@ module VagrantPlugins
 
           @subcommands = Vagrant::Registry.new
 
-          @subcommands.register(:images) do
-            require File.expand_path("../images", __FILE__)
-            Images
+          @subcommands.register(:datacenters) do
+            require File.expand_path('../datacenters', __FILE__)
+            ListDatacenters
           end
-          @subcommands.register(:flavors) do
-            require File.expand_path("../flavors", __FILE__)
-            Flavors
+
+          @subcommands.register(:locations) do
+            require File.expand_path('../locations', __FILE__)
+            ListLocations
           end
-          @subcommands.register(:keypairs) do
-            require File.expand_path("../keypairs", __FILE__)
-            KeyPairs
+
+          @subcommands.register(:snapshots) do
+            require File.expand_path('../snapshots', __FILE__)
+            ListSnapshots
           end
-          @subcommands.register(:networks) do
-            require File.expand_path("../networks", __FILE__)
-            Networks
+
+          @subcommands.register(:flavors) do
+            require File.expand_path('../flavors', __FILE__)
+            ListFlavors
           end
-          @subcommands.register(:servers) do
-            require File.expand_path("../servers", __FILE__)
-            Servers
+          @subcommands.register(:images) do
+            require File.expand_path('../images', __FILE__)
+            ListImages
           end
 
           super(argv, env)
         end
 
         def execute
-          if @main_args.include?("-h") || @main_args.include?("--help")
+          if @main_args.include?('-h') || @main_args.include?('--help')
             # Print the help for all the profitbricks commands.
             return help
           end
@@ -53,25 +58,25 @@ module VagrantPlugins
 
         def help
           opts = OptionParser.new do |opts|
-            opts.banner = "Usage: vagrant profitbricks <subcommand> [<args>]"
-            opts.separator ""
+            opts.banner = 'Usage: vagrant profitbricks <subcommand> [<args>]'
+            opts.separator ''
             opts.separator I18n.t('vagrant_profitbricks.command.available_subcommands')
 
             # Add the available subcommands as separators in order to print them
             # out as well.
             keys = []
-            @subcommands.each { |key, value| keys << key.to_s }
+            @subcommands.each { |key, _value| keys << key.to_s }
 
             keys.sort.each do |key|
               opts.separator "     #{key}"
             end
 
-            opts.separator ""
+            opts.separator ''
             opts.separator I18n.t('vagrant_profitbricks.command.help_subcommands') +
-                           " `vagrant profitbricks <subcommand> -h`"
+                           ' `vagrant profitbricks <subcommand> -h`'
           end
 
-          @env.ui.info(opts.help, :prefix => false)
+          @env.ui.info(opts.help, prefix: false)
         end
       end
     end

data/lib/vagrant-profitbricks/command/servers.rb

@@ -1,17 +1,20 @@
+# frozen_string_literal: true
+
 module VagrantPlugins
   module ProfitBricks
     module Command
-      class Servers < Vagrant.plugin("2", :command)
+      class ListServers < Vagrant.plugin('2', :command)
         def execute
+          p 'Garegaer'
           options = {}
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant profitbricks servers [options]"
+            o.banner = 'Usage: vagrant profitbricks servers [options]'
           end
 
           argv = parse_options(opts)
-          return if !argv
+          return unless argv
 
-          with_target_vms(argv, :provider => :profitbricks) do |machine|
+          with_target_vms(argv, provider: :profitbricks) do |machine|
             machine.action('list_servers')
           end
         end

data/lib/vagrant-profitbricks/command/snapshots.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'vagrant-profitbricks/command/utils'
+
+module VagrantPlugins
+  module ProfitBricks
+    module Command
+      class ListSnapshots < Vagrant.plugin('2', :command)
+        include VagrantPlugins::ProfitBricks::Command::Utils
+        def execute
+          opts = OptionParser.new do |o|
+            o.banner = 'Usage: vagrant profitbricks snapshots [options]'
+          end
+
+          argv = parse_options(opts)
+          return unless argv
+
+          compute = fog_pb(argv[0])
+
+          rows = []
+
+          compute.snapshots.sort_by(&:id).each do |snapshot|
+            rows << [
+              snapshot.id,
+              snapshot.name
+            ]
+          end
+
+          display_table(@env, %w[ID Name], rows)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-profitbricks/command/utils.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'fog/profitbricks'
+require 'terminal-table'
+
+module VagrantPlugins
+  module ProfitBricks
+    module Command
+      module Utils
+        def fog_pb(_token)
+          compute = Fog::Compute.new(provider: 'ProfitBricks', profitbricks_username: ENV['PROFITBRICKS_USERNAME'], profitbricks_password: ENV['PROFITBRICKS_PASSWORD'])
+
+          compute
+        end
+
+        def display_table(env, headers, rows)
+          table = Terminal::Table.new headings: headers, rows: rows
+          if env.respond_to?('ui')
+            env.ui.info(table.to_s)
+          else
+            env[:ui].info(table.to_s)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-profitbricks/config.rb

@@ -1,10 +1,12 @@
-require "vagrant"
-require "fog/profitbricks"
+# frozen_string_literal: true
+
+require 'vagrant'
+require 'fog/profitbricks'
 
 module VagrantPlugins
   module ProfitBricks
-    class Config < Vagrant.plugin("2", :config)
-      # The API key to access ProfitBricks - profitbricks_password
+    class Config < Vagrant.plugin('2', :config)
+      # The API key to access ProfitBricks - password
       # @return [String]
       attr_accessor :password
 
@@ -13,10 +15,10 @@ module VagrantPlugins
       # @return [String]
       attr_accessor :username
 
-      # The profitbricks_url to access ProfitBricks. 
+      # The url to access ProfitBricks Cloud API.
       #
       # expected to be a string url -
-      # 'https://api.profitbricks.com/cloudapi/v3/'
+      # 'https://api.profitbricks.com/cloudapi/v4/'
       attr_accessor :profitbricks_url
 
       # The flavor of server to launch, either the ID or name. This
@@ -26,7 +28,7 @@ module VagrantPlugins
       # The name or ID of the image to use. This can also be a regular
       # expression to partially match a name.
       attr_accessor :image
-
+      attr_accessor :image_alias
 
       # The name of the server. This defaults to the name of the machine
       # defined by Vagrant (via `config.vm.define`), but can be overriden
@@ -39,28 +41,28 @@ module VagrantPlugins
 
       #  Specify location for datacenter if one needs to be created, default value is 'us/las'
       attr_accessor :location
-      
+
       #  Disk volume size in GB
-      attr_accessor :profitbricks_volume_size
+      attr_accessor :volume_size
 
       #  Disk volume type (SSD or HDD)
       #  Will default to HDD if not specified
       attr_accessor :volume_type
 
       #  The licence type of the volume. Options: LINUX, WINDOWS, UNKNOWN, OTHER
-      #  You will need to provide either the image or the licence_type parameters. 
+      #  You will need to provide either the image or the licence_type parameters.
       #  licence_type is required, but if image is supplied, it is already set and cannot be changed
       attr_accessor :volume_licence_type
 
-      #  The storage availability zone assigned to the volume. 
-      #  Valid values: AUTO, ZONE_1, ZONE_2, or ZONE_3. This only applies to HDD volumes. 
+      #  The storage availability zone assigned to the volume.
+      #  Valid values: AUTO, ZONE_1, ZONE_2, or ZONE_3. This only applies to HDD volumes.
       #  Leave blank or set to AUTO when provisioning SSD volumes.
       #  Will default to AUTO if not specified
       attr_accessor :volume_availability_zone
 
-      #  One or more SSH keys to allow access to the volume via SSH. 
+      #  One or more SSH keys to allow access to the volume via SSH.
       #  Works with ProfitBricks supplied Linux images.
-      attr_accessor :volume_ssh_keys
+      attr_accessor :public_ssh_keys
 
       # POne-time password is set on the Image for the appropriate account.
       # This field may only be set in creation requests. When reading, it always returns null.
@@ -68,10 +70,10 @@ module VagrantPlugins
       attr_accessor :image_password
 
       # number of cores in profitbricks server
-      attr_accessor :profitbricks_cores
+      attr_accessor :cores
 
       # Required, amount of memory in GB allocated to virtual server
-      attr_accessor :profitbricks_ram
+      attr_accessor :ram
 
       # Sets the CPU type. "AMD_OPTERON" or "INTEL_XEON". Defaults to "AMD_OPTERON".
       attr_accessor :cpu_family
@@ -83,21 +85,22 @@ module VagrantPlugins
       attr_accessor :nat
 
       def initialize
-        @password  = UNSET_VALUE
+        @password = UNSET_VALUE
         @profitbricks_url = UNSET_VALUE
-        @flavor   = UNSET_VALUE
-        @profitbricks_cores = UNSET_VALUE
-        @profitbricks_ram = UNSET_VALUE
-        @image    = UNSET_VALUE
+        @flavor = UNSET_VALUE
+        @cores = UNSET_VALUE
+        @ram = UNSET_VALUE
+        @image = nil
+        @image_alias = nil
         @server_name = UNSET_VALUE
         @datacenter_id = UNSET_VALUE
         @username = UNSET_VALUE
-        @profitbricks_volume_size = UNSET_VALUE
+        @volume_size = UNSET_VALUE
         @location = UNSET_VALUE
         @volume_type = UNSET_VALUE
         @volume_licence_type = UNSET_VALUE
         @volume_availability_zone = UNSET_VALUE
-        @volume_ssh_keys = UNSET_VALUE
+        @public_ssh_keys = UNSET_VALUE
         @cpu_family = UNSET_VALUE
         @lan_id = UNSET_VALUE
         @nat = UNSET_VALUE
@@ -105,47 +108,49 @@ module VagrantPlugins
       end
 
       def finalize!
-        @password  = nil if @password == UNSET_VALUE
+        @password = nil if @password == UNSET_VALUE
         @profitbricks_url = nil if @profitbricks_url == UNSET_VALUE
-        @flavor    = nil if @flavor == UNSET_VALUE
-        @profitbricks_cores = 1 if @profitbricks_cores == UNSET_VALUE
-        @profitbricks_ram   = 256 if profitbricks_ram == UNSET_VALUE
-        @image    = /ubuntu/ if @image == UNSET_VALUE
+        @flavor = nil if @flavor == UNSET_VALUE
+        @cores = 1 if @cores == UNSET_VALUE
+        @ram   = 2048 if ram == UNSET_VALUE
         @server_name = nil if @server_name == UNSET_VALUE
         @datacenter_id = nil if @datacenter_id == UNSET_VALUE
         @username = nil if @username == UNSET_VALUE
-        @profitbricks_volume_size = 5 if @profitbricks_volume_size == UNSET_VALUE
+        @volume_size = 5 if @volume_size == UNSET_VALUE
         @location = 'us/las' if @location == UNSET_VALUE
         @volume_type = 'HDD' if @volume_type == UNSET_VALUE
         @volume_licence_type = 'UNKNOWN' if @volume_licence_type == UNSET_VALUE
         @volume_availability_zone = 'AUTO' if @volume_availability_zone == UNSET_VALUE
-        @volume_ssh_keys = nil if @volume_ssh_keys == UNSET_VALUE
+        @public_ssh_keys = nil if @public_ssh_keys == UNSET_VALUE
         @cpu_family = 'AMD_OPTERON' if @cpu_family == UNSET_VALUE
         @lan_id = nil if @lan_id == UNSET_VALUE
         @nat = false if @nat == UNSET_VALUE
         @image_password = nil if @image_password == UNSET_VALUE
       end
 
-      def validate(machine)
+      def validate(_machine)
         errors = _detected_errors
 
-        errors << I18n.t("vagrant_profitbricks.config.password_required") if !@password
-        errors << I18n.t("vagrant_profitbricks.config.username_required") if !@username
-        errors << I18n.t("vagrant_profitbricks.config.datacenter_required") if !@datacenter_id
+        errors << I18n.t('vagrant_profitbricks.config.password_required') unless @password
+        errors << I18n.t('vagrant_profitbricks.config.username_required') unless @username
+        errors << I18n.t('vagrant_profitbricks.config.datacenter_required') unless @datacenter_id
+        errors << I18n.t('vagrant_profitbricks.config.image_or_image_alias_must_be_provided') if !@image && !@image_alias
+        errors << I18n.t('vagrant_profitbricks.config.image_password_or_public_ssh_required') if !@public_ssh_keys && !@image_password
+
         {
-            :profitbricks_url => @profitbricks_url
+          url: @profitbricks_url
         }.each_pair do |key, value|
-          errors << I18n.t("vagrant_profitbricks.config.invalid_uri", :key => key, :uri => value) unless value.nil? || valid_uri?(value)
+          errors << I18n.t('vagrant_profitbricks.config.invalid_uri', key: key, uri: value) unless value.nil? || valid_uri?(value)
         end
 
-        { "ProfitBricks Provider" => errors }
+        { 'ProfitBricks Provider' => errors }
       end
 
       private
 
-      def valid_uri? value
+      def valid_uri?(value)
         uri = URI.parse value
-        uri.kind_of?(URI::HTTP)
+        uri.is_a?(URI::HTTP)
       end
     end
   end