mullvadrb 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62025cd992ac7eb3131759b79871deac11d0005d138bc859ac0d25bce2cc0cc5
-  data.tar.gz: '0458bee533857011a1f195b710119c9f2e69a9d78a6051b01be9ff6da61834ba'
+  metadata.gz: 636dfebb481d356dca100281f92e627df90af8956116cc546a332e53ae9fdffe
+  data.tar.gz: 820ba7d690bf9a9bd12e6b4211caabba820cd4d783a9798df3fed8dc978d2323
 SHA512:
-  metadata.gz: ab28e8cbbba0b1bb7428c9bc5ad2e2878cd55f3321dd081c0d16dc2222fb2e0840e196ff3ab08302a75bb2e0a9b2e3c196ecb2ce74e75b94d121128005aa1307
-  data.tar.gz: e8a804c0c70e5b9fd1e15cfe9a1b2c87af1d72616601ccdde35f57f63bf7fbd868ce5bf838023fef028081444f43a2bd682d557ae7f879fbd634be82c702e1e0
+  metadata.gz: a32e2dc8e0e47f5faec592718e614af95b9f1c6001e82677f84439c7eff2f176d2dcbcb740b88fe735d1cb1365acab3e2dbcb561eeeba981f4da0897aec0ec63
+  data.tar.gz: 99fb2637205a6c3be55f72f21614b7a3b573e9c2d2afb0d5b0133077df21d9d9f5813cdce4bd28310f6c7be85bebb6819172cf803127b803ba972f9062d140ee

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.0.8
+
+- Better status format and message for blocked connection.
+- Adds allowing LAN access through mullvad-cli.
+
+# 0.0.7
+
+- Fixes settings configuration, updates Settings code.
+
 # 0.0.6
 
 - Adds DNS Blockers functionality.

data/config/locales/en.yml

@@ -7,7 +7,7 @@ en:
   change_backend: "Change backend"
   choose_country: "Choose country"
   choose_specific: "Choose specific"
-  connected: "📡 Connected ✅ \n"
+  connected: "📡 ✅ Connected"
   connecting: "📞 Connecting ☎ \n"
   connecting_to: "Connecting to %{server}"
   devices: "Devices"
@@ -33,3 +33,4 @@ en:
   language_es: "Spanish"
   dns_blockers: "DNS Blockers"
   dns_blockers_menu: "DNS Blockers - Press Enter↲ to confirm:"
+  lan: "Enable LAN access"

data/config/locales/es.yml

@@ -7,7 +7,7 @@ es:
   change_backend: "Cambiar backend"
   choose_country: "Elegir país"
   choose_specific: "Elegir específico"
-  connected: "📡 Conectado ✅ \n"
+  connected: "📡 ✅ Conectado"
   connecting: "📞 Conectando ☎ \n"
   connecting_to: "Conectándose a %{server}"
   devices: "Dispositivos"
@@ -33,3 +33,4 @@ es:
   language_es: "Español"
   dns_blockers: "Bloqueadores DNS"
   dns_blockers_menu: "Bloqueadores DNS - Presiona Enter↲ para confirmar:"
+  lan: "Habilitar acceso LAN"

data/lib/mullvadrb/account.rb

@@ -11,6 +11,7 @@ module Mullvadrb
 
       def devices
         puts `mullvad account list-devices`
+        puts
       end
     end
   end

data/lib/mullvadrb/command_manager.rb

@@ -50,5 +50,10 @@ module Mullvadrb
         Mullvadrb::Connection.connect
       end
     end
+
+    def lan
+      puts `mullvad lan set allow`
+      puts
+    end
   end
 end

data/lib/mullvadrb/connection.rb

@@ -1,3 +1,5 @@
+require 'countries'
+
 module Mullvadrb
   #
   # Manage Mullvad connect, disconnect and status
@@ -31,12 +33,15 @@ module Mullvadrb
           status.gsub!('Disconnected', I18n.t(:disconnected))
                 .gsub!(/$/, "\n")
         elsif status.start_with?('Connected')
-          status = status.split("\n")
-                         .sort
-                         .reject { |a| a == 'Connected' }
-                         .prepend(I18n.t(:connected))
+          status = status.split("\n").reject { |a| a == 'Connected' }
+          country_name = status.find { |a| a.match?('Visible location') }.split("\s")[2].gsub(',','')
+          country = ISO3166::Country.find_country_by_any_name(country_name)
+          status = status.prepend("#{I18n.t(:connected)} to #{country.emoji_flag} #{country.common_name}\n")
                          .push("\n")
                          .join("\n")
+        # Blocked: Failure to generate tunnel parameters: Failure to select a matching tunnel relay
+        elsif status.start_with?('Blocked')
+          status.prepend("\n🚧 ").concat("\n")
         elsif status.start_with?('Connecting')
           status = status.split("\n")
                          .sort

data/lib/mullvadrb/servers.rb

@@ -19,9 +19,9 @@ module Mullvadrb
           else
             regexp = /\(([a-z]{2})\)/ # Country (xx) - Country name + code and group code
             flag = s.match(regexp)[1]
-                     .upcase
-                     .codepoints
-                     .map { |c| (c + 127397).chr('utf-8') }.join
+                    .upcase
+                    .codepoints
+                    .map { |c| (c + 127_397).chr('utf-8') }.join
             country = s.gsub(regexp, '').strip
             next
           end

data/lib/mullvadrb/settings.rb

@@ -2,53 +2,51 @@ module Mullvadrb
   module Settings
     CONFIG_FILE = File.expand_path('~/.local/share/mullvadrb/mullvadrb.yml').freeze
 
-    class << self
-      def load_config
-        return unless File.exist?(CONFIG_FILE)
+    def load_config
+      return unless File.exist?(CONFIG_FILE)
 
-        config_file = YAML.load(File.read(CONFIG_FILE))
-        @backend = config_file[:backend]
-        @locale = config_file[:locale]
-        @wg = (@backend == 'wg')
-        load_servers unless @wg
-        require 'mullvadrb/wg_manager' if @wg
-      end
+      config_file = YAML.load(File.read(CONFIG_FILE))
+      @backend = config_file[:backend]
+      @locale = config_file[:locale]
+      @wg = (@backend == 'wg')
+      load_servers unless @wg
+      require 'mullvadrb/wg_manager' if @wg
+    end
 
-      def save_config!
-        dir = File.expand_path('~/.local/share/mullvadrb/')
-        system 'mkdir', '-p', dir unless File.exist?(dir)
-        config = {
-          backend: @backend,
-          locale: @locale || I18n.locale
-        }
-        File.open(CONFIG_FILE, 'w+') do |f|
-          f.write(config.to_yaml)
-        end
+    def save_config!
+      dir = File.expand_path('~/.local/share/mullvadrb/')
+      system 'mkdir', '-p', dir unless File.exist?(dir)
+      config = {
+        backend: @backend,
+        locale: @locale || I18n.locale
+      }
+      File.open(CONFIG_FILE, 'w+') do |f|
+        f.write(config.to_yaml)
       end
+    end
 
-      def load_servers
-        @servers = Mullvadrb::Servers.servers
-      end
+    def load_servers
+      @servers = Mullvadrb::Servers.servers
+    end
 
-      def ask_backend
-        backend = TTY::Prompt.new.select(I18n.t(:backend_which), cycle: true) do |menu|
-          menu.choice name: I18n.t(:backend_wg), value: 'wg'
-          menu.choice name: I18n.t(:backend_mullvad), value: 'mullvad'
-        end
-        @wg = (backend == 'wg')
-        require 'mullvadrb/wg_manager' if @wg
-        backend
+    def ask_backend
+      backend = TTY::Prompt.new.select(I18n.t(:backend_which), cycle: true) do |menu|
+        menu.choice name: I18n.t(:backend_wg), value: 'wg'
+        menu.choice name: I18n.t(:backend_mullvad), value: 'mullvad'
       end
+      @wg = (backend == 'wg')
+      require 'mullvadrb/wg_manager' if @wg
+      backend
+    end
 
-      def languages
-        language = TTY::Prompt.new.select(I18n.t(:language_which), cycle: true) do |menu|
-          menu.choice name: I18n.t(:language_en), value: 'en'
-          menu.choice name: I18n.t(:language_es), value: 'es'
-        end
-        @locale = language.to_sym
-        I18n.locale = @locale
-        save_config!
+    def languages
+      language = TTY::Prompt.new.select(I18n.t(:language_which), cycle: true) do |menu|
+        menu.choice name: I18n.t(:language_en), value: 'en'
+        menu.choice name: I18n.t(:language_es), value: 'es'
       end
+      @locale = language.to_sym
+      I18n.locale = @locale
+      save_config!
     end
   end
 end

data/lib/mullvadrb/wg_manager.rb

@@ -30,7 +30,13 @@ module Mullvadrb
       def specific
         connections = CONNECTIONS.map { |c| { name: "#{c[:value]} #{c[:name]}", value: c[:value] } }
         connect(
-          TTY::Prompt.new.select('Select configuration file', connections, cycle: true, per_page: 30, filter: true)
+          TTY::Prompt.new.select(
+            'Select configuration file',
+            connections,
+            cycle: true,
+            per_page: 30,
+            filter: true
+          )
         )
       end
 

data/lib/mullvadrb.rb

@@ -17,15 +17,16 @@ module Mullvadrb
   # Main object instantiated, saves backend, i18n if set, and persists.
   class Main
     include Mullvadrb::CommandManager
+    include Mullvadrb::Settings
 
     def initialize
       # To determine if we're using WireGuard or mullvad cli, attempt to load a pre-saved
       # configuration or prompt the user which one to use:
-      Mullvadrb::Settings.load_config
+      load_config
       @backend ||= Mullvadrb::Settings.ask_backend
       puts I18n.t(:backend_using, backend: @backend)
       I18n.locale = @locale || I18n.default_locale
-      Mullvadrb::Settings.save_config!
+      save_config!
       puts Mullvadrb::Connection.status
     end
 
@@ -45,7 +46,8 @@ module Mullvadrb
         "🔌 #{I18n.t(:disconnect)}" => 'disconnect',
         "⚙ #{I18n.t(:change_backend)}" => 'backend',
         "🗣 #{I18n.t(:languages)}" => 'languages',
-        "📟 #{I18n.t(:dns_blockers)}" => 'dns_blockers'
+        "📟 #{I18n.t(:dns_blockers)}" => 'dns_blockers',
+        "📞 #{I18n.t(:lan)}" => 'lan'
       }
     end
 
@@ -65,10 +67,10 @@ module Mullvadrb
         exit if selection == 'exit'
 
         case selection
-        when 'status', 'disconnect', 'country', 'specific', 'random'
+        when 'status', 'disconnect', 'country', 'specific', 'random', 'lan'
           send(selection)
         when 'backend'
-          Mullvadrb::Settings.ask_backend
+          ask_backend
         # Only when using mullvad cli and not wg:
         when 'update_servers'
           Mullvadrb::Servers.update
@@ -81,7 +83,7 @@ module Mullvadrb
         when 'account_devices'
           Mullvadrb::Account.devices
         when 'languages'
-          Mullvadrb::Settings.languages
+          languages
         when 'dns_blockers'
           Mullvadrb::DNS.blockers
         end

data/mullvadrb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'mullvadrb'
-  s.version       = '0.0.6'
+  s.version       = '0.0.8'
   s.summary       = 'A TUI to use with Mullvad VPN'
   s.description   = 'A Terminal User Interface to use with Mullvad VPN'
   s.authors       = ['Fernando Briano']
@@ -11,10 +11,11 @@ Gem::Specification.new do |s|
   s.license       = 'GPL-3.0-only'
   s.required_ruby_version = '>= 3.0'
   s.executables << 'mullvadrb'
-  s.add_dependency 'countries'
+  s.add_dependency 'countries', '~> 7'
   s.add_dependency 'i18n', '~> 1'
-  s.add_dependency 'tty-prompt'
+  s.add_dependency 'tty-prompt', '~> 0.23'
   s.metadata = {
+    'homepage_uri' => 'https://github.com/picandocodigo/mullvadrb/',
     'bug_tracker_uri' => 'https://github.com/picandocodigo/mullvadrb/issues',
     'changelog_uri' => 'https://github.com/picandocodigo/mullvadrb/blob/master/CHANGELOG.md',
     'source_code_uri' => 'https://github.com/picandocodigo/mullvadrb'

metadata

@@ -1,28 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: mullvadrb
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Fernando Briano
 bindir: bin
 cert_chain: []
-date: 2025-05-13 00:00:00.000000000 Z
+date: 2025-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -41,16 +41,16 @@ dependencies:
   name: tty-prompt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.23'
 description: A Terminal User Interface to use with Mullvad VPN
 email: fernando@picandocodigo.net
 executables:
@@ -79,6 +79,7 @@ homepage: https://github.com/picandocodigo/mullvad-ruby
 licenses:
 - GPL-3.0-only
 metadata:
+  homepage_uri: https://github.com/picandocodigo/mullvadrb/
   bug_tracker_uri: https://github.com/picandocodigo/mullvadrb/issues
   changelog_uri: https://github.com/picandocodigo/mullvadrb/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/picandocodigo/mullvadrb