Lexitron 2.0.2__tar.gz → 2.0.4__tar.gz

{Lexitron-2.0.2 → Lexitron-2.0.4/Lexitron.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Lexitron
-Version: 2.0.2
+Version: 2.0.4
 Summary: A command-line regex search engine for the English language
 Home-page: http://github.com/rothos/lexitron
 Author: Rothos
@@ -59,12 +59,17 @@ where `expression` is a regular expression and `[options]` are as follows.
 --------|-------------------------------------------------
   `-d`  | Append start and end delimiters `^...$` to search query
   `-n`  | Print only the number of matches
-  `-u`  | Search only for common/lowercase/non-capitalized words
-  `-U`  | Search only for proper/uppercase/capitalized words
+  `-u`  | Search only for lowercase/common/uncapitalized words
+  `-U`  | Search only for uppercase/proper/capitalized words
+  `-v`  | Show version and exit
   `-x`  | Print unformatted output, one word per line
 
 Type `$ lx -h` for full help text.
 
+If you aren't familiar with regular expressions, it isn't too hard to learn
+the basics. There are many resources online. A good starting point is
+the [Wikipedia article](https://en.wikipedia.org/wiki/Regular_expression).
+
 
 Output
 ------------------------------------------------------------------------------
@@ -72,7 +77,7 @@ By default, Lexitron will output a well-formatted (potentially multi-column)
 list of words, along with a header describing the results.
 
 The results are separated into "proper" words (capitalized, like "France")
-and "common" words (lowercase, like "banana").
+and "common" words (lowercase, like "boat").
 
 Using the `-x` flag will return a more machine-readable output with one word
 per line.
@@ -170,7 +175,7 @@ hallalling         parallelling       scuttlebutt        yellowbelly
 ```
 
 ### Example 5
-Compare the number of lowercase/non-capitalized words that end in "woman"
+Compare the number of lowercase/uncapitalized words that end in "woman"
 with the number that end in "man".
 ```
 $ lx -nxu ".*woman"

{Lexitron-2.0.2 → Lexitron-2.0.4}/Lexitron.egg-info/SOURCES.txt

@@ -5,11 +5,7 @@ setup.cfg
 ./lexitron/__init__.py
 ./lexitron/agid-common.txt
 ./lexitron/agid-proper.txt
-./lexitron/dict_util.py
 ./lexitron/lexitron.py
-./lexitron/words-lower.txt
-./lexitron/words-upper.txt
-./lexitron/words.txt
 Lexitron.egg-info/PKG-INFO
 Lexitron.egg-info/SOURCES.txt
 Lexitron.egg-info/dependency_links.txt

Lexitron-2.0.4/Lexitron.egg-info/requires.txt

@@ -0,0 +1,4 @@
+
+[:python_version < "3.8"]
+importlib-metadata
+importlib-resources

{Lexitron-2.0.2/Lexitron.egg-info → Lexitron-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Lexitron
-Version: 2.0.2
+Version: 2.0.4
 Summary: A command-line regex search engine for the English language
 Home-page: http://github.com/rothos/lexitron
 Author: Rothos
@@ -59,12 +59,17 @@ where `expression` is a regular expression and `[options]` are as follows.
 --------|-------------------------------------------------
   `-d`  | Append start and end delimiters `^...$` to search query
   `-n`  | Print only the number of matches
-  `-u`  | Search only for common/lowercase/non-capitalized words
-  `-U`  | Search only for proper/uppercase/capitalized words
+  `-u`  | Search only for lowercase/common/uncapitalized words
+  `-U`  | Search only for uppercase/proper/capitalized words
+  `-v`  | Show version and exit
   `-x`  | Print unformatted output, one word per line
 
 Type `$ lx -h` for full help text.
 
+If you aren't familiar with regular expressions, it isn't too hard to learn
+the basics. There are many resources online. A good starting point is
+the [Wikipedia article](https://en.wikipedia.org/wiki/Regular_expression).
+
 
 Output
 ------------------------------------------------------------------------------
@@ -72,7 +77,7 @@ By default, Lexitron will output a well-formatted (potentially multi-column)
 list of words, along with a header describing the results.
 
 The results are separated into "proper" words (capitalized, like "France")
-and "common" words (lowercase, like "banana").
+and "common" words (lowercase, like "boat").
 
 Using the `-x` flag will return a more machine-readable output with one word
 per line.
@@ -170,7 +175,7 @@ hallalling         parallelling       scuttlebutt        yellowbelly
 ```
 
 ### Example 5
-Compare the number of lowercase/non-capitalized words that end in "woman"
+Compare the number of lowercase/uncapitalized words that end in "woman"
 with the number that end in "man".
 ```
 $ lx -nxu ".*woman"

{Lexitron-2.0.2 → Lexitron-2.0.4}/README.md

@@ -46,12 +46,17 @@ where `expression` is a regular expression and `[options]` are as follows.
 --------|-------------------------------------------------
   `-d`  | Append start and end delimiters `^...$` to search query
   `-n`  | Print only the number of matches
-  `-u`  | Search only for common/lowercase/non-capitalized words
-  `-U`  | Search only for proper/uppercase/capitalized words
+  `-u`  | Search only for lowercase/common/uncapitalized words
+  `-U`  | Search only for uppercase/proper/capitalized words
+  `-v`  | Show version and exit
   `-x`  | Print unformatted output, one word per line
 
 Type `$ lx -h` for full help text.
 
+If you aren't familiar with regular expressions, it isn't too hard to learn
+the basics. There are many resources online. A good starting point is
+the [Wikipedia article](https://en.wikipedia.org/wiki/Regular_expression).
+
 
 Output
 ------------------------------------------------------------------------------
@@ -59,7 +64,7 @@ By default, Lexitron will output a well-formatted (potentially multi-column)
 list of words, along with a header describing the results.
 
 The results are separated into "proper" words (capitalized, like "France")
-and "common" words (lowercase, like "banana").
+and "common" words (lowercase, like "boat").
 
 Using the `-x` flag will return a more machine-readable output with one word
 per line.
@@ -157,7 +162,7 @@ hallalling         parallelling       scuttlebutt        yellowbelly
 ```
 
 ### Example 5
-Compare the number of lowercase/non-capitalized words that end in "woman"
+Compare the number of lowercase/uncapitalized words that end in "woman"
 with the number that end in "man".
 ```
 $ lx -nxu ".*woman"

{Lexitron-2.0.2 → Lexitron-2.0.4}/lexitron/lexitron.py

@@ -1,5 +1,5 @@
 import sys, os, re, argparse
-from importlib import resources
+from importlib import resources, metadata
 from math import ceil, floor
 
 class Lexitron:
@@ -33,19 +33,19 @@ class Lexitron:
         # self.parser.add_argument('-a',
         #     dest='all', action='store_true',
         #     help='Search all words, including plurals and conjugations')
-        self.parser.add_argument('-d',
-            dest='delimiters', action='store_true',
-            help='Append start and end delimiters ^...$ to search query')
-        self.parser.add_argument('-n',
+        self.parser.add_argument('-n', '--number-only',
             dest='number', action='store_true',
             help='Print only the number of matches')
-        self.parser.add_argument('-u',
+        self.parser.add_argument('-u', '--lowercase',
             dest='only_common', action='store_true',
-            help='Search only for common/lowercase/non-capitalized words')
-        self.parser.add_argument('-U',
+            help='Search only for lowercase/common/uncapitalized words (like "boat")')
+        self.parser.add_argument('-U', '--uppercase',
             dest='only_proper', action='store_true',
-            help='Search only for proper/uppercase/capitalized words')
-        self.parser.add_argument('-x',
+            help='Search only for uppercase/proper/capitalized words (like "France")')
+        self.parser.add_argument('-v', '--version',
+            action='version', version="Lexitron "+metadata.version('lexitron'),
+            help='Show version and exit')
+        self.parser.add_argument('-x', '--plain',
             dest='unformatted', action='store_true',
             help='Print unformatted output, one word per line')
 
@@ -66,8 +66,6 @@ class Lexitron:
 
         # Get the expression ready.
         expr = self.sanitize(args.expression)
-        if args.delimiters:
-            expr = '^' + expr + '$'
 
         # Currently, lexitron search is case-insensitive.
         expr = re.compile(expr, flags=re.IGNORECASE)

{Lexitron-2.0.2 → Lexitron-2.0.4}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = Lexitron
-version = 2.0.2
+version = 2.0.4
 author = Rothos
 url = http://github.com/rothos/lexitron
 description = A command-line regex search engine for the English language
@@ -17,7 +17,8 @@ include_package_data = True
 packages = find:
 python_requires = >=3.7
 install_requires = 
-	importlib-metadata
+	importlib-metadata;python_version<'3.8'
+	importlib-resources;python_version<'3.8'
 package_dir = 
 	= .
 

Lexitron-2.0.2/Lexitron.egg-info/requires.txt

@@ -1 +0,0 @@
-importlib-metadata

Lexitron-2.0.2/lexitron/dict_util.py

@@ -1,47 +0,0 @@
-# This python script is a utility to separate large dictionary files
-# into lowercase and uppercase (common and proper) parts.
-# These parts are written to two new files.
-
-import sys
-from importlib import resources
-
-dictfile = 'words.txt'
-with open(dictfile, 'rb') as f:
-    words = f.read()
-f.close()
-
-words = words.splitlines()
-words = [word.decode('utf-8') for word in words]
-
-lowercase = []
-uppercase = []
-
-for word in words:
-    word = word.strip()
-
-    # If there is any punctuation in the word, skip it
-    if not word.isalpha():
-        continue
-
-    if word[0].islower():
-        lowercase.append(word)
-
-    elif word[0].isupper():
-        uppercase.append(word)
-
-    else:
-        print("Error: {} is neither lowercase nor uppercase".format(word))
-
-lowercase = [word for word in lowercase]
-uppercase = [word for word in uppercase]
-
-lowercase_file = 'words-lower.txt'
-uppercase_file = 'words-upper.txt'
-
-with open(lowercase_file, 'w') as f:
-    f.write("\n".join(lowercase))
-f.close()
-
-with open(uppercase_file, 'w') as f:
-    f.write("\n".join(uppercase))
-f.close()