mullvadrb 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 145854caf697386a84c9ff1ced322dc11ca656c2ee50b252e5359528b807055a
-  data.tar.gz: 601af470d15636674e8b8be60cb2d1205ab2ca17ff77e5826fea208cf9afe96a
+  metadata.gz: 15b1705d449260a54db9087125b5e4a9e0a6db3d548eb5d21dbeac3fb0031a83
+  data.tar.gz: ef45c9ffec12967471be56c4ca096e4af2bd1e4fde8011744bab1333bf17ea7b
 SHA512:
-  metadata.gz: e781d530cb8ae5d9ca922cd4add693f3e72b2308bb929e65a743aaa01f58f0dc600333eb8979b302faa70dd03f9d4ccf968f3dda000e2d92cb175f67a9605b9f
-  data.tar.gz: e4cbe9d04252f4ea84bc3cdf62fcd05ff728894c5c75d9df3dd20f7c71d541993af984de8f20ade77cd82b598756acb5e0a818946089e7ac90dcd0229edd0f63
+  metadata.gz: c78f22e514750210bab56f43fb18d06fa214c25832782ba6593ea915cdcc077235c25daf695ba6ea3aac10badc01e85b9a77d854073dcfaf35079ba6ddc33d85
+  data.tar.gz: 8234009792fa8e18dc7efef9a6e78e5441a5448086c0b7e5d42ab0f11fec3a618a1a8a305dfe0f8ac39cd3ba90d386cbc160ef32ea6204e5ae97e714a9f84447

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.0.3
+
+Minor cleanup in the code and updates the way status is displayed.
+
 # 0.0.2
 
 I added back the support for WireGuard, in cases you don't want to or can't install the `mullvad` cli app, which was the initial reason I built this. The first time you run the app, it's going to ask you which one you want to use, and save your preference in `~/.local/share/mullvadrb/backend.conf`. You can switch backends from the Main Menu on the app at any time.

data/README.md

@@ -13,7 +13,7 @@ Most of the basic functionality is available for either backend: Select a server
 You need to have a [Mullvad VPN](https://mullvad.net) account to use the app.
 
 > [!WARNING]
-> `mullvad` uses WireGuard, so if you change backends while connected to an OpenVPN server with `wg`, `mullvad` won't be able to disconnect from the OpenVPN.
+> `mullvad` uses WireGuard, so if you change backends while connected to an OpenVPN server with `wg`, `mullvad` won't be able to disconnect from the OpenVPN connection.
 > In general, it's a good idea to stick to one backend, and disconnect from the VPN before switching backends.
 > This might potentially be fixed in the future.
 

data/lib/mullvadrb/connection.rb

@@ -26,7 +26,26 @@ module Mullvadrb
       end
 
       def status
-        puts `mullvad status -v`
+        status = `mullvad status -v`
+        if status.start_with?('Disconnected')
+          status.gsub!('Disconnected', "\n⚠ 🚨  DISCONNECTED  🚨 c⚠")
+                .gsub!(/$/, "\n")
+        elsif status.start_with?('Connected')
+          status = status.split("\n")
+                         .sort
+                         .reject { |a| a == 'Connected' }
+                         .prepend("📡 Connected ✅ \n")
+                         .push("\n")
+                         .join("\n")
+        elsif status.start_with?('Connecting')
+          status = status.split("\n")
+                         .sort
+                         .reject { |a| a == 'Connecting' }
+                         .prepend("📞 Connecting ☎ \n")
+                         .push("\n")
+                         .join("\n")
+        end
+        status
       end
     end
   end

data/lib/mullvadrb/servers.rb

@@ -6,7 +6,7 @@ module Mullvadrb
       def update
         `mullvad relay update`
         data = `mullvad relay list`
-        country, city, info, flag, value = nil
+        country, city, info, flag = nil
 
         # Each line is either a country, a city or a server
         servers = data.split("\n").compact.reject(&:empty?).map do |s|
@@ -86,8 +86,8 @@ module Mullvadrb
 
       def emoji_from_code(code)
         code.upcase
-          .codepoints
-          .map { |c| (c + 127397).chr('utf-8') }.join
+            .codepoints
+            .map { |c| (c + 127_397).chr('utf-8') }.join
       end
 
       def load_servers

data/lib/mullvadrb.rb

@@ -96,8 +96,7 @@ module Mullvadrb
           Mullvadrb::Account.devices
         end
       rescue SystemExit, Interrupt
-        puts
-        exit
+        abort("\n\nTioraidh!\n")
       end
     end
   end

data/mullvadrb.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'mullvadrb'
-  s.version       = '0.0.2'
+  s.version       = '0.0.3'
   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,14 @@
 --- !ruby/object:Gem::Specification
 name: mullvadrb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Fernando Briano
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-23 00:00:00.000000000 Z
+date: 2024-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries