safe 0.5 → 0.7

data/README

@@ -33,33 +33,11 @@ bar
 This is a one-time operation.
 
 == License ==
-Safe is licensed under the BSD License. Copyright (c) 2007, Rob Warner
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of Rob Warner nor the names of its contributors may be
-      used to endorse or promote products derived from this software without
-      specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Safe is licensed under the Eclipse Public License. Copyright (c) 2007, 2010 Rob Warner
+All rights reserved. This program and the accompanying materials 
+are made available under the terms of the Eclipse Public License v1.0 
+which accompanies this distribution, and is available at 
+http://www.eclipse.org/legal/epl-v10.html 
 
 == Installation ==
 To install safe, you must have Ruby and Ruby Gems installed. From the command
@@ -88,6 +66,8 @@ Windows:
 0.3 -- September 7, 2007
 0.4 -- April 4, 2008
 0.5 -- April 6, 2008
+0.6 -- December 16, 2010
+0.7 -- February 18, 2011
 
 See Release-Notes.txt for more information
 

data/Rakefile

@@ -7,7 +7,7 @@ gem_spec = Gem::Specification.new do |spec|
   spec.summary = 'A command-line password storage program'
   spec.description = %{safe safely stores all your user IDs and passwords,
   encrypted by a password of your choosing.}
-  spec.version = '0.5'
+  spec.version = '0.7'
   
   # Author information
   spec.author = 'Rob Warner'
@@ -47,7 +47,9 @@ task :web do
   readme = f.read
   f.close
 
-  # Transform the headings
+  # Transform as necessary
+  readme.gsub!(/</, '&lt;')
+  readme.gsub!(/>/, '&gt;')
   readme.gsub!(/===(.*?)===/, '<h1>\1</h1>')
   readme.gsub!(/==(.*?)==/, '<h2>\1</h2>')
   readme.gsub!(/\n/, '<br />')

data/Release-Notes.txt

@@ -1,5 +1,15 @@
 Safe Release Notes
 ------------------
+0.7 (February 18, 2011)
+-----------------------
+[FIXED] Monkey patch crypt/blowfish so that safe runs under ruby 1.9
+
+0.6 (December 16, 2010)
+-----------------------
+[FIXED] Fix paths for required files to include current directory (1.9)
+[FIXED] Fix when statements to use then instead of : (1.9)
+Note that safe still doesn't work under Ruby 1.9, as the Blowfish gem still doesn't work under 1.9
+
 0.5 (April 6, 2008)
 -------------------
 [FIXED] Version number in help output corrected

data/bin/safe

@@ -4,7 +4,10 @@
 # safe: Safe Storage for Passwords.
 # Stores user IDs and passwords, encrypted by a password.
 #
-# Copyright (c) 2007, Rob Warner
+# Copyright (c) 2007, 2011 Rob Warner
+# rwarner@grailbox.com
+# http://grailbox.com
+# @hoop33
 #
 # All rights reserved.
 #
@@ -34,14 +37,15 @@
 ########################################################################
 require 'rubygems'
 require 'optparse'
-require File.join(File.dirname(__FILE__), '..', 'lib', 'safeentry')
-require File.join(File.dirname(__FILE__), '..', 'lib', 'safefile')
-require File.join(File.dirname(__FILE__), '..', 'lib', 'safeutils')
+
+require File.join('.', File.dirname(__FILE__), '..', 'lib', 'safeentry')
+require File.join('.', File.dirname(__FILE__), '..', 'lib', 'safefile')
+require File.join('.', File.dirname(__FILE__), '..', 'lib', 'safeutils')
 
 # TODO support list <NAME> without -l flag
 
 class Safe
-  SAFE_VERSION = '0.5'
+  SAFE_VERSION = '0.7'
   
   # Gets the command line
   def self.get_command_line
@@ -92,7 +96,7 @@ class Safe
   def self.run
     options = get_command_line
     if options[:action] == 'version'
-      puts "Safe version #{SAFE_VERSION}, Copyright (C) 2007 Rob Warner"
+      puts "Safe version #{SAFE_VERSION}, Copyright (C) 2011 Rob Warner"
     else
       begin
         dir = SafeUtils::get_safe_dir
@@ -100,14 +104,14 @@ class Safe
 
         # Perform the requested action
         case options[:action]
-          when 'list': file.list(options[:name])
-          when 'add': file.add(options[:name])
-          when 'delete': file.delete(options[:name])
-          when 'count': puts file.count
-          when 'password': file.change_password
-          when 'import': SafeUtils::import(file, options[:name])
-          when 'diff': SafeUtils::diff(file, options[:name])
-          when 'merge': SafeUtils::merge(file, options[:name])
+          when 'list' then file.list(options[:name])
+          when 'add' then file.add(options[:name])
+          when 'delete' then file.delete(options[:name])
+          when 'count' then puts file.count
+          when 'password' then file.change_password
+          when 'import' then SafeUtils::import(file, options[:name])
+          when 'diff' then SafeUtils::diff(file, options[:name])
+          when 'merge' then SafeUtils::merge(file, options[:name])
         end
       rescue
         abort $!.message

data/lib/blowfish.rb

@@ -0,0 +1,31 @@
+module Crypt
+  class Blowfish
+    def setup_blowfish()
+      @sBoxes = Array.new(4) { |i| INITIALSBOXES[i].clone }                                                                                                                                                     
+      @pArray = INITIALPARRAY.clone
+      keypos = 0
+      0.upto(17) { |i|
+        data = 0
+        4.times {
+          data = ((data << 8) | @key[keypos].ord) % ULONG
+          keypos = (keypos.next) % @key.length
+        }
+        @pArray[i] = (@pArray[i] ^ data) % ULONG
+      }
+      l = 0
+      r = 0
+      0.step(17, 2) { |i|
+        l, r = encrypt_pair(l, r)
+        @pArray[i]   = l
+        @pArray[i+1] = r
+      }
+      0.upto(3) { |i|
+        0.step(255, 2) { |j|                                                                                                                                                                                    
+          l, r = encrypt_pair(l, r)
+          @sBoxes[i][j]   = l
+          @sBoxes[i][j+1] = r
+        }
+      }
+    end
+  end
+end

data/lib/safediff.rb

@@ -1,6 +1,9 @@
 ########################################################################
 # safediff.rb
-# Copyright (c) 2007, Rob Warner
+# Copyright (c) 2007, 2011 Rob Warner
+# rwarner@grailbox.com
+# http://grailbox.com
+# @hoop33
 #
 # All rights reserved.
 #

data/lib/safeentry.rb

@@ -1,6 +1,9 @@
 ########################################################################
 # safeentry.rb
-# Copyright (c) 2007, Rob Warner
+# Copyright (c) 2007, 2011 Rob Warner
+# rwarner@grailbox.com
+# http://grailbox.com
+# @hoop33
 #
 # All rights reserved.
 #

data/lib/safefile.rb

@@ -1,6 +1,9 @@
 ########################################################################
 # safefile.rb
-# Copyright (c) 2007, Rob Warner
+# Copyright (c) 2007, 2011 Rob Warner
+# rwarner@grailbox.com
+# http://grailbox.com
+# @hoop33
 #
 # All rights reserved.
 #
@@ -29,11 +32,13 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ########################################################################
 require 'rubygems'
-require 'crypt/blowfish'
-require 'digest/sha2'
 require 'rexml/document'
 require 'fileutils'
 require 'base64'
+require 'digest/sha2'
+require 'crypt/blowfish'
+
+require File.join(File.dirname(__FILE__), 'blowfish')
 
 include REXML
 

data/lib/safeutils.rb

@@ -1,6 +1,9 @@
 ########################################################################
 # safeutils.rb
-# Copyright (c) 2007, Rob Warner
+# Copyright (c) 2007, 2011 Rob Warner
+# rwarner@grailbox.com
+# http://grailbox.com
+# @hoop33
 #
 # All rights reserved.
 #
@@ -122,10 +125,8 @@ class SafeUtils
   def SafeUtils.do_merge(safe_file, diffs, override_master = false)
     diffs.each do |diff|
       case diff.operation
-      when SafeDiff::MASTER: # Do nothing
-      when SafeDiff::OTHER:  # Add to safe file
-        safe_file.insert(diff.other.name, diff.other.id, diff.other.password)
-      when SafeDiff::CHANGE: # Update safe file
+      when SafeDiff::OTHER then safe_file.insert(diff.other.name, diff.other.id, diff.other.password)
+      when SafeDiff::CHANGE then # Update safe file
         if override_master || replace_master?(diff)
           safe_file.insert(diff.other.name, diff.other.id, diff.other.password)
         end

data/test/tc_safediff.rb

@@ -7,7 +7,7 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ########################################################################
 
-require File.join(File.dirname(__FILE__), '..', 'lib', 'safediff')
+require File.join('.', File.dirname(__FILE__), '..', 'lib', 'safediff')
 require 'test/unit'
 
 class SafeDiffTest < Test::Unit::TestCase
@@ -49,4 +49,4 @@ class SafeDiffTest < Test::Unit::TestCase
     assert_equal diff.operation, SafeDiff::CHANGE
     assert_equal diff.to_s, "#{SafeDiff::CHANGE}\n< #{e1.to_s}\n---\n> #{e5.to_s}\n"
   end
-end
+end

data/test/tc_safeentry.rb

@@ -7,7 +7,7 @@
 # http://www.eclipse.org/legal/epl-v10.html 
 ########################################################################
 
-require File.join(File.dirname(__FILE__), '..', 'lib', 'safeentry')
+require File.join('.', File.dirname(__FILE__), '..', 'lib', 'safeentry')
 require 'test/unit'
 
 class SafeDirTest < Test::Unit::TestCase

data/test/tc_safefile.rb

@@ -7,8 +7,8 @@
 # http://www.eclipse.org/legal/epl-v10.html 
 ########################################################################
 
-require File.join(File.dirname(__FILE__), '..', 'lib', 'safefile')
-require File.join(File.dirname(__FILE__), '..', 'lib', 'safeentry')
+require File.join('.', File.dirname(__FILE__), '..', 'lib', 'safefile')
+require File.join('.', File.dirname(__FILE__), '..', 'lib', 'safeentry')
 require 'test/unit'
 require 'fileutils'
 

data/test/tc_safeutils.rb

@@ -7,7 +7,7 @@
 # http://www.eclipse.org/legal/epl-v10.html 
 ########################################################################
 
-require File.join(File.dirname(__FILE__), '..', 'lib', 'safeutils')
+require File.join('.', File.dirname(__FILE__), '..', 'lib', 'safeutils')
 require 'test/unit'
 require 'fileutils'
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: safe
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  prerelease: 
+  version: "0.7"
 platform: ruby
 authors: 
 - Rob Warner
@@ -9,28 +10,34 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-06 00:00:00 -04:00
+date: 2011-02-18 00:00:00 -05:00
 default_executable: safe
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: crypt
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 1.1.4
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: highline
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 1.4.0
-    version: 
-description: safe safely stores all your user IDs and passwords, encrypted by a password of your choosing.
+  type: :runtime
+  version_requirements: *id002
+description: |-
+  safe safely stores all your user IDs and passwords,
+    encrypted by a password of your choosing.
 email: rwarner@grailbox.com
 executables: 
 - safe
@@ -40,6 +47,7 @@ extra_rdoc_files: []
 
 files: 
 - README
+- lib/blowfish.rb
 - lib/safediff.rb
 - lib/safeentry.rb
 - lib/safefile.rb
@@ -47,31 +55,38 @@ files:
 - index.html
 - Rakefile
 - Release-Notes.txt
-has_rdoc: false
+- test/tc_safediff.rb
+- test/tc_safeentry.rb
+- test/tc_safefile.rb
+- test/tc_safeutils.rb
+- bin/safe
+has_rdoc: true
 homepage: http://safe.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: safe
-rubygems_version: 1.0.1
+rubygems_version: 1.5.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A command-line password storage program
 test_files: 
 - test/tc_safediff.rb