mullvadrb 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ea238a3050a91a341b127d1592a584f5e3284c6a1d4a55efc54984f42721446
-  data.tar.gz: ee88ee974f1cf2d0c0d2b8ecb2cdd0ed137d36a0784ab18f562ca90da9939d03
+  metadata.gz: 6d3b81115b6138a117c121c0725b47153364d8dc37f8515a3e933491360fa7d1
+  data.tar.gz: 795ea1aced15a02a1fd3bf4f43c154e63ac424ef039db87a888fac02070a2008
 SHA512:
-  metadata.gz: 949b88bc19849a85ff9981b7e7e1e151cc766fb54289eb9f3d5fbf718654960c1dcfa66c5629f76b20f060f0c5be6e50e45498c9ef373617e253a726d731b00d
-  data.tar.gz: 2e5c26fb1ffc1a2395dd4b993acf6b5b6bda7a806f378e2bbf16c7391a293cb58888be308b141395724ee3563c9196b7318a2f60b04d92f20e56dab722c523b8
+  metadata.gz: 8c31f37cb83e5b10c0ede4534f6ba1590f0d51671b88fd9a710e5ac3dda1a69a51c0c88b197af82b6d40a62701d69afff3ca22bdf8ad817384852811ae57c62a
+  data.tar.gz: 7fd4c145ea2e57481a48ff103fb9703f70c353d049fee924d1917fcb606b67e47b096ec9390e849cc667e93b2ecc4028326367f35b1593ad1632474a136ba41b

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 0.0.7
+
+- Fixes settings configuration, updates Settings code.
+
+# 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.

data/config/locales/en.yml

@@ -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

@@ -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,52 @@
+module Mullvadrb
+  module Settings
+    CONFIG_FILE = File.expand_path('~/.local/share/mullvadrb/mullvadrb.yml').freeze
+
+    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

data/lib/mullvadrb.rb

@@ -6,7 +6,9 @@ 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
@@ -15,71 +17,24 @@ 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
+    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:
       load_config
-      @backend ||= ask_backend
+      @backend ||= Mullvadrb::Settings.ask_backend
       puts I18n.t(:backend_using, backend: @backend)
       I18n.locale = @locale || I18n.default_locale
       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
@@ -90,7 +45,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
 
@@ -127,6 +83,8 @@ module Mullvadrb
           Mullvadrb::Account.devices
         when 'languages'
           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.5'
+  s.version       = '0.0.7'
   s.summary       = 'A TUI to use with Mullvad VPN'
   s.description   = 'A Terminal User Interface to use with Mullvad VPN'
   s.authors       = ['Fernando Briano']

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mullvadrb
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Fernando Briano
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-21 00:00:00.000000000 Z
+date: 2025-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
@@ -71,7 +70,9 @@ 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
@@ -81,7 +82,6 @@ metadata:
   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
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -96,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: []