gtk2passwordapp 4.4.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93d76cfb003e1b930d9d2deeaa22c24260456542
-  data.tar.gz: 4e55b73f5c0701b353b72dac3560a386c10a60a8
+  metadata.gz: a3d02303c19a2fdb1438508acbab4d5dfdf158e7
+  data.tar.gz: 0e068062d1241c74f5a86ec81c6b541db64702c0
 SHA512:
-  metadata.gz: 7bb5d79bb06b3caf17e83a90f720dda4c77b538f542745e218d6470e1e4c0ccd43e87470d8b4919c1d48ce529549d0d9bb1f10aac46de2661c7b228aa3062000
-  data.tar.gz: 02b752a61ab739a41addf33e3bc8b7b2141e94548b3f8770bd9aa31af2eaa902f0b05f3a631d39bd2913b4ac218755e6c38efd3ec32696838d3aa84bdb40a718
+  metadata.gz: 9e8b05f2a33c1a2b798ee735f0eb1076958324e11197a452ba73d5c7c08eba3568d18c7718b0cb1376bb66db6ea2f83ccfc6fcded706e53d12443ab3b9dbca0b
+  data.tar.gz: 6f6dad083904cccb777f1d18603387ae598eb6d3745a9010a18094b65a85d6dfdecc9389e59f16ff249bb4ee599f1d9073911f7efef020051deb16cec4f47276

data/README.rdoc

@@ -11,16 +11,21 @@ Features random password generator and clipboard use.
 
 == INSTALL:
 
-Note that you'll need gtk3app installed:
-
-   sudo gem install gtk3app
    sudo gem install gtk2passwordapp
 
 == HELP:
 
-   Usage:
-     gtk3app gtk2passwordapp [--help] [--version]
-     gtk2passwordapp [--no-gui [--dump [--verbose]]] [account]
+    Usage:
+      gtk2pwdV [:options]
+      gtk2pwdV --nogui [<pattern>]
+    Options:
+      -v --version 	Show version and exit
+      -h --help    	Show help and exit
+    Notes:
+    With the --nogui option,
+    one can give a pattern to filter by account names.
+    On the first run, --nogui can be used to export
+    version's 4 password data into version's 5 password data.
 
 == MORE:
 
@@ -32,7 +37,6 @@ See:
 
 You may want to change the following settings:
 
-[Help]  Add any notes to yourself you want.
 [SharedSecretFile]  You may prefer it to be a file in some removable media.
 [BackupFile]  Although the GUI allows you to specify the file, this gives a default.
 [TooOld]  I have this set for a year (in seconds).
@@ -41,8 +45,6 @@ You may want to change the following settings:
 
 If you're updating from a previous version,
 you may need to edit the new config file to match you're previously edited changes.
-Also, double check the requirements to ensure the versions of ruby and gems being used
-(gtk3app, etc...) are compatible.
 
 If you use a qrcode to enter your master password, and
 the result is a multiline string,

data/bin/gtk2pwdV

@@ -0,0 +1,80 @@
+#!/usr/bin/env ruby
+
+if a0 = ARGV.shift
+  if ['-v', '--version'].include?(a0)
+    require 'gtk2passwordapp/version'
+    puts Gtk2PasswordApp::VERSION
+    exit 0
+  end
+
+  if ['-h', '--help'].include?(a0)
+    puts <<-HELP
+Usage:
+  gtk2pwdV [:options]
+  gtk2pwdV --nogui [<pattern>]
+Options:
+  -v --version \tShow version and exit
+  -h --help    \tShow help and exit
+Notes:
+With the --nogui option,
+one can give a pattern to filter by account names.
+On the first run, --nogui can be used to export
+version's 4 password data into version's 5 password data.
+Expected file is:
+  ~/.cache/gtk3app/gtk2passwordapp/gtk2pwdV.dat
+    HELP
+    exit 0
+  end
+
+  if a0 == '--nogui'
+    require 'pp'
+    require 'yaml_zlib_blowfish'
+    print "Enter password: "
+    PWD = $stdin.gets.strip
+    system('clear; clear')
+    F1 = File.expand_path('~/.cache/gtk3app/gtk2passwordapp/gtk2pwdV.dat')
+    unless File.exist?(F1)
+      F0 = File.expand_path('~/.cache/gtk3app/gtk2passwordapp/passwords.dat')
+      if File.exist?(F0)
+        class YZB < YamlZlibBlowfish
+          def initialize(passphrase)
+            key = Digest::SHA256.digest(passphrase)[0..15]
+            @cipher = OpenSSL::Cipher::BF.new(:CBC)
+            @cipher.key = key
+          end
+        end
+        begin
+          YamlZlibBlowfish.new(PWD).dump(F1, YZB.new(PWD).load(F0))
+          $stderr.puts "Auto-exported:"
+          $stderr.puts "\t#{F0} =>"
+          $stderr.puts "\t#{F1}"
+        rescue OpenSSL::Cipher::CipherError
+          $stderr.puts "Bad password"
+          exit 65
+        end
+      else
+        $stderr.puts "No passwords file found."
+        $stderr.puts "Expected: #{F1}"
+      end
+    end
+    begin
+      LIST = YamlZlibBlowfish.new(PWD).load(F1)
+    rescue OpenSSL::Cipher::CipherError
+      $stderr.puts "Bad password"
+      exit 65
+    end
+    if pattern = ARGV.shift
+      pattern = Regexp.new(pattern, Regexp::IGNORECASE)
+    end
+    unless ARGV.shift
+      pp (pattern)? LIST.select{|k,v|pattern.match(k)} : LIST
+      exit 0
+    end
+  end
+
+  $stderr.puts "Please match usage."
+  exit 64
+end
+
+require 'gtk2passwordapp'
+Gtk3App.main(Gtk2PasswordApp)

data/data/VERSION

@@ -1 +1 @@
-4.4.0
+5.0.0

data/lib/gtk2passwordapp.rb

@@ -1,4 +1,5 @@
 # This is a Gtk3App.
+require 'gtk3app'
 
 # Helper Gems.
 require 'yaml_zlib_blowfish'
@@ -12,8 +13,7 @@ require_relative 'gtk2passwordapp/config.rb'
 require_relative 'gtk2passwordapp/such_parts.rb'
 require_relative 'gtk2passwordapp/account.rb'
 require_relative 'gtk2passwordapp/accounts.rb'
-require_relative 'gtk2passwordapp/gtk2passwordapp.rb'
+require_relative 'gtk2passwordapp/gtk2pwdv.rb'
 
 # Requires:
 #`ruby`
-#`gtk3app`

data/lib/gtk2passwordapp/account.rb

@@ -1,4 +1,4 @@
-module Gtk2passwordapp
+module Gtk2PasswordApp
 class Account
 
   PASSWORD    = 0

data/lib/gtk2passwordapp/accounts.rb

@@ -1,4 +1,4 @@
-module Gtk2passwordapp
+module Gtk2PasswordApp
 class Accounts
 
   def reset(password)
@@ -6,8 +6,7 @@ class Accounts
   end
 
   attr_reader :data
-  attr_accessor :dumpfile
-  def initialize(dumpfile=nil, password=nil)
+  def initialize(dumpfile, password=nil)
     reset(password) if password # sets @yzb
     @dumpfile = dumpfile
     @data = {}

data/lib/gtk2passwordapp/config.rb

@@ -1,12 +1,6 @@
-module Gtk2passwordapp
+module Gtk2PasswordApp
   using Rafini::String
 
-  help = <<-HELP
-Usage:
-  gtk3app gtk2passwordapp [--help] [--version]
-  gtk2passwordapp [--no-gui [--dump [--verbose]]] [account]
-  HELP
-
   APPDIR = File.dirname File.dirname __dir__
 
   s0 = Rafini::Empty::STRING
@@ -14,14 +8,13 @@ Usage:
   a0 = Rafini::Empty::ARRAY
 
   CONFIG = {
-    Help: help,
 
     # Password Data File
-    PwdFile: "#{XDG['CACHE']}/gtk3app/gtk2passwordapp/passwords.dat",
+    PwdFile: "#{XDG['CACHE']}/gtk3app/gtk2passwordapp/gtk2pwdV.dat",
     # Shared Secret File
     # Consider using a file found in a removable flashdrive.
     SharedSecretFile: "#{XDG['CACHE']}/gtk3app/gtk2passwordapp/key.ssss",
-    BackupFile: "#{ENV['HOME']}/Dropbox/gtk2passwordapp.bak",
+    BackupFile: "#{ENV['HOME']}/Dropbox/gtk2pwdV.bak",
 
     # Mark Recent Selections
     Recent: 7,
@@ -30,7 +23,7 @@ Usage:
     TooOld: 60*60*24*365, # Year
 
     # Timeout for qr-code read.
-    QrcTimeOut: 9,
+    QrcTimeOut: 15,
 
     # Password Generators
     Random:       'Random',
@@ -127,8 +120,8 @@ Usage:
         },
       ],
 
-      reset!:  [['Reset Master Password'], 'activate'],
-      backup!: [['Backup Passwords'],      'activate'],
+      reset!:  [[label: 'Reset Master Password'], 'activate'],
+      backup!: [[label: 'Backup Passwords'],      'activate'],
 
       about_dialog: {
         set_program_name: 'Password Manager',

data/lib/gtk2passwordapp/{gtk2passwordapp.rb → gtk2pwdv.rb}

@@ -1,4 +1,4 @@
-module Gtk2passwordapp
+module Gtk2PasswordApp
   using Rafini::Exception
   using Rafini::Array
 
@@ -6,16 +6,8 @@ module Gtk2passwordapp
   H2Q = BaseConvert::FromTo.new(:hex, :qgraph)
   H2W = BaseConvert::FromTo.new(:hex, :word)
 
-  def self.options=(opts)
-    @@options=opts
-  end
-
-  def self.options
-    @@options
-  end
-
   def self.run(program)
-    Gtk2PasswordApp.new(program)
+    Gtk2PwdV.new(program)
   end
 
 class DeleteDialog < Gtk3App::Dialog::CancelOk
@@ -28,7 +20,7 @@ end
 class BackupDialog < Such::FileChooserDialog
   def initialize(parent)
     super([parent: parent], :backup_dialog)
-    set_action Gtk::FileChooser::Action::SAVE
+    set_action Gtk::FileChooserAction::SAVE
     add_button(Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL)
     add_button(Gtk::Stock::OPEN, Gtk::ResponseType::ACCEPT)
     if CONFIG[:BackupFile]
@@ -60,7 +52,7 @@ class ErrorDialog < Such::MessageDialog
   end
 end
 
-class Gtk2PasswordApp
+class Gtk2PwdV
 
   def initialize(program)
     @program = program
@@ -125,7 +117,7 @@ class Gtk2PasswordApp
     @accounts.names.sort{|a,b|a.upcase<=>b.upcase}.each do |name|
       account = @accounts.get name
       pwd, user, updated = account.password, account.username, account.updated
-      selected = Such::MenuItem.new([name], 'activate') do
+      selected = Such::MenuItem.new([label: name], 'activate') do
         color_code selected
         @combo.set_active @names.index name if @combo
         copy2clipboard pwd, user
@@ -151,7 +143,10 @@ class Gtk2PasswordApp
   end
 
   def clear_page
-    @page.each{|w|w.destroy}
+    @page.each do |w|
+      w.text = '' if w.class == Such::Entry # Else gives warning.... :-??
+      w.destroy
+    end
   end
 
   def process_pwd_entries(entry1, entry2)

data/lib/gtk2passwordapp/such_parts.rb

@@ -8,15 +8,15 @@ Such::Parts.make('PromptedCombo', 'Box', :prompt_Label, :prompted_ComboBoxText)
 module Such
   class AbButtons
     def labels(a, b)
-      self.a_Button.label = Gtk2passwordapp::CONFIG[a]
-      self.b_Button.label = Gtk2passwordapp::CONFIG[b]
+      self.a_Button.label = Gtk2PasswordApp::CONFIG[a]
+      self.b_Button.label = Gtk2PasswordApp::CONFIG[b]
     end
   end
   class AbcButtons
     def labels(a, b, c)
-      self.a_Button.label = Gtk2passwordapp::CONFIG[a]
-      self.b_Button.label = Gtk2passwordapp::CONFIG[b]
-      self.c_Button.label = Gtk2passwordapp::CONFIG[c]
+      self.a_Button.label = Gtk2PasswordApp::CONFIG[a]
+      self.b_Button.label = Gtk2PasswordApp::CONFIG[b]
+      self.c_Button.label = Gtk2PasswordApp::CONFIG[c]
     end
   end
 end

data/lib/gtk2passwordapp/version.rb

@@ -1,3 +1,3 @@
-module Gtk2passwordapp
-  VERSION = '4.4.0'
+module Gtk2PasswordApp
+  VERSION = '5.0.0'
 end

metadata

@@ -1,115 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: gtk2passwordapp
 version: !ruby/object:Gem::Version
-  version: 4.4.0
+  version: 5.0.0
 platform: ruby
 authors:
 - carlosjhr64
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rafini
+  name: gtk3app
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: xdg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.3
-- !ruby/object:Gem::Dependency
-  name: user_space
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: yaml_zlib_blowfish
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: super_random
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: base_convert
   requirement: !ruby/object:Gem::Requirement
@@ -157,20 +117,20 @@ description: |
   Features random password generator and clipboard use.
 email: carlosjhr64@gmail.com
 executables:
-- gtk2passwordapp
+- gtk2pwdV
 extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
 - README.rdoc
-- bin/gtk2passwordapp
+- bin/gtk2pwdV
 - data/VERSION
 - data/logo.png
 - lib/gtk2passwordapp.rb
 - lib/gtk2passwordapp/account.rb
 - lib/gtk2passwordapp/accounts.rb
 - lib/gtk2passwordapp/config.rb
-- lib/gtk2passwordapp/gtk2passwordapp.rb
+- lib/gtk2passwordapp/gtk2pwdv.rb
 - lib/gtk2passwordapp/such_parts.rb
 - lib/gtk2passwordapp/version.rb
 homepage: https://github.com/carlosjhr64/gtk2passwordapp
@@ -194,10 +154,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- 'ruby: ruby 2.3.3p222 (2016-11-21 revision 56859) [x86_64-linux]'
-- 'gtk3app: 1.5.2'
+- 'ruby: ruby 2.4.1p111 (2017-03-22 revision 58053) [x86_64-linux]'
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby-Gnome Password Manager.

data/bin/gtk2passwordapp

@@ -1,123 +0,0 @@
-#!/usr/bin/env ruby
-require 'rafini'
-using Rafini::Exception
-using Rafini::Array
-using Rafini::String
-
-begin
-  nogui = ARGV.include?('--no-gui')
-  hlp   = ['-h', '--help'].any?{|_|ARGV.include?(_)}
-  vrs   = ['-v', '--version'].any?{|_|ARGV.include?(_)}
-  if nogui or hlp or vrs
-    # Going to proceed on need only basis, which may break some conventions...
-
-    # Get the version.
-    require 'gtk2passwordapp/version'
-    mod     = Gtk2passwordapp
-    version = mod::VERSION
-    if vrs
-      puts version
-      exit
-    end
-
-    vbs = ARGV.any?{|_|['-V', '--verbose'].include?(_)}
-
-    # Get the config.
-    require 'xdg'
-    require 'gtk2passwordapp/config'
-    config  = mod::CONFIG
-    if hlp and !vbs
-      # Note that this will be the original help without any of the user's edit.
-      puts config[:Help]
-      exit
-    end
-
-    # Where are the user's data?
-    require 'user_space'
-    require 'yaml'
-    UserSpace::OPTIONS[:parser] = YAML
-    UserSpace::OPTIONS[:ext]    = 'yml'
-    UserSpace::OPTIONS[:config] = "config-#{version.semantic(0..1)}"
-    appdir  = mod::APPDIR
-    appname = File.join 'gtk3app', mod.name.downcase
-    user_space = UserSpace.new(appname: appname, appdir: appdir)
-    user_space.install unless user_space.version == version
-    user_space.configures(config)
-
-    if hlp # and vbs
-      # Presumably, the user may have edited the help and is requesting this version.
-      puts config[:Help]
-      exit
-    end
-
-    # It's possible that the password file it not there.
-    pwd_file = config[:PwdFile]
-    raise "Could not find passwords data file." unless File.exist? pwd_file
-
-    # Going to get and verify the password.
-    require 'io/console' # Standard library
-    pwd0 = nil
-    print 'Password: '
-    pwd = $stdin.noecho(&:gets).strip
-    while pwd != pwd0
-      exit if pwd == ''
-      pwd0 = pwd
-      puts
-      print 'Again: '
-      pwd = $stdin.noecho(&:gets).strip
-    end
-    puts
-
-    # Ready to read the passwords file.
-    require 'yaml_zlib_blowfish'
-    require 'gtk2passwordapp/account'
-    require 'gtk2passwordapp/accounts'
-    accounts = Gtk2passwordapp::Accounts.new(pwd_file, pwd)
-    accounts.load
-
-    # Does the user want a data dump?
-    if ARGV.include? '--dump'
-      puts
-      # Remember that ARGV is at least ['--no-gui'].
-      pattern = (ARGV.last[0]=='-')? nil : Regexp.new(ARGV.last)
-      now = Time.now.to_i
-      accounts.names.each do |name|
-        next if pattern and not pattern=~name
-        account = accounts.get(name)
-        puts [account.name, account.username, account.password].join("\n\t")
-        if vbs
-          puts "\t" + account.url
-          puts "\t" + account.note
-          using Rafini::Odometers
-          puts "\tUpdated " +  (now - account.updated).sec2time.to_s + ' ago.'
-        end
-        puts
-      end
-      exit
-    end
-
-    # Looks like the user just wants a particular password.
-    # Get the account name.
-    unless name = (ARGV.last[0]=='-')? nil : ARGV.last
-      print 'Account Name: '
-      name = $stdin.gets.strip
-    end
-    # Does the given account exist?
-    raise "Could not find account \"#{name}\"." unless accounts.data[name]
-
-    # Put the password!
-    account = accounts.get(name)
-    password = account.password
-    puts password
-
-    # And we're done!
-    exit
-  end
-rescue StandardError
-  $!.puts
-  exit 1
-end
-
-# Run gui!
-ARGV.unshift 'gtk2passwordapp' # going to gtk3app
-Process.detach spawn "gtk3app #{ARGV.join(' ')}"