pws 1.0.0.pre.1 → 1.0.0

data/README.md

@@ -2,7 +2,6 @@ pws [![Build status](http://travis-ci.org/janlelis/pws.png)](http://travis-ci.or
 ===
 pws is a command-line password safe/manager written in Ruby.
 
-*ATTENTION* Refactoring in progress / The latest stable version is 0.9.2
 
 Usage
 ---
@@ -16,12 +15,11 @@ You can install pws with
 
 Run `$ pws --help` for usage information.
 
+On linux, please make sure you've got `xclip` or `xsel` installed (clipboard).
 
-1.0 / Updating from 0.9
----
-You can try out the newest version with:
-`$ gem install pws --pre`
 
+Updating from 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`
 
@@ -33,6 +31,7 @@ Trust the code by reading the source! It's originally based on [this tutorial](h
 
 Contributions by
 ---
+* [namelessjon](https://github.com/namelessjon)
 * [brianewing](https://github.com/brianewing/)
 * [dquimper](https://github.com/dquimper/)
 * [grapz](https://github.com/grapz/)

data/features/add.feature

@@ -44,14 +44,14 @@ Feature: Add
     Then the output should contain "Master password:"
     And  the output should contain "NO ACCESS"
     
-  @slow-hack
+  @very-slow-hack
   Scenario: Set a new password for "github", this also sets the timestamp
     Given A safe exists with master password "my_master_password"
     When I run `pws ls` interactively
     And  I type "my_master_password"
-    Then the output from "pws ls" should not contain the current date
+    Then the output should not contain the current date
     When I run `pws add github github_password` interactively
     And  I type "my_master_password"
     And  I run `pws show` interactively
     And  I type "my_master_password"
-    Then the output from "pws show" should contain the current date
+    Then the output should contain the current date

data/features/create.feature

@@ -3,6 +3,7 @@ Feature: Create
   As a user
   I want to create a new safe
 
+  @slow-hack
   Scenario: Trying to call a pws task (except help or version), but safe does not exist, yet
     When I run `pws` interactively
     And I type "some_new_master_password"

data/features/generate.feature

@@ -23,7 +23,6 @@ Feature: Generate
     And  the output should contain "The password for github is now available in your clipboard for 1 second"
 
   @wait-11s
-  @slow-hack
   Scenario: Generate a new password for "github", PWS_SECONDS set to 5, gets passed to the get as keep-in-clipboard time
     Given A safe exists with master password "my_master_password"
     When I set env variable "PWS_SECONDS" to "5"
@@ -54,7 +53,7 @@ Feature: Generate
     And  the clipboard should match /^.{64}$/
     
   @slow-hack
-  Scenario: Generate a new password for "github", default length of PWS_GEN_LENGTH
+  Scenario: Generate a new password for "github", default length of PWS_LENGTH
     Given A safe exists with master password "my_master_password"
     When I set env variable "PWS_LENGTH" to "15"
     And  I run `pws generate github 0` interactively
@@ -85,7 +84,7 @@ Feature: Generate
     And  the clipboard should match ^[!\"\#$%&'()*+,\-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ\[\\\]^_`abcdefghijklmnopqrstuvwxyz{|}~]+$
     
   @slow-hack
-  Scenario: Generate a new password for "github", the default char pool PWS_GEN_CHARPOOL
+  Scenario: Generate a new password for "github", the default char pool PWS_CHARPOOL
     Given A safe exists with master password "my_master_password"
     When I set env variable "PWS_CHARPOOL" to "a"
     When I run `pws generate github 0` interactively

data/features/in-out.feature

@@ -37,13 +37,13 @@ Feature: --in and --out options
     Given A "0.9" safe exists with master password "password" and a key "github" with password "123456"
     When I run `pws resave --in 0.9 --out 1.0` interactively
     And  I type "password"
-    Then the output from "pws resave --in 0.9 --out 1.0" should contain "Master password:"
-    Then the output from "pws resave --in 0.9 --out 1.0" should contain "resaved"
+    Then the output should contain "Master password:"
+    Then the output should contain "resaved"
     When I run `pws` interactively
     And  I type "password"
-    Then the output from "pws" should contain "Master password:"
-    Then the output from "pws" should contain "Entries"
-    Then the output from "pws" should contain "github"
+    Then the output should contain "Master password:"
+    Then the output should contain "Entries"
+    Then the output should contain "github"
   
   Scenario: Trying to convert to 0.9, but --out 0.9 is not supported
     Given A "0.9" safe exists with master password "password" and a key "github" with password "123456"

data/features/master.feature

@@ -16,8 +16,8 @@ Feature: Master
     And  the output should contain "The master password has been changed"
     When I run `pws` interactively
     And  I type "my_master_password"
-    And  the output from "pws" should contain "Master password"
-    And  the output from "pws" should contain "NO ACCESS"
+    And  the output should contain "Master password"
+    And  the output should contain "NO ACCESS"
   
   Scenario: Try to change the master password (but password confirmation is wrong)
     Given A safe exists with master password "my_master_password"
@@ -30,7 +30,6 @@ Feature: Master
     And  the output should contain "again"
     And  the output should contain "don't match"
   
-  @slow-hack
   Scenario: Change the master password, already passing it as command line parameter (not recommended)
     Given A safe exists with master password "my_master_password"
     When I run `pws master my_new_master_password` interactively
@@ -49,8 +48,8 @@ Feature: Master
     And  the output should contain "The master password has been changed"
     When I run `pws` interactively
     And  I type ""
-    Then the output from "pws" should contain "Master password:"
-    And  the output from "pws" should contain "There aren't any passwords stored"
+    Then the output should contain "Master password:"
+    And  the output should contain "There aren't any passwords stored"
     
   Scenario: Try to change the master password (but enter the old one wrong)
     Given A safe exists with master password "my_master_password"

data/features/misc.feature

@@ -3,15 +3,17 @@ Feature: Misc
   As a user
   I want ensure the password safe behaves nicely
 
-  @slow-hack
-  Scenario: I am calling with a wrong argument count
-    Given A safe exists with master password "my_master_password" and a key "github" with password "github_password"
+  Scenario: I am calling with too few arguments
+  Given A safe exists with master password "my_master_password" and a key "github" with password "github_password"
     When I run `pws get` interactively
     And  I type "my_master_password"
     And  the output should contain "Wrong number of arguments"
+    
+  Scenario: I am calling with too many arguments
+  Given A safe exists with master password "my_master_password" and a key "github" with password "github_password"
     When I run `pws get github with far too many args` interactively
     And  I type "my_master_password"
-    And  the output from "pws get github with far too many args" should contain "Wrong number of arguments"
+    And  the output should contain "Wrong number of arguments"
     
   Scenario: I am calling a task that does not exist
   Given A safe exists with master password "my_master_password" and a key "github" with password "github_password"

data/features/rename.feature

@@ -3,7 +3,7 @@ Feature: Rename
   As a user
   I want to rename passwords in my password safe
 
-  @slow-hack
+  @very-slow-hack
   Scenario: Rename the password entry "github" to "gh"
     Given A safe exists with master password "my_master_password" and a key "github" with password "github_password"
     When I run `pws rename github gh` interactively
@@ -12,9 +12,9 @@ Feature: Rename
     And  the output should contain "The password entry github has been renamed to gh"
     When I run `pws show` interactively
     And  I type "my_master_password"
-    Then the output from "pws show" should contain "Master password:"
-    And  the output from "pws show" should contain "Entries"
-    And  the output from "pws show" should contain "gh"
+    Then the output should contain "Master password:"
+    And  the output should contain "Entries"
+    And  the output should contain "gh"
     And  the output from "pws show" should not contain "github"
 
   Scenario: Try to rename the password entry "github" to "gh" (but github does not exist)

data/features/resave.feature

@@ -11,27 +11,27 @@ Feature: Resave
       | entries   | 678 |
     When I run `pws resave` interactively
     And  I type "my_master_password"
-    Then the output from "pws resave" should contain "resaved"
+    Then the output should contain "resaved"
     When I run `pws` interactively
     And  I type "my_master_password"
-    And  the output from "pws" should contain "some"
-    And  the output from "pws" should contain "password"
-    And  the output from "pws" should contain "entries"
+    And  the output should contain "some"
+    And  the output should contain "password"
+    And  the output should contain "entries"
     
   @slow-hack
   Scenario: Useful for converting when used together with --in and --out options
     Given A "0.9" safe exists with master password "password" and a key "github" with password "123456"
     When I run `pws show` interactively
     And  I type "password"
-    Then the output from "pws show" should contain "Master password:"
-    Then the output from "pws show" should contain "NO ACCESS"
-    Then the output from "pws show" should contain "convert"
+    Then the output should contain "Master password:"
+    Then the output should contain "NO ACCESS"
+    Then the output should contain "convert"
     When I run `pws resave --in 0.9 --out 1.0` interactively
     And  I type "password"
-    Then the output from "pws resave --in 0.9 --out 1.0" should contain "Master password:"
-    Then the output from "pws resave --in 0.9 --out 1.0" should contain "resaved"
+    Then the output should contain "Master password:"
+    Then the output should contain "resaved"
     When I run `pws` interactively
     And  I type "password"
-    Then the output from "pws" should contain "Master password:"
-    Then the output from "pws" should contain "Entries"
-    Then the output from "pws" should contain "github"
+    Then the output should contain "Master password:"
+    Then the output should contain "Entries"
+    Then the output should contain "github"

data/features/step_definitions/pws_steps.rb

@@ -60,11 +60,11 @@ Then /^the clipboard should match ([^\/].+)$/ do |expected|
   assert_matching_output(expected, Clipboard.paste) 
 end
 
-Then /^the output should contain the current date$/ do |cmd|
+Then /^the output should contain the current date$/ do
   assert_partial_output(Time.now.strftime('%y-%m-%d'), all_output)
 end
 
-Then /^the output should not contain the current date$/ do |cmd|
+Then /^the output should not contain the current date$/ do
   assert_no_partial_output(Time.now.strftime('%y-%m-%d'), all_output)
 end
 

data/features/support/env.rb

@@ -34,9 +34,13 @@ end
 # Hacks
 
 Before('@slow-hack') do
-  @aruba_io_wait_seconds = 5 # 0.5 would be ok... except for "output from", travis even needs more
+  @aruba_io_wait_seconds = 3
+end
+
+Before('@very-slow-hack') do
+  @aruba_io_wait_seconds = 7
 end
 
 Before('@wait-11s') do
-  @aruba_timeout_seconds = 12
+  @aruba_timeout_seconds = 15
 end

data/features/update-generate.feature

@@ -0,0 +1,118 @@
+Feature: Update
+  In order to keep my privacy
+  As a user
+  I want to update a password entry and generate the new password
+
+  @wait-11s
+  Scenario: Generate a new password for "github" and get it
+    Given A safe exists with master password "my_master_password" and a key "github" with password "old_password"
+    When I run `pws update-gen github` interactively
+    And  I type "my_master_password"
+    Then the output should contain "Master password:"
+    And  the output should contain "The password for github has been updated"
+    And  the output should contain "The password for github is now available in your clipboard for 10 seconds"
+  
+  Scenario: Try to update-gen the password for "github" (but it does not exist)
+    Given A safe exists with master password "my_master_password"
+    When I run `pws update-gen github` interactively
+    And  I type "my_master_password"
+    Then the output should contain "Master password:"
+    And  the output should contain "There is no password stored for github, so you cannot update it!"
+    
+  Scenario: Try to update-gen the password for "github" (but the master password is wrong)
+    Given A safe exists with master password "my_master_password" and a key "github" with password "old_password"
+    When I run `pws update-gen github` interactively
+    And  I type "my_master_password_wrong"
+    Then the output should contain "Master password:"
+    And  the output should contain "NO ACCESS"
+    
+  @wait-11s
+  Scenario: Generate a new password for "github" and get it
+    Given A safe exists with master password "my_master_password" and a key "github" with password "old_password"
+    When I run `pws update-gen github` interactively
+    And  I type "my_master_password"
+    Then the output should contain "Master password:"
+    And  the output should contain "The password for github has been updated"
+    And  the output should contain "The password for github is now available in your clipboard for 10 seconds"
+    
+  @slow-hack
+  Scenario: Generate a new password for "github", second parameter gets passed to the get as keep-in-clipboard time 
+    Given A safe exists with master password "my_master_password" and a key "github" with password "old_password"
+    When I run `pws update-gen github 1` interactively
+    And  I type "my_master_password"
+    Then the output should contain "Master password:"
+    And  the output should contain "The password for github has been updated"
+    And  the output should contain "The password for github is now available in your clipboard for 1 second"
+
+  @wait-11s
+  @slow-hack
+  Scenario: Generate a new password for "github", PWS_SECONDS set to 5, gets passed to the get as keep-in-clipboard time
+    Given A safe exists with master password "my_master_password" and a key "github" with password "old_password"
+    When I set env variable "PWS_SECONDS" to "5"
+    And I run `pws update-gen github` interactively
+    And  I type "my_master_password"
+    Then the output should contain "Master password:"
+    And  the output should contain "The password for github has been updated"
+    And  the output should contain "The password for github is now available in your clipboard for 5 seconds"
+
+  @slow-hack
+  Scenario: Generate a new password for "github", third parameter defines password length 
+    Given A safe exists with master password "my_master_password" and a key "github" with password "old_password"
+    When I run `pws update-gen github 0 10` interactively
+    And  I type "my_master_password"
+    Then the output should contain "Master password:"
+    And  the output should contain "The password for github has been updated"
+    And  the output should contain "The password for github has been copied to your clipboard"
+    And  the clipboard should match /^.{10}$/
+    
+  @slow-hack
+  Scenario: Generate a new password for "github", default length is 64 
+    Given A safe exists with master password "my_master_password" and a key "github" with password "old_password"
+    When I run `pws update-gen github 0` interactively
+    And  I type "my_master_password"
+    Then the output should contain "Master password:"
+    And  the output should contain "The password for github has been updated"
+    And  the output should contain "The password for github has been copied to your clipboard"
+    And  the clipboard should match /^.{64}$/
+    
+  @slow-hack
+  Scenario: Generate a new password for "github", default length of PWS_LENGTH
+    Given A safe exists with master password "my_master_password" and a key "github" with password "old_password"
+    When I set env variable "PWS_LENGTH" to "15"
+    And  I run `pws update-gen github 0` interactively
+    And  I type "my_master_password"
+    Then the output should contain "Master password:"
+    And  the output should contain "The password for github has been updated"
+    And  the output should contain "The password for github has been copied to your clipboard"
+    And  the clipboard should match /^.{15}$/
+
+  @slow-hack
+  Scenario: Generate a new password for "github", fourth parameter defines a char pool used for generation 
+    Given A safe exists with master password "my_master_password" and a key "github" with password "old_password"
+    When I run `pws update-gen github 0 10 a` interactively
+    And  I type "my_master_password"
+    Then the output should contain "Master password:"
+    And  the output should contain "The password for github has been updated"
+    And  the output should contain "The password for github has been copied to your clipboard"
+    And  the clipboard should match /^a{10}$/
+    
+  @slow-hack
+  Scenario: Generate a new password for "github", the default char pool is !\"\#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ 
+    Given A safe exists with master password "my_master_password" and a key "github" with password "old_password"
+    When I run `pws update-gen github 0` interactively
+    And  I type "my_master_password"
+    Then the output should contain "Master password:"
+    And  the output should contain "The password for github has been updated"
+    And  the output should contain "The password for github has been copied to your clipboard"
+    And  the clipboard should match ^[!\"\#$%&'()*+,\-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ\[\\\]^_`abcdefghijklmnopqrstuvwxyz{|}~]+$
+    
+  @slow-hack
+  Scenario: Generate a new password for "github", the default char pool PWS_CHARPOOL
+    Given A safe exists with master password "my_master_password" and a key "github" with password "old_password"
+    When I set env variable "PWS_CHARPOOL" to "a"
+    When I run `pws update-gen github 0` interactively
+    And  I type "my_master_password"
+    Then the output should contain "Master password:"
+    And  the output should contain "The password for github has been updated"
+    And  the output should contain "The password for github has been copied to your clipboard"
+    And  the clipboard should match ^a{64}$

data/features/update.feature

@@ -3,7 +3,6 @@ Feature: Update
   As a user
   I want to update a password entry
 
-  @slow-hack
   Scenario: Set a new password for "github"
     Given A safe exists with master password "my_master_password" and a key "github" with password "old_password"
     When I run `pws update github` interactively
@@ -45,16 +44,16 @@ Feature: Update
     Then the output should contain "Master password:"
     And  the output should contain "NO ACCESS"
     
-  @slow-hack
+  @very-slow-hack
   Scenario: Set a new password for "github", this also sets the timestamp
     Given A safe exists with master password "my_master_password" and a key "github" with password "old_password" and timestamp "42424242"
     When I run `pws ls` interactively
     And  I type "my_master_password"
-    Then the output from "pws ls" should not contain the current date
+    Then the output should not contain the current date
     When I run `pws update github github_password` interactively
     And  I type "my_master_password"
     And  I run `pws show` interactively
     And  I type "my_master_password"
-    Then the output from "pws show" should contain the current date
+    Then the output should contain the current date
     
   

data/lib/pws/format/1.0.rb

@@ -11,7 +11,7 @@ class PWS
     # see at bottom block for a short format description
     module V1_0
       TEMPLATE = 'a64 a16 N a64 a*'.freeze
-      DEFAULT_ITERATIONS =        80_000
+      DEFAULT_ITERATIONS =        75_000
       MAX_ITERATIONS     =    10_000_000
       MAX_ENTRY_LENGTH   = 4_294_967_295 # N
     

data/lib/pws/runner.rb

@@ -35,7 +35,7 @@ module PWS::Runner
       [action || :show, arguments, options]
     end
     
-    # makes the Ruby safe more usable
+    # makes the Ruby safe usable from the cli
     def run(action, arguments, options)
       case action
       when :v, :version
@@ -45,27 +45,27 @@ module PWS::Runner
   
   #{Paint["Usage", :underline]}
   
-  #{Paint['pws', :bold]} [-namespace] action [arguments]
+  #{Paint['pws', :bold]} [-namespace] action [arguments] [--options]
   
   #{Paint["Info", :underline]}
   
   pws allows you to manage passwords in encryted password files (safes). It
   operates on the file specified in the environment variable PWS or on "~/.pws".
-  You can apply a namespace as first parameter that will be appended to the
-  filename, e.g. `pws -work show` with usual env would use "~/.pws-work".
+  Using a single dash, you can set a namespace that will be appended to the
+  filename, e.g. `pws -work show` will operate on "~/.pws-work".
   
-  #{Paint["Available actions", :underline]}
+  #{Paint["Available Actions", :underline]}
   
   #{Paint['ls', :bold]} / list / show / status ( pattern = nil )
   Lists all available password entries. Optionally takes a regex filter.
   
-  #{Paint['add', :bold]} / set / store / create ( name, password = nil )
-  Stores a new password entry. The second argument can be the password, but
-  it's recommended to not pass it, but enter it interactively.
-  
   #{Paint['get', :bold]} / entry / copy / password / for ( name, seconds = 10 )
   Copies the password for <name> to the clipboard. The second argument specifies,
   how long the password is kept in the clipboard (0 = no deletion).
+
+  #{Paint['add', :bold]} / set / store / create ( name, password = nil )
+  Stores a new password entry. The second argument can be the password, but
+  it's recommended to not pass it, but enter it interactively.
   
   #{Paint['gen', :bold]} / generate ( name, seconds = 10, length = 64, char_pool )
   Generates a new password for <name> and then copies it to the clipboard, like
@@ -73,6 +73,12 @@ module PWS::Runner
   argument sets the password length. The fourth argument allows you to pass a
   character pool that is used for generating the passwords.
   
+  #{Paint['update', :bold]} / update-add ( name, password = nil )
+  Updates an existing password entry.
+  
+  #{Paint['update-gen', :bold]} / update-generate( name, seconds = 10, length = 64, char_pool )
+  Updates an existing password entry using the generate method.
+  
   #{Paint['rm', :bold]} / remove / del / delete ( name )
   Removes a password entry.
   
@@ -82,12 +88,47 @@ module PWS::Runner
   #{Paint['master', :bold]} ( password = nil )
   Changes the master password.
   
+  #{Paint['resave', :bold]} / convert
+  Just save the safe. Useful for converting the file format.
+  
   #{Paint['v', :bold]} / version
   Displays version and website.
   
   #{Paint['help', :bold]} / actions / commands
   Displays this help.
+
+  #{Paint["Available Options", :underline]}
+  
+  #{Paint['--in', :bold]}
+  Specifies the password file input format. Neccessary to convert 0.9 safes.
+  Supported values: 0.9 1.0
+  
+  #{Paint['--out', :bold]}
+  Specifies the password file output format. Ignored for non-writing actions,
+  e.g. get. Defaults to the current version.
+  Supported values: 1.0
+  
+  #{Paint['--filename', :bold]}
+  Path to the password safe to use. Overrides usual path and any namespaces.
   
+  #{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
+  it harder for attacker to bruteforce your password.
+  
+  #{Paint['--seconds', :bold]}, #{Paint['--length', :bold]}, #{Paint['--charpool', :bold]} 
+  Preset options for specific actions.
+  
+  #{Paint["ENV Variables", :underline]}
+  
+  You can use environment variables to customize the default settings of pws.
+  Except for PWS (info at top), the following variables can be used:
+  
+  PWS_SECONDS
+  PWS_LENGTH
+  PWS_CHARPOOL
+  PWS_ITERATIONS
+
 HELP
       else # redirect to safe
         if PWS.public_instance_methods(false).include?(action)

data/lib/pws/version.rb

@@ -1,3 +1,3 @@
 class PWS
-  VERSION = '1.0.0.pre.1'
+  VERSION = '1.0.0'
 end

data/lib/pws.rb

@@ -94,7 +94,7 @@ class PWS
       end
     end
   end
-  aliases_for :update, :change
+  alias :'update-add' :update
   
   # Gets the password entry and copies it to the clipboard. The second parameter is the time in seconds it stays there
   def get(key, seconds = @options[:seconds])
@@ -130,17 +130,23 @@ class PWS
         length    = @options[:length],
         charpool  = @options[:charpool]
     )
-    charpool_size = charpool.size
-    new_pw = (1..length.to_i).map{
-      charpool[SecureRandom.random_number(charpool_size)]
-    }.join
-    
-    if add(key, new_pw) 
-      get(key, seconds)
-    end
+    get(key, seconds) if add(key, generator(length, charpool))
   end
   alias_for :generate, :gen
   
+  # Updates a password entry with a freshly generated random password
+  def update_generate(
+        key,
+        seconds   = @options[:seconds],
+        length    = @options[:length],
+        charpool  = @options[:charpool]
+    )
+    get(key, seconds) if update(key, generator(length, charpool))
+  end
+  alias :'update-generate' :update_generate
+  alias :'update_gen'      :update_generate
+  alias :'update-gen'      :update_generate
+  
   # Removes a specific password entry
   def remove(key)
     if @data.delete key
@@ -191,6 +197,7 @@ class PWS
     pa %[The password file has been resaved], :green
     return true
   end
+  alias_for :resave, :convert
   
   # Prevents accidental displaying, e.g. in irb
   def to_s
@@ -202,12 +209,13 @@ class PWS
 
   def collect_options(options = {})
     @options = options
-    @options[:filename] ||= ENV["PWS"]          || '~/.pws'
-    @options[:seconds]  ||= ENV['PWS_SECONDS']  || 10
-    @options[:length]   ||= ENV['PWS_LENGTH']   || 64
-    @options[:charpool] ||= ENV['PWS_CHARPOOL'] || (33..126).map(&:chr).join
-    @options[:in]       ||= ENV['PWS_FORMAT']   || VERSION
-    @options[:out]      ||= ENV['PWS_FORMAT']   || VERSION
+    @options[:filename]   ||= ENV["PWS"]            || '~/.pws'
+    @options[:seconds]    ||= ENV['PWS_SECONDS']    || 10
+    @options[:length]     ||= ENV['PWS_LENGTH']     || 64
+    @options[:charpool]   ||= ENV['PWS_CHARPOOL']   || (33..126).map(&:chr).join
+    @options[:in]         ||= ENV['PWS_FORMAT']     || VERSION
+    @options[:out]        ||= ENV['PWS_FORMAT']     || VERSION
+    @options[:iterations] ||= ENV['PWS_ITERATIONS'] || 75_000
   end
   
   # Checks if the file is accessible or create a new one
@@ -237,7 +245,7 @@ class PWS
       @data,
       password: @password,
       format: @options[:out],
-      iterations: @options[:iterations], # TODO
+      iterations: @options[:iterations],
     )
     File.open(@filename, 'w'){ |f| f.write(encrypted_data) }
   end
@@ -268,8 +276,16 @@ class PWS
     
     password
   end
+  
+  # Generate a random password, maybe put in its own class sometime
+  def generator(length, charpool)
+    charpool_size = charpool.size
+    (1..length.to_i).map{
+      charpool[SecureRandom.random_number(charpool_size)]
+    }.join
+  end
 end
 
-# Command line action in pws/runner.rb
+# Command line behavior in pws/runner.rb
 
 # J-_-L

data/pws.gemspec

@@ -4,7 +4,7 @@ name = 'pws'
 require File.dirname(__FILE__) + "/lib/#{name}/version"
  
 Gem::Specification.new do |s|
-  s.required_ruby_version = '>= 1.9'
+  s.required_ruby_version = '>= 1.9.2'
   s.name        = name
   s.version     = PWS::VERSION
   s.authors     = ["Jan Lelis"]

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: pws
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.1
-  prerelease: 6
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Jan Lelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clipboard
@@ -207,6 +207,7 @@ files:
 - bin/pws
 - features/in-out.feature
 - features/update.feature
+- features/update-generate.feature
 - features/show.feature
 - features/misc.feature
 - features/get.feature
@@ -238,13 +239,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23