password_characters 0.1.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acdef392daa31b915b00cc6fe7ffeed0a6fbe2f6
-  data.tar.gz: a489523ad89d71258b72f3c4d6c8086f4ab40782
+  metadata.gz: 5ed3c346e67225b17346a58797191032b239a205
+  data.tar.gz: 876e3acd646486aafcce6a0d44273ea5a4164668
 SHA512:
-  metadata.gz: 5b35229af138d337c100016db16dea999b9c4a35653aabbfc03042542181f3cb9e9f06e18430371d7bfb9a086ade0bf75e0dbd2d26de0f1492844d93f09d499a
-  data.tar.gz: b0648368919bfa8da669d3b86948eb5385ddd47f0e5fdf6490b7c3b574e4c471f5ad60739b0a9bd0c7a997411765c8a8487fa9f84c213332591a231b7d57db30
+  metadata.gz: c650a5a4f95870ab1b14a8dd8ec5adc1bef30c0eacc9aaa04f601fe41312b811f4feeb18286b47551d8745874ef614bd34f4a71e64063bd5bb1246ead46ef238
+  data.tar.gz: 5b1fd2b96dae733e55656300cab0a5b400bafa5c3292caa3b1910acb9d9eabdeb52e915c214127cdfbe1904ee55f6283510ff124e6580fc32eb9d6484ef99e8f

data/bin/password_characters

@@ -1,29 +1,5 @@
 #!/usr/bin/env ruby
-require_relative '../lib/password_and_ordinals'
+require 'password_characters/cli'
+require 'password_characters'
 
-require 'active_support'
-require 'active_support/core_ext/string'
-
-password = if ARGV.any?
-             ARGV[0]
-           else
-             puts 'Enter password:'
-             gets
-           end
-
-character_ordinals = if ARGV.any?
-                       ARGV[1]
-                     else
-                       puts 'Enter indices:'
-                       gets
-                     end
-
-def character_ordinals_to_integer_array(character_ordinals)
-  character_ordinals.split(',').map(&:to_i)
-end
-
-begin
-  puts PasswordAndOrdinals.new(password.squish, character_ordinals_to_integer_array(character_ordinals.squish)).characters.join ' '
-rescue Exception => e
-  abort e.message
-end
+PasswordCharacters::CLI.start

data/lib/password_characters.rb

@@ -1,6 +1,83 @@
 require "password_characters/version"
 
+require 'set'
+
+require 'active_support'
+require 'active_support/core_ext/object'
+
 module PasswordCharacters
-  require 'password_and_ordinals'
-  require 'ordinal_parser'
+  class PasswordAndOrdinals
+    def initialize(password, ordinals)
+      raise(ArgumentError, "#{ordinals} does not ask for any characters") if ordinals.empty?
+      raise(ArgumentError, "#{ordinals} only asks for one character") if ordinals.one?
+
+      raise(ArgumentError, "#{ordinals} does not only ask for integers") unless ordinals.all? { |o| o.is_a? Fixnum }
+
+      raise(ArgumentError, "#{ordinals} is not in ascending order") unless sorted?(ordinals)
+
+      raise(ArgumentError, "#{ordinals.uniq.to_sentence} duplicated in #{ordinals}") unless uniq?(ordinals)
+      raise(ArgumentError, "#{ordinals} would reveal entire password") unless ordinals.size < password.size # needs to come after checking duplicates
+
+      raise(ArgumentError, "#{ordinals_out_of_bounds(password, ordinals).to_sentence} out of bounds") unless ordinals.all? { |i| i.in? ordinal_range(password) }
+
+      @password_array = password.chars
+      @indices = indices ordinals
+    end
+
+    def characters
+      @indices.map { |i| @password_array.at i }
+    end
+
+    private
+
+    def sorted?(a)
+      a.sort == a
+    end
+
+    def uniq?(a)
+      a.uniq == a
+    end
+
+    def ordinals_out_of_bounds(password, ordinals)
+      ordinals.reject { |i| i.in? ordinal_range(password) }
+    end
+
+    def ordinal_range(password)
+      1..password.length
+    end
+
+    def indices(ordinals)
+      ordinals.map { |n| n - 1 }
+    end
+  end
+
+  class OrdinalParser
+    def initialize(string, password=nil)
+      @input = string
+      @password = password
+    end
+
+    def ordinal
+      case @input
+        when /the last/
+          @password.length
+        when /second (from|to) last/
+          @password.length - 1
+        when /third from last/
+          @password.length - 2
+        when /fourth from last/
+          @password.length - 3
+        when /first/
+          1
+        when /second/
+          2
+        when /third/
+          3
+        when /fourth/
+          4
+        else
+          @input[/\d+/].to_i
+      end
+    end
+  end
 end

