ruby-pass-qt 1.0.0 → 2.0.1

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

@@ -1,169 +1,167 @@
-module PassQt
-  class NewPasswordDialog < RubyQt6::Bando::QDialog
-    q_object do
-      slot "_on_okbutton_clicked()"
-      slot "_on_cancelbutton_clicked()"
-      slot "_on_view_action_triggered()"
-    end
-
-    def initialize(store, folder, on_success:)
-      super()
-
-      @store = store
-      @folder = folder
-      @on_success = on_success
-
-      initialize_form
-      initialize_btngroup
-
-      mainlayout = QVBoxLayout.new(self)
-      mainlayout.add_widget(@form)
-      mainlayout.add_widget(@btngroup)
+class NewPasswordDialog < RubyQt6::Bando::QDialog
+  q_object do
+    slot "_on_okbutton_clicked()"
+    slot "_on_cancelbutton_clicked()"
+    slot "_on_view_action_triggered()"
+  end
 
-      set_attribute(Qt::WA_DeleteOnClose)
-      set_modal(true)
-    end
+  def initialize(store, folder, on_success:)
+    super()
 
-    private
+    @store = store
+    @folder = folder
+    @on_success = on_success
 
-    def initialize_form
-      titlelabel = QLabel.new("<center><b>Insert New Password</b></center>")
+    initialize_form
+    initialize_btngroup
 
-      @errinfolabel = QLabel.new("")
-      @errinfolabel.set_style_sheet("background: white; color: red; padding: 8px; margin: 4px;")
-      @errinfolabel.set_hidden(true)
+    mainlayout = QVBoxLayout.new(self)
+    mainlayout.add_widget(@form)
+    mainlayout.add_widget(@btngroup)
 
-      placeholder = (@folder == "") ? "github.com" : "#{@folder}/github.com"
-      @passnamelabel = initialize_form_label("File")
-      @passnameinput = initialize_form_inputfield(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"].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
+    set_attribute(Qt::WA_DeleteOnClose)
+    set_modal(true)
+  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
+  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 == "") ? "github.com" : "#{@folder}/github.com"
+    @passnamelabel = initialize_form_label("File")
+    @passnameinput = initialize_form_inputfield(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_inputfield(placeholder)
-      input = QLineEdit.new
-      input.set_placeholder_text(placeholder)
-      input
-    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_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_form_inputfield(placeholder)
+    input = QLineEdit.new
+    input.set_placeholder_text(placeholder)
+    input
+  end
 
-    def initialize_btngroup
-      @okbutton = QPushButton.new("Create")
-      @okbutton.clicked.connect(self, :_on_okbutton_clicked)
+  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
 
-      @cancelbutton = QPushButton.new("Cancel")
-      @cancelbutton.clicked.connect(self, :_on_cancelbutton_clicked)
+  def initialize_btngroup
+    @okbutton = QPushButton.new("Create")
+    @okbutton.clicked.connect(self, :_on_okbutton_clicked)
 
-      @btngroup = QWidget.new
-      layout = QHBoxLayout.new(@btngroup)
-      layout.add_stretch
-      layout.add_widget(@okbutton)
-      layout.add_widget(@cancelbutton)
-    end
+    @cancelbutton = QPushButton.new("Cancel")
+    @cancelbutton.clicked.connect(self, :_on_cancelbutton_clicked)
 
-    def update_form_errinfo(info)
-      if info.empty?
-        @errinfolabel.set_text("")
-        @errinfolabel.set_hidden(true)
-        return
-      end
+    @btngroup = QWidget.new
+    layout = QHBoxLayout.new(@btngroup)
+    layout.add_stretch
+    layout.add_widget(@okbutton)
+    layout.add_widget(@cancelbutton)
+  end
 
-      @errinfolabel.set_text(info)
-      @errinfolabel.set_hidden(false)
+  def update_form_errinfo(info)
+    if info.empty?
+      @errinfolabel.set_text("")
+      @errinfolabel.set_hidden(true)
+      return
     end
 
-    def validate_form
-      update_form_errinfo("")
+    @errinfolabel.set_text(info)
+    @errinfolabel.set_hidden(false)
+  end
 
-      {
-        "File" => @passnameinput,
-        "Username" => @usernameinput,
-        "Password" => @passwordinput,
-        "Website" => @websiteinput
-      }.each do |k, v|
-        next unless v.text.empty?
+  def validate_form
+    update_form_errinfo("")
 
-        update_form_errinfo("#{k} can't be blank")
-        return false
-      end
+    {
+      "File" => @passnameinput,
+      "Username" => @usernameinput,
+      "Password" => @passwordinput,
+      "Website" => @websiteinput
+    }.each do |k, v|
+      next unless v.text.empty?
 
-      true
+      update_form_errinfo("#{k} can't be blank")
+      return false
     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
+    true
+  end
 
-    def _on_cancelbutton_clicked
+  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
-    end
+    }, on_failure: ->(data) {
+      update_form_errinfo(data["stderr"].strip)
+    })
+  end
+
+  def _on_cancelbutton_clicked
+    close
+  end
 
-    def _on_view_action_triggered
-      input = sender.parent
-      case input.echo_mode
-      when QLineEdit::Normal then input.set_echo_mode(QLineEdit::Password)
-      when QLineEdit::Password then input.set_echo_mode(QLineEdit::Normal)
-      else raise "unreachable!"
-      end
+  def _on_view_action_triggered
+    input = sender.parent
+    case input.echo_mode
+    when QLineEdit::Normal then input.set_echo_mode(QLineEdit::Password)
+    when QLineEdit::Password then input.set_echo_mode(QLineEdit::Normal)
+    else raise "unreachable!"
     end
   end
 end

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

@@ -1,2 +1,3 @@
 QApplication.set_organization_name("souk4711")
 QApplication.set_application_name("PassQt")
+QApplication.set_window_icon(QIcon.from_theme("pass-qt"))

data/lib/pass-qt/config.rb

@@ -1,5 +1,4 @@
 require_relative "config/initializers/qt6"
-
 require_relative "config/settings"
 
 module PassQt

data/lib/pass-qt/lib/pass/clients/gopass.rb

@@ -0,0 +1,21 @@
+module Pass
+  module Clients
+    class GoPass < ::Pass::Clients::Pass
+      def initialize
+        @program = "gopass"
+      end
+
+      def otp_insert(store, passname, password, on_success:, on_failure:)
+        arguments = QStringList.new << "insert" << passname
+        stdin = password
+        envs = {PASSWORD_STORE_DIR: store}
+        Contrib::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:)
+      end
+    end
+  end
+end

data/lib/pass-qt/lib/pass/clients/pass.rb

@@ -0,0 +1,40 @@
+module Pass
+  module Clients
+    class Pass
+      def initialize
+        @program = "pass"
+      end
+
+      def show(store, passname, on_success:, on_failure:)
+        arguments = QStringList.new << "show" << passname
+        envs = {PASSWORD_STORE_DIR: store}
+        Contrib::Process.execute(@program, arguments, envs:, on_success:, on_failure:)
+      end
+
+      def insert(store, passname, password, extra, on_success:, on_failure:)
+        arguments = QStringList.new << "insert" << "-m" << passname
+        stdin = "#{password}\n#{extra}"
+        envs = {PASSWORD_STORE_DIR: store}
+        Contrib::Process.execute(@program, arguments, stdin:, envs:, on_success:, on_failure:)
+      end
+
+      def otp(store, passname, on_success:, on_failure:)
+        arguments = QStringList.new << "otp" << passname
+        envs = {PASSWORD_STORE_DIR: store}
+        Contrib::Process.execute(@program, arguments, envs:, on_success:, on_failure:)
+      end
+
+      def otp_insert(store, passname, password, on_success:, on_failure:)
+        arguments = QStringList.new << "otp" << "insert" << passname
+        stdin = password
+        envs = {PASSWORD_STORE_DIR: store}
+        Contrib::Process.execute(@program, arguments, stdin:, envs:, on_success:, on_failure:)
+      end
+
+      def pwgen(pw_length, on_success:, on_failure:)
+        arguments = QStringList.new << "-cnysB" << pw_length.to_s << "1"
+        Contrib::Process.execute("pwgen", arguments, on_success:, on_failure:)
+      end
+    end
+  end
+end

data/lib/pass-qt/lib/pass/clients.rb

@@ -0,0 +1,2 @@
+require_relative "clients/pass"
+require_relative "clients/gopass"

data/lib/pass-qt/lib/pass.rb

@@ -1,32 +1,37 @@
+require_relative "pass/clients"
+
 module Pass
   def self.show(store, passname, on_success:, on_failure:)
-    arguments = QStringList.new << "show" << passname
-    envs = {PASSWORD_STORE_DIR: store}
-    Contrib::Process.execute("pass", arguments, envs:, on_success:, on_failure:)
+    client.show(store, passname, on_success:, on_failure:)
   end
 
   def self.insert(store, passname, password, extra, on_success:, on_failure:)
-    arguments = QStringList.new << "insert" << "-m" << passname
-    stdin = "#{password}\n#{extra}"
-    envs = {PASSWORD_STORE_DIR: store}
-    Contrib::Process.execute("pass", arguments, stdin:, envs:, on_success:, on_failure:)
+    client.insert(store, passname, password, extra, on_success:, on_failure:)
   end
 
   def self.otp(store, passname, on_success:, on_failure:)
-    arguments = QStringList.new << "otp" << passname
-    envs = {PASSWORD_STORE_DIR: store}
-    Contrib::Process.execute("pass", arguments, envs:, on_success:, on_failure:)
+    client.otp(store, passname, on_success:, on_failure:)
   end
 
   def self.otp_insert(store, passname, password, on_success:, on_failure:)
-    arguments = QStringList.new << "otp" << "insert" << passname
-    stdin = password
-    envs = {PASSWORD_STORE_DIR: store}
-    Contrib::Process.execute("pass", arguments, stdin:, envs:, on_success:, on_failure:)
+    client.otp_insert(store, passname, password, on_success:, on_failure:)
   end
 
   def self.pwgen(pw_length, on_success:, on_failure:)
-    arguments = QStringList.new << "-cnysB" << pw_length.to_s << "1"
-    Contrib::Process.execute("pwgen", arguments, on_success:, on_failure:)
+    client.pwgen(pw_length, on_success:, on_failure:)
+  end
+
+  def self.client
+    @client ||= lambda do
+      [
+        ["pass", ::Pass::Clients::Pass],
+        ["gopass", ::Pass::Clients::GoPass]
+      ].each do |program, klass|
+        r = QProcess.execute(program, QStringList.new << "--version")
+        return klass.new if r.zero?
+      end
+
+      ::Pass::Clients::Pass.new
+    end.call
   end
 end

data/lib/pass-qt/version.rb

@@ -1,3 +1,3 @@
 module PassQt
-  VERSION = "1.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-pass-qt
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - John Doe
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 6.0.0
 description: A simple GUI for pass on Linux.
 email:
 - johndoe@example.com
@@ -55,6 +55,9 @@ files:
 - lib/pass-qt/lib/contrib.rb
 - lib/pass-qt/lib/contrib/process.rb
 - lib/pass-qt/lib/pass.rb
+- lib/pass-qt/lib/pass/clients.rb
+- lib/pass-qt/lib/pass/clients/gopass.rb
+- lib/pass-qt/lib/pass/clients/pass.rb
 - lib/pass-qt/version.rb
 - screenshot.png
 homepage: https://github.com/souk4711/ruby-pass-qt