mullvadrb 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62025cd992ac7eb3131759b79871deac11d0005d138bc859ac0d25bce2cc0cc5
-  data.tar.gz: '0458bee533857011a1f195b710119c9f2e69a9d78a6051b01be9ff6da61834ba'
+  metadata.gz: 6d3b81115b6138a117c121c0725b47153364d8dc37f8515a3e933491360fa7d1
+  data.tar.gz: 795ea1aced15a02a1fd3bf4f43c154e63ac424ef039db87a888fac02070a2008
 SHA512:
-  metadata.gz: ab28e8cbbba0b1bb7428c9bc5ad2e2878cd55f3321dd081c0d16dc2222fb2e0840e196ff3ab08302a75bb2e0a9b2e3c196ecb2ce74e75b94d121128005aa1307
-  data.tar.gz: e8a804c0c70e5b9fd1e15cfe9a1b2c87af1d72616601ccdde35f57f63bf7fbd868ce5bf838023fef028081444f43a2bd682d557ae7f879fbd634be82c702e1e0
+  metadata.gz: 8c31f37cb83e5b10c0ede4534f6ba1590f0d51671b88fd9a710e5ac3dda1a69a51c0c88b197af82b6d40a62701d69afff3ca22bdf8ad817384852811ae57c62a
+  data.tar.gz: 7fd4c145ea2e57481a48ff103fb9703f70c353d049fee924d1917fcb606b67e47b096ec9390e849cc667e93b2ecc4028326367f35b1593ad1632474a136ba41b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.0.7
+
+- Fixes settings configuration, updates Settings code.
+
 # 0.0.6
 
 - Adds DNS Blockers functionality.

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.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
 
@@ -68,7 +69,7 @@ module Mullvadrb
         when 'status', 'disconnect', 'country', 'specific', 'random'
           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 +82,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.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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mullvadrb
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Fernando Briano