mullvadrb 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b06202dd0245fa8332044957b4915e35b1d5ef452e99e84a0c757bbe829b0c4
-  data.tar.gz: 7cce851045dacc5223bd0dde4ae672745d02f017fa4628339595c889c0d8b218
+  metadata.gz: 62025cd992ac7eb3131759b79871deac11d0005d138bc859ac0d25bce2cc0cc5
+  data.tar.gz: '0458bee533857011a1f195b710119c9f2e69a9d78a6051b01be9ff6da61834ba'
 SHA512:
-  metadata.gz: 5d93386a5e958dfce396a29da52b2c245799abf3816056889494dcc3315bb7e23087487dd113f07f407c781f72a757a240924c605c770cb35adfe970e3dac2e3
-  data.tar.gz: e1025f30b585fd45917c8d96ff837a4da6665019e8f982b217c237c923e86d3fd5d6c8ae176f91a560409a22291e070ca2981b26c5f5286efa4f0f17dce00a88
+  metadata.gz: ab28e8cbbba0b1bb7428c9bc5ad2e2878cd55f3321dd081c0d16dc2222fb2e0840e196ff3ab08302a75bb2e0a9b2e3c196ecb2ce74e75b94d121128005aa1307
+  data.tar.gz: e8a804c0c70e5b9fd1e15cfe9a1b2c87af1d72616601ccdde35f57f63bf7fbd868ce5bf838023fef028081444f43a2bd682d557ae7f879fbd634be82c702e1e0

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.0.6
+
+- Adds DNS Blockers functionality.
+- Refactors settings into `Mullvadrb::Settings` module.
+
+# 0.0.5
+
+- Updates display for menu, adds separation between main functionality and settings.
+- Sets the process name to 'mullvadrb'
+
 # 0.0.4
 
 Adds support for internationalization, translations can be added easily now. ¡Disponible en Español! The configuration file `backend.conf` has been replaced by `mullvadrb.yml` which will store the backend and locale preferences.

data/config/locales/en.yml

@@ -11,7 +11,7 @@ en:
   connecting: "📞 Connecting ☎ \n"
   connecting_to: "Connecting to %{server}"
   devices: "Devices"
-  disconnect: "Disconnect"
+  disconnect: "Disconnect\n"
   disconnected: "\n⚠ 🚨  DISCONNECTED  🚨⚠"
   error_connecting: "Error connecting"
   error_disconnecting: "Error disconnecting"
@@ -31,3 +31,5 @@ en:
   language_which: "Which language would you like to use?"
   language_en: "English"
   language_es: "Spanish"
+  dns_blockers: "DNS Blockers"
+  dns_blockers_menu: "DNS Blockers - Press Enter↲ to confirm:"

data/config/locales/es.yml

@@ -11,7 +11,7 @@ es:
   connecting: "📞 Conectando ☎ \n"
   connecting_to: "Conectándose a %{server}"
   devices: "Dispositivos"
-  disconnect: "Desconectar"
+  disconnect: "Desconectar\n"
   disconnected: "\n⚠ 🚨  DESCONECTADO  🚨⚠"
   error_connecting: "Error conectando"
   error_disconnecting: "Error desconectando "
@@ -31,3 +31,5 @@ es:
   language_which: "¿Qué idioma quieres usar?"
   language_en: "Inglés"
   language_es: "Español"
+  dns_blockers: "Bloqueadores DNS"
+  dns_blockers_menu: "Bloqueadores DNS - Presiona Enter↲ para confirmar:"

data/lib/mullvadrb/dns.rb

@@ -0,0 +1,49 @@
+module Mullvadrb
+  # Displays a menu to set DNS blockers
+  module DNS
+    class << self
+      def blockers
+        status = cli_status
+        selected = selected(status)
+
+        choices = TTY::Prompt.new.multi_select(I18n.t(:dns_blockers_menu)) do |menu|
+          menu.default(*selected) unless selected.empty?
+          status.each_key do |k|
+            menu.choice k.to_sym
+          end
+        end
+
+        puts `mullvad dns set default #{cli_parameters(choices)}`
+      end
+
+      # Sets the parameters as arguments for `mullvad dns set``
+      def cli_parameters(choices)
+        choices.map do |choice|
+          "--block-#{choice.gsub(' ', '-')}"
+        end.join(' ')
+      end
+
+      # Gets the current status to show ones already selected
+      def cli_status
+        status = {}
+        data = `mullvad dns get`.gsub('Block ', '').split("\n").reject { |a| a.start_with?('Custom') }
+        data.map { |a| a.split(':') }.map do |entry|
+          status[entry[0]] = convert_to_boolean(entry[1].strip)
+        end
+        status
+      end
+
+      # Get the index of the values that are already set (true). The multi_select uses `menu.default
+      # 1, 2, n` to display selected: To mark choice(s) as selected use the default option with
+      # either index(s) of the choice(s) starting from 1 or choice name(s) (why I add 1 to i)
+      def selected(status)
+        status.map.with_index { |(_, v), i| (i + 1) if v == true }.compact
+      end
+
+      # Convert string to booleans
+      def convert_to_boolean(string)
+        !!(string == 'true')
+      end
+    end
+  end
+end

data/lib/mullvadrb/settings.rb

@@ -0,0 +1,54 @@
+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)
+
+        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
+      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
+      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!
+      end
+    end
+  end
+end

data/lib/mullvadrb.rb

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
+Process.setproctitle('mullvadrb')
 
 require 'i18n'
 require 'tty-prompt'
 require 'mullvadrb/account'
 require 'mullvadrb/command_manager'
 require 'mullvadrb/connection'
+require 'mullvadrb/dns'
 require 'mullvadrb/servers'
+require 'mullvadrb/settings'
 require 'yaml'
 
 module Mullvadrb
@@ -14,71 +17,23 @@ module Mullvadrb
   # Main object instantiated, saves backend, i18n if set, and persists.
   class Main
     include Mullvadrb::CommandManager
-    CONFIG_FILE = File.expand_path('~/.local/share/mullvadrb/mullvadrb.yml').freeze
 
     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:
-      load_config
-      @backend ||= ask_backend
+      Mullvadrb::Settings.load_config
+      @backend ||= Mullvadrb::Settings.ask_backend
       puts I18n.t(:backend_using, backend: @backend)
       I18n.locale = @locale || I18n.default_locale
-      save_config!
+      Mullvadrb::Settings.save_config!
       puts Mullvadrb::Connection.status
     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
-    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!
-    end
-
-    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
-
-    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 main_menu
       choices = common_menu_choices
       choices.merge!(mullvad_cli_choices) unless @wg
       choices.merge!({ "❌ #{I18n.t(:exit)}" => 'exit' })
-      TTY::Prompt.new.select(I18n.t(:main_menu), choices, cycle: true, per_page: 12)
+      TTY::Prompt.new.select(I18n.t(:main_menu), choices, cycle: true, per_page: 20)
     end
 
     def common_menu_choices
@@ -89,7 +44,8 @@ module Mullvadrb
         "🗺 #{I18n.t(:choose_specific)}" => 'specific',
         "🔌 #{I18n.t(:disconnect)}" => 'disconnect',
         "⚙ #{I18n.t(:change_backend)}" => 'backend',
-        "🗣 #{I18n.t(:languages)}" => 'languages'
+        "🗣 #{I18n.t(:languages)}" => 'languages',
+        "📟 #{I18n.t(:dns_blockers)}" => 'dns_blockers'
       }
     end
 
@@ -112,7 +68,7 @@ module Mullvadrb
         when 'status', 'disconnect', 'country', 'specific', 'random'
           send(selection)
         when 'backend'
-          ask_backend
+          Mullvadrb::Settings.ask_backend
         # Only when using mullvad cli and not wg:
         when 'update_servers'
           Mullvadrb::Servers.update
@@ -125,7 +81,9 @@ module Mullvadrb
         when 'account_devices'
           Mullvadrb::Account.devices
         when 'languages'
-          languages
+          Mullvadrb::Settings.languages
+        when 'dns_blockers'
+          Mullvadrb::DNS.blockers
         end
       rescue SystemExit, Interrupt
         abort("\n\nTioraidh!\n")

data/mullvadrb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'mullvadrb'
-  s.version       = '0.0.4'
+  s.version       = '0.0.6'
   s.summary       = 'A TUI to use with Mullvad VPN'
   s.description   = 'A Terminal User Interface to use with Mullvad VPN'
   s.authors       = ['Fernando Briano']
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files`.split($/)
   s.require_paths = ['lib']
   s.homepage      = 'https://github.com/picandocodigo/mullvad-ruby'
-  s.license       = 'GPL-3.0'
+  s.license       = 'GPL-3.0-only'
   s.required_ruby_version = '>= 3.0'
   s.executables << 'mullvadrb'
   s.add_dependency 'countries'
@@ -17,7 +17,6 @@ Gem::Specification.new do |s|
   s.metadata = {
     'bug_tracker_uri' => 'https://github.com/picandocodigo/mullvadrb/issues',
     'changelog_uri' => 'https://github.com/picandocodigo/mullvadrb/blob/master/CHANGELOG.md',
-    'homepage_uri' => 'https://github.com/picandocodigo/mullvadrb',
     'source_code_uri' => 'https://github.com/picandocodigo/mullvadrb'
   }
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mullvadrb
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - Fernando Briano
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-07 00:00:00.000000000 Z
+date: 2025-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
@@ -71,18 +70,18 @@ files:
 - lib/mullvadrb/account.rb
 - lib/mullvadrb/command_manager.rb
 - lib/mullvadrb/connection.rb
+- lib/mullvadrb/dns.rb
 - lib/mullvadrb/servers.rb
+- lib/mullvadrb/settings.rb
 - lib/mullvadrb/wg_manager.rb
 - mullvadrb.gemspec
 homepage: https://github.com/picandocodigo/mullvad-ruby
 licenses:
-- GPL-3.0
+- GPL-3.0-only
 metadata:
   bug_tracker_uri: https://github.com/picandocodigo/mullvadrb/issues
   changelog_uri: https://github.com/picandocodigo/mullvadrb/blob/master/CHANGELOG.md
-  homepage_uri: https://github.com/picandocodigo/mullvadrb
   source_code_uri: https://github.com/picandocodigo/mullvadrb
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -97,8 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: A TUI to use with Mullvad VPN
 test_files: []