dev-random-passwords 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8261b4136ad87c2f35d7a26800ada66e5f536a60
-  data.tar.gz: d9d61fc0286e9a623d7381ff363e1eaf935206d4
+  metadata.gz: 88f5996ac8df46987fd4d86a9a9cf748bc62de00
+  data.tar.gz: 9278f36b51fde496e4dcdde56010c47091489cb0
 SHA512:
-  metadata.gz: 6a52f5af0bf2212ffd1ed6838f4f68e1d6b114ea60e3cb8683a958ba7ac1424f7929d0691accba4b72df6ff4eb950542fe4bb75af74e68a614bd8f61fb65cff4
-  data.tar.gz: b57885e98f43a38c132677560a02f4358af2cd5998f867e79b57b006e0b77a108f2ed97d717916602d68a3904998031c2835f4302f15b7acca469800f7c6a19b
+  metadata.gz: 04c9fe5ac098ae363f9be7bb178cefb95438f7c3a25e2080214790c7a14cb0faf1895d4787a47b2c631f5f28ebd295254a6336df37c2272d4fb1fb2a84030ffb
+  data.tar.gz: eafbf4760d066d37f5df37ec0d173288d754539657081441748fed1504a0e8333740cc37fa5cfcccf41a8b2a1ddedeac0e7c7b05966809dc44c94492b2675609

data/lib/dev-random-passwords.rb

@@ -8,6 +8,8 @@ module DevRandomPasswords
     UPPERCASE_CHARS = ('A'..'Z').to_a.join("")
     DIGITS = ('0'..'9').to_a.join("")
     SPECIAL_CHARS = '!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~'
+    NOT_READABLE_ERROR = "is not readable by the current user please change permissions on this file or switch users."
+    REQUIREMENT_CONFLICT_ERROR = "You required a character type that is not possible with your current password options. Set your options and try again."
 
     def initialize
       @charset = LOWERCASE_CHARS + UPPERCASE_CHARS + DIGITS + SPECIAL_CHARS
@@ -16,66 +18,6 @@ module DevRandomPasswords
       @hardware_random = false
     end
 
-    def get_byte
-      if @hardware_random == true
-
-        if File.exist?('/dev/hwrng')
-          if File.readable?('/dev/hwrng')
-            random_file = File.new('/dev/hwrng', 'r')
-            random_byte = random_file.read(1).ord
-            random_file.close
-            if random_byte
-              return random_byte
-            end
-          else
-            raise "/dev/hwrng is not readable by the current user please change permissions on this file"
-          end
-        end
-
-        if File.exist?('/dev/hwrandom')
-          if File.readable?('/dev/hwrandom')
-            random_file = File.new('/dev/hwrandom', 'r')
-            random_byte = random_file.read(1).ord
-            random_file.close
-            if random_byte
-              return random_byte
-            end
-          else
-            raise "/dev/hwrandom is not readable by the current user please change permissions on this file"
-          end
-        end
-
-      end
-
-      if File.exist?('/dev/random')
-        if File.readable?('/dev/random')
-          random_file = File.new('/dev/random', 'r')
-          random_byte = random_file.read(1).ord
-          random_file.close
-          if random_byte
-            return random_byte
-          end
-        else
-          raise "/dev/random is not readable by the current user please change permissions on this file"
-        end
-
-      elsif File.exist?('/dev/urandom')
-        if File.readable?('/dev/urandom')
-          random_file = File.new('/dev/urandom', 'r')
-          random_byte = random_file.read(1).ord
-          random_file.close
-          if random_byte
-            return random_byte
-          end
-        else
-          raise "/dev/urandom is not readable by the current user please change permissions on this file"
-        end
-
-      else
-        raise "Could not find a random number generator on your system"
-      end
-    end
-
     def set_options(options={
       'lowercase' => true,
       'uppercase' => true,
@@ -150,6 +92,89 @@ module DevRandomPasswords
 
     end
 
+    def generate
+      new_password = ""
+
+      @char_length.times do
+        rand_num = get_byte
+        while rand_num >= @charset.length
+          rand_num -= @charset.length
+        end
+        new_password += @charset[rand_num]
+      end
+
+      check_for_conflicts
+
+      if requirements_met? new_password
+        return new_password
+      else
+        return generate
+      end
+
+    end
+
+  private
+
+    def get_byte
+      if @hardware_random == true
+
+        if File.exist?('/dev/hwrng')
+          if File.readable?('/dev/hwrng')
+            random_file = File.new('/dev/hwrng', 'r')
+            random_byte = random_file.read(1).ord
+            random_file.close
+            if random_byte
+              return random_byte
+            end
+          else
+            raise "/dev/hwrng #{NOT_READABLE_ERROR}"
+          end
+        end
+
+        if File.exist?('/dev/hwrandom')
+          if File.readable?('/dev/hwrandom')
+            random_file = File.new('/dev/hwrandom', 'r')
+            random_byte = random_file.read(1).ord
+            random_file.close
+            if random_byte
+              return random_byte
+            end
+          else
+            raise "/dev/hwrandom #{NOT_READABLE_ERROR}"
+          end
+        end
+
+      end
+
+      if File.exist?('/dev/random')
+        if File.readable?('/dev/random')
+          random_file = File.new('/dev/random', 'r')
+          random_byte = random_file.read(1).ord
+          random_file.close
+          if random_byte
+            return random_byte
+          end
+        else
+          raise "/dev/random #{NOT_READABLE_ERROR}"
+        end
+
+      elsif File.exist?('/dev/urandom')
+        if File.readable?('/dev/urandom')
+          random_file = File.new('/dev/urandom', 'r')
+          random_byte = random_file.read(1).ord
+          random_file.close
+          if random_byte
+            return random_byte
+          end
+        else
+          raise "/dev/urandom #{NOT_READABLE_ERROR}"
+        end
+
+      else
+        raise "Could not find a random number generator on your system"
+      end
+    end
+
     def requirements_met?(password)
 
       if @requirements
@@ -182,21 +207,32 @@ module DevRandomPasswords
 
     end
 
-    def generate
-      new_password = ""
+    def check_for_conflicts
 
-      @char_length.times do
-        rand_num = get_byte
-        while rand_num >= @charset.length
-          rand_num -= @charset.length
+      if @requirements
+        if @requirements['uppercase']
+          if (@charset.split("") & UPPERCASE_CHARS.split("")).empty?
+            raise REQUIREMENT_CONFLICT_ERROR
+          end
         end
-        new_password += @charset[rand_num]
-      end
 
-      if requirements_met? new_password
-        return new_password
-      else
-        return generate
+        if @requirements['lowercase']
+          if (@charset.split("") & LOWERCASE_CHARS.split("")).empty?
+            raise REQUIREMENT_CONFLICT_ERROR
+          end
+        end
+
+        if @requirements['digits']
+          if (@charset.split("") & DIGITS.split("")).empty?
+            raise REQUIREMENT_CONFLICT_ERROR
+          end
+        end
+
+        if @requirements['special']
+          if (@charset.split("") & SPECIAL_CHARS.split("")).empty?
+            raise REQUIREMENT_CONFLICT_ERROR
+          end
+        end
       end
 
     end

data/lib/dev-random-passwords/version.rb

@@ -1,3 +1,3 @@
 module DevRandomPasswords
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev-random-passwords
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Joel Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler