pwm 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58c0d286216f2201a37bc78782c5763a1695daee
-  data.tar.gz: 6ff21248e08dbed3d06db1ab01fb2df19be4ca01
+  metadata.gz: 189dbb4eaa91cc5fb097644d22f10ee25d20ad9d
+  data.tar.gz: 36bc9792cdc0b9015616475726ffd2f6e077a9bf
 SHA512:
-  metadata.gz: eb1a4fefbd355ced7e2a05b820c2b4ee1ad91b4a30538bce05805b85bfda887ae270c6705ef9c33fea3ffe6475840fa83658d86c3c55cc67597f15fb7e37b35e
-  data.tar.gz: 4e9af9353c9c751c1f58755986eb90634c3f6bf4f13a7608678aacbc3a5005d757fdc7f4db442fc726a3c363b32c2ee79e6224534010cdc8273ca335eb1df1e3
+  metadata.gz: 260b7f490b18c101b0a5d04b8757a17df69df963cadb125c6e89bf2adeb08de8e0737bc38472752a76ae67384047b4accf243597fdd2dfd3fc01e22d9bc497db
+  data.tar.gz: 2f82eeadb7224e6c4b9107b88e6137df44de0a41e09d7a889bb319be6406f560ad5f84ad7cf26f047f699c0bdc6d4cfdefd02a8675d2cd87af52d02dbb9c0ada

data/.gitignore

@@ -3,3 +3,5 @@
 Gemfile.lock
 pkg/*
 .ruby-version
+vendor
+coverage

data/.rubocop.yml

@@ -0,0 +1,7 @@
+AllCops:
+  Excludes:
+    - vendor/**
+Documentation:
+  Enabled: false
+Encoding:
+  Enabled: false

data/.travis.yml

@@ -3,5 +3,4 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
-# uncomment this line if your project needs to run something other than `rake`:
-# script: bundle exec rspec spec
+script: bundle exec rake

data/Rakefile

@@ -1,7 +1,11 @@
 require 'bundler/gem_tasks'
+require 'cucumber'
+require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
+Cucumber::Rake::Task.new(:features)
 RSpec::Core::RakeTask.new(:spec)
+Rubocop::RakeTask.new
 
-task :default => :spec
-task :test => :spec
+task :default => [:rubocop, :spec, :features]

data/features/pwm.feature

@@ -4,7 +4,7 @@ Feature: Pwm
   As a person needing random passwords
   I want to use the pwm command-line tool
 
-  Scenario: Generating a password of the default length
+  Scenario: Generating a password of no specific length
     When I run `pwm`
     Then the password should be 16 characters long
     And the exit status should be 0

data/features/step_definitions/pwm.rb

@@ -1,3 +1,3 @@
-Then /^the password should be (\d+) characters long$/ do |length|
-  expect(all_output.strip.length).to eq length.to_i
+Then(/^the password should be (\d+) characters long$/) do |length|
+  expect(all_output.strip.length).to eq(length.to_i)
 end

data/lib/pwm.rb

@@ -1,7 +1,6 @@
-require "pwm/version"
+require 'pwm/version'
 
 module Pwm
-
   # Internal: The exception raised when a requested password length is
   # too short.
   class TooShortException < Exception; end
@@ -11,8 +10,7 @@ module Pwm
   #
   # Returns the set of characters as an Array.
   def self.characters
-    (('A'..'Z').to_a  + ('a'..'z').to_a +
-     ('2'..'9').to_a) - ['I', 'O', 'l']
+    (('A'..'Z').to_a  + ('a'..'z').to_a + ('2'..'9').to_a) - %w(I O l)
   end
 
   # Public: Generate a password.
@@ -30,19 +28,35 @@ module Pwm
   # Returns the generated password as a String if length >= 8,
   # or raises exception if length < 8.
   def self.password(length = 16)
-    if length < 8
-      raise Pwm::TooShortException,
-            "Requested length #{length} is too short."
-    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
+    fail Pwm::TooShortException, "#{length} is too short." if length < 8
+    password = ''
+    until acceptable?(password)
+      password = (0..length - 1).reduce('') do |pw, n|
+        pw + characters[rand(characters.length)]
       end
-      password
     end
+    password
+  end
+
+  private
+
+  # Private: Checks if a password is acceptable.
+  #
+  # password - the password to check
+  #
+  # Examples
+  #
+  #   Pwm.acceptable?('AaBbCc1234')
+  #   # => true
+  #
+  #   Pwm.acceptable?('ABCDEFGHIJ')
+  #   # => false
+  #
+  # Returns true if password has at least one of each required character
+  # class, or false if not.
+  def self.acceptable?(password)
+    password.match(/[A-Z]/) &&
+    password.match(/[a-z]/) &&
+    password.match(/[0-9]/)
   end
 end

data/lib/pwm/version.rb

@@ -1,3 +1,3 @@
 module Pwm
-  VERSION = "1.2.1"
+  VERSION = '1.2.2'
 end

data/pwm.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "pwm"
   s.version     = Pwm::VERSION
   s.authors     = ["Mark Cornick"]
-  s.email       = ["mark@markcornick.com"]
-  s.homepage    = "https://github.com/markcornick/pwm"
+  s.email       = ["mark@cornick.io"]
+  s.homepage    = "https://bitbucket.org/markcornick/pwm"
   s.summary     = %q{A reasonably secure password maker}
   s.description = %q{A tiny class and command-line tool to generate reasonably secure passwords.}
 
@@ -20,4 +20,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "aruba"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 2.14.0"
+  s.add_development_dependency "rubocop"
+  s.add_development_dependency "simplecov"
 end

data/spec/pwm_spec.rb

@@ -1,25 +1,29 @@
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/vendor/'
+end
 require 'pwm'
 
 describe Pwm do
   describe 'The default set of characters' do
-    (('A'..'Z').to_a - ['I', 'O']).each do |letter|
-      it "includes #{letter}" do
-        expect(Pwm.characters).to include(letter)
+    (('A'..'Z').to_a - %w(I O)).each do |character|
+      it "includes #{character}" do
+        expect(Pwm.characters).to include(character)
       end
     end
-    (('a'..'z').to_a - ['l']).each do |letter|
-      it "includes #{letter}" do
-        expect(Pwm.characters).to include(letter)
+    (('a'..'z').to_a - ['l']).each do |character|
+      it "includes #{character}" do
+        expect(Pwm.characters).to include(character)
       end
     end
-    ('2'..'9').each do |letter|
-      it "includes #{letter}" do
-        expect(Pwm.characters).to include(letter)
+    ('2'..'9').each do |character|
+      it "includes #{character}" do
+        expect(Pwm.characters).to include(character)
       end
     end
-    %w(I O l 0 1).each do |letter|
-      it "does not include #{letter}" do
-        expect(Pwm.characters).not_to include(letter)
+    %w(I O l 0 1).each do |character|
+      it "does not include #{character}" do
+        expect(Pwm.characters).not_to include(character)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pwm
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Mark Cornick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -52,9 +52,37 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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: simplecov
+  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: A tiny class and command-line tool to generate reasonably secure passwords.
 email:
-- mark@markcornick.com
+- mark@cornick.io
 executables:
 - pwm
 extensions: []
@@ -63,7 +91,7 @@ files:
 - ".gemtest"
 - ".gitignore"
 - ".rspec"
-- ".tailor"
+- ".rubocop.yml"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
@@ -77,7 +105,7 @@ files:
 - lib/pwm/version.rb
 - pwm.gemspec
 - spec/pwm_spec.rb
-homepage: https://github.com/markcornick/pwm
+homepage: https://bitbucket.org/markcornick/pwm
 licenses: []
 metadata: {}
 post_install_message: 
@@ -96,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A reasonably secure password maker

data/.tailor

@@ -1,106 +0,0 @@
-#------------------------------------------------------------------------------
-# Horizontal Whitespace
-#------------------------------------------------------------------------------
-# allow_hard_tabs         True to let hard tabs be considered a single space.
-#                         Default:      false
-#
-# allow_trailing_line_spaces
-#                         True to skip detecting extra spaces at the ends of
-#                         lines.
-#                         Default:      false
-#
-# indentation_spaces      The number of spaces to consider a proper indent.
-#                         Default:      2
-#
-# max_line_length         The maximum number of characters in a line before
-#                         tailor complains.
-#                         Default:      80
-# spaces_after_comma      Number of spaces to expect after a comma.
-#                         Default:      1
-#
-# spaces_before_comma     Number of spaces to expect before a comma.
-#                         Default:      0
-#
-# spaces_after_lbrace     The number of spaces to expect after an lbrace ('{').
-#                         Default:      1
-#
-# spaces_before_lbrace    The number of spaces to expect before an lbrace ('{').
-#                         Default:      1
-#
-# spaces_before_rbrace    The number of spaces to expect before an rbrace ('}').
-#                         Default:      1
-#
-# spaces_in_empty_braces  The number of spaces to expect between braces when
-#                         there's nothing in the braces (i.e. {}).
-#                         Default:      0
-#
-# spaces_after_lbracket   The number of spaces to expect after an
-#                         lbracket ('[').
-#                         Default:      0
-#
-# spaces_before_rbracket  The number of spaces to expect before an
-#                         rbracket (']').
-#                         Default:      0
-#
-# spaces_after_lparen     The number of spaces to expect after an
-#                         lparen ('(').
-#                         Default:      0
-#
-# spaces_before_rparen    The number of spaces to expect before an
-#                         rbracket (')').
-#                         Default:      0
-#
-#------------------------------------------------------------------------------
-# Naming
-#------------------------------------------------------------------------------
-# allow_camel_case_methods
-#                         Setting to true skips detection of camel-case method
-#                         names (i.e. def myMethod).
-#                         Default:      false
-#
-# allow_screaming_snake_case_classes
-#                         Setting to true skips detection of screaming
-#                         snake-case class names (i.e. My_Class).
-#                         Default:      false
-#
-#------------------------------------------------------------------------------
-# Vertical Whitespace
-#------------------------------------------------------------------------------
-# max_code_lines_in_class The number of lines of code in a class to allow before
-#                         tailor will warn you.
-#                         Default:      300
-#
-# max_code_lines_in_method
-#                         The number of lines of code in a method to allow
-#                         before tailor will warn you.
-#                         Default:      30
-#
-# trailing_newlines       The number of newlines that should be at the end of
-#                         the file.
-#                         Default:      1
-#
-Tailor.config do |config|
-  config.formatters "text"
-  config.file_set 'lib/**/*.rb' do |style|
-    style.allow_camel_case_methods false, level: :error
-    style.allow_hard_tabs false, level: :error
-    style.allow_screaming_snake_case_classes false, level: :error
-    style.allow_trailing_line_spaces false, level: :error
-    style.allow_invalid_ruby false, level: :warn
-    style.indentation_spaces 2, level: :off
-    style.max_code_lines_in_class 300, level: :error
-    style.max_code_lines_in_method 30, level: :error
-    style.max_line_length 80, level: :error
-    style.spaces_after_comma 1, level: :error
-    style.spaces_after_lbrace 1, level: :error
-    style.spaces_after_lbracket 0, level: :error
-    style.spaces_after_lparen 0, level: :error
-    style.spaces_before_comma 0, level: :error
-    style.spaces_before_lbrace 1, level: :error
-    style.spaces_before_rbrace 1, level: :error
-    style.spaces_before_rbracket 0, level: :error
-    style.spaces_before_rparen 0, level: :error
-    style.spaces_in_empty_braces 0, level: :error
-    style.trailing_newlines 1, level: :error
-  end
-end