gtk2passwordapp 2.3.0 → 2.3.1

data/bin/gtk2passwordapp2

@@ -1,22 +1,20 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-gem 'gtk2applib', '~> 15.3'
-$help = <<EOT
-\t--no-gui\tcommand line access to passwords
-\t--dump\t\tpp dump of data
-EOT
-require 'gtk2applib'
-require 'gtk2passwordapp'
 
-if (nogui = $options=~/-no-gui/) || ($options=~/-dump/) then
-  $stderr.print Gtk2Password::Configuration::COMMAND_LINE_MSG1
+if (nogui = ARGV.include?('--no-gui')) || (ARGV.include?('--dump')) then
+  require 'gtk2passwordapp/passwords'
+  # Unfortunately, gtk2applib makes this awkard.
+  # Have to assume things...
+  pwfile = File.expand_path('~/.gtk2passwordapp-2/passwords.dat')
+  raise "Need #{pwfile}" unless File.exist?(pwfile)
+  $stderr.print  "Warning: password will be shown.\nPassword:"
   pwd = $stdin.gets.strip
   if nogui then
-    $stderr.print Gtk2Password::Configuration::COMMAND_LINE_MSG2
+    $stderr.print "Warning: selected passwords will be shown.\nEnter Account pattern:"
     pattern = Regexp.new( $stdin.gets.strip, Regexp::IGNORECASE )
   end
   begin
-    passwords = Gtk2Password::Passwords.new(Gtk2Password::Configuration::PASSWORDS_FILE, pwd)
+    passwords = Gtk2Password::Passwords.new(pwfile, pwd)
     passwords.load
     if $options=~/-dump/ then
       require 'pp'
@@ -31,12 +29,19 @@ if (nogui = $options=~/-no-gui/) || ($options=~/-dump/) then
       end
     end
   rescue Exception
-    sleep(1.0)
     puts $!
   end
   exit
 end
 
+gem 'gtk2applib', '~> 15.3'
+$help = <<EOT
+\t--no-gui\tcommand line access to passwords
+\t--dump\t\tpp dump of data
+EOT
+require 'gtk2applib'
+require 'gtk2passwordapp'
+
 program = Gtk2AppLib::Program.new( Gtk2Password::ABOUT )
 
 begin

data/lib/gtk2passwordapp/appconfig.rb

@@ -118,9 +118,6 @@ module Configuration
   AGAIN = 'Again' # for when verifying new passwords.
   RETRY = 'Retry' # for when you got your password wrong.
 
-  # These are the --no-gui dialogs...
-  COMMAND_LINE_MSG1 = "Warning: password will be shown.\nPassword:"
-  COMMAND_LINE_MSG2 = "Warning: selected passwords will be shown.\nEnter Account pattern:"
 end
 
   # Set OTP to true if you're going to use a one time pad

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtk2passwordapp
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crypt-tea
-  requirement: &11586400 !ruby/object:Gem::Requirement
+  requirement: &6740220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *11586400
+  version_requirements: *6740220
 - !ruby/object:Gem::Dependency
   name: gtk2applib
-  requirement: &11585860 !ruby/object:Gem::Requirement
+  requirement: &6739680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '15.3'
   type: :runtime
   prerelease: false
-  version_requirements: *11585860
+  version_requirements: *6739680
 description: ! 'A Ruby-Gnome password manager.
 
   Uses crypt-tea''s Tiny Encryption Algorithm to encrypt the datafile.