vagrant-docker-hosts-manager 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90a6a5b049e33dce80821b66d57d4c4ca4edd35d7e51f1125d96f4211adb3eb1
-  data.tar.gz: 634910fe60c21185160b1269bdc6b3cbb77e0d6e6e7df8d5a2cb6eb6115762e1
+  metadata.gz: 66272a00d09743fc1c067456c1680ac75768ca3d3c9534f1ad01eac5bf3b139e
+  data.tar.gz: 24452535a62c76a094e86d77398697647207528e9cea5315b53b8031822ebfb5
 SHA512:
-  metadata.gz: a1523d6ca1643bac26e2040020b9207a62d6e1b1328b89f56eae7e6d33ad69e6f2c136cee1c2c8e4824388ec126be962ad898107ab08cac66aa310f1a33f7c7b
-  data.tar.gz: da1215b0b930905713b6d9e202035e6523dd1878d9fbdf535a55bbfbc6706200a006c8bc2935ea4c2213efaed23584d7a98a6d5ce31fe7c168cf59ff5e01471a
+  metadata.gz: 2ba755242cce735714503633ef65d425e9368fc0871bf85a268da447b32c3d7032610db4994707de04cf64df79ff94ab587815ddeb11ad3e3571664b7680b200
+  data.tar.gz: d2e14700ece77c25e67c59b5a0c033f3daec0b86cea3227ff0438052163b9c577e39e8bb482ec0ef3e8f5e34a3a44471143dff13a45656f9884454f7bcc3f2d7

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.3.0](https://github.com/julienpoirou/vagrant-docker-hosts-manager/compare/v0.2.0...v0.3.0) (2026-03-11)
+
+
+### Fonctionnalités ✨
+
+* **i18n:** Add locale config attr and centralize i18n setup in UiHelpers ([9336f87](https://github.com/julienpoirou/vagrant-docker-hosts-manager/commit/9336f878cebcfa98cfc615fd206014cf2cebe47a))
+
 ## [0.2.0](https://github.com/julienpoirou/vagrant-docker-hosts-manager/compare/v0.1.0...v0.2.0) (2025-08-20)
 
 

data/README.md

@@ -7,6 +7,7 @@
 [![License](https://img.shields.io/github/license/julienpoirou/vagrant-docker-hosts-manager.svg)](LICENSE.md)
 [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-%23FE5196.svg)](https://www.conventionalcommits.org)
 [![Renovate](https://img.shields.io/badge/Renovate-enabled-brightgreen.svg)](https://renovatebot.com)
+[![Total downloads](https://img.shields.io/gem/dt/vagrant-docker-hosts-manager?logo=rubygems&label=downloads)](https://rubygems.org/gems/vagrant-docker-hosts-manager)
 
 Vagrant plugin to **manage custom hostnames** by updating the local `hosts` file (Windows/Linux/macOS) for Docker‑based environments.
 

data/lib/vagrant-docker-hosts-manager/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/vagrant-docker-hosts-manager/command.rb

@@ -18,7 +18,7 @@ module VagrantDockerHostsManager
         i = raw_argv.index { |x| x =~ /\A(?:help|--help|-h)\z/ }
         cand = (i && raw_argv[i + 1]) ? raw_argv[i + 1] : nil
         (cand && cand !~ /\A-/) ? cand : nil
-      rescue
+      rescue StandardError
         nil
       end
 
@@ -274,7 +274,7 @@ module VagrantDockerHostsManager
         print_help(@env.ui, no_emoji: opts[:no_emoji])
         return 0
       end
-    rescue => e
+    rescue StandardError => e
       Util::Json.emit(action: "command", status: "error", error: e.message)
       1
     end
@@ -294,7 +294,7 @@ module VagrantDockerHostsManager
         $stdout.print(line)
         $stdout.flush
         answer = ($stdin.gets || "").to_s
-      rescue
+      rescue StandardError
         answer = ""
       ensure
         $stdout.puts ""

data/lib/vagrant-docker-hosts-manager/config.rb

@@ -3,13 +3,10 @@
 module VagrantDockerHostsManager
   class Config < Vagrant.plugin("2", :config)
     attr_accessor :domains
-
     attr_accessor :domain
-
     attr_accessor :container_name
-
     attr_accessor :ip
-
+    attr_accessor :locale
     attr_accessor :verbose
 
     def initialize
@@ -17,6 +14,7 @@ module VagrantDockerHostsManager
       @domain         = nil
       @container_name = nil
       @ip             = nil
+      @locale         = nil
       @verbose        = false
     end
 
@@ -24,6 +22,7 @@ module VagrantDockerHostsManager
 
     def validate(_machine)
       errors = []
+
       if (@domains.nil? || @domains.empty?) && (@domain.nil? || @domain.strip.empty?)
         errors << "You must configure at least one domain: " \
                   "`config.docker_hosts.domain = \"example.test\"` or set " \
@@ -38,6 +37,10 @@ module VagrantDockerHostsManager
         errors << "`ip` must be IPv4 like 172.28.0.10"
       end
 
+      if @locale && !%w[en fr].include?(@locale.to_s[0, 2].downcase)
+        errors << "`locale` must be 'en' or 'fr'."
+      end
+
       { "vagrant-docker-hosts-manager" => errors }
     end
   end

data/lib/vagrant-docker-hosts-manager/helpers.rb

@@ -4,6 +4,12 @@ require "i18n"
 
 module VagrantDockerHostsManager
   module UiHelpers
+    class MissingTranslationError < StandardError; end
+    class UnsupportedLocaleError   < StandardError; end
+
+    SUPPORTED      = [:en, :fr].freeze
+    OUR_NAMESPACES = %w[messages. errors. log. help.].freeze
+
     EMOJI = {
       success:  "✅",
       info:     "🔍",
@@ -18,21 +24,89 @@ module VagrantDockerHostsManager
 
     module_function
 
+    def setup_i18n!
+      return if defined?(@i18n_setup) && @i18n_setup
+
+      ::I18n.enforce_available_locales = false
+
+      base  = File.expand_path("../../locales", __dir__)
+      paths = Dir[File.join(base, "*.yml")]
+      ::I18n.load_path |= paths
+      ::I18n.available_locales = SUPPORTED
+
+      default = ((ENV["VDHM_LANG"] || ENV["LANG"] || "en")[0, 2] rescue "en").to_sym
+      ::I18n.default_locale = SUPPORTED.include?(default) ? default : :en
+
+      ::I18n.backend.load_translations
+      @i18n_setup = true
+    end
+
+    def set_locale!(lang)
+      setup_i18n!
+      sym = lang.to_s[0, 2].downcase.to_sym
+      unless SUPPORTED.include?(sym)
+        raise UnsupportedLocaleError,
+              "#{EMOJI[:error]} Unsupported language: #{sym}. Available: #{SUPPORTED.join(", ")}"
+      end
+      ::I18n.locale = sym
+      ::I18n.backend.load_translations
+    end
+
+    def setup_locale_from_config!(cfg)
+      lang = (cfg.respond_to?(:locale) ? cfg.locale : nil) || ENV["VDHM_LANG"]
+      return unless lang
+      set_locale!(lang)
+    rescue UnsupportedLocaleError
+      set_locale!("en")
+    end
+
+    def t(key, **opts)
+      ::I18n.t(key, **opts)
+    end
+
+    def t!(key, **opts)
+      setup_i18n!
+      k = key.to_s
+      if our_key?(k) && !::I18n.exists?(k, ::I18n.locale)
+        raise MissingTranslationError, "#{EMOJI[:error]} [#{::I18n.locale}] Missing translation for key: #{k}"
+      end
+      ::I18n.t(k, **opts)
+    end
+
+    def t_hash(key)
+      setup_i18n!
+      v = ::I18n.t(key, default: {})
+      v.is_a?(Hash) ? v : {}
+    end
+
+    def exists?(key)
+      ::I18n.exists?(key, ::I18n.locale)
+    end
+
+    def our_key?(k)
+      OUR_NAMESPACES.any? { |ns| k.start_with?(ns) }
+    end
+
     def e(key, no_emoji: false)
       return "" if no_emoji || ENV["VDHM_NO_EMOJI"] == "1"
       EMOJI[key] || ""
     end
 
-    def debug_enabled?
-      ENV["VDHM_DEBUG"].to_s == "1"
+    def say(ui, msg)
+      ui&.info(msg) || puts(msg)
+    end
+
+    def warn(ui, msg)
+      ui&.warn(msg) || puts(msg)
     end
 
-    def t(key, **opts)  = ::I18n.t(key, **opts)
-    def exists?(key)    = ::I18n.exists?(key, ::I18n.locale)
+    def error(ui, msg)
+      ui&.error(msg) || warn(ui, msg)
+    end
 
-    def say(ui, msg)    = (ui&.info(msg)  || puts(msg))
-    def warn(ui, msg)   = (ui&.warn(msg)  || puts(msg))
-    def error(ui, msg)  = (ui&.error(msg) || warn(ui, msg))
+    def debug_enabled?
+      ENV["VDHM_DEBUG"].to_s == "1"
+    end
 
     def debug(ui, msg)
       return unless debug_enabled?

data/lib/vagrant-docker-hosts-manager/plugin.rb

@@ -39,7 +39,6 @@ module VagrantDockerHostsManager
 
     [:machine_action_up, :machine_action_provision, :machine_action_reload].each do |hook_name|
       action_hook(:vdhm_apply, hook_name) do |hook|
-        hook.after(Vagrant::Action::Builtin::Provision, Action::Apply)
         hook.append(Action::Apply)
       end
     end
@@ -63,20 +62,20 @@ module VagrantDockerHostsManager
 
         entries = compute_entries(env, cfg, ui)
         if entries.empty?
-          ui.info(::I18n.t("messages.no_entries"))
-          return @app.call(env)
+          UiHelpers.say(ui, ::I18n.t("messages.no_entries"))
+          return
         end
 
         if dry
           Util::Json.emit(action: "apply", status: "dry-run", data: { owner: mid, entries: entries })
-          return @app.call(env)
+          return
         end
 
         hoster.apply(entries)
         Util::Json.emit(action: "apply", status: "success", data: { owner: mid, entries: entries })
-      rescue => e
+      rescue StandardError => e
         Util::Json.emit(action: "apply", status: "error", error: e.message, backtrace: e.backtrace&.first(3))
-        ui&.error("VDHM: #{e.message}") || puts("VDHM: #{e.message}")
+        UiHelpers.error(ui, "VDHM: #{e.message}")
       ensure
         @app.call(env)
       end
@@ -89,7 +88,7 @@ module VagrantDockerHostsManager
         cfg.domains.each do |domain, ip|
           next if domain.to_s.strip.empty?
           if ip.nil? || ip.to_s.strip.empty?
-            ui&.warn(::I18n.t("messages.missing_ip_for", domain: domain))
+            UiHelpers.warn(ui, ::I18n.t("messages.missing_ip_for", domain: domain))
             next
           end
           entries[domain] = ip
@@ -102,10 +101,10 @@ module VagrantDockerHostsManager
             end
           end
           if ip && !ip.strip.empty?
-            ui&.info(::I18n.t("messages.detected_ip", domain: cfg.domain, ip: ip))
+            UiHelpers.say(ui, ::I18n.t("messages.detected_ip", domain: cfg.domain, ip: ip))
             entries[cfg.domain] = ip
           else
-            ui&.warn(::I18n.t("messages.no_ip_found", domain: cfg.domain, container: cfg.container_name))
+            UiHelpers.warn(ui, ::I18n.t("messages.no_ip_found", domain: cfg.domain, container: cfg.container_name))
           end
         end
 
@@ -125,15 +124,14 @@ module VagrantDockerHostsManager
 
         if dry
           Util::Json.emit(action: "cleanup", status: "dry-run", data: { owner: mid })
-          return @app.call(env)
+          return
         end
 
         removed = hoster.remove!
         Util::Json.emit(action: "cleanup", status: "success", data: { owner: mid, removed: removed })
-        ui.info(::I18n.t("messages.cleaned"))
-      rescue => e
+      rescue StandardError => e
         Util::Json.emit(action: "cleanup", status: "error", error: e.message)
-        ui.error("VDHM: #{e.message}")
+        UiHelpers.error(ui, "VDHM: #{e.message}")
       ensure
         @app.call(env)
       end

data/lib/vagrant-docker-hosts-manager/util/docker.rb

@@ -9,19 +9,22 @@ module VagrantDockerHostsManager
 
       def ip_for_container(name)
         return nil if name.to_s.strip.empty?
-        cmd = %(docker inspect -f "{{range .NetworkSettings.Networks}}{{.IPAddress}} {{end}}" #{shell_escape(name)})
-        out, _err, status = Open3.capture3(cmd)
+        out, _err, status = Open3.capture3(
+          "docker", "inspect", "-f",
+          "{{range .NetworkSettings.Networks}}{{.IPAddress}} {{end}}",
+          name.to_s
+        )
         return nil unless status.success?
         out.split(/\s+/).find { |ip| ip =~ /\A\d{1,3}(\.\d{1,3}){3}\z/ }
-      rescue
+      rescue StandardError
         nil
       end
 
       def shell_escape(str)
         if Gem.win_platform?
-          %("#{str.gsub('"', '\"')}")
+          %('#{str.to_s.gsub("'", "''")}')
         else
-          %('#{str.gsub("'", "'\\\\''")}')
+          %('#{str.to_s.gsub("'", "'\\''")}')
         end
       end
     end

data/lib/vagrant-docker-hosts-manager/util/hosts_file.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "base64"
 require "tempfile"
 require "time"
 require "open3"
@@ -62,7 +63,11 @@ module VagrantDockerHostsManager
 
       def compose_block(entries, newline: "\n")
         start, stop = block_markers
-        ts = (Time.now.utc.iso8601 rescue Time.now.utc.to_s)
+        ts = begin
+               Time.now.utc.iso8601
+             rescue StandardError
+               Time.now.utc.to_s
+             end
 
         header = [
           start,
@@ -216,7 +221,7 @@ module VagrantDockerHostsManager
         begin
           data = File.binread(pth)
           UiHelpers.debug(@ui, "File.binread ok, bytes=#{data.bytesize}, encoding=#{data.encoding}")
-        rescue => e
+        rescue StandardError => e
           UiHelpers.debug(@ui, "File.binread error: #{e.class}: #{e.message}")
           data = nil
         end
@@ -253,7 +258,7 @@ module VagrantDockerHostsManager
                    .force_encoding("Windows-1252")
                    .encode(Encoding::UTF_8, invalid: :replace, undef: :replace, replace: "")
             UiHelpers.debug(@ui, "Transcoded via Windows-1252 -> UTF-8, encoding=#{data.encoding}")
-          rescue => e2
+          rescue StandardError => e2
             UiHelpers.debug(@ui, "Windows-1252 fallback failed: #{e2.class}: #{e2.message}")
             data = data.force_encoding(Encoding::UTF_8)
           end
@@ -265,7 +270,7 @@ module VagrantDockerHostsManager
         end
 
         data
-      rescue => e
+      rescue StandardError => e
         UiHelpers.debug(@ui, "read() fatal: #{e.class}: #{e.message}")
         ""
       end
@@ -429,7 +434,7 @@ module VagrantDockerHostsManager
         else
           begin
             Process.euid == 0
-          rescue
+          rescue StandardError
             false
           end
         end
@@ -446,31 +451,32 @@ module VagrantDockerHostsManager
         begin
           tf.binmode
           tf.write(content); tf.flush
-          system("sudo cp #{tf.path} #{real_path}") || raise("sudo copy failed")
+          system("sudo", "cp", tf.path, real_path) || raise("sudo copy failed")
         ensure
           tf.close!
         end
       end
 
       def write_windows(content)
-        tf = Tempfile.new("vdhm-hosts")
-        begin
-          tf.binmode
-          tf.write(content); tf.flush
-          ps = <<~POW
-            $ErrorActionPreference = "Stop"
-            Copy-Item -LiteralPath '#{tf.path.gsub("'", "''")}' -Destination '#{real_path.gsub("'", "''")}' -Force
-          POW
-          system(%{powershell -NoProfile -NonInteractive -Command #{Util::Docker.shell_escape(ps)}}) ||
-            system(
-              %{
-                powershell -NoProfile -NonInteractive -Command
-                "Start-Process PowerShell -Verb RunAs -ArgumentList #{Util::Docker.shell_escape(ps)}"
-              }.strip
-            ) || raise("elevated copy failed")
-        ensure
-          tf.close!
-        end
+        b64  = Base64.strict_encode64(
+          content.encode("UTF-8", invalid: :replace, undef: :replace, replace: "")
+        )
+        dest = real_path.gsub("'", "''")
+
+        ps = <<~POW
+          $ErrorActionPreference = "Stop"
+          $bytes = [System.Convert]::FromBase64String('#{b64}')
+          [System.IO.File]::WriteAllBytes('#{dest}', $bytes)
+        POW
+        encoded = Base64.strict_encode64(ps.encode("UTF-16LE"))
+        _out, _err, st = Open3.capture3("powershell", "-NoProfile", "-NonInteractive", "-EncodedCommand", encoded)
+        return if st.success?
+
+        elev_ps      = "Start-Process PowerShell -Verb RunAs -Wait " \
+                       "-ArgumentList '-NonInteractive', '-NoProfile', '-EncodedCommand', '#{encoded}'"
+        elev_encoded = Base64.strict_encode64(elev_ps.encode("UTF-16LE"))
+        system("powershell", "-NoProfile", "-NonInteractive", "-EncodedCommand", elev_encoded) ||
+          raise("elevated write failed")
       end
     end
   end

data/lib/vagrant-docker-hosts-manager/util/i18n.rb

@@ -1,34 +1,42 @@
 # frozen_string_literal: true
 
 require "i18n"
+require_relative "../helpers"
 
 module VagrantDockerHostsManager
   module Util
     module I18n
-      SUPPORTED = [:en, :fr].freeze
       @json = false
 
       module_function
 
       def setup!(env, forced: nil)
-        ::I18n.enforce_available_locales = false
+        UiHelpers.setup_i18n!
 
-        gem_root = File.expand_path("../..", __dir__)
-        paths    = Dir[File.join(gem_root, "locales", "*.yml")]
-        ::I18n.load_path |= paths
-        ::I18n.available_locales = SUPPORTED
-        ::I18n.backend.load_translations
+        if forced
+          begin
+            UiHelpers.set_locale!(forced)
+          rescue UiHelpers::UnsupportedLocaleError
+            UiHelpers.set_locale!("en")
+          end
+        end
 
-        lang = forced || ENV["VDHM_LANG"] || ENV["LANG"] || "en"
-        sym  = lang.to_s[0, 2].downcase.to_sym
-        ::I18n.locale = SUPPORTED.include?(sym) ? sym : :en
+        begin
+          cfg = env[:machine]&.config&.docker_hosts
+          if cfg&.respond_to?(:locale) && !cfg.locale.to_s.strip.empty?
+            UiHelpers.setup_locale_from_config!(cfg)
+          end
+        rescue StandardError
+          nil
+        end
 
         begin
-          if env[:ui] && env[:machine] && env[:machine].config.docker_hosts.respond_to?(:verbose) &&
+          if env[:ui] && env[:machine]&.config&.docker_hosts&.respond_to?(:verbose) &&
              env[:machine].config.docker_hosts.verbose
             env[:ui].info(::I18n.t("messages.lang_set", lang: ::I18n.locale))
           end
         rescue StandardError
+          nil
         end
       end
 

data/lib/vagrant-docker-hosts-manager/version.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 module VagrantDockerHostsManager
-  VERSION = begin
-    path = File.expand_path("VERSION", __dir__)
-    File.exist?(path) ? File.read(path).strip : "0.0.0"
-  rescue
-    "0.0.0"
+  unless defined?(VERSION)
+    VERSION = begin
+      path = File.expand_path("VERSION", __dir__)
+      File.exist?(path) ? File.read(path).strip : "0.0.0"
+    rescue StandardError
+      "0.0.0"
+    end
   end
 end

data/locales/en.yml

@@ -109,6 +109,7 @@ en:
   errors:
     no_machine: "No target machine found. Run this inside a Vagrant project or pass a VM name."
     not_admin: "Administrator/root privileges required to modify hosts at %{path}."
+    invalid_locale: "Locale must be 'en' or 'fr'."
 
   log:
     version_line: "vagrant-docker-hosts-manager version %{version}"

data/locales/fr.yml

@@ -110,6 +110,7 @@ fr:
   errors:
     no_machine: "Aucune machine cible trouvée. Lancez cette commande dans un projet Vagrant ou indiquez un nom de VM."
     not_admin: "Droits administrateur/root requis pour modifier le fichier hosts : %{path}."
+    invalid_locale: "Locale doit être en 'en' ou en 'fr'."
 
   log:
     version_line: "vagrant-docker-hosts-manager version %{version}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-docker-hosts-manager
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Julien Poirou
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-20 00:00:00.000000000 Z
+date: 2026-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n