dev-random-passwords 0.1.0 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b91d26f0f17f4378ab2e6996d56bb9f229d53d7
-  data.tar.gz: 273f5593f2140747c97dc7d39c0584d5b2f61431
+  metadata.gz: 6e8810ba253d09244991432b1fd01ea4a60ff1e7
+  data.tar.gz: 0941d50a538e70d5c03b694be44360e29ba3cb62
 SHA512:
-  metadata.gz: ead906d135cd93edc72b8556b7f91ec0def52b64e2643bdc8a50a2d9e25118d59e403bae23a6721c0e5ced2e0dd0ca29cde17ce4eb01a9a6c6ca14cc93ea019e
-  data.tar.gz: e3fd250e62adc92afd45d1c67d8caadbd4218e59223321998ee10c5d67a04fcbf14de9bc5e6badc8376aeed22ed9199704428424c20f17971d2be0a98331cf6c
+  metadata.gz: 1ccd06e3eb1947c0b3c7198f2a3be27e8bc40d60ddc921b1426ce92ad211f304e77f9328d0b263b90d653621dcd6c4b80783e548e829a5eba3132af4f32edfb5
+  data.tar.gz: 29f02179bfcddc821ef88fc9f49651d66881cc9b1c945fbdd86401c3bf93d9f2905623a60ef6c18e0ddbb378788b34e51fd088324d42219a0264d3a331e2b181

data/lib/dev-random-passwords.rb

@@ -138,35 +138,46 @@ module DevRandomPasswords
 
     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
+        hw_byte = read_byte_from_hw
+        if hw_byte
+          return hw_byte
         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}"
+      random_byte = read_byte_from_dev_random
+      if random_byte
+        return random_byte
+      end
+
+      random_byte = read_byte_from_dev_urandom
+      if random_byte
+        return random_byte
+      else
+        raise "Could not find a random number generator on your system"
+      end
+    end
+
+    def read_byte_from_dev_urandom
+      if 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
-
       end
+    end
 
+    def read_byte_from_dev_random
+      if File.exist?('/proc/sys/kernel/random/entropy_avail')
+        if `cat /proc/sys/kernel/random/entropy_avail`.chomp.to_i < 64
+          return read_byte_from_dev_urandom
+        end
+      end
       if File.exist?('/dev/random')
         if File.readable?('/dev/random')
           random_file = File.new('/dev/random', 'r')
@@ -178,21 +189,34 @@ module DevRandomPasswords
         else
           raise "/dev/random #{NOT_READABLE_ERROR}"
         end
+      end
+    end
 
-      elsif File.exist?('/dev/urandom')
-        if File.readable?('/dev/urandom')
-          random_file = File.new('/dev/urandom', 'r')
+    def read_byte_from_hw
+      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/urandom #{NOT_READABLE_ERROR}"
+          raise "/dev/hwrng #{NOT_READABLE_ERROR}"
         end
+      end
 
-      else
-        raise "Could not find a random number generator on your system"
+      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
 

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

@@ -1,3 +1,3 @@
 module DevRandomPasswords
-  VERSION = "0.1.0"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev-random-passwords
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.4
 platform: ruby
 authors:
 - Joel Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler