pwm 1.1.0 → 1.1.1

data/bin/pwm

@@ -1,4 +1,9 @@
 #!/usr/bin/env ruby
 require 'pwm'
 length = (ARGV[0] || 16).to_i
-puts Pwm.password(length)
+if length < 8
+  puts 'length must be >= 8'
+  exit 1
+else
+  puts Pwm.password(length)
+end

data/lib/pwm.rb

@@ -13,7 +13,7 @@ module Pwm
 
   # Public: Generate a password.
   #
-  # length - The length of the password.
+  # length - The length of the password. Minimum is 8. Default is 16.
   #
   # Examples
   #
@@ -23,14 +23,19 @@ module Pwm
   #   Pwm.password(8)
   #   # => 'oUX4fmqr'
   #
-  # Returns the generated password as a String.
+  # Returns the generated password as a String if length >= 8,
+  # or nil is length < 8.
   def self.password(length = 16)
-    password = ''
-    until (password.match(/[A-Z]/) && password.match(/[a-z]/) && password.match(/[0-9]/))
-      password = (0..length - 1).inject('') do |pw, n|
-        pw + characters[rand(characters.length)]
+    if length < 8
+      nil
+    else
+      password = ''
+      until (password.match(/[A-Z]/) && password.match(/[a-z]/) && password.match(/[0-9]/))
+        password = (0..length - 1).inject('') do |pw, n|
+          pw + characters[rand(characters.length)]
+        end
       end
+      password
     end
-    password
   end
 end

data/lib/pwm/version.rb

@@ -1,3 +1,3 @@
 module Pwm
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/pwm_spec.rb

@@ -26,8 +26,20 @@ describe Pwm do
 
   context 'The password method' do
     context 'when given a length' do
-      it 'generates a password of that length' do
-        Pwm.password(8).length.should == 8
+      context 'equal to 8' do
+        it 'generates a password of that length' do
+          Pwm.password(8).length.should == 8
+        end
+      end
+      context 'greater than 8' do
+        it 'generates a password of that length' do
+          Pwm.password(9).length.should == 9
+        end
+      end
+      context 'less than 8' do
+        it 'does not generate a password' do
+          Pwm.password(7).should be_nil
+        end
       end
     end
     context 'when not given a length' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwm
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-22 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake