pws 1.0.1 → 1.0.2

data/README.md

@@ -17,9 +17,18 @@ Run `$ pws --help` for usage information.
 
 On Linux, please make sure you've got `xclip` or `xsel` installed (clipboard).
 
-On MacOS, the KDF might be generated pretty slow. You can work around this issue by using less iterations (see help) or [solving this problem](https://github.com/janlelis/pws/issues/7).
 
-Updating from 0.9
+OpenSSL 1.0
+---
+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).
+
+
+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:
 `$ pws resave --in 0.9 --out 1.0`
@@ -30,13 +39,13 @@ 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.
 
 
-Contributions by
+Contributors
 ---
 * [namelessjon](https://github.com/namelessjon)
 * [brianewing](https://github.com/brianewing/)
 * [dquimper](https://github.com/dquimper/)
 * [grapz](https://github.com/grapz/)
-* Cucumber specs loosely based on [the ones](https://github.com/thecatwasnot/passwordsafe/blob/master/features/) by [thecatwasnot](https://github.com/thecatwasnot/)
+* [thecatwasnot](https://github.com/thecatwasnot/) (cucumber specs loosely based on [these](https://github.com/thecatwasnot/passwordsafe/blob/master/features/))
 
 
 Copyright

data/features/misc.feature

@@ -36,3 +36,10 @@ Feature: Misc
     And  the output should contain "J-_-L"
     And  the output should contain "github"
   
+  Scenario: I want to use a .pws file in the current directory
+    When I run `pws --cwd ls` interactively
+    And  I type "123"
+    And  I type "456"
+    Then the output should contain the current path
+    And  the output should contain ".pws"
+    And  the output should contain "The passwords don't match!"

data/features/step_definitions/pws_steps.rb

@@ -76,6 +76,10 @@ Then /^the output from "([^"]*)" should not contain the current date$/ do |cmd|
   assert_no_partial_output(Time.now.strftime('%y-%m-%d'), output_from(cmd))
 end
 
+Then /^the output should contain the current path$/ do
+  assert_partial_output(FileUtils.pwd, all_output)
+end
+
 When /^I set env variable "(\w+)" to "([^"]*)"$/ do |var, value|
   ENV[var] = value
 end

data/lib/pws.rb

@@ -20,7 +20,7 @@ class PWS
   # You can pass the master password as third parameter (not recommended)
   def initialize(options)
     collect_options(options)
-    @filename = File.expand_path(@options[:filename])
+    @filename = @options[:cwd] ? File.join(FileUtils.pwd, '.pws') : File.expand_path(@options[:filename])
     @filename << '-' << @options[:namespace] if @options[:namespace]
     
     read_safe(options[:password])

data/lib/pws/format/1.0.rb

@@ -155,6 +155,7 @@ class PWS
           OpenSSL::PKCS5::pbkdf2_hmac("","",2,512,OpenSSL::Digest::SHA512.new)
         rescue NotImplementedError
           alias kdf kdf_ruby
+          warn "[pws slow] https://github.com/janlelis/pws#openssl-10"
         else
           alias kdf kdf_openssl
         end

data/lib/pws/runner.rb

@@ -17,6 +17,8 @@ module PWS::Runner
           # ignore
         when /^--(help|version)$/
           return [$1.to_sym, [], {}]
+        when /^--(cwd)/ # special single options
+          options[$1.to_sym] = true
         when /^--/
           # parse option in next iteration
         when /^-([^-].*)$/
@@ -111,6 +113,10 @@ module PWS::Runner
   #{Paint['--filename', :bold]}
   Path to the password safe to use. Overrides usual path and any namespaces.
   
+  #{Paint['--cwd', :bold]}
+  Use a .pws file in the current directory instead of the one specified in
+  ENV['PWS'] or with --filename.
+  
   #{Paint['--iterations', :bold]}
   Sets the number of sha iterations used to transform your password into the
   encryption key (pbkdf2). A higher number takes longer to compute, but makes

data/lib/pws/version.rb

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

metadata

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