pws 1.0.2 → 1.0.3

data/README.md

@@ -1,6 +1,6 @@
 pws [![Build status](http://travis-ci.org/janlelis/pws.png)](http://travis-ci.org/janlelis/pws)
 ===
-pws is a command-line password safe/manager written in Ruby.
+pws is a command-line password safe/manager written in Ruby using [aes-256-cbc](http://en.wikipedia.org/wiki/Advanced_Encryption_Standard) and [pbkdf2](http://en.wikipedia.org/wiki/PBKDF2).
 
 
 Usage
@@ -8,46 +8,43 @@ Usage
 [![Screenshot](http://rbjl.net/pws-example.png)](http://rbjl.net/60-pws-the-ruby-powered-command-line-password-manager)
 
 
-Installation
+Setup
 ---
-You can install pws with
-`$ gem install pws`
+You can install *pws* with: `$ gem install pws`
 
 Run `$ pws --help` for usage information.
 
-On Linux, please make sure you've got `xclip` or `xsel` installed (clipboard).
+On Linux, please make sure you've got `xclip` or `xsel` installed (for the clipboard).
 
-
-OpenSSL 1.0
+Hints
 ---
-You should use a Ruby built with bindings to an openssl version >= 1.0. If not, pws will fall back to a Ruby-only version of the PBKDF2 function. If using openssl 1.0 is not possible for you, you can work around the issue by using the `--iterations` option with a value < 75\_000 (see help). If you have problems using openssl 1.0 with your Ruby, please look for a solution in [this github issue](https://github.com/janlelis/pws/issues/7).
 
+### OpenSSL 1.0
+You should use a Ruby that was built with bindings to an openssl version >= 1.0 or pws will fall back to a Ruby-only version of the PBKDF2 function, which is much slower. If using openssl 1.0 is not possible for you, you can work around that issue by using the `--iterations` option with a value below 75\_000 (see help). If you have problems using openssl 1.0 with your Ruby, please look for a solution in [this issue](https://github.com/janlelis/pws/issues/7).
 
-Using a .pws file in the current working directory
----
-Besides using the `--filename path/to/safe` option, you can shortly call `pws --cwd` for using a `.pws` file in the current directory.
 
-
-Updating from pws 0.9
----
-The 0.9 password files are not compatible with that version, however, you can convert your safe with:
+### Updating from pws 0.9
+The 0.9 password files are not compatible with the 1.0 version of pws, however, you can convert your safe with:
 `$ pws resave --in 0.9 --out 1.0`
 
 
-Reading the source
----
+### How to use a .pws file in the current working directory
+Besides using the `--filename path/to/safe` option, you can shortly call `pws --cwd` for using a `.pws` file in the current directory.
+
+
+### Reading the source
 Trust the code by reading the source! It's originally based on [this tutorial](http://rbjl.net/41-tutorial-build-your-own-password-safe-with-ruby). You might want to start reading in the [0.9.2 tag](https://github.com/janlelis/pws/tree/0.9.2), because it's got less features and therefore is less code.
 
 
 Contributors
 ---
-* [namelessjon](https://github.com/namelessjon)
+* [namelessjon](https://github.com/namelessjon/)
 * [brianewing](https://github.com/brianewing/)
 * [dquimper](https://github.com/dquimper/)
 * [grapz](https://github.com/grapz/)
 * [thecatwasnot](https://github.com/thecatwasnot/) (cucumber specs loosely based on [these](https://github.com/thecatwasnot/passwordsafe/blob/master/features/))
 
 
-Copyright
+J-\_-L
 ---
 © 2010-2012 Jan Lelis, MIT license

data/lib/pws/runner.rb

@@ -1,6 +1,10 @@
 require_relative '../pws'
 
 module PWS::Runner
+  SINGLE_OPTIONS = Regexp.union *%w[
+    cwd
+  ].freeze
+
   class << self
     # some simple option parsing
     # returns action, arguments, options
@@ -17,15 +21,15 @@ module PWS::Runner
           # ignore
         when /^--(help|version)$/
           return [$1.to_sym, [], {}]
-        when /^--(cwd)/ # special single options
+        when /^--(#{SINGLE_OPTIONS})/ # special single options
           options[$1.to_sym] = true
         when /^--/
           # parse option in next iteration
         when /^-([^-].*)$/
           options[:namespace] = $1
         else
-          if prev_arg =~ /^--(.+)$/
-            options[$1.to_sym] = arg
+          if prev_arg =~ /^--(.+)$/ && SINGLE_OPTIONS !~ opt = $1
+            options[opt.to_sym] = arg
           elsif !action
             action = arg.to_sym
           else

data/lib/pws/version.rb

@@ -1,3 +1,3 @@
 class PWS
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pws
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard