passgen 1.1.2 → 1.2.0

data/CHANGELOG

@@ -1,3 +1,5 @@
+v1.2.0 Use Ruby >1.9 hashes
+
 v1.1.2 Added contributors
 
 v1.1.1 Removed malicious dependency

data/lib/passgen.rb

@@ -1,8 +1,8 @@
 #= Passgen
 #
-#Ruby gem for generating passwords quickly and easily. Although it is
-#suitable for use within Rails it has no Rails dependencies and can be used in
-#non-Rails applications as well.
+# Ruby gem for generating passwords quickly and easily. Although it is
+# suitable for use within Rails it has no Rails dependencies and can be used in
+# non-Rails applications as well.
 #
 #== Install
 #
@@ -10,116 +10,116 @@
 #
 #== Usage
 #
-#The usage could not be easier. Just require and call the generate method:
+# The usage could not be easier. Just require and call the generate method:
 #
 #  >> require 'rubygems'
 #  >> require 'passgen'
 #  >> Passgen::generate
 #  => "zLWCeS3xC9"
 #
-#== Examples
+# == Examples
 #
 #  >> Passgen::generate
 #  => "zLWCeS3xC9"
 #
-#  >> Passgen::generate(:length => 20)
+#  >> Passgen::generate(length: 20)
 #  => "6lCcHvkuEW6OuzAtkoAs"
 #
-#  >> Passgen::generate(:symbols => true)
+#  >> Passgen::generate(symbols: true)
 #  => "gr)$6bIym1"
 #
-#  >> Passgen::generate(:lowercase => :only)
+#  >> Passgen::generate(lowercase: :only)
 #  => "ysbwuxbcea"
 #
-#  >> Passgen::generate(:number => 3)
+#  >> Passgen::generate(number: 3)
 #  => ["REdOigTkdI", "PQu8DsV9WZ", "qptKLbw8YQ"]
 #
-#  >> Passgen::generate(:seed => 5)
+#  >> Passgen::generate(seed: 5)
 #  => "JoV9M2qjiK"
-#  >> Passgen::generate(:seed => 5) # Will generate same password again
+#  >> Passgen::generate(seed: 5) # Will generate same password again
 #  => "JoV9M2qjiK"
 #
-#  >> Passgen::generate(:seed => :default) # Will set random seed...
+#  >> Passgen::generate(seed: :default) # Will set random seed...
 #  => "SI8QDBdV98"
-#  >> Passgen::generate(:seed => :default) # and hence give different password
+#  >> Passgen::generate(seed: :default) # and hence give different password
 #  => "tHHU5HLBAn"
 #
-#== Options:
+# == Options:
 #
-#=== :lowercase => true/false/:only
-#* true - Use lowercase letters in the generated password.
-#* false - Do not use lowercase letters in the generated password.
-#* :only - Only use lowercase letters in the generated password.
+# === :lowercase => true/false/:only
+# * true - Use lowercase letters in the generated password.
+# * false - Do not use lowercase letters in the generated password.
+# * :only - Only use lowercase letters in the generated password.
 #
-#=== :uppercase => true/false/:only
-#* true - Use uppercase letters in the generated password.
-#* false - Do not use uppercase letters in the generated password.
-#* :only - Only use uppercase letters in the generated password.
+# === :uppercase => true/false/:only
+# * true - Use uppercase letters in the generated password.
+# * false - Do not use uppercase letters in the generated password.
+# * :only - Only use uppercase letters in the generated password.
 #
-#=== :digits => true/false/:only
-#* true - Use digits in the generated password.
-#* false - Do not use digits in the generated password.
-#* :only - Only use digits in the generated password.
+# === :digits => true/false/:only
+# * true - Use digits in the generated password.
+# * false - Do not use digits in the generated password.
+# * :only - Only use digits in the generated password.
 #
-#=== :symbols => true/false/:only/:list
-#* true - Use symbols in the generated password.
-#* false - Do not use symbols in the generated password.
-#* :only - Only use symbols in the generated password.
-#* :list - A string with the symbols to use. Not implemented yet.
+# === :symbols => true/false/:only/:list
+# * true - Use symbols in the generated password.
+# * false - Do not use symbols in the generated password.
+# * :only - Only use symbols in the generated password.
+# * :list - A string with the symbols to use. Not implemented yet.
 #
-#=== :pronounceable => true/false
-#Not implmented yet.
+# === :pronounceable => true/false
+# Not implmented yet.
 #
