patter 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dc182b17165e35d6587316c053b91b4ae61eb011484d71b05ccb8f0609809a0
-  data.tar.gz: 2523f20c2a140136488771470eb85a37064ab2e086eae1b3deed2fd06b735746
+  metadata.gz: 98c93193bff13c9e47603f28665a82952728ff3193dfe791be531a06611e03b9
+  data.tar.gz: 128d5e401374de2c0b011c2ffd121e9e13bb77cff72e6b971d6f6aa3b881a7f3
 SHA512:
-  metadata.gz: 8f67828e507abc88f2749a2925367ddf82360ec1ced4c28784c8480c2cd7cfddba0a8a69fcc8d90232c2d4149927543060c5f5704b0a9571f6d4b31607225f8b
-  data.tar.gz: 42fd989ebb98aaa8bc005d81dad72e9ee226f76c4eb78129cab1acc699571daca1150caa045f08500d6f94809912ace09f497746edcd0f67564d977823eaff35
+  metadata.gz: 96f797f6c7f6d23e82e8fd31cd85ff6adc2f6148db340baa8a9bf89964290a2fc8a9fa32dcfc0a3a450215fb50d18e4d1ecb777259fa37d2c31db294a00f780c
+  data.tar.gz: 1577e20b2a577b8b5f5f0a2162bfbeb34e8acadb9eb9ee675294e5e52a293a524fc9fd19f7b7aeae020b3adfc505b11994bfc19bf78df4b808c38ebb1f30fd7f

data/bin/patter

@@ -1,27 +1,49 @@
 #!/usr/bin/env ruby
+require_relative '../lib/patter'
+include Patter
 
-require 'patter'
-require 'docopt'
+class Main
+    def self.run(opts)
+        opts['--count'].to_i.times do
+            puts Pattern.new(opts['<pattern>']).to_s
+        end
+    end
+end
+
+docs = <<~EOF
+    #{'Usage:'.bold}
+        #{File.basename $0} [options] <pattern>
+
+    #{'Options:'.bold}
+        -n, --count N       Number of patterns to generate [default: 10]
+        -v, --version       Show version
+        -h, --help          Show this help
 
-str = <<~EOF
-    Usage: #{File.basename $0} [options] <pattern>
+    #{'Tags:'.bold}
+        {A} adjective       {N} noun
+        {S} symbol          {D} digit
+        {C} character
 
-    Generate strings from <pattern>.
+    #{'Modifiers:'.bold}
+        s: plural           t: titlecase
+        u: uppercase        l: lowercase
+        a: AlTeRnAtE case
+        <number>: repeat <number> times
 
-    -n, --count N     Number of patterns to generate [default: 10].
-    -h, --help        Show this help.
-    -v, --version     Show version.
+    Apply modifiers using a colon after the tag name.
 
-    #{Patter::Pattern.help}
+    #{'Examples:'.bold}
+        Ten random uppercase letters: {C:10u}
+        Three camelcase nouns:        {N:3t}
+        Plural, titlecase noun:       {N:ts}
+        Uppercase adjective:          {A:u}
+        Five random digits:           {D:5}
+        A username:                   {A}_{N}
 EOF
 
 begin
-    opts = Docopt::docopt(str, { version: Patter::VERSION })
+    Main.run(Docopt::docopt(docs, version: VERSION))
 rescue Docopt::Exit => e
     puts e.message
-    exit
-end
-
-opts['--count'].to_i.times do
-    puts Patter::Pattern.new(opts['<pattern>']).to_s
+    exit 1
 end

data/lib/patter.rb

@@ -1,14 +1,17 @@
+require 'colorize'
+require 'docopt'
+
 require 'singleton'
 
+module Patter
+    def self.root_dir
+        File.expand_path('../..', __FILE__)
+    end
+end
+
 require_relative 'patter/source_provider'
 require_relative 'patter/inflector'
 require_relative 'patter/pattern'
 require_relative 'patter/source'
 require_relative 'patter/sample'
 require_relative 'patter/version'
-
-module Patter
-    def self.root
-        File.expand_path('../..', __FILE__)
-    end
-end

data/lib/patter/pattern.rb

@@ -47,33 +47,5 @@ module Patter
                 end.join
             end
         end
-
-        def self.help
-            return <<~EOF
-                TAGS
-
-                    {A} adjective       {N} noun
-                    {S} symbol          {D} digit
-                    {C} character
-
-                MODIFIERS
-
-                    s: plural           t: titlecase
-                    u: uppercase        l: lowercase
-                    a: AlTeRnAtE case
-                    <number>: repeat <number> times
-
-                Apply modifiers using a colon after the tag name.
-
-                EXAMPLES
-
-                    Ten random uppercase letters: {C:10u}
-                    Three camelcase nouns:        {N:3t}
-                    Plural, titlecase noun:       {N:ts}
-                    Uppercase adjective:          {A:u}
-                    Five random digits:           {D:5}
-                    A username:                   {A}_{N}
-            EOF
-        end
     end
 end

data/lib/patter/source_provider.rb

@@ -9,7 +9,7 @@ module Patter
         private
 
         def get_wordlist(type)
-            File.read(Patter.root + "/words/#{type}.txt").split
+            File.read(Patter.root_dir + "/words/#{type}.txt").split
         end
 
         def chars

data/lib/patter/version.rb

@@ -1,3 +1,3 @@
 module Patter
-    VERSION = "1.0.11"
+    VERSION = "1.0.12"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: patter
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.12
 platform: ruby
 authors:
 - crdx
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-15 00:00:00.000000000 Z
+date: 2019-09-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: docopt
   requirement: !ruby/object:Gem::Requirement
@@ -25,47 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 0.17.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '12.3'
 description: 
 email: 
 executables: