perfect_world 0.2.1 → 0.3.0

data/README.md

@@ -30,10 +30,11 @@ Dropbox, but they should not get my passwords.)
 ## Dependencies
 
 You need an installed and set up version of gnupg. It should be available
-in the package repo of your linux distribution. There are also several ways
-to install it on a Mac.
+in the package repo of your linux distribution. Check out the
+[GPGTools](https://www.gpgtools.org/installer/index.html) project, if you
+are on a Mac.
 
-In addition you will need at least Ruby 1.9.3.
+In addition you need at least Ruby 1.9.3.
 
 ## pwm
 
@@ -60,6 +61,7 @@ Or clone the repo.
         -C, --clipboard                  Copies the password to the clipboard.
         -d, --delete ID                  Deletes the password.
         -D, --database [FILE]            Prints or sets the used database.
+        -f, --force                      Override existing password.
         -g, --get ID                     Prints the password for an ID.
         -G, --generate ID                Generates and stores a new passord.
             --gpgdir DIR                 Sets the path to the GPG directory.
@@ -94,6 +96,11 @@ Directly to the clipboard.
     $ pwm --clipboard --get google
     Copied the password for 'google' to your clipboard.
 
+Override an existing password.
+
+    $ pwm --force --generate google
+    gi>VlHK<=m2D+}8X4P\( yB6(<Jk'/9^ JAwCjK|!j-$exDe83g8[CD.n^%cYxO7   google
+
 And delete one.
 
     $ pwm --delete google
@@ -110,6 +117,11 @@ changed with the ```--config``` switch. It contains straight forward Yaml.
     gpgdir: /home/ushi/.gnupg          # Path to the GnuPG home dir.
     database: /home/ushi/.pwm.yml.gpg  # Path to the password database.
 
+## Clipboard
+
+The clipboard feature should work out of the box on Mac OS. If you are on a
+Linux system you need to install ```xclip``` or ```xsel``` to make it work.
+
 # License (MIT)
 
 Copyright (c) 2013 ushi <ushi@porkbox.net>

data/bin/pwm

@@ -34,7 +34,7 @@ parser = OptionParser.new do |parser|
     options[:config] = f
   end
 
-  parser.on('-C', '--clipboard', "Copies the password to the clipboard.") do |c|
+  parser.on('-C', '--clipboard', 'Copies the password to the clipboard.') do |c|
     options[:clipboard] = c
   end
 
@@ -46,6 +46,10 @@ parser = OptionParser.new do |parser|
     options[:database] = f
   end
 
+  parser.on('-f', '--force', 'Override existing password.') do |f|
+    options[:force] = f
+  end
+
   parser.on('-g', '--get ID', 'Prints the password for an ID.') do |id|
     options[:get] = id
   end
@@ -98,7 +102,7 @@ rescue SystemCallError, Psych::Exception, Psych::SyntaxError => e
 end
 
 # Override config with command line options.
-[:clipboard, :database, :gpgdir, :length, :owner].each do |option|
+[:clipboard, :database, :force, :gpgdir, :length, :owner].each do |option|
   config[option.to_s] = options.delete(option) unless options[option].nil?
 end
 

data/lib/perfect_world/cli.rb

@@ -11,9 +11,10 @@ module PerfectWorld
 
     # Default config.
     CONFIG = {
-      'length' => 64,
+      'clipboard' => false,
       'database' => File.expand_path('~/.pwm.yml.gpg'),
-      'clipboard' => false
+      'force' => false,
+      'length' => 64
     }
 
     # Sets the config.
@@ -52,7 +53,9 @@ module PerfectWorld
 
     # Generats a new password and sends it to stdout.
     def generate(db, id)
-      print_or_copy_to_clipboard(id, db.generate(id, @config.fetch('length')))
+      len = @config.fetch('length')
+      pwd = @config['force'] ? db.generate!(id, len) : db.generate(id, len)
+      print_or_copy_to_clipboard(id, pwd)
     rescue Error => e
       raise Error, "Couldn't create password: #{e.message}"
     end

data/lib/perfect_world/db.rb

@@ -49,8 +49,18 @@ module PerfectWorld
     #   store[:google]
     #   #=> "B6m/![)A%fqw,\\ti-d`4\"&0>gl+>$0$Z"
     #
-    # Returns the new password.
+    # Returns the new password or raises an error if the password is already
+    # in the database.
     def generate(id, len = 64)
+      if ! @passwords.key?(id)
+        generate!(id, len)
+      else
+        raise Error, "Password for '#{id}' is already in the database."
+      end
+    end
+
+    # Does the same as DB#generate, but overrides existing passwords.
+    def generate!(id, len = 64)
       @passwords[id] = Random.string(len)
       @changed = true
       @passwords[id]

data/lib/perfect_world/version.rb

@@ -1,3 +1,3 @@
 module PerfectWorld
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfect_world
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -36,7 +36,7 @@ cert_chain:
   bjRVQmxyeTVQVzB6ZzY0VEk5L1AzNEFHUXQ2SStUOHMKQnh0dUdkZ0YyMkpt
   M3ZYbGlySkJJSStvMDdIeDV3ZjJEUGRDMTRKRU1UUVZoRVFkc2ZwbU9ub2Q0
   SnpLdWRxNwpES1U9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gpgme
@@ -62,14 +62,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/perfect_world.rb
-- lib/perfect_world/version.rb
+- lib/perfect_world/cli.rb
 - lib/perfect_world/storage.rb
-- lib/perfect_world/clipboard.rb
-- lib/perfect_world/error.rb
-- lib/perfect_world/db.rb
+- lib/perfect_world/version.rb
 - lib/perfect_world/random.rb
-- lib/perfect_world/cli.rb
+- lib/perfect_world/db.rb
+- lib/perfect_world/error.rb
+- lib/perfect_world/clipboard.rb
+- lib/perfect_world.rb
 - bin/pwm
 - README.md
 homepage: http://github.com/ushis/perfect_world