ppg 0.0.1.1 → 0.0.2

data/bin/ppg

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: utf-8 -*-
 
-require 'ppg'
-
+require_relative '../lib/ppg'
 require 'getoptlong'
 
 DEFAULT_PASSWORD_LENGTH = 8
@@ -49,12 +48,12 @@ password_length = DEFAULT_PASSWORD_LENGTH
       exit
     when '--digits'
 
-      mutators[:Digits]  = Proc.new { Random.rand(10).to_s },
-        arg.empty? ? 1 : arg.to_i
+      mutators[:Digits]  = arg.empty? ? 1 : arg.to_i,
+        Proc.new { Random.rand(10).to_s }
 
     when '--upcase'
-      mutators[:Upcase] = Proc.new { |c| c.upcase },
-        arg.empty? ? 1 : arg.to_i
+      mutators[:Upcase] = arg.empty? ? 1 : arg.to_i,
+        Proc.new { |c| c.upcase }
 
     when '--length'
       password_length = arg.to_i
@@ -73,8 +72,9 @@ password_length = DEFAULT_PASSWORD_LENGTH
   end
 
   pwgen = PwGen.new(password_length)
+
   mutators.each { |name, mutator|
-    puts "enabling #{name} mutator for #{mutator.last} character(s)" 
+    puts "enabling #{name} mutator for #{mutator.first} character(s)" 
     pwgen.add_mutator(*mutator)
   }
   
@@ -84,6 +84,4 @@ rescue GetoptLong::MissingArgument
   puts
   print_help
   exit
-
 end
-

data/lib/ppg/password.rb

@@ -3,16 +3,18 @@ class Password
   attr_reader :PASSWORD_LENGTH
 
   def initialize (password_length, password_pattern = nil)
+    raise ArgumentError, "length must be > 0" if password_length <= 0
     @PASSWORD_LENGTH = password_length.freeze
     @password = String.new
     #TODO: make password_pattern validation check method
     @password_pattern ||= []
   end
 
-  def length= (length)
-    @PASSWORD_LENGTH = length.freeze
+  def length= (password_length)
+    raise ArgumentError, "length must be > 0" if password_length <= 0
+    @PASSWORD_LENGTH = password_length.freeze
   end
-  
+
   alias :to_s :password
 
 end

data/lib/ppg/phonemes.rb

@@ -1,11 +1,11 @@
 $ENGLISH_PHONEMES_HASH = {
 
-  :vowels => [ "a","e","i","o","u" ],
+  :vowel => [ "a","e","i","o","u" ],
 
-  :consonants => [ "b", "c", "d", "f", "g", "h", "j", "k", "l", "m", "n",
+  :consonant => [ "b", "c", "d", "f", "g", "h", "j", "k", "l", "m", "n",
     "p", "r", "s", "t", "v", "w", "x", "y", "z" ],
 
-  :dipthongs => { 
+  :dipthong => { 
     :vowel => ["ae", "oh", "oo", "ah", "ai", "ee", "ei", "ie"],
     :consonant => ["ng", "gh", "ch", "ph", "qu", "sh", "th"] 
   }
@@ -15,7 +15,7 @@ $ENGLISH_PHONEMES_HASH = {
 $ENGLISH_DOWNCASE_REGEXP = /[a-z]/.freeze
 
 class Phonemes
-  attr_reader :downcase_regexp
+  attr_reader :downcase_regexp, :phonemes
   
   def initialize(
     vowels = nil,
@@ -24,9 +24,9 @@ class Phonemes
     downcase_regexp = $ENGLISH_DOWNCASE_REGEXP
   )
 
-    @phonemes = { :vowel => vowels || $ENGLISH_PHONEMES_HASH[:vowels], 
-      :consonant => consonants || $ENGLISH_PHONEMES_HASH[:consonants], 
-      :dipthong => dipthongs || $ENGLISH_PHONEMES_HASH[:dipthongs]
+    @phonemes = { :vowel => vowels || $ENGLISH_PHONEMES_HASH[:vowel], 
+      :consonant => consonants || $ENGLISH_PHONEMES_HASH[:consonant], 
+      :dipthong => dipthongs || $ENGLISH_PHONEMES_HASH[:dipthong]
     }
     @downcase_regexp = downcase_regexp
   end

data/lib/ppg/pwgen.rb

@@ -19,7 +19,7 @@ class PwGen
     @dipthong_length = 2
   end
 
-  def add_mutator(proc, count)
+  def add_mutator(count, proc)
     @mutated_chars ||= []
     @clean_chars_left ||= @password.PASSWORD_LENGTH
 

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: ppg
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.2
+  prerelease: 
 platform: ruby
 authors:
 - enoch0x5a
@@ -17,33 +18,34 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/ppg
-- lib/ppg.rb
 - lib/ppg/password.rb
 - lib/ppg/phonemes.rb
 - lib/ppg/pwgen.rb
+- lib/ppg.rb
+- bin/ppg
 homepage: 
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Phonetic Password Generator
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 8cfd70a8672f3df6fe2516af336b97f686aa3001
-  data.tar.gz: 82bfb856d6a3cfe78bbfcbcd70066abfd6a00d8a
-SHA512:
-  metadata.gz: db880f29757216f42134cb11376b231931a2bb1ada582d7dc1771bafd2c36f1d110efaccf551852b2fbb28f2ccf78457f2a4ea521209e6c7994fcf534e036819
-  data.tar.gz: 6fb661bc2b099fbf6b15aad50b16484f5907e21d702e2b57927863561e3aec3e7ac2b451c408bbdf67c9d2cd286e4ef4f3bd0062412cb8648c2f211802ca6cf2