keybox 1.1.1 → 1.2.0

data/lib/keybox/storage/container.rb

@@ -73,7 +73,6 @@ module Keybox
             def initialize(passphrase,path)
                 super()
 
-
                 @path        = path
                 @passphrase  = passphrase
                 @records     = []

data/lib/keybox/string_generator.rb

@@ -84,7 +84,7 @@ module Keybox
 
         def load_default_chargram_list
             list = []
-            File.open(File.join(Keybox::APP_DATA_DIR,"chargrams.txt")) do |f|
+            File.open(File.join(Keybox::APP_RESOURCE_DIR,"chargrams.txt")) do |f|
                 f.each_line do |line|
                     next if line =~ /^#/
                     list << line.rstrip

data/lib/keybox/version.rb

@@ -0,0 +1,21 @@
+require 'keybox'
+
+module Keybox
+    class Version
+        MAJOR   = 1 
+        MINOR   = 2 
+        BUILD   = 0 
+
+        class << self
+            def to_a
+                [MAJOR, MINOR, BUILD]
+            end
+
+            def to_s
+                to_a.join(".")
+            end
+        end
+    end 
+    VERSION = Version.to_s
+end
+

data/spec/base_app_spec.rb

@@ -1,4 +1,4 @@
-require 'keybox'
+require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
 require 'keybox/application/base'
 
 describe "Keybox Base Application" do

data/spec/convert_csv_spec.rb

@@ -1,6 +1,5 @@
-require 'tempfile'
-require 'keybox'
-require 'keybox/convert/csv'
+require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
+
 describe "CSV Convert class" do
     before(:each) do 
         @import_csv = Tempfile.new("keybox_import.csv")

data/spec/entry_spec.rb

@@ -1,4 +1,4 @@
-require 'keybox'
+require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
 describe "Account Entry" do
     it "fields get set correctly" do
         k = Keybox::AccountEntry.new("a test title", "user")

data/spec/keybox_app_spec.rb

@@ -1,5 +1,4 @@
-require 'tempfile'
-require 'keybox'
+require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
 require 'keybox/application/password_safe'
 
 describe "Keybox Password Safe Application" do
@@ -50,13 +49,15 @@ describe "Keybox Password Safe Application" do
 
     it "executing with no args should have output on stdout" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path])
-        kps.set_io(StringIO.new(@passphrase),StringIO.new,StringIO.new)
+        prompted_values = ["dark", @passphrase].join("\n")
+        kps.set_io(StringIO.new(prompted_values),StringIO.new,StringIO.new)
         kps.run
         kps.stdout.string.size.should > 0
     end
 
     it "general options get set correctly" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path, "--debug", "--no-use-hash-for-url"])
+        kps.set_io(StringIO.new("dark"),StringIO.new,StringIO.new)
         kps.merge_options
         kps.options.db_file.should == @testing_db.path
         kps.options.config_file.should == @testing_cfg.path
@@ -78,7 +79,7 @@ describe "Keybox Password Safe Application" do
 
     it "space separated words are okay for names" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path, "--add", "An Example"])
-        prompted_values = [@passphrase, "An example"] + %w(example.com someuser apassword apassword noinfo yes)
+        prompted_values = ["none", @passphrase, "An example"] + %w(example.com someuser apassword apassword noinfo yes)
         stdin = StringIO.new(prompted_values.join("\n"))
         kps.set_io(stdin,StringIO.new,StringIO.new)
         kps.run
@@ -126,7 +127,7 @@ describe "Keybox Password Safe Application" do
     it "prompted for password twice to create database initially" do
         File.unlink(@testing_db.path)
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path])
-        stdin  = StringIO.new([@passphrase,@passphrase].join("\n"))
+        stdin  = StringIO.new(["dark", @passphrase,@passphrase].join("\n"))
         kps.set_io(stdin,StringIO.new,StringIO.new)
         kps.run
         kps.db.records.size.should == 0
@@ -136,7 +137,7 @@ describe "Keybox Password Safe Application" do
 
     it "file can be opened with password" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path])
-        stdin  = StringIO.new(@passphrase + "\n")
+        stdin  = StringIO.new(["light",@passphrase].join("\n"))
         kps.set_io(stdin,StringIO.new,StringIO.new)
         kps.run
         kps.db.records.size.should == 3
@@ -144,7 +145,7 @@ describe "Keybox Password Safe Application" do
 
     it "adding an entry to the database works" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path, "--add", "example.com"])
-        prompted_values = [@passphrase] + %w(example.com example.com someuser apassword apassword noinfo yes)
+        prompted_values = ["dark",@passphrase] + %w(example.com example.com someuser apassword apassword noinfo yes)
         stdin  = StringIO.new(prompted_values.join("\n"))
         kps.set_io(stdin,StringIO.new,StringIO.new)
         kps.run
@@ -153,7 +154,7 @@ describe "Keybox Password Safe Application" do
 
     it "editing an entry in the database works" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path, "--edit", "localhost"])
-        prompted_values = [@passphrase] + %w(yes example.com example.com someother anewpassword anewpassword someinfo yes)
+        prompted_values = ["dark", @passphrase] + %w(yes example.com example.com someother anewpassword anewpassword someinfo yes)
         stdin  = StringIO.new(prompted_values.join("\n"))
         kps.set_io(stdin,StringIO.new,StringIO.new)
         kps.run
@@ -163,7 +164,7 @@ describe "Keybox Password Safe Application" do
 
     it "add a url entry to the database" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path, "--use-hash-for-url", "--add", "http://www.example.com"])
-        prompted_values = [@passphrase] + %w(www.example.com http://www.example.com someuser noinfo yes)
+        prompted_values = ["dark", @passphrase] + %w(www.example.com http://www.example.com someuser noinfo yes)
         stdin  = StringIO.new(prompted_values.join("\n"))
         kps.set_io(stdin,StringIO.new,StringIO.new)
         kps.run
@@ -174,7 +175,7 @@ describe "Keybox Password Safe Application" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, 
                                                      "-c", @testing_cfg.path, 
                                                      "--add", "example.com"])
-        prompted_values = [@passphrase, ""] + %w(example.com someuser apassword abadpassword abcdef abcdef noinfo yes)
+        prompted_values = ["dark", @passphrase, ""] + %w(example.com someuser apassword abadpassword abcdef abcdef noinfo yes)
         stdin  = StringIO.new(prompted_values.join("\n"))
         kps.set_io(stdin,StringIO.new,StringIO.new)
         kps.run
@@ -183,7 +184,7 @@ describe "Keybox Password Safe Application" do
 
     it "able to delete an entry" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path, "--delete", "example"])
-        prompted_values = [@passphrase] + %w(Yes)
+        prompted_values = ["dark", @passphrase] + %w(Yes)
         stdin = StringIO.new(prompted_values.join("\n"))
         kps.set_io(stdin,StringIO.new,StringIO.new)
         kps.run
@@ -193,7 +194,7 @@ describe "Keybox Password Safe Application" do
 
     it "able to cancel deletion" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path, "--delete", "example"])
-        prompted_values = [@passphrase] + %w(No)
+        prompted_values = ["dark", @passphrase] + %w(No)
         stdin = StringIO.new(prompted_values.join("\n"))
         kps.set_io(stdin,StringIO.new,StringIO.new)
         kps.run
@@ -203,7 +204,7 @@ describe "Keybox Password Safe Application" do
 
     it "list all the entries" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path, "--list"])
-        stdin = StringIO.new(@passphrase)
+        stdin = StringIO.new(["dark", @passphrase].join("\n"))
         kps.set_io(stdin,StringIO.new,StringIO.new)
         kps.run
         kps.stdout.string.should =~ /2./m 
@@ -211,7 +212,7 @@ describe "Keybox Password Safe Application" do
 
     it "listing no entries found" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path, "--list", "nothing"])
-        stdin = StringIO.new(@passphrase)
+        stdin = StringIO.new(["dark", @passphrase].join("\n"))
         kps.set_io(stdin,StringIO.new,StringIO.new)
         kps.run
         kps.stdout.string.should =~ /No matching records were found./ 
@@ -219,7 +220,7 @@ describe "Keybox Password Safe Application" do
 
     it "showing no entries found" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path, "--show", "nothing"])
-        stdin = StringIO.new(@passphrase)
+        stdin = StringIO.new(["dark", @passphrase].join("\n"))
         kps.set_io(stdin,StringIO.new,StringIO.new)
         kps.run
         kps.stdout.string.should =~ /No matching records were found./ 
@@ -228,7 +229,7 @@ describe "Keybox Password Safe Application" do
 
     it "show all the entries" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path, "--show"])
-        stdin = StringIO.new([@passphrase, "", "", ""].join("\n"))
+        stdin = StringIO.new(["dark", @passphrase, "", "", ""].join("\n"))
         kps.set_io(stdin,StringIO.new,StringIO.new)
         kps.run
         kps.stdout.string.should =~ /2./m 
@@ -236,7 +237,7 @@ describe "Keybox Password Safe Application" do
 
     it "changing master password works" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path, "--master-password"])
-        stdin  = StringIO.new([@passphrase, "I really love ruby.", "I really love ruby."].join("\n"))
+        stdin  = StringIO.new(["dark", @passphrase, "I really love ruby.", "I really love ruby."].join("\n"))
         kps.set_io(stdin,StringIO.new,StringIO.new)
         kps.run
         kps.stdout.string.should =~ /New master password set/m 
@@ -244,7 +245,7 @@ describe "Keybox Password Safe Application" do
 
     it "master password must be non-zero" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path, "--master-password"])
-        stdin  = StringIO.new([@passphrase, "", ""].join("\n"))
+        stdin  = StringIO.new(["dark",@passphrase, "", ""].join("\n"))
         kps.set_io(stdin,StringIO.new,StringIO.new)
         begin
             kps.run
@@ -256,7 +257,7 @@ describe "Keybox Password Safe Application" do
 
     it "importing from a valid csv file" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path,"-i", @import_csv.path])
-        stdin  = StringIO.new([@passphrase, @passphrase].join("\n"))
+        stdin  = StringIO.new(["dark",@passphrase, @passphrase].join("\n"))
         kps.set_io(stdin,StringIO.new,StringIO.new)
         kps.run
         kps.stdout.string.should =~ /Imported \d* records from/m 
@@ -264,7 +265,7 @@ describe "Keybox Password Safe Application" do
 
     it "Error message give on invalid imported csv" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path,"-i", @bad_import_csv.path])
-        stdin  = StringIO.new([@passphrase, @passphrase].join("\n"))
+        stdin  = StringIO.new(["dark",@passphrase, @passphrase].join("\n"))
         kps.set_io(stdin,StringIO.new,StringIO.new)
         begin
             kps.run
@@ -276,7 +277,7 @@ describe "Keybox Password Safe Application" do
 
     it "able to export to a csv" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path,"-x", @export_csv.path])
-        stdin  = StringIO.new([@passphrase, @passphrase].join("\n"))
+        stdin  = StringIO.new(["dark",@passphrase, @passphrase].join("\n"))
         kps.set_io(stdin,StringIO.new,StringIO.new)
         kps.run
         kps.stdout.string.should  =~ /Exported \d* records to/m 
@@ -284,14 +285,14 @@ describe "Keybox Password Safe Application" do
 
     it "able to turn off color schemes" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path,"--color","none"])
-        kps.set_io(StringIO.new(@passphrase),StringIO.new,StringIO.new)
+        kps.set_io(StringIO.new(["dark",@passphrase].join("\n")),StringIO.new,StringIO.new)
         kps.run
         kps.options.color_scheme.should == :none
     end
 
     it "an invalid color scheme results in a no color scheme" do
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path,"--color","dne"])
-        kps.set_io(StringIO.new(@passphrase),StringIO.new,StringIO.new)
+        kps.set_io(StringIO.new(["dark",@passphrase].join("\n")),StringIO.new,StringIO.new)
         kps.run
         kps.options.color_scheme.should == :none
     end
@@ -300,7 +301,7 @@ describe "Keybox Password Safe Application" do
         bad_color_scheme = { :bad => [:bold, :white, :on_magenta] }
         File.open("/tmp/test.color_scheme.yaml", "w+") { |f| f.write(bad_color_scheme.to_yaml) }
         kps = Keybox::Application::PasswordSafe.new(["-f", @testing_db.path, "-c", @testing_cfg.path,"--color","test"])
-        kps.set_io(StringIO.new(@passphrase),StringIO.new,StringIO.new)
+        kps.set_io(StringIO.new(["dark",@passphrase].join("\n")),StringIO.new,StringIO.new)
         kps.run
 
         File.unlink("/tmp/test.color_scheme.yaml")

data/spec/kpg_app_spec.rb

@@ -1,4 +1,4 @@
-require 'keybox'
+require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
 require 'keybox/application/password_generator'
 
 describe "Keybox Password Generator Application" do

data/spec/password_hash_spec.rb

@@ -1,4 +1,5 @@
-require 'keybox'
+require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
+
 describe "PasswordHash" do
     before(:each) do 
         @pwd_hash = Keybox::PasswordHash.new("i love ruby")

data/spec/randomizer_spec.rb

@@ -1,4 +1,4 @@
-require 'keybox/randomizer'
+require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
 
 describe "a random device class" do
     it "should have a default source" do

data/spec/spec_helper.rb

@@ -0,0 +1,21 @@
+begin
+    require 'rubygems'
+    require 'keybox'
+    require 'spec'
+    require 'stringio'
+    require 'tempfile'
+    
+    # termios cannot be used during testing
+    begin
+        require 'termios'
+        raise "ERROR!!!! termios library found.  It is not possible to run keybox tests with the termios library at this time."
+        exit 2
+    rescue LoadError
+    end
+    
+rescue LoadError
+    path = File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
+    raise if $:.include? path
+    $: << path
+    retry
+end

data/spec/storage_container_spec.rb

@@ -1,10 +1,4 @@
-require 'keybox'
-require 'keybox/storage'
-require 'keybox/error'
-require 'keybox/entry'
-require 'openssl'
-require 'tempfile'
-require 'yaml'
+require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
 
 describe 'a storage container' do
     before(:each) do

data/spec/storage_record_spec.rb

@@ -1,4 +1,4 @@
-require 'keybox/storage'
+require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
 
 describe 'a storage record entry' do
     before(:each) do

data/spec/string_generator_spec.rb

@@ -1,4 +1,5 @@
-require 'keybox'
+require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
+
 describe Keybox::StringGenerator  do
     before(:each) do
         @generator = Keybox::StringGenerator.new

data/spec/uuid_spec.rb

@@ -1,4 +1,5 @@
-require 'keybox/uuid'
+require File.expand_path(File.join(File.dirname(__FILE__),"spec_helper.rb"))
+
 describe "UUID class" do
     it "should have 16 bytes" do
         uuid = Keybox::UUID.new

metadata

@@ -1,27 +1,26 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: keybox
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
-date: 2007-06-21 00:00:00 -06:00
-summary: Keybox is a set of command line applications and ruby libraries for secure password storage and password generation.
+  version: 1.2.0
+date: 2007-09-09 00:00:00 -06:00
+summary: Secure pasword storage.
 require_paths: 
 - lib
-- lib
 email: jeremy@hinegardner.org
 homepage: http://keybox.rubyforge.org
 rubyforge_project: keybox
-description: Keybox is a set of command line applications and ruby libraries for secure password storage and password generation.
+description: A set of command line applications and ruby libraries for secure password storage and password generation.
 autorequire: 
-default_executable: 
+default_executable: keybox
 bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 0.0.0
+      version: 1.8.5
   version: 
 platform: ruby
 signing_key: 
@@ -30,62 +29,71 @@ post_install_message: "\e[1m\e[31m\e[40mTry `keybox --help` for more information
 authors: 
 - Jeremy Hinegardner
 files: 
-- data/dark_bg.color_scheme.yaml
-- data/chargrams.txt
-- data/light_bg.color_scheme.yaml
-- vendor/highline/highline.rb
-- vendor/highline/highline/system_extensions.rb
-- vendor/highline/highline/question.rb
-- vendor/highline/highline/color_scheme.rb
-- vendor/highline/highline/menu.rb
-- vendor/highline/highline/import.rb
-- spec/kpg_app_spec.rb
-- spec/convert_csv_spec.rb
-- spec/storage_record_spec.rb
-- spec/storage_container_spec.rb
-- spec/uuid_spec.rb
 - spec/base_app_spec.rb
+- spec/convert_csv_spec.rb
 - spec/entry_spec.rb
 - spec/keybox_app_spec.rb
-- spec/string_generator_spec.rb
+- spec/kpg_app_spec.rb
 - spec/password_hash_spec.rb
 - spec/randomizer_spec.rb
-- lib/keybox/storage/container.rb
-- lib/keybox/storage/record.rb
-- lib/keybox/convert/csv.rb
+- spec/spec_helper.rb
+- spec/storage_container_spec.rb
+- spec/storage_record_spec.rb
+- spec/string_generator_spec.rb
+- spec/uuid_spec.rb
+- CHANGES
+- COPYING
+- README
 - lib/keybox/application/base.rb
 - lib/keybox/application/password_generator.rb
 - lib/keybox/application/password_safe.rb
-- lib/keybox/highline_util.rb
 - lib/keybox/cipher.rb
-- lib/keybox/error.rb
-- lib/keybox/randomizer.rb
-- lib/keybox/uuid.rb
-- lib/keybox/digest.rb
+- lib/keybox/convert/csv.rb
 - lib/keybox/convert.rb
+- lib/keybox/digest.rb
 - lib/keybox/entry.rb
-- lib/keybox/string_generator.rb
+- lib/keybox/error.rb
+- lib/keybox/gemspec.rb
+- lib/keybox/highline_util.rb
 - lib/keybox/password_hash.rb
+- lib/keybox/randomizer.rb
+- lib/keybox/specification.rb
+- lib/keybox/storage/container.rb
+- lib/keybox/storage/record.rb
 - lib/keybox/storage.rb
+- lib/keybox/string_generator.rb
+- lib/keybox/uuid.rb
+- lib/keybox/version.rb
 - lib/keybox.rb
+- resources/chargrams.txt
+- resources/dark_bg.color_scheme.yaml
+- resources/light_bg.color_scheme.yaml
 - bin/keybox
 - bin/kpg
-- README
-- CHANGES
-- COPYING
-test_files: []
-
+test_files: 
+- spec/base_app_spec.rb
+- spec/convert_csv_spec.rb
+- spec/entry_spec.rb
+- spec/keybox_app_spec.rb
+- spec/kpg_app_spec.rb
+- spec/password_hash_spec.rb
+- spec/randomizer_spec.rb
+- spec/spec_helper.rb
+- spec/storage_container_spec.rb
+- spec/storage_record_spec.rb
+- spec/string_generator_spec.rb
+- spec/uuid_spec.rb
 rdoc_options: 
 - --line-numbers
 - --inline-source
-- --title
-- keybox - 1.1.1
 - --main
 - README
+- --title
+- "'keybox -- Secure pasword storage.'"
 extra_rdoc_files: 
-- README
 - CHANGES
 - COPYING
+- README
 executables: 
 - keybox
 - kpg
@@ -101,5 +109,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.6
+        version: 1.4.0
     version: