🗓 Jul 23, 2022 11:18:22 PM

🔧 fix #12
🔍 version 2.0.0
🐛 fix bug with RipgrepOut spelling
🐛 fix numeric arguments cast to string
🧪 tests added/updated

ripgrepy/__init__.py

@@ -5,10 +5,8 @@
 from json import dumps, loads
 from functools import wraps
 from timeit import default_timer
-from pkg_resources import get_distribution
 import logging
 
-__version__ = get_distribution("ripgrepy").version
 
 
 def _logger(func):
@@ -82,7 +80,7 @@ def as_json(self) -> str:
         :rtype: str
         """
         if "--json" not in self.command:
-            raise TypeError("To use as_dict, use the json() method")
+            raise TypeError("To use as_json, use the json() method")
         out = self._output.splitlines()
         holder = []
         for line in out:
@@ -205,12 +203,12 @@ def __init__(self, regex_pattern: str, path: str, rg_path: str = "rg"):
         self.run_rg = self.run
 
     @_logger
-    def run(self) -> RipgrepOut:
+    def run(self) -> RipGrepOut:
         """
         Returns an instace of the Ripgrepy object
 
         :return: self
-        :rtype: RipgrepOut
+        :rtype: RipGrepOut
         """
         self.command.append(self.regex_pattern)
         self.command.append(self.path)
@@ -244,7 +242,7 @@ def after_context(self, number: int) -> Ripgrepy:
         :rtype: Ripgrepy
         """
         self.command.append("--after-context")
-        self.command.append(number)
+        self.command.append(str(number))
         return self
 
     @_logger
@@ -260,7 +258,7 @@ def before_context(self, number: int) -> Ripgrepy:
         :rtype: Ripgrepy
         """
         self.command.append("--before-context")
-        self.command.append(number)
+        self.command.append(str(number))
         return self
 
     @_logger
@@ -280,7 +278,7 @@ def context(self, number: int) -> Ripgrepy:
         :rtype: Ripgrepy
         """
         self.command.append("--context")
-        self.command.append(number)
+        self.command.append(str(number))
         return self
 
     @_logger
@@ -496,7 +494,7 @@ def dfa_size_limit(self, num_suffix: int) -> Ripgrepy:
         :rtype: Ripgrepy
         """
         self.command.append('--dfa-size-limit')
-        self.command.append(num_suffix)
+        self.command.append(str(num_suffix))
         return self
 
     @_logger
@@ -856,7 +854,7 @@ def max_columns(self, num: int) -> Ripgrepy:
         :rtype: Ripgrepy
         """
         self.command.append("--max-columns")
-        self.command.append(num)
+        self.command.append(str(num))
         return self
 
     @_logger
@@ -890,7 +888,7 @@ def max_count(self, num: int) -> Ripgrepy:
         :rtype: Ripgrepy
         """
         self.command.append("--max-count")
-        self.command.append(num)
+        self.command.append(str(num))
         return self
 
     @_logger
@@ -910,7 +908,7 @@ def max_depth(self, num: int) -> Ripgrepy:
         :rtype: Ripgrepy
         """
         self.command.append("--max-depth")
-        self.command.append(num)
+        self.command.append(str(num))
         return self
 
     @_logger
@@ -1743,7 +1741,7 @@ def threads(self, num: int) -> Ripgrepy:
         :rtype: Ripgrepy
         """
         self.command.append("--threads")
-        self.command.append(num)
+        self.command.append(str(num))
         return self
 
     @_logger

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 from os import path
 
-__version__ = '1.1.0'
+__version__ = '2.0.0'
 __author__ = 'Hapsida @securisec'
 
 this_directory = path.abspath(path.dirname(__file__))

tests/test.py

@@ -1,7 +1,8 @@
 from ripgrepy import Ripgrepy
 
-rg = Ripgrepy('lol', '.').json().run()
+def test_base():
+    rg = Ripgrepy('lol', '.').context(1).json().run()
 
-print(rg.as_string)
-print(rg.as_dict)
-print(rg.as_json)
+    print(rg.as_string)
+    print(rg.as_dict)
+    print(rg.as_json)