ruby-netmon-qt 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef00043ddd797d7eb54541887a7fc555b4cf364776c4816fd1c0595846b1bfa5
-  data.tar.gz: ae2776b9ba39d934ca00e2429e025b45b7dc2465a45ff63c3632051c4cadcbbc
+  metadata.gz: ec8bdd6a57990ad26094807149172feac0d65dc8790a3788216085f545090144
+  data.tar.gz: c07ba1349e86146dee02190e0d6aae81c008387c37f3c23a2e6c4aea08bcf8c2
 SHA512:
-  metadata.gz: 97834105620607927518ef39a38e3430cd22debf3c1e56637c850ab7ee1f63e774307764bf938e45512efd607d0b6d4fbc84bb016437d252281e5d6c12f0f371
-  data.tar.gz: c43afc8ec1c5d1fac3e97a8cce5fc90f8844d11727172ccdb57a31e54442e86a90228678003d47dd3eca41b1749c000ef9a4913c1430c66ab9bf61d32a31e430
+  metadata.gz: 23ce6e3b2d47265fc48fa4304a44b6915bf5b60bd511f0b659adba90adc7e0a239096e6e4db6819433c3dde6bcbcca6868deea45ebf9f9ba4363fd2c8e96b29c
+  data.tar.gz: 3f8b114bcfc95c85953c6280f49b4223d0b740ea979ef1c87d43d437024f6c2fc2e324106ff48dd2b1e46c1c3131065180e1985f08f501a8380a50d670127f7f

data/.rubocop.yml

@@ -8,3 +8,7 @@ AllCops:
   Exclude:
     - "bin/**/*"
     - "tmp/**/*"
+
+Style/GlobalVars:
+  AllowedVariables:
+    - '$qApp'

data/README.md

@@ -1,4 +1,4 @@
-# NetmonQt
+# RubyNetmonQt
 
 A simple network monitor on Linux.
 
@@ -18,7 +18,7 @@ gem install ruby-netmon-qt
 To launch the GUI:
 
 ```sh
-netmon-qt
+ruby-netmon-qt
 ```
 
 ## Screenshot

data/lib/netmon-qt/app/{components → views/mainwindow/components}/connstableview/sortfilterproxymodel.rb

