vagrant-tart 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c396d57625272e20fa44038feb071add4d80fc19de6cf17e8339a46bdaef72ea
-  data.tar.gz: ff2b337cb649360c7d451b721fb8c836e75e1e549fe282ca1a79307f7da36471
+  metadata.gz: 3e9661a2803897b09b1601b13b608e24ea19a5f95db89c760f3c04e6a1b18c41
+  data.tar.gz: fd5723f36984a597846413d9fe14438dd8386116357faff32d212ba6ca265c8e
 SHA512:
-  metadata.gz: 0bab80c64715d5292521cba50edbcbdae81c7cbe50ed42bb28bcb4a5e4169660688ddf8d4dfb903f0d65eaf861df47f5af91982ca15b4b348654be97cce4b51a
-  data.tar.gz: 0267bb6950b5eb82c7ec11c0d2c7dedfc4d753353f372189033500709a3f3a8841090b09b9998d761718a04ceaa0b4864218316149dad08d4a96782d947b0702
+  metadata.gz: 942cb301b228455fac8369be172bd5c9be38cf4b4ed91fe7eac0b0af46a15ff9235ecb3e9601de039aafb0836ec493b4e417c46748da4b79058fb8957f762d53
+  data.tar.gz: 53d7dba4e76a42d9ea51f76cfacb5306db38397e13102ab18123c2b1bc129d65775f09cafa030981d21f2fb16b21c42ef445e5eb8f07feddb433a81605938f75

data/lib/vagrant-tart/action/start_instance.rb

@@ -25,7 +25,7 @@ module VagrantPlugins
           return @app.call(env) if instance.nil? || instance.vagrant_state == :running
 
           env[:ui].output(I18n.t("vagrant_tart.messages.configuring_instance", name: name))
-          driver.set(name, "cpu", config.cpu)
+          driver.set(name, "cpus", config.cpus)
           driver.set(name, "memory", config.memory)
           driver.set(name, "disk", config.disk)
           driver.set(name, "display", config.display)

data/lib/vagrant-tart/action.rb

@@ -14,11 +14,13 @@ module VagrantPlugins
       action_root = Pathname.new(File.expand_path("action", __dir__))
       autoload :CreateInstance, action_root.join("create_instance")
       autoload :DeleteInstance, action_root.join("delete_instance")
+      autoload :ForwardPorts, action_root.join("forward_ports")
       autoload :GetState, action_root.join("get_state")
       autoload :Login, action_root.join("login")
       autoload :PullImage, action_root.join("pull_image")
       autoload :StartInstance, action_root.join("start_instance")
       autoload :StopInstance, action_root.join("stop_instance")
+      autoload :SuspendInstance, action_root.join("suspend_instance")
 
       # Vargrant action "destroy".
       def self.action_destroy
@@ -26,7 +28,7 @@ module VagrantPlugins
           b.use ConfigValidate
 
           b.use Call, IsState, :not_created do |env1, b1|
-            raise Errors::InstanceNotCreatedError if  env1[:result]
+            raise Errors::InstanceNotCreatedError if env1[:result]
 
             b1.use Call, DestroyConfirm do |env2, b2|
               if env2[:result]

data/lib/vagrant-tart/config.rb

@@ -11,9 +11,9 @@ module VagrantPlugins
     class Config < Vagrant.plugin("2", :config)
       # @return [String] The image registry
       attr_accessor :registry
-      # @return [String] The image registry username
+      # @return [String] The image registry username (optional)
       attr_accessor :username
-      # @return [String] The image registry password
+      # @return [String] The image registry password (optional)
       attr_accessor :password
 
       # @return [String] The image source
@@ -21,14 +21,14 @@ module VagrantPlugins
       # @return [String] The name
       attr_accessor :name
 
+      # @return [Boolean] Show a GUI window on boot, or run headless
+      attr_accessor :gui
       # @return [Integer] Number of CPUs
-      attr_accessor :cpu
+      attr_accessor :cpus
       # @return [Integer] Memory size in MB
       attr_accessor :memory
       # @return [Integer] Disk storage size in GB
       attr_accessor :disk
-      # @return [Boolean] Show a GUI window on boot, or run headless
-      attr_accessor :gui
       # @return [String] Display screen resolution
       attr_accessor :display
       # @return [Boolean] Whether the machine is suspendable
@@ -48,10 +48,10 @@ module VagrantPlugins
         @image = UNSET_VALUE
         @name = UNSET_VALUE
 
-        @cpu = UNSET_VALUE
+        @gui = UNSET_VALUE
+        @cpus = UNSET_VALUE
         @memory = UNSET_VALUE
         @disk = UNSET_VALUE
-        @gui = UNSET_VALUE
         @display = UNSET_VALUE
         @suspendable = UNSET_VALUE
 
@@ -67,10 +67,10 @@ module VagrantPlugins
         @image = nil if @image == UNSET_VALUE
         @name = nil if @name == UNSET_VALUE
 
-        @cpu = 1 if @cpu == UNSET_VALUE
+        @gui = false if @gui == UNSET_VALUE
+        @cpus = 1 if @cpus == UNSET_VALUE
         @memory = 1024 if @memory == UNSET_VALUE
         @disk = 10 if @disk == UNSET_VALUE
-        @gui = false if @gui == UNSET_VALUE
         @display = "1024x768" if @display == UNSET_VALUE
         @suspendable = false if @suspendable == UNSET_VALUE
       end
@@ -79,12 +79,6 @@ module VagrantPlugins
       def validate(_machine)
         errors = _detected_errors
 
-        # Sanity checks for the registry
-        unless @registry.nil?
-          errors << I18n.t("vagrant_tart.config.username_required") if @username.nil? || @username.empty?
-          errors << I18n.t("vagrant_tart.config.password_required") if @password.nil? || @password.empty?
-        end
-
         # Sanity checks for the image and the name
         errors << I18n.t("vagrant_tart.config.image_required") if @image.nil? || @image.empty?
         errors << I18n.t("vagrant_tart.config.name_required") if @name.nil? || @name.empty?
@@ -92,10 +86,10 @@ module VagrantPlugins
         # Check that the GUI flag is a valid boolean
         errors << I18n.t("vagrant_tart.config.gui_invalid") unless @gui == true || @gui == false
 
-        # Check that CPU is a valid number and between 1 and the maximum available CPUs
+        # Check that CPUs is a valid number and between 1 and the maximum available CPUs
         max_cpus = Etc.nprocessors
-        unless (@cpu.is_a? Integer) && @cpu >= 1 && @cpu <= max_cpus
-          errors << I18n.t("vagrant_tart.config.cpu_invalid", max_cpus: max_cpus)
+        unless (@cpus.is_a? Integer) && @cpus >= 1 && @cpus <= max_cpus
+          errors << I18n.t("vagrant_tart.config.cpus_invalid", max_cpus: max_cpus)
         end
 
         # Check that memory is a valid number and between 1 and the maximum available memory
@@ -110,6 +104,9 @@ module VagrantPlugins
         # Check that the display resolution is a valid string conforming to the format "WIDTHxHEIGHT"
         errors << I18n.t("vagrant_tart.config.display_invalid") unless @display.match?(/^\d+x\d+$/)
 
+        # Check that the suspendable flag is a valid boolean
+        errors << I18n.t("vagrant_tart.config.suspendable_invalid") unless @suspendable == true || @suspendable == false
+
         { "Tart Provider" => errors }
       end
 
@@ -117,8 +114,10 @@ module VagrantPlugins
         @suspendable
       end
 
+      # Check if the configuration uses a registry.
+      # @return [Boolean] True if the configuration uses a registry, false otherwise
       def use_registry?
-        !@registry.nil? && !@username.nil? && !@password.nil?
+        !@registry.nil?
       end
     end
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity

data/lib/vagrant-tart/model/get_result.rb

@@ -6,7 +6,7 @@ module VagrantPlugins
       # Represents the result of a Tart 'get' operation.
       class GetResult
         # @return [Integer] The number of CPUs of the machine.
-        attr_accessor :cpu
+        attr_accessor :cpus
         # @return [Integer] The size of the machine's disk.
         attr_accessor :disk
         # @return [Boolean] Whether the machine is running.
@@ -25,7 +25,7 @@ module VagrantPlugins
         # Initialize the result from raw data.
         # @param [Hash] data The raw data.
         def initialize(data)
-          @cpu = data["CPU"]
+          @cpus = data["CPU"]
           @disk = data["Disk"]
           @running = data["Running"]
           @memory = data["Memory"]

data/lib/vagrant-tart/plugin.rb

@@ -26,7 +26,6 @@ module VagrantPlugins
       # Register the provider.
       provider(:tart, box_optional: true, parallel: true) do
         setup_i18n
-
         require_relative "provider"
         Provider
       end

data/lib/vagrant-tart/scripts/login.sh

@@ -5,5 +5,10 @@ HOST="$1"
 USERNAME="$2"
 PASSWORD="$3"
 
-# Login to the registry with the provided credentials
-echo "$PASSWORD" | tart login "$HOST" --username "$USERNAME" --password-stdin
+if [[ -z "$USERNAME" ]] || [[ -z "$PASSWORD" ]]; then
+  # Assumes that the credentials are provided in another way (e.g. environment variables)
+  tart login "$HOST"
+else
+  # Login to the registry with the provided credentials
+  echo "$PASSWORD" | tart login "$HOST" --username "$USERNAME" --password-stdin
+fi

data/lib/vagrant-tart/util/driver.rb

@@ -127,7 +127,7 @@ module VagrantPlugins
           # Map the key to the correct switch
           switch = nil
           case key
-          when "cpu"
+          when "cpus"
             switch = "--cpu"
           when "memory"
             switch = "--memory"

data/lib/vagrant-tart/version.rb

@@ -4,6 +4,6 @@ module VagrantPlugins
   # Top level module for the Tart provider plugin.
   module Tart
     # Current version of the Tart provider plugin.
-    VERSION = "0.0.2"
+    VERSION = "0.0.4"
   end
 end

data/locales/en.yml

@@ -1,21 +1,22 @@
 en:
   vagrant_tart:
     config:
-      image_required: |-
-        Configuration must specify an image
-      name_required: |-
-        Configuration must specify a virtual machine name
-
-      gui_invalid: |-
-        Configuration must specify a valid GUI setting (true or false)
-      cpu_invalid: |-
-        Configuration must specify a valid CPU count (between 1 and %{max_cpus})
-      memory_invalid: |-
-        Configuration must specify a valid memory size (between 1 and %{max_memory} MB)
+      cpus_invalid: |-
+        Configuration must specify a valid CPUs count (between 1 and %{max_cpus})
       disk_invalid: |-
         Configuration must specify a valid disk size (greater than 1 GB)
       display_invalid: |-
         Configuration must specify a valid display size (WIDTHxHEIGHT pixels)
+      gui_invalid: |-
+        Configuration must specify a valid GUI setting (true or false)
+      image_required: |-
+        Configuration must specify an image
+      memory_invalid: |-
+        Configuration must specify a valid memory size (between 1 and %{max_memory} MB)
+      name_required: |-
+        Configuration must specify a virtual machine name
+      suspendable_invalid: |-
+        Configuration must specify a valid suspendable setting (true or false)
 
     errors:
       command_error: |-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-tart
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Laurent Etiemble
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-06-22 00:00:00.000000000 Z
 dependencies: []
 description: Allows Vagrant to manage Tart virtual machines.
 email: