passw3rd 0.0.7 → 0.0.8

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.8.0 / 2011-10-02
+
+Custom key directories
+
 === 0.6.0 / 2011-10-02
 
 Added custom password directories, more tests.  Some code cleanup.  Java version maven site generation.

data/lib/passw3rd/password_service.rb

@@ -1,18 +1,23 @@
 module Passw3rd
   class PasswordService
     @@password_file_dir = ENV["HOME"]
+    @@key_file_dir = ENV["HOME"]
 
     def self.password_file_dir= dir
       @@password_file_dir = dir
     end
 
+    def self.key_file_dir= dir
+      @@key_file_dir = dir
+    end    
+
     def self.get_password (password_file, key_path=nil)
       encoded_password = Base64.decode64(IO.readlines(File.join(@@password_file_dir, password_file)).join)
-      PasswordService.decrypt(encoded_password, key_path)
+      PasswordService.decrypt(encoded_password, key_path || @@key_file_dir)
     end
 
     def self.write_password_file(password, output_path, key_path = nil)
-      enc_password = PasswordService.encrypt(password, key_path)
+      enc_password = PasswordService.encrypt(password, key_path || @@key_file_dir)
       base64pw = Base64.encode64(enc_password) 
       path = File.join(@@password_file_dir, output_path)
       File.open(path, 'w') { |f| f.write base64pw }
@@ -22,7 +27,7 @@ module Passw3rd
     def self.encrypt(password, key_path = nil)
       raise "password cannot be blank" if password.empty?
 
-      pair = KeyLoader.load(key_path)
+      pair = KeyLoader.load(key_path || @@key_file_dir)
       cipher = OpenSSL::Cipher::Cipher.new('aes-128-cbc')
       cipher.encrypt
       cipher.key = pair.key
@@ -37,7 +42,7 @@ module Passw3rd
     end
 
     def self.decrypt(cipher_text, key_path = nil)
-      pair = KeyLoader.load(key_path)
+      pair = KeyLoader.load(key_path || @@key_file_dir)
       cipher = OpenSSL::Cipher::Cipher.new('aes-128-cbc')
       cipher.decrypt
       cipher.key = pair.key

data/lib/passw3rd/version.rb

@@ -1,3 +1,3 @@
 module Passw3rd
-  Version = VERSION = '0.0.7'
+  Version = VERSION = '0.0.8'
 end

data/test/password_service_test.rb

@@ -8,6 +8,9 @@ class PasswordServiceTest < Test::Unit::TestCase
   def setup
     random_num = SecureRandom.random_number(5000)
     @random_string = SecureRandom.random_bytes(5000 + random_num)
+
+    ::Passw3rd::KeyLoader.create_key_iv_file(Dir.tmpdir)
+    ::Passw3rd::PasswordService.key_file_dir = Dir.tmpdir    
   end
   
   def test_enc_dec
@@ -18,25 +21,22 @@ class PasswordServiceTest < Test::Unit::TestCase
   end
 
   def test_set_and_get_password
-    ::Passw3rd::KeyLoader.create_key_iv_file(Dir.tmpdir)
-    password_file = ::Passw3rd::PasswordService.write_password_file(@random_string, "test", Dir.tmpdir)
-    decrypted = Passw3rd::PasswordService.get_password("test", Dir.tmpdir)
+    password_file = ::Passw3rd::PasswordService.write_password_file(@random_string, "test")
+    decrypted = Passw3rd::PasswordService.get_password("test")
     assert_equal(@random_string, decrypted)
   end
 
   def test_set_and_get_password_custom_dir
     ::Passw3rd::PasswordService.password_file_dir = Dir.tmpdir    
-    ::Passw3rd::KeyLoader.create_key_iv_file(Dir.tmpdir)
+
     password_file = ::Passw3rd::PasswordService.write_password_file(@random_string, "test2")
     decrypted = Passw3rd::PasswordService.get_password("test2")
     assert_equal(@random_string, decrypted)
   end  
   
   def test_gen_key
-    ::Passw3rd::KeyLoader.create_key_iv_file(Dir.tmpdir)
-    
-    enc = ::Passw3rd::PasswordService.encrypt(@random_string, Dir.tmpdir)
-    dec = ::Passw3rd::PasswordService.decrypt(enc, Dir.tmpdir)
+    enc = ::Passw3rd::PasswordService.encrypt(@random_string)
+    dec = ::Passw3rd::PasswordService.decrypt(enc)
     
     assert_equal(@random_string, dec)
   end

metadata

@@ -1,25 +1,33 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: passw3rd
-version: !ruby/object:Gem::Version
-  version: 0.0.7
+version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 8
+  version: 0.0.8
 platform: ruby
-authors:
+authors: 
 - Neil Matatall
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-02 00:00:00.000000000Z
+
+date: 2011-10-02 00:00:00 Z
 dependencies: []
-description: Generate a key/iv file, generate passwords, and store encrypted files
-  in source control, keep the key/iv safe!
-email:
+
+description: Generate a key/iv file, generate passwords, and store encrypted files in source control, keep the key/iv safe!
+email: 
 - neil.matatall@gmail.com
-executables:
+executables: 
 - passw3rd
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - README.md
 - LICENSE
 - EXAMPLES
@@ -33,26 +41,36 @@ files:
 - test/password_service_test.rb
 homepage: https://github.com/oreoshake/passw3rd
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A simple "keep the passwords out of source code and config files".
 test_files: []
+