pwqgen.rb 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b0a254ec0160ba29091440eec20fd70719e680b
-  data.tar.gz: 1661919c80df689c703aa295e2f3e95a0be4e710
+  metadata.gz: d175c0aa4bddf1e3fab53fac8f870586063c7b5a
+  data.tar.gz: bbdfe9d63c4dba8103a82a36627c8306a34f0510
 SHA512:
-  metadata.gz: b114a98c51e746d1e5cf1aeaeddf8d91ea59c7ef69a06ecc6fce2215ab4f98cde6b42012e02055863f906e2119ef5d477b9ea99f7ca8665c57104605767ffbd0
-  data.tar.gz: 4bd94f6a9fb2e84cc24e6326ef5ece91d20a36a598ac0f01336bd3df26f6c3dddae109976f39bc933c87ef3854a7c7090510c44ca5c1b3f3304298bf59877bfb
+  metadata.gz: b6752ea31a2b4b38eb645dc72cc80a67df6d8e6fbb62b2a8408db1359c817b1ead793ef7c4281849999320f11040b99a4190f62f0f17763267ba581be44127f7
+  data.tar.gz: e79b9d9b5da4f81585c5b9ee65aec19886c7ff1ae945e954c68ccc7d39afc46c4a5b97a2c89c975b3545264777868318f64106f86f18295ec22e6cde76c47d01

data/bin/pwqgen.rb

@@ -10,26 +10,45 @@ doc = <<DOCOPT
 Generate a random pronouncable passphrase.
 
 Usage:
-  #{filename} [LENGTH]
+  #{filename} [options] [LENGTH]
   #{filename} [-h | --help]
   #{filename} [-v | --version]
 
 Arguments:
-  LENGTH          Number of words in the passphrase. [default: 3]
+  LENGTH          Number of words in the passphrase [default: 3].
+  COLS            Number of columns to output.
 
 Options:
-  -h, --help      show this help message and exit
-  -v, --version   show version and exit
+  -C COLS, --columns COLS   output passphrases in multiple columns
+  -h, --help                show this help message and exit
+  -v, --version             show version and exit
 
 DOCOPT
 
 begin
   options = Docopt::docopt(doc, :version => Pwqgen::VERSION)
-
-  if ARGV.length > 0 && ARGV[0].to_s.match(/\A[+-]?\d+?(\.\d+)?\Z/) then
-    puts Pwqgen.generate(ARGV[0].to_i)
+  p options
+  
+  if !options["LENGTH"].nil? && options["LENGTH"].to_s.match(/\A[+-]?\d+?(\.\d+)?\Z/)
+    opts = options["LENGTH"].to_i
+  end
+  if options["--columns"].nil?
+    if opts
+      puts Pwqgen.generate(opts)
+    else
+      puts Pwqgen.generate
+    end
   else
-    puts Pwqgen.generate
+    for i in 1..(options["--columns"][0].to_i)
+      for j in 1..(options["--columns"][0].to_i)
+        if opts
+          print Pwqgen.generate(opts) + "\t"
+        else
+          print Pwqgen.generate + "\t"
+        end
+      end
+      puts ""
+    end
   end
 rescue Docopt::Exit => e
   puts e.message

data/lib/pwqgen/pwqgen.rb

@@ -1,5 +1,5 @@
 require 'pwqgen/wordlist'
-require 'securerandom'
+require 'sysrandom/securerandom'
 
 # Public: Pwqgen is a Ruby implementation of passwdqc's pwqgen password
 # generator.
@@ -42,9 +42,10 @@ module Pwqgen
 	end
 
 	class Generator
-		def initialize
+		def initialize(opts = {})
+			opts[:separators] ||= "-_!$&*+=23456789"
 			@@wordlist_size = @@wordlist.length
-			@@separators = "-_!$&*+=23456789".split(//)
+			@@separators = opts[:separators].split(//)
 			@@separators_size = @@separators.length
 			@rand = SecureRandom
 		end

data/lib/pwqgen/version.rb

@@ -1,3 +1,3 @@
 module Pwqgen
-	VERSION = "0.0.5"
+	VERSION = "0.0.6"
 end

data/pwqgen.rb.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.8.7'
   s.required_rubygems_version = ">= 1.3.6"
-  s.add_runtime_dependency('docopt', "~> 0.5.0")
+  s.add_runtime_dependency('docopt', "~> 0.5")
+  s.add_runtime_dependency('sysrandom')
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'

metadata

@@ -1,69 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: pwqgen.rb
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ronald Ip
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-01 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: sysrandom
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: pwqgen.rb is a Ruby implementation of passwdqc's pwqgen, a random pronouncable
@@ -74,8 +88,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - ChangeLog
 - Gemfile
 - README.md
@@ -139,17 +153,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: pwqgen in Ruby