@@ -1,4 +1,4 @@
-class ConnsTableView < RubyQt6::Bando::QWidget
+class MainWindowConnsTableView < RubyQt6::Bando::QWidget
   class SortFilterProxyModel < RubyQt6::Bando::QSortFilterProxyModel
     def filter_accepts_row(source_row, source_parent)
       {

data/lib/netmon-qt/app/{components → views/mainwindow/components}/connstableview/statusbar.rb

@@ -1,4 +1,4 @@
-class ConnsTableView < RubyQt6::Bando::QWidget
+class MainWindowConnsTableView < RubyQt6::Bando::QWidget
   class StatusBar < RubyQt6::Bando::QWidget
     def initialize(storeproxymodel)
       super()

data/lib/netmon-qt/app/{components → views/mainwindow/components}/connstableview/store.rb

@@ -1,4 +1,4 @@
-class ConnsTableView < RubyQt6::Bando::QWidget
+class MainWindowConnsTableView < RubyQt6::Bando::QWidget
   # rubocop:disable Layout
   COLUMN_CONNECTION_KEY = 0
   COLUMN_PROCESS_NAME   = 1

data/lib/netmon-qt/app/{components → views/mainwindow/components}/connstableview.rb

@@ -2,7 +2,7 @@ require_relative "connstableview/sortfilterproxymodel"
 require_relative "connstableview/statusbar"
 require_relative "connstableview/store"
 
-class ConnsTableView < RubyQt6::Bando::QWidget
+class MainWindowConnsTableView < RubyQt6::Bando::QWidget
   QSS_BUTTON_AUTOREFRESH = "
     QPushButton {
       background: #EFF0F1;
@@ -24,9 +24,6 @@ class ConnsTableView < RubyQt6::Bando::QWidget
     slot "_on_autorefreshbtn_toggled(bool)"
     slot "_on_autorefresh_timer_timeout()"
     slot "_on_tableview_custom_context_menu_requested(QPoint)"
-    slot "_on_endprocess_action_triggered()"
-    slot "_on_whois_action_triggered()"
-    slot "_on_copy_action_triggered()"
   end
 
   attr_reader :processfilter, :protocolfilter, :statefilter, :userfilter
@@ -59,15 +56,13 @@ class ConnsTableView < RubyQt6::Bando::QWidget
   end
 
   def initialize_actions
-    @endprocess_action = initialize_actions_act(QIcon::ThemeIcon::ApplicationExit, "End Process", :_on_endprocess_action_triggered)
-    @whois_action = initialize_actions_act(QIcon::ThemeIcon::EditFind, "", :_on_whois_action_triggered)
-    @copy_action = initialize_actions_act(QIcon::ThemeIcon::EditCopy, "", :_on_copy_action_triggered)
+    @endprocess_action = initialize_actions_act(QIcon::ThemeIcon::ApplicationExit, "End Process")
+    @whois_action = initialize_actions_act(QIcon::ThemeIcon::EditFind, "")
+    @copy_action = initialize_actions_act(QIcon::ThemeIcon::EditCopy, "")
   end
 
-  def initialize_actions_act(icon, text, slot)
-    action = QAction.new(QIcon.from_theme(icon), text, self)
-    action.triggered.connect(self, slot)
-    action
+  def initialize_actions_act(icon, text)
+    QAction.new(QIcon.from_theme(icon), text, self)
   end
 
   def initialize_toolbar
@@ -201,40 +196,36 @@ class ConnsTableView < RubyQt6::Bando::QWidget
     menu.set_attribute(Qt::WA_DeleteOnClose)
 
     pid = @lastindex.sibling_at_column(COLUMN_PROCESS_ID).data.value.to_s
-    remote_address = @lastindex.sibling_at_column(COLUMN_REMOTE_ADDRESS).data.value
-    remote_address = remote_address.contains(".") ? remote_address : "#{remote_address[0, 12]}..."
+    remote_address = @lastindex.sibling_at_column(COLUMN_REMOTE_ADDRESS).data.value.to_s
+    remote_address = remote_address.include?(".") ? remote_address : "#{remote_address[0, 12]}..."
+    text = @lastindex.data.value.to_s
 
     @endprocess_action.set_enabled(pid.to_i.nonzero?)
     @whois_action.set_text("Whois #{remote_address} - via IPinfo")
-    @copy_action.set_text("Copy \"#{@lastindex.data.value}\"")
+    @copy_action.set_text("Copy \"#{text}\"")
 
     menu.add_action(@endprocess_action)
     menu.add_separator
     menu.add_action(@whois_action)
     menu.add_action(@copy_action)
 
-    menu.exec(@tableview.viewport.map_to_global(position))
+    case menu.exec(@tableview.viewport.map_to_global(position))
+    when @endprocess_action then _on_endprocess_action_triggered(pid)
+    when @whois_action then _on_whois_action_triggered(remote_address)
+    when @copy_action then _on_copy_action_triggered(text)
+    end
   end
 
-  def _on_endprocess_action_triggered
-    return unless @lastindex.valid?
-
-    pid = @lastindex.sibling_at_column(COLUMN_PROCESS_ID).data.value
+  def _on_endprocess_action_triggered(pid)
     QProcess.execute("kill", QStringList.new << "-9" << pid)
   end
 
-  def _on_whois_action_triggered
-    return unless @lastindex.valid?
-
-    remote_address = @lastindex.sibling_at_column(COLUMN_REMOTE_ADDRESS).data.value
+  def _on_whois_action_triggered(remote_address)
     url = QUrl.new("https://ipinfo.io/#{remote_address}")
     QDesktopServices.open_url(url)
   end
 
-  def _on_copy_action_triggered
-    return unless @lastindex.valid?
-
-    text = @lastindex.data.value
+  def _on_copy_action_triggered(text)
     QApplication.clipboard.set_text(text)
   end
 end

data/lib/netmon-qt/app/views/mainwindow/ui.rb

@@ -0,0 +1,28 @@
+class MainWindow < RubyQt6::Bando::QMainWindow
+  private
+
+  def initialize_ui
+    initialize_central_widget
+    initialize_statusbar
+
+    set_context_menu_policy(Qt::NoContextMenu)
+  end
+
+  def initialize_central_widget
+    @connstableview = MainWindowConnsTableView.new
+
+    centralwidget = QWidget.new
+    mainlayout = QHBoxLayout.new(centralwidget)
+    mainlayout.add_widget(@connstableview)
+
+    set_central_widget(centralwidget)
+  end
+
+  def initialize_statusbar
+    statusbar = QStatusBar.new
+    statusbar.set_contents_margins(12, 0, 12, 0)
+    statusbar.add_permanent_widget(@connstableview.statusbar, 1)
+
+    set_status_bar(statusbar)
+  end
+end

data/lib/netmon-qt/app/views/mainwindow.rb

@@ -1,3 +1,6 @@
+require_relative "mainwindow/components"
+require_relative "mainwindow/ui"
+
 class MainWindow < RubyQt6::Bando::QMainWindow
   q_object do
   end
@@ -5,36 +8,12 @@ class MainWindow < RubyQt6::Bando::QMainWindow
   def initialize
     super
 
-    initialize_central_widget
-    initialize_statusbar
-
-    set_context_menu_policy(Qt::NoContextMenu)
+    initialize_ui
     NetmonQt.settings.GET_mainwindow_geometry_and_restore_to(self)
   end
 
   def close_event(evt)
     NetmonQt.settings.PUT_mainwindow_geometry(self)
-
     _close_event(evt)
   end
-
-  private
-
-  def initialize_central_widget
-    @connstableview = ConnsTableView.new
-
-    centralwidget = QWidget.new
-    mainlayout = QHBoxLayout.new(centralwidget)
-    mainlayout.add_widget(@connstableview)
-
-    set_central_widget(centralwidget)
-  end
-
-  def initialize_statusbar
-    statusbar = QStatusBar.new
-    statusbar.set_contents_margins(12, 0, 12, 0)
-    statusbar.add_permanent_widget(@connstableview.statusbar, 1)
-
-    set_status_bar(statusbar)
-  end
 end

data/lib/netmon-qt/app.rb

@@ -1,7 +1,6 @@
 require_relative "config"
 require_relative "lib"
 
-require_relative "app/components"
 require_relative "app/services"
 require_relative "app/views"
 
@@ -17,7 +16,8 @@ module NetmonQt
     end
 
     def exec
-      Contrib::SigHandler.new(@app)
+      handler = Ctrlc::Handler.new
+      handler.exec
 
       @mainwindow.show
       @app.exec

data/lib/netmon-qt/lib/{contrib/sighandler.rb → ctrlc/handler.rb}

@@ -1,12 +1,14 @@
-module Contrib
-  class SigHandler < RubyQt6::Bando::QObject
+module Ctrlc
+  class Handler < RubyQt6::Bando::QObject
     q_object do
       slot "_noop()"
     end
 
-    def initialize(parent)
-      super
+    def initialize
+      super($qApp)
+    end
 
+    def exec
       ["INT", "TERM"].each do |sig|
         Signal.trap(sig) { |_| QApplication.quit }
       end

data/lib/netmon-qt/lib/ctrlc.rb

@@ -0,0 +1 @@
+require_relative "ctrlc/handler"

data/lib/netmon-qt/lib.rb

@@ -1,2 +1,2 @@
-require_relative "lib/contrib"
+require_relative "lib/ctrlc"
 require_relative "lib/netmon"

data/lib/netmon-qt/version.rb

@@ -1,3 +1,3 @@
 module NetmonQt
-  VERSION = "1.0.1"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-netmon-qt
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
 platform: ruby
 authors:
 - John Doe
@@ -37,11 +37,10 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.0'
-description: A simple network monitor on Linux.
 email:
 - johndoe@example.com
 executables:
-- netmon-qt
+- ruby-netmon-qt
 extensions: []
 extra_rdoc_files: []
 files:
@@ -50,7 +49,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- exe/netmon-qt
+- exe/ruby-netmon-qt
 - lib/netmon-qt.rb
 - lib/netmon-qt/app.rb
 - lib/netmon-qt/app/assets/README.md
@@ -326,21 +325,22 @@ files:
 - lib/netmon-qt/app/assets/flags/za.svg
 - lib/netmon-qt/app/assets/flags/zm.svg
 - lib/netmon-qt/app/assets/flags/zw.svg
-- lib/netmon-qt/app/components.rb
-- lib/netmon-qt/app/components/connstableview.rb
-- lib/netmon-qt/app/components/connstableview/sortfilterproxymodel.rb
-- lib/netmon-qt/app/components/connstableview/statusbar.rb
-- lib/netmon-qt/app/components/connstableview/store.rb
 - lib/netmon-qt/app/services.rb
 - lib/netmon-qt/app/services/conns_lookup_service.rb
 - lib/netmon-qt/app/views.rb
 - lib/netmon-qt/app/views/mainwindow.rb
+- lib/netmon-qt/app/views/mainwindow/components.rb
+- lib/netmon-qt/app/views/mainwindow/components/connstableview.rb
+- lib/netmon-qt/app/views/mainwindow/components/connstableview/sortfilterproxymodel.rb
+- lib/netmon-qt/app/views/mainwindow/components/connstableview/statusbar.rb
+- lib/netmon-qt/app/views/mainwindow/components/connstableview/store.rb
+- lib/netmon-qt/app/views/mainwindow/ui.rb
 - lib/netmon-qt/config.rb
 - lib/netmon-qt/config/initializers/qt6.rb
 - lib/netmon-qt/config/settings.rb
 - lib/netmon-qt/lib.rb
-- lib/netmon-qt/lib/contrib.rb
-- lib/netmon-qt/lib/contrib/sighandler.rb
+- lib/netmon-qt/lib/ctrlc.rb
+- lib/netmon-qt/lib/ctrlc/handler.rb
 - lib/netmon-qt/lib/netmon.rb
 - lib/netmon-qt/lib/netmon/connection.rb
 - lib/netmon-qt/lib/netmon/localaddresschecker.rb
@@ -348,11 +348,9 @@ files:
 - lib/netmon-qt/version.rb
 - misc/screenshots/mainwindow.png
 homepage: https://github.com/souk4711/ruby-netmon-qt
-licenses: []
-metadata:
-  homepage_uri: https://github.com/souk4711/ruby-netmon-qt
-  source_code_uri: https://github.com/souk4711/ruby-netmon-qt
-  changelog_uri: https://github.com/souk4711/ruby-netmon-qt
+licenses:
+- GPL-3.0-only
+metadata: {}
 rdoc_options: []
 require_paths:
 - lib

data/lib/netmon-qt/lib/contrib.rb

@@ -1 +0,0 @@
-require_relative "contrib/sighandler"