ruby-pass-qt 2.0.7 → 2.1.0

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

@@ -0,0 +1,39 @@
+class MainWindow < RubyQt6::Bando::QMainWindow
+  private
+
+  def initialize_ui
+    initialize_toolbar
+    initialize_central_widget
+
+    set_context_menu_policy(Qt::NoContextMenu)
+  end
+
+  def initialize_toolbar
+    browse_action = QAction.new(QIcon.from_theme(QIcon::ThemeIcon::Computer), "Browse", self)
+    browse_action.set_tool_tip("Browse password stores")
+    browse_action.triggered.connect(self, :_on_browse_action_triggered)
+
+    toolbar = add_tool_bar("ToolBar")
+    toolbar.set_object_name("mainwindow_toolbar")
+    toolbar.set_movable(false)
+    toolbar.add_action(browse_action)
+  end
+
+  def initialize_central_widget
+    @passlistwidget = MainWindowPassListWidget.new
+    @passinfowidget = MainWindowPassInfoWidget.new
+
+    @passlistwidget.store_changed.connect(@passinfowidget, :activate_infocard)
+    @passlistwidget.nil_selected.connect(@passinfowidget, :activate_infocard)
+    @passlistwidget.passfile_selected.connect(@passinfowidget, :activate_passfilecard)
+    @passlistwidget.passfolder_selected.connect(@passinfowidget, :activate_passfoldercard)
+
+    centralwidget = QWidget.new
+    mainlayout = QHBoxLayout.new(centralwidget)
+    mainlayout.add_widget(@passlistwidget)
+    mainlayout.add_widget(@passinfowidget)
+    mainlayout.set_stretch(0, 2)
+    mainlayout.set_stretch(1, 3)
+    set_central_widget(centralwidget)
+  end
+end

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

@@ -1,84 +1,28 @@
+require_relative "mainwindow/components"
+require_relative "mainwindow/ui"
+
 class MainWindow < RubyQt6::Bando::QMainWindow
   q_object do
     slot "_on_browse_action_triggered()"
-    slot "_on_browsestoresdialog_stores_changed()"
-    slot "_on_passlistwidget_store_changed(QString)"
-    slot "_on_passlistwidget_nil_selected(QString)"
-    slot "_on_passlistwidget_passfile_selected(QString,QString)"
-    slot "_on_passlistwidget_passfolder_selected(QString,QString)"
   end
 
   def initialize
     super
 
-    initialize_toolbar
-    initialize_central_widget
-
-    set_context_menu_policy(Qt::NoContextMenu)
+    initialize_ui
     PassQt.settings.GET_mainwindow_geometry_and_restore_to(self)
   end
 
   def close_event(evt)
     PassQt.settings.PUT_mainwindow_geometry(self)
-
     _close_event(evt)
   end
 
   private
 
-  def initialize_toolbar
-    browse_action = QAction.new(QIcon.from_theme(QIcon::ThemeIcon::Computer), "Browse", self)
-    browse_action.set_tool_tip("Browse password stores")
-    browse_action.triggered.connect(self, :_on_browse_action_triggered)
-
-    toolbar = add_tool_bar("ToolBar")
-    toolbar.set_object_name("mainwindow_toolbar")
-    toolbar.set_movable(false)
-    toolbar.add_action(browse_action)
-  end
-
-  def initialize_central_widget
-    @passlistwidget = PassListWidget.new
-    @passlistwidget.store_changed.connect(self, :_on_passlistwidget_store_changed)
-    @passlistwidget.nil_selected.connect(self, :_on_passlistwidget_nil_selected)
-    @passlistwidget.passfile_selected.connect(self, :_on_passlistwidget_passfile_selected)
-    @passlistwidget.passfolder_selected.connect(self, :_on_passlistwidget_passfolder_selected)
-
-    @passinfowidget = PassInfoWidget.new
-
-    centralwidget = QWidget.new
-    mainlayout = QHBoxLayout.new(centralwidget)
-    mainlayout.add_widget(@passlistwidget)
-    mainlayout.add_widget(@passinfowidget)
-    mainlayout.set_stretch(0, 2)
-    mainlayout.set_stretch(1, 3)
-
-    set_central_widget(centralwidget)
-  end
-
   def _on_browse_action_triggered
     dialog = BrowseStoresDialog.new
-    dialog.stores_changed.connect(self, :_on_browsestoresdialog_stores_changed)
+    dialog.stores_changed.connect(@passlistwidget, :refresh)
     dialog.show
   end
-
-  def _on_browsestoresdialog_stores_changed
-    @passlistwidget.refresh
-  end
-
-  def _on_passlistwidget_store_changed(_store)
-    @passinfowidget.use_infocard
-  end
-
-  def _on_passlistwidget_nil_selected(_store)
-    @passinfowidget.use_infocard
-  end
-
-  def _on_passlistwidget_passfile_selected(store, passname)
-    @passinfowidget.use_passfilecard(store, passname)
-  end
-
-  def _on_passlistwidget_passfolder_selected(store, passname)
-    @passinfowidget.use_passfoldercard(store, passname)
-  end
 end

data/lib/pass-qt/app/views/newonetimepassworddialog/ui.rb

@@ -0,0 +1,90 @@
+class NewOneTimePasswordDialog < RubyQt6::Bando::QDialog
+  private
+
+  def initialize_ui
+    initialize_form
+    initialize_btngroup
+    initialize_layout
+
+    set_attribute(Qt::WA_DeleteOnClose)
+    set_modal(true)
+  end
+
+  def initialize_form
+    titlelabel = QLabel.new("<center><b>Insert New OTP Password</b></center>")
+
+    @errinfolabel = QLabel.new("")
+    @errinfolabel.set_style_sheet("background: white; color: red; padding: 8px; margin: 4px;")
+    @errinfolabel.set_hidden(true)
+
+    placeholder = (@folder == "") ? "example.com-otp" : "#{@folder}/example.com-otp"
+    @passnamelabel = initialize_form_label("File")
+    @passnameinput = initialize_form_inputfield(placeholder)
+    @passnameinput.set_text(placeholder)
+    set_focus_proxy(@passnameinput)
+
+    @passwordlabel = initialize_form_label("OTP URI")
+    @passwordinput = initialize_form_inputfield("otpauth://totp/GitHub...")
+
+    @form = QWidget.new
+    @form.set_object_name("newonetimepassworddialog_form")
+    @form.set_style_sheet("
+      #newonetimepassworddialog_form {
+        min-width: 600px;
+      }
+    ")
+
+    layout = QGridLayout.new(@form)
+    layout.add_widget(titlelabel, 0, 0, 1, 2)
+    layout.set_row_minimum_height(1, 10)
+    layout.add_widget(@errinfolabel, 2, 0, 1, 2)
+    layout.add_widget(@passnamelabel, 3, 0)
+    layout.add_widget(@passnameinput, 3, 1)
+    layout.add_widget(@passwordlabel, 4, 0)
+    layout.add_widget(@passwordinput, 4, 1)
+  end
+
+  def initialize_form_label(text)
+    label = QLabel.new(text)
+    label.set_alignment(Qt::AlignRight)
+    label.set_style_sheet("min-width: 80px; padding-right: 4px;")
+    label
+  end
+
+  def initialize_form_inputfield(placeholder)
+    input = QLineEdit.new
+    input.set_placeholder_text(placeholder)
+    input
+  end
+
+  def initialize_btngroup
+    @btngroup = QDialogButtonBox.new(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal)
+    @btngroup.accepted.connect(self, :_on_okbutton_clicked)
+    @btngroup.rejected.connect(self, :_on_cancelbutton_clicked)
+
+    okbutton = @btngroup.button(QDialogButtonBox::Ok)
+    okbutton.set_text("Create")
+    okbutton.set_default(true)
+    okbutton.set_auto_default(true)
+
+    cancelbutton = @btngroup.button(QDialogButtonBox::Cancel)
+    cancelbutton.set_auto_default(true)
+  end
+
+  def initialize_layout
+    mainlayout = QVBoxLayout.new(self)
+    mainlayout.add_widget(@form)
+    mainlayout.add_widget(@btngroup)
+  end
+
+  def update_form_errinfo(info)
+    if info.empty?
+      @errinfolabel.set_text("")
+      @errinfolabel.set_hidden(true)
+      return
+    end
+
+    @errinfolabel.set_text(info)
+    @errinfolabel.set_hidden(false)
+  end
+end

