gtk2passwordapp 2.1.2 → 2.1.3

data/bin/gtk2passwordapp2

@@ -1,37 +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 $options=~/-no-gui/ then
+  print Gtk2Password::Configuration::COMMAND_LINE_MSG1
   pwd = $stdin.gets.strip
-  if nogui then
-    $stderr.print Gtk2Password::Configuration::COMMAND_LINE_MSG2
-    pattern = Regexp.new( $stdin.gets.strip, Regexp::IGNORECASE )
-  end
-  begin
-    passwords = Gtk2Password::Passwords.new(Gtk2Password::Configuration::PASSWORDS_FILE, pwd)
-    passwords.load
-    if $options=~/-dump/ then
-      require 'pp'
-      pp passwords
-    else
-      passwords.accounts.each do |account|
-        if account =~ pattern then
-          password = passwords.password_of(account)
-          username = passwords.username_of(account)
-          puts [account,username,password].join("\n\t")
-        end
-      end
+  passwords = Gtk2Password::Passwords.new(Gtk2Password::Configuration::PASSWORDS_FILE, pwd)
+  print Gtk2Password::Configuration::COMMAND_LINE_MSG2
+  pattern = Regexp.new( $stdin.gets.strip, Regexp::IGNORECASE )
+  passwords.accounts.each do |account|
+    if account =~ pattern then
+      password = passwords.password_of(account)
+      puts "\t\"" + account + "\"\t\t" + password
     end
-  rescue Exception
-    # we're going to be silent here... muhahaha-ha!
   end
   exit
 end

data/lib/gtk2passwordapp/iocrypt.rb

@@ -19,7 +19,14 @@ class IOCrypt
 
   def load(dumpfile)
     data = nil
-    File.open(dumpfile,'r'){|fh| data = YAML.load( @key.decrypt( fh.read ) ) }
+    begin
+      File.open(dumpfile,'r'){|fh| data = YAML.load( @key.decrypt( fh.read ) ) }
+    rescue Psych::SyntaxError
+      # assume it's syck
+      YAML::ENGINE.yamler = 'syck'
+      File.open(dumpfile,'r'){|fh| data = YAML.load( @key.decrypt( fh.read ) ) }
+      YAML::ENGINE.yamler = 'psych' # make it psych
+    end
     return data
   end
 

metadata

@@ -1,52 +1,77 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gtk2passwordapp
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.1.3
   prerelease: 
-  version: 2.1.2
 platform: ruby
-authors: 
+authors:
 - carlosjhr64@gmail.com
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-16 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: crypt-tea
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
   name: gtk2applib
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '15.3'
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "15.3"
+      - !ruby/object:Gem::Version
+        version: '15.3'
+- !ruby/object:Gem::Dependency
+  name: gtk2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-description: |
-  A Ruby-Gnome password manager.
-  Uses crypt-tea's Tiny Encryption Algorithm to encrypt the datafile.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'A Ruby-Gnome password manager.
+
+  Uses crypt-tea''s Tiny Encryption Algorithm to encrypt the datafile.
+
   Features random password generator and clipboard use.
 
+'
 email: carlosjhr64@gmail.com
-executables: 
+executables:
 - gtk2passwordapp2
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - ./lib/gtk2passwordapp/appconfig.rb
 - ./lib/gtk2passwordapp/iocrypt.rb
 - ./lib/gtk2passwordapp/passwords.rb
@@ -59,31 +84,26 @@ files:
 - bin/gtk2passwordapp2
 homepage: https://sites.google.com/site/gtk2applib/home/gtk2applib-applications/gtk2passwordapp
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-requirements: 
-- gtk2
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby-Gnome Password Manager
 test_files: []
-
-has_rdoc: false