jameswilding-passgen 1.3.0 → 2.0.0

data/bin/passgen

@@ -1,36 +1,32 @@
 #!/usr/bin/env ruby
 require 'optparse'
-
-# Try for the gem version, fallback on the development version.
-begin
-  require 'passgen'
-rescue LoadError
-  require File.join(File.dirname(__FILE__), '..', 'lib', 'passgen')
-end
+require 'rubygems'
+require 'passgen'
 
 options = {}
 
-# Command line switches
-OptionParser.new do |opts|
-  opts.banner = "Usage: passgen [options]"
+begin
+  # Command line switches
+  OptionParser.new do |opts|
+    opts.banner = "Usage: passgen [options]"
       
-  opts.on('-l', '--length n', Integer, 'Make a password of length n (default is 10)') do |n|
-    options[:length] = n
-  end
-
-  opts.on('-H', '--hex', 'Output both plain text and hexdigest-encrypted versions of the password') do |hex|
-    options[:hex] = hex
-  end
-
-end.parse!
+    opts.on('-l', '--length N', Integer, 'Make a password of length N (default is 10)') do |n|
+      options[:length] = n
+    end
 
-# New password according to options
-password = PassGen::Password.new(options)
+    opts.on('--memorable', 'Create a more memorable (but less secure) password using real words. Ignores --length') do
+      options[:memorable] = true
+    end
 
-# Show hexed password if requested
-if options[:hex]
-  puts "Plain: #{password}"
-  puts "Hexed: #{password.hexed}"
+    opts.on('-H', '--hexed', 'Output both plain text and hexdigest-encrypted versions of the password') do
+      options[:hex] = true
+    end
+  
+  end.parse!
+rescue OptionParser::InvalidOption, OptionParser::InvalidArgument
+ puts "Usage: passgen [--length N | --memorable] [--hexed]"
+ puts
+ puts "Try passgen --help for more information."
 else
-  puts password
+  PassGen::CLI.execute(options)
 end

data/lib/passgen.rb

@@ -1,5 +1,7 @@
-require File.join(File.dirname(__FILE__), 'passgen', 'password')
+require 'passgen/password'
+require 'passgen/memorable'
+require 'passgen/cli'
 
 module PassGen
-  VERSION = '1.3.0'
+  VERSION = '2.0.0'
 end

data/lib/passgen/cli.rb

@@ -0,0 +1,39 @@
+module PassGen
+  module CLI
+    
+    class << self
+      def execute(options)
+        @@options = options
+        
+        if options[:hex]
+          execute_with_hexing
+        else
+          execute_without_hexing
+        end
+      end
+      
+      private
+      def execute_without_hexing
+        say normal_or_memorable_password
+      end
+      
+      def execute_with_hexing
+        password = normal_or_memorable_password
+        say "plain: #{password}", "hexed: #{password.hexed}"        
+      end
+      
+      def normal_or_memorable_password
+        if @@options[:memorable]
+          PassGen::Memorable::Password.new
+        else
+          PassGen::Password.new(@@options)
+        end        
+      end
+      
+      def say(*things)
+        STDOUT.puts things.join("\n")
+      end
+    end
+    
+  end
+end

data/lib/passgen/memorable.rb

@@ -0,0 +1,54 @@
+require 'digest/sha1'
+
+module PassGen
+  module Memorable
+    class Password < String
+      
+      SYMBOLS = %w(% & $ £ @ !)
+      
+      def initialize
+        @dictionary = Dictionary.new
+        super(random_words_symbols_and_numbers)
+      end
+      
+      def hexed
+        Digest::SHA1.hexdigest(self)
+      end
+      
+      private
+      def random_words_symbols_and_numbers
+        (random_words.join random_symbols_and_numbers).downcase
+      end
+      
+      def random_words
+        [@dictionary.random, @dictionary.random]
+      end
+      
+      def random_symbols_and_numbers
+        SYMBOLS[rand(SYMBOLS.length)] + random_numbers
+      end
+      
+      def random_numbers
+        rand(10).to_s + rand(10).to_s
+      end
+    end
+    
+    # Inspired by http://stephencelis.com/2009/03/29/whats-the-password-haddock.html
+    class Dictionary
+      
+      PATHS = %w(/usr/share/dict/words /usr/share/words)
+      
+      def random
+        words = get_words
+        words[rand(words.length)].chomp
+      end
+    
+      def get_words
+        File.readlines(PATHS.first).select { |word| word.length < 6 }
+      rescue Errno::ENOENT
+        File.readlines(PATHS.last).select { |word| word.length < 6 }
+      end
+      
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jameswilding-passgen
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 2.0.0
 platform: ruby
 authors: 
 - James Wilding
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-12 00:00:00 -07:00
+date: 2009-06-17 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: Passgen quickly generates random, alphanumeric passwords of up to twenty characters.
+description: Passgen generates random, alphanumeric passwords of up to twenty characters, which can be made memorable if you don't mind the security tradeoff.
 email: 
 executables: 
 - passgen
@@ -24,6 +24,8 @@ extra_rdoc_files: []
 files: 
 - bin/passgen
 - lib/passgen.rb
+- lib/passgen/cli.rb
+- lib/passgen/memorable.rb
 - lib/passgen/password.rb
 has_rdoc: false
 homepage: 
@@ -50,6 +52,6 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: random password generator
+summary: random password generator with command-line utility
 test_files: []