data/lib/pass-qt/app/views/newonetimepassworddialog.rb

@@ -1,3 +1,5 @@
+require_relative "newonetimepassworddialog/ui"
+
 class NewOneTimePasswordDialog < RubyQt6::Bando::QDialog
   q_object do
     slot "_on_okbutton_clicked()"
@@ -11,92 +13,26 @@ class NewOneTimePasswordDialog < RubyQt6::Bando::QDialog
     @folder = folder
     @on_success = on_success
 
-    initialize_form
-    initialize_btngroup
-
-    mainlayout = QVBoxLayout.new(self)
-    mainlayout.add_widget(@form)
-    mainlayout.add_widget(@btngroup)
-
-    set_attribute(Qt::WA_DeleteOnClose)
-    set_modal(true)
+    initialize_ui
   end
 
   private
 
-  def initialize_form
-    titlelabel = QLabel.new("<center><b>Insert New OTP Password</b></center>")
-
-    @errinfolabel = QLabel.new("")
-    @errinfolabel.set_style_sheet("background: white; color: red; padding: 8px; margin: 4px;")
-    @errinfolabel.set_hidden(true)
-
-    placeholder = (@folder == "") ? "example.com-otp" : "#{@folder}/example.com-otp"
-    @passnamelabel = initialize_form_label("File")
-    @passnameinput = initialize_form_inputfield(placeholder)
-    @passnameinput.set_text(placeholder)
-    set_focus_proxy(@passnameinput)
-
-    @passwordlabel = initialize_form_label("OTP URI")
-    @passwordinput = initialize_form_inputfield("otpauth://totp/GitHub...")
-
-    @form = QWidget.new
-    @form.set_object_name("newonetimepassworddialog_form")
-    @form.set_style_sheet("
-      #newonetimepassworddialog_form {
-        min-width: 600px;
-      }
-    ")
-
-    layout = QGridLayout.new(@form)
-    layout.add_widget(titlelabel, 0, 0, 1, 2)
-    layout.set_row_minimum_height(1, 10)
-    layout.add_widget(@errinfolabel, 2, 0, 1, 2)
-    layout.add_widget(@passnamelabel, 3, 0)
-    layout.add_widget(@passnameinput, 3, 1)
-    layout.add_widget(@passwordlabel, 4, 0)
-    layout.add_widget(@passwordinput, 4, 1)
-  end
-
-  def initialize_form_label(text)
-    label = QLabel.new(text)
-    label.set_alignment(Qt::AlignRight)
-    label.set_style_sheet("min-width: 80px; padding-right: 4px;")
-    label
-  end
-
-  def initialize_form_inputfield(placeholder)
-    input = QLineEdit.new
-    input.set_placeholder_text(placeholder)
-    input
-  end
-
-  def initialize_btngroup
-    @btngroup = QDialogButtonBox.new(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal)
-    @btngroup.accepted.connect(self, :_on_okbutton_clicked)
-    @btngroup.rejected.connect(self, :_on_cancelbutton_clicked)
-
-    okbutton = @btngroup.button(QDialogButtonBox::Ok)
-    okbutton.set_text("Create")
-    okbutton.set_default(true)
-    okbutton.set_auto_default(true)
-
-    cancelbutton = @btngroup.button(QDialogButtonBox::Cancel)
-    cancelbutton.set_auto_default(true)
-  end
-
-  def update_form_errinfo(info)
-    if info.empty?
-      @errinfolabel.set_text("")
-      @errinfolabel.set_hidden(true)
-      return
-    end
+  def _on_okbutton_clicked
+    return unless _on_okbutton_clicked_validate_form
 
-    @errinfolabel.set_text(info)
-    @errinfolabel.set_hidden(false)
+    store = @store
+    passname = @passnameinput.text
+    password = @passwordinput.text
+    Pass.otp_insert(store, passname, password, on_success: ->(_) {
+      @on_success.call(passname)
+      close
+    }, on_failure: ->(data) {
+      update_form_errinfo(data["stderr"].strip)
+    })
   end
 
-  def validate_form
+  def _on_okbutton_clicked_validate_form
     update_form_errinfo("")
 
     {
@@ -112,20 +48,6 @@ class NewOneTimePasswordDialog < RubyQt6::Bando::QDialog
     true
   end
 
-  def _on_okbutton_clicked
-    return unless validate_form
-
-    store = @store
-    passname = @passnameinput.text
-    password = @passwordinput.text
-    Pass.otp_insert(store, passname, password, on_success: ->(_) {
-      @on_success.call(passname)
-      close
-    }, on_failure: ->(data) {
-      update_form_errinfo(data["stderr"].strip)
-    })
-  end
-
   def _on_cancelbutton_clicked
     close
   end

data/lib/pass-qt/app/views/newpassworddialog/ui.rb

@@ -0,0 +1,111 @@
+class NewPasswordDialog < RubyQt6::Bando::QDialog
+  private
+
+  def initialize_ui
+    initialize_form
+    initialize_btngroup
+    initialize_layout
+
+    set_attribute(Qt::WA_DeleteOnClose)
+    set_modal(true)
+  end
+
+  def initialize_form
+    titlelabel = QLabel.new("<center><b>Insert New Password</b></center>")
+
+    @errinfolabel = QLabel.new("")
+    @errinfolabel.set_style_sheet("background: white; color: red; padding: 8px; margin: 4px;")
+    @errinfolabel.set_hidden(true)
+
+    placeholder = (@folder == "") ? "example.com" : "#{@folder}/example.com"
+    @passnamelabel = initialize_form_label("File")
+    @passnameinput = initialize_form_inputfield(placeholder)
+    @passnameinput.set_text(placeholder)
+    set_focus_proxy(@passnameinput)
+
+    @passwordlabel = initialize_form_label("Password")
+    @passwordinput = initialize_form_inputfield("")
+    initialize_form_inputfield_viewaction(@passwordinput)
+
+    @passwordinput.set_echo_mode(QLineEdit::Password)
+    Pass.pwgen(16, on_success: ->(data) {
+      @passwordinput.set_text(data["stdout"].lines[0].strip)
+    }, on_failure: ->(_) {})
+
+    @usernamelabel = initialize_form_label("Username")
+    @usernameinput = initialize_form_inputfield("johndoe")
+
+    @websitelabel = initialize_form_label("Website")
+    @websiteinput = initialize_form_inputfield("https://github.com/login")
+
+    @form = QWidget.new
+    @form.set_object_name("newpassworddialog_form")
+    @form.set_style_sheet("
+      #newpassworddialog_form {
+        min-width: 600px;
+      }
+    ")
+
+    layout = QGridLayout.new(@form)
+    layout.add_widget(titlelabel, 0, 0, 1, 2)
+    layout.set_row_minimum_height(1, 10)
+    layout.add_widget(@errinfolabel, 2, 0, 1, 2)
+    layout.add_widget(@passnamelabel, 3, 0)
+    layout.add_widget(@passnameinput, 3, 1)
+    layout.add_widget(@usernamelabel, 4, 0)
+    layout.add_widget(@usernameinput, 4, 1)
+    layout.add_widget(@passwordlabel, 5, 0)
+    layout.add_widget(@passwordinput, 5, 1)
+    layout.add_widget(@websitelabel, 6, 0)
+    layout.add_widget(@websiteinput, 6, 1)
+  end
+
+  def initialize_form_label(text)
+    label = QLabel.new(text)
+    label.set_alignment(Qt::AlignRight)
+    label.set_style_sheet("min-width: 80px; padding-right: 4px;")
+    label
+  end
+
+  def initialize_form_inputfield(placeholder)
+    input = QLineEdit.new
+    input.set_placeholder_text(placeholder)
+    input
+  end
+
+  def initialize_form_inputfield_viewaction(input)
+    action = input.add_action(QIcon.from_theme(QIcon::ThemeIcon::DocumentPrintPreview), QLineEdit::TrailingPosition)
+    action.triggered.connect(self, :_on_view_action_triggered)
+  end
+
+  def initialize_btngroup
+    @btngroup = QDialogButtonBox.new(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal)
+    @btngroup.accepted.connect(self, :_on_okbutton_clicked)
+    @btngroup.rejected.connect(self, :_on_cancelbutton_clicked)
+
+    okbutton = @btngroup.button(QDialogButtonBox::Ok)
+    okbutton.set_text("Create")
+    okbutton.set_default(true)
+    okbutton.set_auto_default(true)
+
+    cancelbutton = @btngroup.button(QDialogButtonBox::Cancel)
+    cancelbutton.set_auto_default(true)
+  end
+
+  def initialize_layout
+    mainlayout = QVBoxLayout.new(self)
+    mainlayout.add_widget(@form)
+    mainlayout.add_widget(@btngroup)
+  end
+
+  def update_form_errinfo(info)
+    if info.empty?
+      @errinfolabel.set_text("")
+      @errinfolabel.set_hidden(true)
+      return
+    end
+
+    @errinfolabel.set_text(info)
+    @errinfolabel.set_hidden(false)
+  end
+end

data/lib/pass-qt/app/views/newpassworddialog.rb

@@ -1,3 +1,5 @@
+require_relative "newpassworddialog/ui"
+
 class NewPasswordDialog < RubyQt6::Bando::QDialog
   q_object do
     slot "_on_okbutton_clicked()"
@@ -12,113 +14,29 @@ class NewPasswordDialog < RubyQt6::Bando::QDialog
     @folder = folder
     @on_success = on_success
 
-    initialize_form
-    initialize_btngroup
-
-    mainlayout = QVBoxLayout.new(self)
-    mainlayout.add_widget(@form)
-    mainlayout.add_widget(@btngroup)
-
-    set_attribute(Qt::WA_DeleteOnClose)
-    set_modal(true)
+    initialize_ui
   end
 
   private
 
-  def initialize_form
-    titlelabel = QLabel.new("<center><b>Insert New Password</b></center>")
-
-    @errinfolabel = QLabel.new("")
-    @errinfolabel.set_style_sheet("background: white; color: red; padding: 8px; margin: 4px;")
-    @errinfolabel.set_hidden(true)
-
-    placeholder = (@folder == "") ? "example.com" : "#{@folder}/example.com"
-    @passnamelabel = initialize_form_label("File")
-    @passnameinput = initialize_form_inputfield(placeholder)
-    @passnameinput.set_text(placeholder)
-    set_focus_proxy(@passnameinput)
-
-    @passwordlabel = initialize_form_label("Password")
-    @passwordinput = initialize_form_inputfield("")
-    initialize_form_inputfield_viewaction(@passwordinput)
-
-    @passwordinput.set_echo_mode(QLineEdit::Password)
-    Pass.pwgen(16, on_success: ->(data) {
-      @passwordinput.set_text(data["stdout"].lines[0].strip)
-    }, on_failure: ->(_) {})
-
-    @usernamelabel = initialize_form_label("Username")
-    @usernameinput = initialize_form_inputfield("johndoe")
-
-    @websitelabel = initialize_form_label("Website")
-    @websiteinput = initialize_form_inputfield("https://github.com/login")
-
-    @form = QWidget.new
-    @form.set_object_name("newpassworddialog_form")
-    @form.set_style_sheet("
-      #newpassworddialog_form {
-        min-width: 600px;
-      }
-    ")
-
-    layout = QGridLayout.new(@form)
-    layout.add_widget(titlelabel, 0, 0, 1, 2)
-    layout.set_row_minimum_height(1, 10)
-    layout.add_widget(@errinfolabel, 2, 0, 1, 2)
-    layout.add_widget(@passnamelabel, 3, 0)
-    layout.add_widget(@passnameinput, 3, 1)
-    layout.add_widget(@usernamelabel, 4, 0)
-    layout.add_widget(@usernameinput, 4, 1)
-    layout.add_widget(@passwordlabel, 5, 0)
-    layout.add_widget(@passwordinput, 5, 1)
-    layout.add_widget(@websitelabel, 6, 0)
-    layout.add_widget(@websiteinput, 6, 1)
-  end
-
-  def initialize_form_label(text)
-    label = QLabel.new(text)
-    label.set_alignment(Qt::AlignRight)
-    label.set_style_sheet("min-width: 80px; padding-right: 4px;")
-    label
-  end
-
-  def initialize_form_inputfield(placeholder)
-    input = QLineEdit.new
-    input.set_placeholder_text(placeholder)
-    input
-  end
-
-  def initialize_form_inputfield_viewaction(input)
-    action = input.add_action(QIcon.from_theme(QIcon::ThemeIcon::DocumentPrintPreview), QLineEdit::TrailingPosition)
-    action.triggered.connect(self, :_on_view_action_triggered)
-  end
-
-  def initialize_btngroup
-    @btngroup = QDialogButtonBox.new(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal)
-    @btngroup.accepted.connect(self, :_on_okbutton_clicked)
-    @btngroup.rejected.connect(self, :_on_cancelbutton_clicked)
-
-    okbutton = @btngroup.button(QDialogButtonBox::Ok)
-    okbutton.set_text("Create")
-    okbutton.set_default(true)
-    okbutton.set_auto_default(true)
-
-    cancelbutton = @btngroup.button(QDialogButtonBox::Cancel)
-    cancelbutton.set_auto_default(true)
-  end
-
-  def update_form_errinfo(info)
-    if info.empty?
-      @errinfolabel.set_text("")
-      @errinfolabel.set_hidden(true)
-      return
-    end
+  def _on_okbutton_clicked
+    return unless _on_okbutton_clicked_validate_form
 
-    @errinfolabel.set_text(info)
-    @errinfolabel.set_hidden(false)
+    store = @store
+    passname = @passnameinput.text
+    password = @passwordinput.text
+    username = @usernameinput.text
+    website = @websiteinput.text
+    extra = "Username: #{username}\nWebsite: #{website}\n"
+    Pass.insert(store, passname, password, extra, on_success: ->(_) {
+      @on_success.call(passname)
+      close
+    }, on_failure: ->(data) {
+      update_form_errinfo(data["stderr"].strip)
+    })
   end
 
-  def validate_form
+  def _on_okbutton_clicked_validate_form
     update_form_errinfo("")
 
     {
@@ -136,23 +54,6 @@ class NewPasswordDialog < RubyQt6::Bando::QDialog
     true
   end
 
-  def _on_okbutton_clicked
-    return unless validate_form
-
-    store = @store
-    passname = @passnameinput.text
-    password = @passwordinput.text
-    username = @usernameinput.text
-    website = @websiteinput.text
-    extra = "Username: #{username}\nWebsite: #{website}\n"
-    Pass.insert(store, passname, password, extra, on_success: ->(_) {
-      @on_success.call(passname)
-      close
-    }, on_failure: ->(data) {
-      update_form_errinfo(data["stderr"].strip)
-    })
-  end
-
   def _on_cancelbutton_clicked
     close
   end

data/lib/pass-qt/app.rb

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

data/lib/pass-qt/config/initializers/qt6.rb

@@ -4,5 +4,5 @@ QApplication.set_application_name("PassQt")
 root_path = File.expand_path("../..", __dir__)
 QDir.add_search_path("assets", File.join(root_path, "app/assets"))
 
-icon = QIcon.new("assets:/app.svg")
+icon = QIcon.from_theme("enpass")
 QApplication.set_window_icon(icon)

data/lib/pass-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/pass-qt/lib/ctrlc.rb

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

data/lib/pass-qt/lib/pass/{clients → backend}/gopass.rb

@@ -1,6 +1,6 @@
 module Pass
-  module Clients
-    class GoPass < ::Pass::Clients::Pass
+  module Backend
+    class GoPass < ::Pass::Backend::Pass
       def initialize
         @program = "gopass"
       end
@@ -9,12 +9,12 @@ module Pass
         arguments = QStringList.new << "insert" << passname
         stdin = password
         envs = {PASSWORD_STORE_DIR: store}
-        Contrib::Process.execute(@program, arguments, stdin:, envs:, on_success:, on_failure:)
+        Process.execute(@program, arguments, stdin:, envs:, on_success:, on_failure:)
       end
 
       def pwgen(pw_length, on_success:, on_failure:)
         arguments = QStringList.new << "pwgen" << "-By1" << pw_length.to_s
-        Contrib::Process.execute(@program, arguments, on_success:, on_failure:)
+        Process.execute(@program, arguments, on_success:, on_failure:)
       end
     end
   end