gtk2passwordapp 1.1.2 → 1.2.1

data/README.txt

@@ -12,29 +12,28 @@ in the appropriate entry boxes.
 To set a new password, either enter the password in the "New:" entry box, or
 generate it by pressing "Random", "Alpha-Numeric", "Numeric", "Letters", or
 "All-Caps".  One can set the password length generated with the spin-box.
-To make the password generated visible, press the "Visible" button.
-The "Current" button copies the current password to the primary clipboard.
-The "Previous" button copies the previous password to the primary clipboard.
+To make the password generated visible, un-check the check button.
 
+Once one has edited the account, clicking the "Update Account" button finalizes the record.
+Note, however, that the change is not yet permanent and saved on disk.
 To delete an account, select the account in the entry/combo box, and
 the press the "Delete Account" button.
+Once one is done with all updates, one then needs to press "Save To Disk".
+"Cancel All Changes" or closing the window without "Save To Disk" will ignore all of the sessions updates.
 
-Once one has edited the account, clicking the "Update" button finalizes the record.
-Note, however, that the change is not yet permanent and saved on disk.
-Once one is done with all updates, one then needs to press "Save".
-"Cancel" or closing the window without "Save" will ignore all of the sessions updates.
+The "Clip Current Password" button copies the current password to the primary clipboard.
+The "Clip Previous Password" button copies the previous (old) password to the primary clipboard.
 
 The "Change Data File Password" button will allow one the change
-the master password.
+the master password. Do not forget the master password!
 
 Right click most anywhere on the app's window for the main menu.
-"Close" will dock the app and has the same effect as "Cancel".
+"Close" will dock the app and has the same effect as "Cancel All Changes".
 
 Left click on the docked icon to bring back the editor window.
-
 Right click on the docked icon to select one of the accounts to load
 the password and username to the clipboard.
-The password is copied the the primary clipboard and will paste on
+The password is copied to the primary clipboard and will paste on
 middle mouse button click.
 Right click on an entry box to paste the username (via the clipboard's menu).
 
@@ -43,9 +42,8 @@ Lastly, do not edit
 It's used to "salt" the password... without it,
 one will not be able to decrypt the datafile.
 
-
 For full documentation and comments, see
 
 	http://ruby-gnome-apps.blogspot.com/search/label/Passwords
 
--Carlos
+carlosjhr64@gmail.com

data/bin/gtk2passwordapp

@@ -1,31 +1,38 @@
 #!/usr/bin/env ruby
+
 require 'rubygems'
-gem 'gtk2applib', '~> 5.0.0'
-require 'gtk2applib/gtk2_app'
+gem 'gtk2applib', '~> 7'
+require 'gtk2applib'
 
-application = {
+include Gtk2AppLib
+PROGRAM = Program.new( {
 	:name		=> 'Ruby-Gnome Password Manager',
 	:tooltip	=> 'Password Manager',
-	:FILE		=> __FILE__,
-	}
-Gtk2App.init(application)
-Gtk2App.icon.set_icon_name(Gtk::Stock::DIALOG_AUTHENTICATION)
+        :icon_name      => 'Passwords',
+        :FILE           => __FILE__,
+        :lock           => "Proceed anyways?",
+        } )
 
-require 'gtk2passwordapp/edit_box.rb'
-require 'gtk2passwordapp/passwords.rb'
-passwords = Gtk2PasswordApp::Passwords.new
-Gtk2PasswordApp.build_menu(passwords)
+begin
+  require 'gtk2passwordapp'
+  passwords = Gtk2PasswordApp::Passwords.new
+  Gtk2PasswordApp.build_menu(passwords)
 
-about = {
-	:authors	=> ['carlosjhr64@gmail.com'],
-	:comments	=> 'Ruby-Gtk2 Passsword Manager',
+  about = {
+        :authors        => ['carlosjhr64@gmail.com'],
 	:website	=> 'http://ruby-gnome-apps.blogspot.com/search/label/Passwords',
 	:website_label	=> 'Ruby-Gnome Password Manager',
-	:license	=> 'GPL',
-	:copyright	=> '2010-03-10 18:08:34',
-	}
-Gtk2App.main_window(about) do |window|
-  Gtk2PasswordApp.edit(window,passwords)
+        :license        => 'GPL',
+        :copyright      => '2010-08-04 16:39:30',
+        }
+
+  PROGRAM.window(about) do |window|
+    Gtk2PasswordApp.edit(window,passwords)
+  end
+rescue Exception
+  $verbose = true
+  Gtk2AppLib.puts_bang!
+ensure
+  PROGRAM.finalize
 end
 
-Gtk2App.finalize

data/lib/gtk2passwordapp/appconfig.rb

@@ -0,0 +1,48 @@
+# Note: you'll see in ~/.gtk2passwordapp-* a file called passphrase.txt.
+# Do not edit or delete passphrase, or you'll loose your passwords data.
+
+module Gtk2AppLib
+module Configuration
+  # Note that the passwords data file name is auto generated, but...
+  # You can place your passwords data file in a directory other than ~/gtk2passwordapp-*
+  PASSWORDS_DATA_DIR = UserSpace::DIRECTORY
+
+  HILDON = (WRAPPER.to_s == 'HildonWrapper')
+
+  GO_BUTTON_LENGTH	= 50
+  SPIN_BUTTON_LENGTH	= 60
+  PADDING		= 2
+  ENTRY_WIDTH		= (HILDON)? 600: 300
+  LABEL_WIDTH		= 75
+
+
+  # Switches the roles of PRIMARY and CLIPBOARD when true
+  SWITCH_CLIPBOARDS	= HILDON
+
+  PASSWORD_EXPIRED	= 60*60*24*30*3 # 3 months
+
+  URL_PATTERN		= Regexp.new('^https?:\/\/[^\s\']+$')
+
+  if HILDON then
+    WIDGET_OPTIONS[:font] = FONT[:normal] = FONT[:large] = Pango::FontDescription.new( 'Arial 18' )
+  end
+
+  MENU[:close]		= '_Close'
+
+  WINDOW_DEFAULT_SIZE[0],WINDOW_DEFAULT_SIZE[1] = 100,100
+
+  WIDGET_OPTIONS[:max]		= 20 # MAX PASSWORD LENGTH
+  WIDGET_OPTIONS[:min]		= 3  # MIN PASSWORD LENGTH
+  DEFAULT_PASSWORD_LENGTH = 7
+
+  WIDGET_OPTIONS[:spinbutton_width] = SPIN_BUTTON_LENGTH
+  WIDGET_OPTIONS[:padding]	= PADDING
+end
+
+  def self.passwords_updated
+    # You may want to mirror Configuration::PASSWORDS_DATA_DIR.
+    # For example: 
+    # system( "scp #{Configuration::PASSWORDS_DATA_DIR}/*.dat user@192.168.1.123:.gtk2passwordapp-1/")
+    # system( "scp #{Configuration::PASSWORDS_DATA_DIR}/passphrase.txt user@192.168.1.123:.gtk2passwordapp-1/passphrase.txt")
+  end
+end

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

@@ -25,7 +25,7 @@ class Passwords < PasswordsData
       if File.exist?(@pfile) then
         File.open(@pfile,'r'){|fh| passphrase = fh.read }
       else
-        passphrase = _create_passphrase(@pfile)
+        passphrase = _create_passphrase
       end
     end
 
@@ -42,9 +42,14 @@ class Passwords < PasswordsData
     return false
   end
 
+  def self._get_salt(prompt)
+    (ret = Gtk2PasswordApp.get_salt(prompt,'Salt')) || exit
+    ret.strip
+  end
+
   attr_reader :pfile
   def initialize
-    @pwd = Gtk2PasswordApp.get_salt || exit
+    @pwd = Passwords._get_salt('Short Password')
     @pfile = nil
     @pph = get_passphrase
     super(@pwd+@pph)
@@ -57,17 +62,17 @@ class Passwords < PasswordsData
       if has_datafile? # then
         # Yes, it's got a datafile. Ask for password again.
         while !self.exist? do
-          @pwd = Gtk2PasswordApp.get_salt('Try again!') || exit
+          @pwd = Passwords._get_salt('Try again!')
           super(@pwd+@pph)
         end
         self.load 
       else
       # Else, must be a new install.
         pwd = @pwd
-        @pwd = Gtk2PasswordApp.get_salt('Verify New Password') || exit
+        @pwd = Passwords._get_salt('Verify New Password')
         while !(pwd == @pwd) do
-          pwd = Gtk2PasswordApp.get_salt('Try again!') || exit
-          @pwd = Gtk2PasswordApp.get_salt('Verify New Password') || exit
+          pwd = Passwords._get_salt('Try again!')
+          @pwd = Passwords._get_salt('Verify New Password')
         end
       end
     end

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

@@ -1,3 +1,4 @@
+require 'gtk2passwordapp/passwords'
 module Gtk2PasswordApp
    include Configuration
    PRIMARY	= Gtk::Clipboard.get((SWITCH_CLIPBOARDS)? Gdk::Selection::CLIPBOARD: Gdk::Selection::PRIMARY)
@@ -6,58 +7,29 @@ module Gtk2PasswordApp
    @@index = nil
    def self.build_menu(passwords)
      passwords.accounts.each {|account|
-       item = Gtk2App.dock_menu.append_menu_item(account){
+       item = PROGRAM.dock_menu.append_menu_item(account){
          @@index = passwords.accounts.index(account)
          PRIMARY.text   = passwords.password_of(account)
          CLIPBOARD.text = passwords.username_of(account)
        }
        item.child.modify_fg(Gtk::STATE_NORMAL, COLOR[:red]) if passwords.expired?(account)
      }
-     Gtk2App.dock_menu.show_all
+     PROGRAM.dock_menu.show_all
    end
    def self.rebuild_menu(passwords)
-     items = Gtk2App.dock_menu.children
+     items = PROGRAM.dock_menu.children
      3.times{ items.shift } # shift out Quit, Run, and Spacer
      while item = items.shift do
-       Gtk2App.dock_menu.remove(item)
+       PROGRAM.dock_menu.remove(item)
        item.destroy
      end
      Gtk2PasswordApp.build_menu(passwords)
    end
 
-   def self.get_salt(title='Short Password')
-     dialog = Gtk::Dialog.new(
-         title,
-         nil, nil,
-         [ Gtk::Stock::QUIT,  0 ],
-         [ Gtk::Stock::OK,  1 ])
- 
-     label = Gtk::Label.new(title)
-     label.justify = Gtk::JUSTIFY_LEFT
-     label.wrap = true
-     label.modify_font(Configuration::FONT[:normal])
-     dialog.vbox.add(label)
-     entry = Gtk::Entry.new
-     entry.visibility = false
-     entry.modify_font(Configuration::FONT[:normal])
-     dialog.vbox.add(entry)
-     dialog.show_all
- 
-     entry.signal_connect('activate'){
-       dialog.response(1)
-     }
- 
-     ret = nil
-     dialog.run {|response|
-       ret = entry.text.strip if response == 1
-     }
-     dialog.destroy
- 
-     return ret
+   def self.get_salt(prompt,title=prompt)
+     Gtk2AppLib::DIALOGS.entry(prompt,{:title=>title,:visibility=>false})
    end
  
-   DIALOGS = Gtk2App::Dialogs.new
-
    EDITOR_LABELS = [
  	:account,
   	:url,
@@ -69,8 +41,9 @@ module Gtk2PasswordApp
  
    EDITOR_BUTTONS = [
  	[ :random, :alphanum, :num, :alpha, :caps, ],
- 	[ :visibility, :current, :previous, :cancel, :save, :update, ],
- 	[ :delete, :cpwd ],
+ 	[ :cancel, :delete, :update, :save, ],
+ 	[ :cpwd ],
+ 	[ :current, :previous, ],
  	]
  
    TEXT = {
@@ -80,77 +53,59 @@ module Gtk2PasswordApp
  	:password	=> 'New',
  	# Buttons
  	:username	=> 'Username',
- 	:current	=> 'Current',
+ 	:current	=> 'Clip Current Password',
  	:url		=> 'Url',
  	:note		=> 'Note',
  	:edit		=> 'Edit',
- 	:update		=> 'Update',
- 	:visibility	=> 'Visible',
+ 	:update		=> 'Update Account',
  	:alphanum	=> 'Alpha-Numeric',
  	:num		=> 'Numeric',
  	:alpha		=> 'Letters',
  	:caps		=> 'All-Caps',
  	:random		=> 'Random',
- 	:previous	=> 'Previous',
+ 	:previous	=> 'Clip Previous Password',
  	:quit		=> 'Quit',
- 	:cancel		=> 'Cancel',
- 	:save		=> 'Save',
+ 	:cancel		=> 'Cancel All Changes',
+ 	:save		=> 'Save To Disk',
  	:cpwd		=> 'Change Data File Password',
  	:delete		=> 'Delete Account',
    }
  
    def self.edit(window, passwords)
-     begin
        dialog_options = {:window=>window}
        updated = false	# only saves data if data updated
 
-       vbox = Gtk::VBox.new
-       window.add(vbox)
+       vbox = Gtk2AppLib::VBox.new(window)
  
-       pwdlength = Gtk::SpinButton.new(MIN_PASSWORD_LENGTH, MAX_PASSWORD_LENGTH, 1)
-       pwdlength.value = DEFAULT_PASSWORD_LENGTH
-       pwdlength.width_request = SPIN_BUTTON_LENGTH
-       pwdlength.modify_font(FONT[:normal])
-       goto_url = Gtk::Button.new('Go')
-       goto_url.child.modify_font(FONT[:normal])
-       goto_url.width_request = GO_BUTTON_LENGTH
+       goto_url = pwdlength = visibility = nil
  
        widget = {}
        EDITOR_LABELS.each {|s|
-         hbox = Gtk::HBox.new
-         label = Gtk2App::Label.new(TEXT[s]+':',hbox) # Gtk2App's Label
-         label.width_request = LABEL_WIDTH
-         label.justify = Gtk::JUSTIFY_RIGHT
-         widget[s] = (s==:account)? Gtk::ComboBoxEntry.new : Gtk::Entry.new
-         widget[s].width_request = ENTRY_WIDTH -
-		((s == :password)? (SPIN_BUTTON_LENGTH+2*GUI[:padding]):
-		((s == :url)? (GO_BUTTON_LENGTH+2*GUI[:padding]): 0))
-         widget[s].modify_font(FONT[:normal])
-         hbox.pack_start(widget[s], false, false, GUI[:padding])
-         vbox.pack_start(hbox, false, false, GUI[:padding])
-         hbox.pack_start(pwdlength, false, false, GUI[:padding]) if s == :password
-         hbox.pack_start(goto_url, false, false, GUI[:padding]) if s == :url
-       }
+         hbox = Gtk2AppLib::HBox.new(vbox)
+         label = Gtk2AppLib::Label.new(TEXT[s]+':',hbox,{:label_width=>LABEL_WIDTH})
+         dx =  ((s == :password)? (SPIN_BUTTON_LENGTH+2*PADDING+30): ((s == :url)? (GO_BUTTON_LENGTH+2*PADDING): 0))
+         width = ENTRY_WIDTH  - dx
+         widget[s] = (s==:account)?
+		Gtk2AppLib::ComboBoxEntry.new(passwords.accounts,hbox,{:comboboxentry_width=>width}) :
+		Gtk2AppLib::Entry.new('',hbox,{:entry_width=>width})
 
-       # The go button opens the url in a browser
-       goto_url.signal_connect('clicked'){
-         system("#{APP[:browser]} #{widget[:url].text} > /dev/null 2> /dev/null &")
+         if s == :password then
+           visibility = Gtk2AppLib::CheckButton.new(hbox,{:active=>true})
+           pwdlength = Gtk2AppLib::SpinButton.new(hbox)
+           pwdlength.value = DEFAULT_PASSWORD_LENGTH
+         elsif s == :url then
+           goto_url = Gtk2AppLib::Button.new('Go',hbox,{:button_width=>GO_BUTTON_LENGTH}){
+             # The go button opens the url in a browser
+             system("#{APP[:browser]} #{widget[:url].text} > /dev/null 2> /dev/null &")
+           }
+         end
        }
- 
+
        EDITOR_BUTTONS.each{|row|
-         hbox = Gtk::HBox.new
-         row.each {|s|
-           widget[s] = Gtk::Button.new(TEXT[s])
-           widget[s].child.modify_font(FONT[:normal])
-           hbox.pack_start(widget[s], false, false, GUI[:padding])
-         }
-         vbox.pack_start(hbox, false, false, GUI[:padding])
+         hbox = Gtk2AppLib::HBox.new(vbox)
+         row.each {|s| widget[s] = Gtk2AppLib::Button.new(TEXT[s],hbox) }
        }
  
-       # Account
-       passwords.accounts.each { |account|
-         widget[:account].append_text( account )
-       }
        widget[:account].active = @@index	if @@index
        account_changed = proc {
          account = (widget[:account].active_text)? widget[:account].active_text.strip: ''
@@ -198,7 +153,7 @@ module Gtk2PasswordApp
              end
            end
          else
-           DIALOGS.quick_message('Need url like http://www.site.com/page.html', dialog_options)
+           Gtk2AppLib::DIALOGS.quick_message('Need url like http://www.site.com/page.html', dialog_options)
          end
        }
    
@@ -248,7 +203,7 @@ module Gtk2PasswordApp
        }
  
        # Visibility
-       widget[:visibility].signal_connect('clicked'){
+       visibility.signal_connect('clicked'){
          widget[:password].visibility = !widget[:password].visibility?
        }
  
@@ -278,6 +233,7 @@ module Gtk2PasswordApp
              end
              #@pwd = pwd1
              passwords.save(pwd1)
+             Gtk2AppLib.passwords_updated
            end
          end
        }
@@ -286,10 +242,11 @@ module Gtk2PasswordApp
        widget[:save].signal_connect('clicked'){
          if updated then
            passwords.save
+           Gtk2AppLib.passwords_updated
            updated = false
            Gtk2PasswordApp.rebuild_menu(passwords)
          end
-         Gtk2App.close
+         PROGRAM.close
        }
  
        # Delete
@@ -302,13 +259,13 @@ module Gtk2PasswordApp
              widget[:account].remove_text(i)
              @@index = (widget[:account].active = (i > 0)? i - 1: 0)
              updated = true
-             DIALOGS.quick_message("#{account} deleted.", dialog_options)
+             Gtk2AppLib::DIALOGS.quick_message("#{account} deleted.", dialog_options)
            end
          end
        }
 
        # Cancel
-       widget[:cancel].signal_connect('clicked'){ Gtk2App.close }
+       widget[:cancel].signal_connect('clicked'){ PROGRAM.close }
        window.signal_connect('destroy'){
          if updated then
            passwords.load # revert
@@ -317,8 +274,5 @@ module Gtk2PasswordApp
        }
  
        window.show_all
-     rescue Exception
-       puts_bang!
-     end
    end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gtk2passwordapp
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 1
-  - 1
   - 2
-  version: 1.1.2
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - carlosjhr64@gmail.com
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-10 00:00:00 -08:00
+date: 2010-08-04 00:00:00 -07:00
 default_executable: gtk2passwordapp
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: crypt-tea
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -35,14 +38,14 @@ dependencies:
   name: gtk2applib
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
-        - 5
-        - 0
-        - 0
-        version: 5.0.0
+        - 7
+        version: "7"
   type: :runtime
   version_requirements: *id002
 description: |
@@ -58,13 +61,15 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- ./gtk2passwordapp/passwords.rb
-- ./gtk2passwordapp/passwords_data.rb
-- ./gtk2passwordapp/edit_box.rb
-- ./gtk2passwordapp/iocrypt.rb
-- ./gtk2passwordapp/appconfig.rb
+- ./lib/gtk2passwordapp.rb
+- ./lib/gtk2passwordapp/passwords.rb
+- ./lib/gtk2passwordapp/passwords_data.rb
+- ./lib/gtk2passwordapp/iocrypt.rb
+- ./lib/gtk2passwordapp/appconfig.rb
 - ./pngs/logo.png
+- ./pngs/icon.png
 - README.txt
+- bin/gtk2passwordapp
 has_rdoc: true
 homepage: http://ruby-gnome-apps.blogspot.com/search/label/Passwords
 licenses: []
@@ -73,25 +78,29 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- .
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - gtk2
 rubyforge_project: gtk2passwordapp
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby-Gnome Password Manager

data/gtk2passwordapp/appconfig.rb

@@ -1,29 +0,0 @@
-# Note: you'll see in ~/.gtk2passwordapp-* a file called passphrase.txt.
-# Do not edit or delete passphrase, or you'll loose your passwords data.
-
-module Configuration
-  # Note that the passwords data file name is auto generated, but...
-  # You can place your passwords data file in a directory other than ~/gtk2passwordapp-*
-  PASSWORDS_DATA_DIR = UserSpace::DIRECTORY
-
-  ENTRY_WIDTH	= (Gtk2App::HILDON)? 600: 300
-  LABEL_WIDTH	= 75
-  GO_BUTTON_LENGTH = 50
-  SPIN_BUTTON_LENGTH = 60
-# PAD		= 2	# cell padding
-
-  MAX_PASSWORD_LENGTH = 20
-  DEFAULT_PASSWORD_LENGTH = 7
-  MIN_PASSWORD_LENGTH = 3
-
-  # Switches the roles of PRIMARY and CLIPBOARD when true
-  SWITCH_CLIPBOARDS = Gtk2App::HILDON
-
-  PASSWORD_EXPIRED = 60*60*24*30*3 # 3 months
-
-  URL_PATTERN	= Regexp.new('^https?:\/\/[^\s\']+$')
-
-  FONT[:normal] = FONT[:large] = Pango::FontDescription.new( 'Arial 18' )	if Gtk2App::HILDON
-  GUI[:window_size] = [100,100]
-  MENU[:close]  = '_Close'
-end