-#=== :number => integer
-#Number of passwords to generate. If >1 the result is an Array.
+# === :number => integer
+# Number of passwords to generate. If >1 the result is an Array.
 #
-#=== :length => integer/range
-#The number of characters in the generated passwords. A range results in passwords
-#lengths within the given range.
+# === :length => integer/range
+# The number of characters in the generated passwords. A range results in passwords
+# lengths within the given range.
 #
-#=== :seed => integer/:default
-#Set the srand seed to the given integer prior to generating the passwords.
+# === :seed => integer/:default
+# Set the srand seed to the given integer prior to generating the passwords.
 #
-#=== Default values:
+# === Default values:
 #
-#:lowercase => true
+# lowercase: true
 #
-#:uppercase => true
+# uppercase: true
 #
-#:digits => true
+# digits: true
 #
-#:symbols => false
+# symbols: false
 #
-#:pronounceable => Not implemented yet.
+# pronounceable: Not implemented yet.
 #
-#:number => 1
+# number: 1
 #
-#:length => 10
+# length: 10
 #
-#:seed => nil
+# seed: nil
 #
-#== Copyright and license
+# == Copyright and license
 #
-#Copyright (c) 2009 Erik Lindblad
+# Copyright (c) 2009 Erik Lindblad
 #
-#Permission is hereby granted, free of charge, to any person obtaining
-#a copy of this software and associated documentation files (the
-#"Software"), to deal in the Software without restriction, including
-#without limitation the rights to use, copy, modify, merge, publish,
-#distribute, sublicense, and/or sell copies of the Software, and to
-#permit persons to whom the Software is furnished to do so, subject to
-#the following conditions:
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
 #
-#The above copyright notice and this permission notice shall be
-#included in all copies or substantial portions of the Software.
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
 #
-#THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-#EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-#MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-#NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-#LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-#OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-#WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'digest'
 require 'passgen/probabilities'
@@ -128,22 +128,22 @@ require 'passgen/strength_analyzer'
 module Passgen
 
   VERSION = "1.0.0"
-  
+
   DEFAULT_PARAMS = {
-    :number => 1,
-    :length => 10,
-    :lowercase => true,
-    :uppercase => true,
-    :digits => true,
-    :symbols => false,
-    :pronounceable => false
+      number:        1,
+      length:        10,
+      lowercase:     true,
+      uppercase:     true,
+      digits:        true,
+      symbols:       false,
+      pronounceable: false
   }
 
   def self.default_seed
     Digest::MD5.hexdigest("#{rand}#{Time.now}#{Process.object_id}").to_i(16)
   end
 
-  def self.generate(params={})
+  def self.generate(params = {})
     set_options(params)
     tokens = valid_tokens
     set_seed
@@ -151,15 +151,16 @@ module Passgen
     if n == 1
       generate_one(tokens)
     else
-      Array.new(n) {|i| generate_one(tokens) }
+      Array.new(n) { |i| generate_one(tokens) }
     end
   end
 
   def self.analyze(pw)
     Passgen::StrengthAnalyzer.analyze(pw)
   end
-  
+
   private
+
   def self.alphabet(index)
     if use_lowercase? && !use_uppercase?
       LOWERCASE_TOKENS[index]
@@ -171,12 +172,12 @@ module Passgen
       tmp
     end
   end
-  
+
   def self.generate_one(tokens)
     if @options[:pronounceable]
       generate_pronounceable
     else
-      Array.new(password_length) {tokens[rand(tokens.size)]}.join
+      Array.new(password_length) { tokens[rand(tokens.size)] }.join
     end
   end
 
@@ -185,24 +186,24 @@ module Passgen
 
     # Append digits in front
     digits_prefix = if @options[:digits_before]
-      @options[:length] -= @options[:digits_before]
-      Array.new(@options[:digits_before]) {DIGIT_TOKENS[rand(DIGIT_TOKENS.size)]}.join
-    else
-      ""
-    end
+                      @options[:length] -= @options[:digits_before]
+                      Array.new(@options[:digits_before]) { DIGIT_TOKENS[rand(DIGIT_TOKENS.size)] }.join
+                    else
+                      ""
+                    end
 
     # Append digits at the end
     digits_suffix = if @options[:digits_after]
-      @options[:length] -= @options[:digits_after]
-      Array.new(@options[:digits_after]) {DIGIT_TOKENS[rand(DIGIT_TOKENS.size)]}.join
-    else
-      ""
-    end
+                      @options[:length] -= @options[:digits_after]
+                      Array.new(@options[:digits_after]) { DIGIT_TOKENS[rand(DIGIT_TOKENS.size)] }.join
+                    else
+                      ""
+                    end
 
     # Find a random starting point.
     found_start = false
-    ranno = rand * SIGMA # random number [0,1[ weighed by sum of frequencies
-    sum = 0;
+    ranno       = rand * SIGMA # random number [0,1[ weighed by sum of frequencies
+    sum         = 0;
     N_LETTERS.times do |c1|
       N_LETTERS.times do |c2|
         N_LETTERS.times do |c3|
@@ -222,13 +223,13 @@ module Passgen
 
     # Do a random walk.
     (3...@options[:length]).each do |nchar|
-      c1 = LETTER_INDEXES[password[nchar-2..nchar-2]]
-      c2 = LETTER_INDEXES[password[nchar-1..nchar-1]]
+      c1  = LETTER_INDEXES[password[nchar - 2..nchar - 2]]
+      c2  = LETTER_INDEXES[password[nchar - 1..nchar - 1]]
       sum = 0
-      N_LETTERS.times {|c3| sum += P[c1][c2][c3]}
+      N_LETTERS.times { |c3| sum += P[c1][c2][c3] }
       break if sum == 0
       ranno = rand * sum
-      sum = 0;
+      sum   = 0
       N_LETTERS.times do |c3|
         sum += P[c1][c2][c3]
         if sum > ranno
@@ -239,7 +240,7 @@ module Passgen
     end
     digits_prefix + password + digits_suffix
   end
-  
+
   def self.password_length
     if @options[:length].is_a?(Range)
       tmp = @options[:length].to_a
@@ -256,12 +257,12 @@ module Passgen
   def self.set_options(params)
     if params[:lowercase] == :only
       params[:uppercase] = false
-      params[:digits] = false
+      params[:digits]    = false
     end
 
     if params[:uppercase] == :only
       params[:lowercase] = false
-      params[:digits] = false
+      params[:digits]    = false
     end
 
     if params[:digits] == :only
@@ -272,8 +273,8 @@ module Passgen
     if params[:symbols] == :only
       params[:lowercase] = false
       params[:uppercase] = false
-      params[:digits] = false
-      params[:symbols] = true
+      params[:digits]    = false
+      params[:symbols]   = true
     end
 
     if params[:digits_before] == true

data/lib/passgen/probabilities.rb

@@ -748,57 +748,57 @@ module Passgen
   DIGIT_TOKENS    = %w{0 1 2 3 4 5 6 7 8 9}
   
   LETTER_INDEXES = {
-    "a" => 0,
-    "b" => 1,
-    "c" => 2,
-    "d" => 3,
-    "e" => 4,
-    "f" => 5,
-    "g" => 6,
-    "h" => 7,
-    "i" => 8,
-    "j" => 9,
-    "k" => 10,
-    "l" => 11,
-    "m" => 12,
-    "n" => 13,
-    "o" => 14,
-    "p" => 15,
-    "q" => 16,
-    "r" => 17,
-    "s" => 18,
-    "t" => 19,
-    "u" => 20,
-    "v" => 21,
-    "w" => 22,
-    "x" => 23,
-    "y" => 24,
-    "z" => 25,
-    "A" => 0,
-    "B" => 1,
-    "C" => 2,
-    "D" => 3,
-    "E" => 4,
-    "F" => 5,
-    "G" => 6,
-    "H" => 7,
-    "I" => 8,
-    "J" => 9,
-    "K" => 10,
-    "L" => 11,
-    "M" => 12,
-    "N" => 13,
-    "O" => 14,
-    "P" => 15,
-    "Q" => 16,
-    "R" => 17,
-    "S" => 18,
-    "T" => 19,
-    "U" => 20,
-    "V" => 21,
-    "W" => 22,
-    "X" => 23,
-    "Y" => 24,
-    "Z" => 25 
+      a: 0,
+      b: 1,
+      c: 2,
+      d: 3,
+      e: 4,
+      f: 5,
+      g: 6,
+      h: 7,
+      i: 8,
+      j: 9,
+      k: 10,
+      l: 11,
+      m: 12,
+      n: 13,
+      o: 14,
+      p: 15,
+      q: 16,
+      r: 17,
+      s: 18,
+      t: 19,
+      u: 20,
+      v: 21,
+      w: 22,
+      x: 23,
+      y: 24,
+      z: 25,
+      A: 0,
+      B: 1,
+      C: 2,
+      D: 3,
+      E: 4,
+      F: 5,
+      G: 6,
+      H: 7,
+      I: 8,
+      J: 9,
+      K: 10,
+      L: 11,
+      M: 12,
+      N: 13,
+      O: 14,
+      P: 15,
+      Q: 16,
+      R: 17,
+      S: 18,
+      T: 19,
+      U: 20,
+      V: 21,
+      W: 22,
+      X: 23,
+      Y: 24,
+      Z: 25
   }
 end

data/lib/passgen/strength_analyzer.rb

@@ -2,125 +2,125 @@ module Passgen
   class StrengthAnalyzer
     MIN_LENGTH = 8
     attr_reader :password, :score, :complexity, :errors
-    
+
     def initialize(pw)
-      @password = pw
-      @score = 0
+      @password   = pw
+      @score      = 0
       @complexity = "Invalid"
-      @errors = []
+      @errors     = []
     end
-    
+
     def self.analyze(pw)
       sa = StrengthAnalyzer.new(pw)
       sa.analyze
       sa
     end
-    
+
     def analyze
       return self unless check_minimum_requirements
-      
-      nScore = 0
-      nLength = 0
-      nAlphaUC = 0
-      nAlphaLC = 0
-      nNumber = 0
-      nSymbol = 0
-      nMidChar = 0
-      nRequirements = 0
-      nAlphasOnly = 0
-      nNumbersOnly = 0
-      nUnqChar = 0
-      nRepChar = 0
-      nRepInc = 0
-      nConsecAlphaUC = 0
-      nConsecAlphaLC = 0
-      nConsecNumber = 0
-      nConsecSymbol = 0
-      nConsecCharType = 0
-      nSeqAlpha = 0
-      nSeqNumber = 0
-      nSeqSymbol = 0
-      nSeqChar = 0
-      nReqChar = 0
+
+      nScore              = 0
+      nLength             = 0
+      nAlphaUC            = 0
+      nAlphaLC            = 0
+      nNumber             = 0
+      nSymbol             = 0
+      nMidChar            = 0
+      nRequirements       = 0
+      nAlphasOnly         = 0
+      nNumbersOnly        = 0
+      nUnqChar            = 0
+      nRepChar            = 0
+      nRepInc             = 0
+      nConsecAlphaUC      = 0
+      nConsecAlphaLC      = 0
+      nConsecNumber       = 0
+      nConsecSymbol       = 0
+      nConsecCharType     = 0
+      nSeqAlpha           = 0
+      nSeqNumber          = 0
+      nSeqSymbol          = 0
+      nSeqChar            = 0
+      nReqChar            = 0
       nMultConsecCharType = 0
-      nMultRepChar = 1
-      nMultConsecSymbol = 1
-      nMultMidChar = 2
-      nMultRequirements = 2
-      nMultConsecAlphaUC = 2
-      nMultConsecAlphaLC = 2
-      nMultConsecNumber = 2
-      nReqCharType = 3
-      nMultAlphaUC = 3
-      nMultAlphaLC = 3
-      nMultSeqAlpha = 3
-      nMultSeqNumber = 3
-      nMultSeqSymbol = 3
-      nMultLength = 4
-      nMultNumber = 4
-      nMultSymbol = 6
-      nTmpAlphaUC = ""
-      nTmpAlphaLC = ""
-      nTmpNumber = ""
-      nTmpSymbol = ""
-      sAlphas = 'abcdefghijklmnopqrstuvwxyz'
-      sNumerics = '01234567890'
-      sSymbols  = '!@#$%&/()+?*'
-      sComplexity = 'Invalid'
-      sStandards = 'Below'
-      nMinPwdLen = MIN_LENGTH
-      
-      nScore = @password.length * nMultLength
-      nLength = @password.length
-      arrPwd = @password.gsub(/\s+/, "").split(/\s*/)
+      nMultRepChar        = 1
+      nMultConsecSymbol   = 1
+      nMultMidChar        = 2
+      nMultRequirements   = 2
+      nMultConsecAlphaUC  = 2
+      nMultConsecAlphaLC  = 2
+      nMultConsecNumber   = 2
+      nReqCharType        = 3
+      nMultAlphaUC        = 3
+      nMultAlphaLC        = 3
+      nMultSeqAlpha       = 3
+      nMultSeqNumber      = 3
+      nMultSeqSymbol      = 3
+      nMultLength         = 4
+      nMultNumber         = 4
+      nMultSymbol         = 6
+      nTmpAlphaUC         = ""
+      nTmpAlphaLC         = ""
+      nTmpNumber          = ""
+      nTmpSymbol          = ""
+      sAlphas             = 'abcdefghijklmnopqrstuvwxyz'
+      sNumerics           = '01234567890'
+      sSymbols            = '!@#$%&/()+?*'
+      sComplexity         = 'Invalid'
+      sStandards          = 'Below'
+      nMinPwdLen          = MIN_LENGTH
+
+      nScore    = @password.length * nMultLength
+      nLength   = @password.length
+      arrPwd    = @password.gsub(/\s+/, "").split(/\s*/)
       arrPwdLen = arrPwd.length
-      
+
       # Loop through password to check for Symbol, Numeric, Lowercase and Uppercase pattern matches
       arrPwdLen.times do |a|
         if /[A-Z]/.match(arrPwd[a])
-          if (nTmpAlphaUC != "")
+          if nTmpAlphaUC != ""
             if (nTmpAlphaUC + 1) == a
-              nConsecAlphaUC += 1
+              nConsecAlphaUC  += 1
               nConsecCharType += 1
             end
           end
           nTmpAlphaUC = a
-          nAlphaUC += 1
+          nAlphaUC    += 1
         elsif /[a-z]/.match(arrPwd[a])
           if nTmpAlphaLC != ""
             if (nTmpAlphaLC + 1) == a
-              nConsecAlphaLC += 1
+              nConsecAlphaLC  += 1
               nConsecCharType += 1
             end
           end
           nTmpAlphaLC = a
-          nAlphaLC += 1
+          nAlphaLC    += 1
         elsif /[0-9]/.match(arrPwd[a])
-          if (a > 0 && a < (arrPwdLen - 1))
+          if a > 0 && a < (arrPwdLen - 1)
             nMidChar += 1
           end
           if nTmpNumber != ""
-            if ((nTmpNumber + 1) == a)
-              nConsecNumber += 1
+            if (nTmpNumber + 1) == a
+              nConsecNumber   += 1
               nConsecCharType += 1
             end
           end
           nTmpNumber = a
-          nNumber += 1
-        elsif /[^a-zA-Z0-9_]/.match(arrPwd[a]) 
+          nNumber    += 1
+        elsif /[^a-zA-Z0-9_]/.match(arrPwd[a])
           if a > 0 && a < (arrPwdLen - 1)
             nMidChar += 1
           end
           if nTmpSymbol != ""
             if (nTmpSymbol + 1) == a
-              nConsecSymbol += 1
+              nConsecSymbol   += 1
               nConsecCharType += 1
             end
           end
-          nTmpSymbol = a;
-          nSymbol += 1;
+          nTmpSymbol = a
+          nSymbol += 1
         end
-        
+
         # Internal loop through password to check for repeat characters
         bCharExists = false
         arrPwdLen.times do |b|
@@ -130,75 +130,75 @@ module Passgen
             # Deduction is incremented each time a new match is discovered
             # Deduction amount is based on total password length divided by the
             # difference of distance between currently selected match
-            nRepInc += (arrPwdLen/(b-a)).abs
+            nRepInc += (arrPwdLen / (b - a)).abs
           end
         end
-        if bCharExists 
-          nRepChar += 1 
-          nUnqChar = arrPwdLen - nRepChar;
-          nRepInc = (nUnqChar > 0) ? (nRepInc/nUnqChar).ceil : nRepInc.ceil
+        if bCharExists
+          nRepChar += 1
+          nUnqChar = arrPwdLen - nRepChar
+          nRepInc = (nUnqChar > 0) ? (nRepInc / nUnqChar).ceil : nRepInc.ceil
         end
       end
-      
+
       # Check for sequential alpha string patterns (forward and reverse)
       (sAlphas.size - 3).times do |s|
-        sFwd = sAlphas[s...s+3]
+        sFwd = sAlphas[s...s + 3]
         sRev = sFwd.reverse
         if @password.downcase.index(sFwd) || @password.downcase.index(sRev)
           nSeqAlpha += 1
-          nSeqChar += 1
+          nSeqChar  += 1
         end
       end
-      
+
       # Check for sequential numeric string patterns (forward and reverse)
       (sNumerics.size - 3).times do |s|
-        sFwd = sNumerics[s...s+3]
+        sFwd = sNumerics[s...s + 3]
         sRev = sFwd.reverse
         if @password.downcase.index(sFwd) || @password.downcase.index(sRev)
           nSeqNumber += 1
-          nSeqChar += 1
+          nSeqChar   += 1
         end
       end
-      
+
       # Check for sequential symbol string patterns (forward and reverse)
       (sSymbols.size - 3).times do |s|
-        sFwd = sSymbols[s...s+3]
+        sFwd = sSymbols[s...s + 3]
         sRev = sFwd.reverse
         if @password.downcase.index(sFwd) || @password.downcase.index(sRev)
           nSeqSymbol += 1
-          nSeqChar += 1
+          nSeqChar   += 1
         end
       end
-      
+
       # Modify overall score value based on usage vs requirements
       if nAlphaUC > 0 && nAlphaUC < nLength
         nScore += (nLength - nAlphaUC) * 2
       end
 
-      if nAlphaLC > 0 && nAlphaLC < nLength 
+      if nAlphaLC > 0 && nAlphaLC < nLength
         nScore += (nLength - nAlphaLC) * 2
       end
 
-      if (nNumber > 0 && nNumber < nLength)
+      if nNumber > 0 && nNumber < nLength
         nScore += nNumber * nMultNumber
       end
 
-      if nSymbol > 0  
+      if nSymbol > 0
         nScore += nSymbol * nMultSymbol
       end
 
       if nMidChar > 0
         nScore += nMidChar * nMultMidChar
       end
-      
+
       # Point deductions for poor practices
       if (nAlphaLC > 0 || nAlphaUC > 0) && nSymbol == 0 && nNumber == 0 # Only Letters
-        nScore -= nLength
+        nScore      -= nLength
         nAlphasOnly = nLength
       end
 
       if nAlphaLC === 0 && nAlphaUC === 0 && nSymbol === 0 && nNumber > 0 # Only Numbers
-        nScore -= nLength
+        nScore       -= nLength
         nNumbersOnly = nLength
       end
 
@@ -231,9 +231,9 @@ module Passgen
       end
 
       # Determine if mandatory requirements have been met and set image indicators accordingly
-      arrChars = [nLength, nAlphaUC, nAlphaLC, nNumber, nSymbol]
+      arrChars    = [nLength, nAlphaUC, nAlphaLC, nNumber, nSymbol]
       arrCharsIds = ["nLength", "nAlphaUC", "nAlphaLC", "nNumber", "nSymbol"]
-      arrCharsLen = arrChars.length;
+      arrCharsLen = arrChars.length
       arrCharsLen.times do |c|
         minVal = arrCharsIds[c] == "nLength" ? MIN_LENGTH - 1 : 0
         if arrChars[c] == (minVal + 1)
@@ -243,34 +243,35 @@ module Passgen
         end
       end
       nRequirements = nReqChar
-      nMinReqChars = @password.length >= nMinPwdLen ? 3 : 4
+      nMinReqChars  = @password.length >= nMinPwdLen ? 3 : 4
       if nRequirements > nMinReqChars # One or more required characters exist
-        nScore += (nRequirements * 2) 
+        nScore += (nRequirements * 2)
       end
-  
+
       # Determine complexity based on overall score
-      if (nScore > 100)
+      if nScore > 100
         nScore = 100
-      elsif (nScore < 0)
+      elsif nScore < 0
         nScore = 0
       end
       @complexity = case nScore
-      when 0...20
-        "Trivial"
-      when 20...40
-        "Weak"
-      when 40...60
-        "Good"
-      when 60...80
-        "Strong"
-      else
-        "Very Strong"
-      end
-      
+                    when 0...20
+                      "Trivial"
+                    when 20...40
+                      "Weak"
+                    when 40...60
+                      "Good"
+                    when 60...80
+                      "Strong"
+                    else
+                      "Very Strong"
+                    end
+
       @score = nScore
     end
-    
+
     private
+
     def check_minimum_requirements
       if @password.length < MIN_LENGTH
         @errors << "Password must be at least #{MIN_LENGTH} characters long"

data/passgen.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{passgen}
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erik Lindblad (CrypticE)", "Ronald Brachetti(rbecher)", "Ken Spencer (IotaSpencer)"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passgen
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors: