stephencelis-haddock 0.0.1 → 0.1.1

data/History.txt

@@ -1,3 +1,19 @@
+=== 0.1.1 / 2009-03-29
+
+* 2 minor enhancements
+
+  * Add version option to command-line utility.
+  * Bumping up version numbers to improve credibility.
+
+
+=== 0.1.0 / 2009-03-29
+
+* 2 minor enhancements
+
+  * Friendlier command-line errors.
+  * General cleanup.
+
+
 === 0.0.1 / 2009-03-28
 
 * 1 major enhancement

data/Manifest.txt

@@ -4,4 +4,5 @@ README.txt
 Rakefile
 bin/haddock
 lib/haddock.rb
+test/names.txt
 test/test_haddock.rb

data/bin/haddock

@@ -8,13 +8,20 @@ include Haddock
 parser = OptionParser.new do |opts|
   opts.banner = "usage: #{File.basename($0)} [options]"
 
+  opts.on("-V", "--version") do
+    require 'capistrano/version'
+    puts "haddock: v#{Haddock::VERSION}"
+    exit
+  end
+
   opts.on("-h", "--help") do
     puts opts
     exit
   end
 
   opts.on("-l", "--length [length]") do |value|
-    @length = value
+    raise Password::LengthError, "Invalid length" if value.match(/\D/)
+    @length = value.to_i
   end
 
   opts.on("-f", "--words [words file]") do |value|
@@ -30,4 +37,9 @@ rescue OptionParser::ParseError, Password::LengthError => error
     "(must be between #{Password::MINIMUM} and #{Password::MAXIMUM})."
   puts parser
   exit 1
+rescue Password::NoWordsError => error
+  warn "haddock: #{error.message}."
+  puts "Word lists are available here: http://wordlist.sourceforge.net"
+  puts parser
+  exit 1
 end

data/lib/haddock.rb

@@ -1,7 +1,7 @@
 # A more memorable password generator. Swordfish? No, I got tired of that. I
 # changed it.
 module Haddock
-  VERSION = '0.0.1'
+  VERSION = '0.1.1'
 
   module Password
     MINIMUM = 8
@@ -21,13 +21,11 @@ module Haddock
       #   Password.generate(30) # => "Phlebotomus2473?nonconditioned"
       #   Password.generate(8)  # => "amy7@rax"
       def generate(length = DEFAULT)
-        @@diction ||= IO.readlines(@@paths.find { |path| File.exist?(path) })
-
-        if !length.is_a?(Integer)
-          raise LengthError, "Invalid password" if length.match(/\D/)
-          length = length.to_i
+        unless defined? @@diction
+          self.diction = @@paths.find { |path| File.exist? path }
         end
 
+        raise LengthError, "Invalid length" unless length.is_a? Integer
         raise LengthError, "Password length is too short" if length < MINIMUM
         raise LengthError, "Password length is too long" if length > MAXIMUM
 
@@ -41,9 +39,16 @@ module Haddock
         words.join random_number(length - words_length)
       end
 
-      # Sets the dictionary. Uses "/usr/share/dict/words" otherwise.
+      # Sets the dictionary. Uses "/usr/share/dict/words" or
+      # "/usr/share/words" otherwise.
+      #
+      #   Password.diction = File.expand_path(__FILE__) + "/my_words.txt"
       def diction=(path)
         @@diction = IO.readlines path
+      rescue TypeError
+        raise NoWordsError, "No words file found"
+      rescue Errno::ENOENT
+        raise NoWordsError, "No words file at #{path.inspect}"
       end
 
       private
@@ -66,7 +71,11 @@ module Haddock
     end
 
     # Raised if a password is generated with too few or too many characters.
-    class LengthError < StandardError
+    class LengthError < ArgumentError
+    end
+
+    # Raised if no words file is found.
+    class NoWordsError < StandardError
     end
   end
 end

data/test/names.txt

@@ -0,0 +1,2 @@
+Mary
+sturgeon

data/test/test_haddock.rb

@@ -21,7 +21,7 @@ class TestHaddock < Test::Unit::TestCase
   end
 
   def test_accepts_alternate_wordlist
-    Password.diction = path = File.dirname(__FILE__) + "/names"
+    Password.diction = path = File.dirname(__FILE__) + "/names.txt"
     pattern = Regexp.new File.read(path).split.join("|")
     assert_match(pattern, Password.generate(14))
   ensure
@@ -45,4 +45,16 @@ class TestHaddock < Test::Unit::TestCase
       Password.generate("invalid")
     end
   end
+
+  def test_fail_on_invalid_path
+    assert_raise Password::NoWordsError do
+      Password.diction = "invalid/path"
+    end
+  end
+
+  def test_fail_on_nil_path
+    assert_raise Password::NoWordsError do
+      Password.diction = nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stephencelis-haddock
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Stephen Celis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-28 00:00:00 -07:00
+date: 2009-03-29 00:00:00 -07:00
 default_executable: haddock
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,6 +40,7 @@ files:
 - Rakefile
 - bin/haddock
 - lib/haddock.rb
+- test/names.txt
 - test/test_haddock.rb
 has_rdoc: true
 homepage: http://github.com/stephencelis/haddock