@@ -1,15 +1,9 @@ -#!/opt/local/bin/ruby +#!/usr/bin/env ruby -%w( rubygems active_support optparse ostruct ).each {|l| require l} - -module Enumerable - def shuffle - sort_by { rand } - end -end +%w( rubygems optparse ).each &method(:require) class PassGrid - ALPHANUMERIC = ('A'..'Z').to_a + (0..9).to_a.map(&:to_s) + ALPHANUMERIC = ('A'..'Z').to_a + (0..9).to_a.map {|i| i.to_s } EXTENDED = ALPHANUMERIC + %w( + - = _ ! / < > @ # $ % ^ & * \ ; : . , ) def initialize(width, height, extended_charset = false, label = nil) @@ -34,12 +28,12 @@ class PassGrid def populate @height.times do @rows << [] - @width.times { @rows.last << characters.shuffle.last.gsub(/\s+/, "") } + @width.times { @rows.last << characters.sort_by { rand }.last.gsub(/\s+/, "") } end end def characters=(charset) @charset = ALPHANUMERIC - return if charset.blank? + return if charset.nil? || charset.empty? @charset += case charset when String then charset.split("").uniq passgen 9cbd966a1703b9c7c6fde512676303ce47be23ad Nicolás Sanguinetti contacto@nicolassanguinetti.info http://github.com/sabman/utility_scripts/commit/898b31fd7d662efefcaaccf806dec05dc63ed0d5 898b31fd7d662efefcaaccf806dec05dc63ed0d5 2008-03-24T14:58:17-07:00 2008-03-24T14:58:17-07:00 Cleaned up old dependencies in passgen 5004c5aac7be23b7f6512f04723d7a265df1dafc Nicolás Sanguinetti contacto@nicolassanguinetti.info