data/lib/password_characters/cli.rb

@@ -0,0 +1,19 @@
+require 'thor'
+require 'active_support'
+require 'active_support/core_ext/string'
+
+module PasswordCharacters
+  class CLI < Thor
+    desc 'inline', 'allows input of the password and indices during invocation'
+    options password: :required, indices: :required
+    def inline
+      puts PasswordCharacters::PasswordAndOrdinals.new(options[:password], character_ordinals_to_integer_array(options[:indices])).characters.join ' '
+    end
+
+    no_commands do
+      def character_ordinals_to_integer_array(character_ordinals)
+        character_ordinals.split(',').map(&:to_i)
+      end
+    end
+  end
+end

data/lib/password_characters/version.rb

@@ -1,3 +1,3 @@
 module PasswordCharacters
-  VERSION = "0.1.2"
+  VERSION = "1.0.0"
 end

data/password_characters.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency 'aruba', '0.14.1'
-  spec.add_development_dependency 'rspec', '3.4.0'
-  spec.add_runtime_dependency 'activesupport', '4.2.6'
+  spec.add_development_dependency "rake", "~> 11.2.2"
+  spec.add_development_dependency 'aruba', '~> 0.14.1'
+  spec.add_development_dependency 'rspec', '~> 3.5.0'
+  spec.add_runtime_dependency 'activesupport', '~> 5.0.0.1'
+  spec.add_dependency 'thor'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: password_characters
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Nigel Lowry
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,56 +30,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 11.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 11.2.2
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.0.1
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: '0'
 description: Can be used to log in to Web sites which ask for specific characters
   from your password
 email:
@@ -101,9 +115,8 @@ files:
 - bin/console
 - bin/password_characters
 - bin/setup
-- lib/ordinal_parser.rb
-- lib/password_and_ordinals.rb
 - lib/password_characters.rb
+- lib/password_characters/cli.rb
 - lib/password_characters/version.rb
 - password_characters.gemspec
 homepage: https://github.com/nigel-lowry/password_characters

data/lib/ordinal_parser.rb

@@ -1,29 +0,0 @@
-class OrdinalParser
-  def initialize(string, password=nil)
-    @input = string
-    @password = password
-  end
-
-  def ordinal
-    case @input
-      when /the last/
-        @password.length
-      when /second (from|to) last/
-        @password.length - 1
-      when /third from last/
-        @password.length - 2
-      when /fourth from last/
-        @password.length - 3
-      when /first/
-        1
-      when /second/
-        2
-      when /third/
-        3
-      when /fourth/
-        4
-      else
-        @input[/\d+/].to_i
-    end
-  end
-end

data/lib/password_and_ordinals.rb

@@ -1,47 +0,0 @@
-require 'set'
-
-require 'active_support'
-require 'active_support/core_ext/object'
-
-class PasswordAndOrdinals
-  def initialize(password, ordinals)
-    raise(ArgumentError, "#{ordinals} does not ask for any characters") if ordinals.empty?
-    raise(ArgumentError, "#{ordinals} only asks for one character") if ordinals.one?
-
-    raise(ArgumentError, "#{ordinals} is not in ascending order") unless sorted?(ordinals)
-
-    raise(ArgumentError, "#{ordinals.uniq.to_sentence} duplicated in #{ordinals}") unless uniq?(ordinals)
-    raise(ArgumentError, "#{ordinals} would reveal entire password") unless ordinals.size < password.size # needs to come after checking duplicates
-
-    raise(ArgumentError, "#{ordinals_out_of_bounds(password, ordinals).to_sentence} out of bounds") unless ordinals.all? { |i| i.in? ordinal_range(password) }
-
-    @password_array = password.chars
-    @indices = indices ordinals
-  end
-
-  def characters
-    @indices.map { |i| @password_array.at i }
-  end
-
-  private
-
-  def sorted?(a)
-    a.sort == a
-  end
-
-  def uniq?(a)
-    a.uniq == a
-  end
-
-  def ordinals_out_of_bounds(password, ordinals)
-    ordinals.reject { |i| i.in? ordinal_range(password) }
-  end
-
-  def ordinal_range(password)
-    1..password.length
-  end
-
-  def indices(ordinals)
-    ordinals.map { |n| n - 1 }
-  end
-end