passphrase 0.0.3 → 0.1.0

data/README.rdoc

@@ -2,11 +2,12 @@
 
 Trying to come up with a good passphrase when creating an SSH public key pair
 or when signing up for an online service is a pain. Typical password generators
-yield a string of random characters which is secure but is hard to type. The
-{Diceware method}[http://world.std.com/~reinhold/diceware.html] constructs a
-passphrase made up of more-or-less recognizable words. This makes it easier to
-type, while still being reasonably secure.  Passphrase is a command line tool
-written in Ruby for generating a passphrase using the Diceware method.
+yield a string of random characters which may be strong but is often hard to
+type. The {Diceware method}[http://world.std.com/~reinhold/diceware.html]
+constructs a passphrase made up of more-or-less recognizable words. This makes
+it easier to type, while still being reasonably secure. Passphrase is a command
+line tool written in Ruby for generating a passphrase using the Diceware
+method.
 
 The act of rolling dice is simulated by requesting random numbers from
 {www.random.org}[http://www.random.org]. If a network error occurs or a request
@@ -19,24 +20,25 @@ code as compressed, base64 encoded strings. No external files are referenced.
 
 == Generating a passphrase
 
-The command line interface is simple. You have the option to specify the number
-of words in the generated passphrase within the range of 3 to 10. The default
-is 5. One _odd_ character is automatically mixed into one of the words
-comprising the passphrase. You can omit mixing if desired.
+The command line interface is simple. You have the option to request from 3 to
+10 words in the generated passphrase. The default is 5 if a number is not
+specified. In addition, at least one capital letter, one number character, and
+one non-alphanumeric character are automatically mixed into the passphrase.
+However, you can omit mixing if desired.
 
   Usage: passphrase [options]
   Options:
     -n, --num-words NUMBER           Desired number of words (3..10), default 5
-    -x, --[no-]mix                   Mix in odd character, default mix
-    -h, --help                       Show this message
-    -v, --version                    Show version
+    -x, --[no-]mix                   Mix in cap, num, non-alphanum, default mix
+    -l, --local                      Force use of local random number generator
+    -h, --help                       Show this message and exit
+    -v, --version                    Show version and exit
 
 == Examples
 
   $ passphrase --num-words 3
-  unmixed phrase => shot elm mild
-  odd character  => !
-  passphrase     => shot e!m mild
+  unmixed phrase => tomb sima smog
+  passphrase     => ]omb s0ma smoG
 
   $ passphrase --num-words 4 --no-mix
   passphrase => humus smooth persia mz

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/passphrase/generator.rb

@@ -16,6 +16,7 @@ module Passphrase
     def initialize(argv)
       @options = Options.new(argv)
       @words = []
+      Random.use_local if @options.local
     end
 
     def run

data/lib/passphrase/options.rb

@@ -11,10 +11,12 @@ module Passphrase
 
     attr_reader :num_words
     attr_reader :mix
+    attr_reader :local
 
     def initialize(argv)
       @num_words = DEFAULT_NUM_WORDS
       @mix = true
+      @local = false
       parse(argv)
       validate
     end
@@ -32,6 +34,9 @@ module Passphrase
         opts.on("-x", "--[no-]mix", "Mix in cap, num, non-alphanum, default mix") do |m|
           @mix = m
         end
+        opts.on("-l", "--local", "Force use of local random number generator") do |l|
+          @local = l
+        end
         opts.on_tail("-h", "--help", "Show this message and exit") do
           puts opts
           exit

data/lib/passphrase/random.rb

@@ -6,9 +6,12 @@ require 'securerandom'
 module Passphrase
   class Random
 
+    @@use_random_org = true
+
     def initialize(num, min, max)
       @num, @min, @max = num, min, max
       @array_of_rands = []
+      @via_random_org = true
       generate_array_of_rands
     end
     
@@ -19,18 +22,29 @@ module Passphrase
     def to_array
       @array_of_rands
     end
+    
+    def self.use_local
+      @@use_random_org = false
+    end  
 
     private
 
     def generate_array_of_rands
-      query = "/integers/?col=1&base=10&format=plain&rnd=new" + 
-        "&num=#{@num}&min=#{@min}&max=#{@max}"
-      site = Net::HTTP.new("www.random.org")
-      response, data = site.get(query)
-      raise unless response.code == "200"
-      @array_of_rands = data.split.collect {|num| num.to_i}
-      @via_random_org = true
+      if @@use_random_org
+        query = "/integers/?col=1&base=10&format=plain&rnd=new" + 
+          "&num=#{@num}&min=#{@min}&max=#{@max}"
+        site = Net::HTTP.new("www.random.org")
+        response, data = site.get(query)
+        raise unless response.code == "200"
+        @array_of_rands = data.split.collect {|num| num.to_i}
+      else
+        local_rands
+      end
     rescue
+      local_rands
+    end
+
+    def local_rands
       max = @max - @min + 1
       offset = @min
       @num.times do

data/lib/passphrase/version.rb

@@ -6,8 +6,8 @@ module Passphrase
     # rubygems rational versioning policy
     # http://docs.rubygems.org/read/chapter/7
     MAJOR = 0
-    MINOR = 0
-    BUILD = 3
+    MINOR = 1
+    BUILD = 0
 
     STRING = [MAJOR, MINOR, BUILD].compact.join('.')
   end

metadata

@@ -2,7 +2,7 @@
 name: passphrase
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
   - Edmund Sumbar
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-12 00:00:00 -07:00
+date: 2011-04-25 00:00:00 -06:00
 default_executable: passphrase
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -40,11 +40,12 @@ description: |+
   
   Trying to come up with a good passphrase when creating an SSH public key pair
   or when signing up for an online service is a pain. Typical password generators
-  yield a string of random characters which is secure but is hard to type. The
-  {Diceware method}[http://world.std.com/~reinhold/diceware.html] constructs a
-  passphrase made up of more-or-less recognizable words. This makes it easier to
-  type, while still being reasonably secure.  Passphrase is a command line tool
-  written in Ruby for generating a passphrase using the Diceware method.
+  yield a string of random characters which may be strong but is often hard to
+  type. The {Diceware method}[http://world.std.com/~reinhold/diceware.html]
+  constructs a passphrase made up of more-or-less recognizable words. This makes
+  it easier to type, while still being reasonably secure. Passphrase is a command
+  line tool written in Ruby for generating a passphrase using the Diceware
+  method.
   
   The act of rolling dice is simulated by requesting random numbers from
   {www.random.org}[http://www.random.org]. If a network error occurs or a request
@@ -57,24 +58,25 @@ description: |+
   
   == Generating a passphrase
   
-  The command line interface is simple. You have the option to specify the number
-  of words in the generated passphrase within the range of 3 to 10. The default
-  is 5. One _odd_ character is automatically mixed into one of the words
-  comprising the passphrase. You can omit mixing if desired.
+  The command line interface is simple. You have the option to request from 3 to
+  10 words in the generated passphrase. The default is 5 if a number is not
+  specified. In addition, at least one capital letter, one number character, and
+  one non-alphanumeric character are automatically mixed into the passphrase.
+  However, you can omit mixing if desired.
   
     Usage: passphrase [options]
     Options:
       -n, --num-words NUMBER           Desired number of words (3..10), default 5
-      -x, --[no-]mix                   Mix in odd character, default mix
-      -h, --help                       Show this message
-      -v, --version                    Show version
+      -x, --[no-]mix                   Mix in cap, num, non-alphanum, default mix
+      -l, --local                      Force use of local random number generator
+      -h, --help                       Show this message and exit
+      -v, --version                    Show version and exit
   
   == Examples
   
     $ passphrase --num-words 3
-    unmixed phrase => shot elm mild
-    odd character  => !
-    passphrase     => shot e!m mild
+    unmixed phrase => tomb sima smog
+    passphrase     => ]omb s0ma smoG
   
     $ passphrase --num-words 4 --no-mix
     passphrase => humus smooth persia mz