perfect_world 0.3.0 → 0.3.1

data/README.md

@@ -34,7 +34,7 @@ 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 need at least Ruby 1.9.3.
+In addition you need at least Ruby 1.9.
 
 ## pwm
 
@@ -76,35 +76,35 @@ Or clone the repo.
 Let's create some passwords.
 
     $ pwm --generate github
-    9&sq'8Gz.Bpb8#%M.T-Xyi#&.sDcTYFE.=qFyEbld Z[wA'By75y?NA?qUy}U>xd   github
+    9&sq'8Gz.Bpb8#%M.T-Xyi#&.sDcTYFE.=qFyEbld-Z[wA'By75y?NA?qUy}U>xd
     $ pwm --generate google
-    8UN:'I1^M)H\kj'U{4l!.tK3\v9V+}L4$XNal \rzE@c\["&u#@#TRINt5"Jj[6A   google
+    8UN:'I1^M)H\kj'U{4l!.tK3\v9V+}L4$XNal-\rzE@c\["&u#@#TRINt5"Jj[6A
 
 And retrieve them.
 
     $ pwm --list
-    9&sq'8Gz.Bpb8#%M.T-Xyi#&.sDcTYFE.=qFyEbld Z[wA'By75y?NA?qUy}U>xd   github
-    8UN:'I1^M)H\kj'U{4l!.tK3\v9V+}L4$XNal \rzE@c\["&u#@#TRINt5"Jj[6A   google
+    9&sq'8Gz.Bpb8#%M.T-Xyi#&.sDcTYFE.=qFyEbld-Z[wA'By75y?NA?qUy}U>xd   github
+    8UN:'I1^M)H\kj'U{4l!.tK3\v9V+}L4$XNal-\rzE@c\["&u#@#TRINt5"Jj[6A   google
 
 Or just one.
 
     $ pwm --get github
-    9&sq'8Gz.Bpb8#%M.T-Xyi#&.sDcTYFE.=qFyEbld Z[wA'By75y?NA?qUy}U>xd   github
+    9&sq'8Gz.Bpb8#%M.T-Xyi#&.sDcTYFE.=qFyEbld-Z[wA'By75y?NA?qUy}U>xd
 
 Directly to the clipboard.
 
     $ pwm --clipboard --get google
-    Copied the password for 'google' to your clipboard.
+    Copied your google password to the clipboard.
 
 Override an existing password.
 
     $ pwm --force --generate google
-    gi>VlHK<=m2D+}8X4P\( yB6(<Jk'/9^ JAwCjK|!j-$exDe83g8[CD.n^%cYxO7   google
+    gi>VlHK<=m2D+}8X4P\(-yB6(<Jk'/9^-JAwCjK|!j-$exDe83g8[CD.n^%cYxO7
 
 And delete one.
 
     $ pwm --delete google
-    Deleted the password for 'google'.
+    Deleted your google password.
 
 ## Config file
 

data/bin/pwm

@@ -2,11 +2,9 @@
 
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 
+require 'yaml'
 require 'optparse'
 
-require 'psych'
-require 'psych/syntax_error'
-
 require 'perfect_world/cli'
 require 'perfect_world/error'
 require 'perfect_world/version'
@@ -21,7 +19,7 @@ end
 options = {}
 
 parser = OptionParser.new do |parser|
-  parser.banner = "Usage: #{$0} [options]"
+  parser.banner = "Usage: #{ARGV.options.program_name} [options]"
 
   parser.separator ''
   parser.separator 'Options:'
@@ -79,7 +77,7 @@ parser = OptionParser.new do |parser|
   end
 
   parser.on('--version', 'Prints the version and exits.') do
-    puts 'pwm ' << PerfectWorld::VERSION; exit
+    puts "#{ARGV.options.program_name} #{PerfectWorld::VERSION}"; exit
   end
 
   parser.separator ''
@@ -96,8 +94,8 @@ end
 config_file = File.expand_path(options.fetch(:config, '~/.pwmrc'))
 
 begin
-  config = File.exist?(config_file) ? Psych.load_file(config_file) : {}
-rescue SystemCallError, Psych::Exception, Psych::SyntaxError => e
+  config = File.exist?(config_file) ? YAML.load_file(config_file) : {}
+rescue => e
   die "Couldn't load config file: #{e.message}"
 end
 

data/lib/perfect_world/cli.rb

@@ -45,7 +45,7 @@ module PerfectWorld
     # Deletes a password.
     def delete(db, id)
       if db.delete(id)
-        puts "Deleted the password for '#{id}'."
+        puts "Deleted your #{id} password."
       else
         password_not_found(id)
       end
@@ -74,7 +74,7 @@ module PerfectWorld
 
     # Lists all passwords.
     def list(db, _ = nil)
-      db.each { |id, password| print_password(id, password) }
+      db.each { |id, password| puts "#{password}   #{id}" }
     end
 
     # Prints the current key owner.
@@ -84,24 +84,19 @@ module PerfectWorld
 
     # Raises an error with a proper message.
     def password_not_found(id)
-      raise Error, "Couldn't find the password for '#{id}'."
+      raise Error, "Couldn't find your #{id} password."
     end
 
     # Prints a password or copies it to the clipboard.
     def print_or_copy_to_clipboard(id, password)
       if @config.fetch('clipboard')
         Clipboard << password
-        puts "Copied the password for '#{id}' to your clipboard."
+        puts "Copied your #{id} password to the clipboard."
       else
-        print_password(id, password)
+        puts password
       end
     end
 
-    # Prints a password.
-    def print_password(id, password)
-      puts "#{password}   #{id}"
-    end
-
     # Prints a config entry.
     def print_config(key)
       puts @config[key]

data/lib/perfect_world/db.rb

@@ -55,7 +55,7 @@ module PerfectWorld
       if ! @passwords.key?(id)
         generate!(id, len)
       else
-        raise Error, "Password for '#{id}' is already in the database."
+        raise Error, "Your #{id} password is already in the database."
       end
     end
 

data/lib/perfect_world/error.rb

@@ -6,7 +6,7 @@ module PerfectWorld
   # Should be raised, when gpg key could not be found.
   class KeyNotFound < Error
     def initialize(owner)
-      super("Couldn't find key for '#{owner}'.")
+      super("Couldn't find GPG key for '#{owner}'.")
     end
   end
 

data/lib/perfect_world/random.rb

@@ -16,7 +16,7 @@ module PerfectWorld
       s = String.new
 
       while s.length < len
-        s << SecureRandom.random_bytes(len * 3).gsub(/[^[:print:]]/, '')
+        s << SecureRandom.random_bytes(len * 3.3).gsub(/[^[:graph:]]/, '')
       end
 
       s[0..(len - 1)]

data/lib/perfect_world/storage.rb

@@ -1,5 +1,4 @@
-require 'psych'
-require 'psych/syntax_error'
+require 'yaml'
 require 'gpgme'
 require 'perfect_world/error'
 
@@ -58,14 +57,14 @@ module PerfectWorld
       end
 
       def serialize(data)
-        Psych.dump(data)
-      rescue Psych::Exception => e
+        YAML.dump(data)
+      rescue => e
         raise Error, e.message
       end
 
       def deserialize(data)
-        Psych.load(data)
-      rescue Psych::Exception, Psych::SyntaxError => e
+        YAML.load(data)
+      rescue => e
         raise Error, e.message
       end
 

data/lib/perfect_world/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfect_world
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -54,6 +54,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
 description: An attempt to build a simple but secure password manager.
 email:
 - ushi@porkbox.net
@@ -84,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: