datec 0.1__tar.gz → 0.3__tar.gz

datec-0.3/.gitignore

@@ -0,0 +1,105 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+requirements-dev.txt
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/

datec-0.3/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 isaacto
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

datec-0.3/PKG-INFO

@@ -0,0 +1,119 @@
+Metadata-Version: 2.4
+Name: datec
+Version: 0.3
+Summary: Date Command
+Project-URL: Homepage, https://github.com/isaacto/datec
+Project-URL: Repository, https://github.com/isaacto/datec.git
+Project-URL: Issues, https://github.com/isaacto/datec/issues
+Author-email: Isaac To <isaac.to@gmail.com>
+License-Expression: MIT
+License-File: LICENSE
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Topic :: Software Development :: Libraries
+Requires-Python: >=3.9
+Requires-Dist: python-dateutil
+Description-Content-Type: text/markdown
+
+# Date command: A command-based date computation engine
+
+## Installation
+
+You can install the package simply by
+
+    pip install datec
+
+## Usage
+
+datec allows you to use "date commands" to modify datetime's by adding
+to them, like this:
+
+    datetime.datetime.now() + datec.Period(2, 'week')
+
+A date command can be parsed from strings using the parse() function,
+which create a command from a string representation.  This forms the
+basis of the datec command, which is a command-line program to output
+datetime after applying date commands, or sleep until that time if
+"-w" is given.  In general the date representation is
+NxYYYY-mm-ddTHH:MM:SS.ffffff, where unspecified parts are omitted
+leaving the symbols intact, like "2x-2-29T3::." (see the following for
+the meaning).  If the fractional part is not specified the "." may be
+omitted, if all time parts are not specified the "T::."  can be
+omitted, if all date parts are not specified the "--T" can be omitted,
+and if Nx may be omitted in some cases for setting a partial datetime
+or weekday.  There are a couple other more formats like +3week and
+-2wed for shifting by period and weekday.
+
+Date commands are in two forms: period shifting commands and partial
+datetime shifting commands.  The first type is more familiar: they
+look like
+
+  * +2week (shift the datetime forward by 2 week)
+  * -1month (shift the datetime backward by 1 month)
+
+Period is one of year, month, week, day, hour, minute and second,
+represented by an object of the Period class.  Fractional numbers are
+acceptable except for year and month.  If shifting a period leads to
+an invalid date (e.g., shift backward 1 month from 2019-07-31), it
+moves backwards the closest valid date (here, 2019-06-30).  In general
+the parts finer than the shifted part is unaffected (e.g., shifting 1
+month from 2019-07-31 02:00 gives you 2019-06-30 02:00).
+
+Partial datetime shifting is less familiar.  It looks like:
+
+  * 12:: (set the hour number to 12)
+  * +2x12:: (move forward to the second hour 12)
+  * +4x--31 (move forward to the fourth occurrence of day 31 of a month)
+  * -3x-02-29 (move backward to the third occurrence of February 29)
+  * wed (set to the Wednesday of the same week, week starts on Sunday)
+  * -3wed (move to the third Wednesday before the current datetime)
+
+They are represented by either a Weekday object or a PartialDate
+object with a count.  A count of 0 means setting instead of shifting.
+Only integer counts are acceptable.
+
+A trailing "/" on a partial date command sets all fields after the
+last specified field to zero.  For example, `12::/` sets the hour to
+12 and the minute, second and microsecond to 0, whereas `12::` would
+leave those unchanged.
+
+It is an error to set to an invalid date (e.g., --31 applied on
+2019-06-25 is an error).  The datetime parts which are specified must
+be consecutive (it is an error to specify 12::05).  It is also an
+error to shift for occurrence of a partial date with year specified
+(e.g., "+2x2019--").
+
+On the other hand, shifting to an invalid date with day number
+specified will shift more until a specified date is valid.  For
+example, if you add -2-29 with count 1 to 2019-01-01, you end up with
+2020-02-29, because 2019-02-29 is not a valid date.  If the count is 2
+you get 2024-02-29 instead.
+
+Shifting to an invalid date by a partial date with just a month number
+will cause the date to moved backwards until the date is valid.  E.g.,
+if you shift by -6- with count 1 (next June) from 2019-05-31, you get
+2019-06-30.  With count 2 you get 2020-06-30.
+
+All these functionalities are available in the constructors too.  Read
+their docstring to find how to use them.
+
+This library is grown out of frustration that it is tedious to have a
+shell script or program to get a datetime like "the next 6pm from now"
+or "the next 3rd of any month from two days ago".  With this module
+they can be specified like "+1x18:00:00.0" and "-2day +1x--3"
+respectively.  In the expected use cases, counts are small numbers.
+So the library is not always efficient (at times we just loop "count"
+times to step forward or backward).  Whenever it is simple to do so,
+the implementation just forward to relativedelta, in which case they
+are more efficient.
+
+At present the program does not handle timezone and daylight saving.
+This is bacause the author lives at a place where no daylight saving
+is observed.  Contributions are welcome.

datec-0.3/README.md

@@ -0,0 +1,95 @@
+# Date command: A command-based date computation engine
+
+## Installation
+
+You can install the package simply by
+
+    pip install datec
+
+## Usage
+
+datec allows you to use "date commands" to modify datetime's by adding
+to them, like this:
+
+    datetime.datetime.now() + datec.Period(2, 'week')
+
+A date command can be parsed from strings using the parse() function,
+which create a command from a string representation.  This forms the
+basis of the datec command, which is a command-line program to output
+datetime after applying date commands, or sleep until that time if
+"-w" is given.  In general the date representation is
+NxYYYY-mm-ddTHH:MM:SS.ffffff, where unspecified parts are omitted
+leaving the symbols intact, like "2x-2-29T3::." (see the following for
+the meaning).  If the fractional part is not specified the "." may be
+omitted, if all time parts are not specified the "T::."  can be
+omitted, if all date parts are not specified the "--T" can be omitted,
+and if Nx may be omitted in some cases for setting a partial datetime
+or weekday.  There are a couple other more formats like +3week and
+-2wed for shifting by period and weekday.
+
+Date commands are in two forms: period shifting commands and partial
+datetime shifting commands.  The first type is more familiar: they
+look like
+
+  * +2week (shift the datetime forward by 2 week)
+  * -1month (shift the datetime backward by 1 month)
+
+Period is one of year, month, week, day, hour, minute and second,
+represented by an object of the Period class.  Fractional numbers are
+acceptable except for year and month.  If shifting a period leads to
+an invalid date (e.g., shift backward 1 month from 2019-07-31), it
+moves backwards the closest valid date (here, 2019-06-30).  In general
+the parts finer than the shifted part is unaffected (e.g., shifting 1
+month from 2019-07-31 02:00 gives you 2019-06-30 02:00).
+
+Partial datetime shifting is less familiar.  It looks like:
+
+  * 12:: (set the hour number to 12)
+  * +2x12:: (move forward to the second hour 12)
+  * +4x--31 (move forward to the fourth occurrence of day 31 of a month)
+  * -3x-02-29 (move backward to the third occurrence of February 29)
+  * wed (set to the Wednesday of the same week, week starts on Sunday)
+  * -3wed (move to the third Wednesday before the current datetime)
+
+They are represented by either a Weekday object or a PartialDate
+object with a count.  A count of 0 means setting instead of shifting.
+Only integer counts are acceptable.
+
+A trailing "/" on a partial date command sets all fields after the
+last specified field to zero.  For example, `12::/` sets the hour to
+12 and the minute, second and microsecond to 0, whereas `12::` would
+leave those unchanged.
+
+It is an error to set to an invalid date (e.g., --31 applied on
+2019-06-25 is an error).  The datetime parts which are specified must
+be consecutive (it is an error to specify 12::05).  It is also an
+error to shift for occurrence of a partial date with year specified
+(e.g., "+2x2019--").
+
+On the other hand, shifting to an invalid date with day number
+specified will shift more until a specified date is valid.  For
+example, if you add -2-29 with count 1 to 2019-01-01, you end up with
+2020-02-29, because 2019-02-29 is not a valid date.  If the count is 2
+you get 2024-02-29 instead.
+
+Shifting to an invalid date by a partial date with just a month number
+will cause the date to moved backwards until the date is valid.  E.g.,
+if you shift by -6- with count 1 (next June) from 2019-05-31, you get
+2019-06-30.  With count 2 you get 2020-06-30.
+
+All these functionalities are available in the constructors too.  Read
+their docstring to find how to use them.
+
+This library is grown out of frustration that it is tedious to have a
+shell script or program to get a datetime like "the next 6pm from now"
+or "the next 3rd of any month from two days ago".  With this module
+they can be specified like "+1x18:00:00.0" and "-2day +1x--3"
+respectively.  In the expected use cases, counts are small numbers.
+So the library is not always efficient (at times we just loop "count"
+times to step forward or backward).  Whenever it is simple to do so,
+the implementation just forward to relativedelta, in which case they
+are more efficient.
+
+At present the program does not handle timezone and daylight saving.
+This is bacause the author lives at a place where no daylight saving
+is observed.  Contributions are welcome.

{datec-0.1 → datec-0.3}/datec/__init__.py

@@ -1,27 +1,29 @@
 """Date command: A command-based date computation engine
 
 datec allows you to use "date commands" to modify datetime's by adding
-to them, like datetime.datetime.now() + Period(2, 'week').
+to them, like this:
 
-A date command can be parsed from string using the parse() function,
+    datetime.datetime.now() + datec.Period(2, 'week')
+
+A date command can be parsed from strings using the parse() function,
 which create a command from a string representation.  This forms the
 basis of the datec command, which is a command-line program to output
 datetime after applying date commands.  In general the date
 representation is NxYYYY-mm-ddTHH:MM:SS.ffffff, where unspecified
 parts are omitted leaving the symbols intact, like "2x-2-29T3::." (see
-the following for the meaning).  If fractional part is not specified
-the "." may be omitted, if all time parts are not specified the "T::."
-can be omitted, if all date parts are not specified the "--T" can be
-omitted, and if N is 0 the x may be omitted.  By there are a couple
-other more formats like +3week and -2wed for shifting by period and
-weekday.
+the following for the meaning).  If the fractional part is not
+specified the "." may be omitted, if all time parts are not specified
+the "T::."  can be omitted, if all date parts are not specified the
+"--T" can be omitted, and if Nx may be omitted in some cases for
+setting a partial datetime or weekday.  There are a couple other more
+formats like +3week and -2wed for shifting by period and weekday.
 
 Date commands are in two forms: period shifting commands and partial
 datetime shifting commands.  The first type is more familiar: they
 look like
 
-  +2week (shift the datetime forward by 2 week)
-  -1month (shift the datetime backward by 1 month)
+  * +2week (shift the datetime forward by 2 week)
+  * -1month (shift the datetime backward by 1 month)
 
 Period is one of year, month, week, day, hour, minute and second,
 represented by an object of the Period class.  Fractional numbers are
@@ -33,21 +35,26 @@ month from 2019-07-31 02:00 gives you 2019-06-30 02:00).
 
 Partial datetime shifting is less familiar.  It looks like:
 
-  12:: (set the hour number to 12)
-  +2x12:: (move forward to the second hour 12)
-  +4x--31 (move forward to the fourth occurrence of day 31 of a month)
-  -3x-02-29 (move backward to the third occurrence of February 29)
-  wed (set to the Wednesday of the same week, week starts on Sunday)
-  -3wed (move to the third Wednesday before the current datetime)
+  * 12:: (set the hour number to 12)
+  * +2x12:: (move forward to the second hour 12)
+  * +4x--31 (move forward to the fourth occurrence of day 31 of a month)
+  * -3x-02-29 (move backward to the third occurrence of February 29)
+  * wed (set to the Wednesday of the same week, week starts on Sunday)
+  * -3wed (move to the third Wednesday before the current datetime)
 
 They are represented by either a Weekday object or a PartialDate
 object with a count.  A count of 0 means setting instead of shifting.
 Only integer counts are acceptable.
 
+A trailing "/" on a partial date command sets all fields after the
+last specified field to zero.  For example, `12::/` sets the hour to
+12 and the minute, second and microsecond to 0, whereas `12::` would
+leave those unchanged.
+
 It is an error to set to an invalid date (e.g., --31 applied on
 2019-06-25 is an error).  The datetime parts which are specified must
 be consecutive (it is an error to specify 12::05).  It is also an
-error to shift for occurrence of partial date with year specified
+error to shift for occurrence of a partial date with year specified
 (e.g., "+2x2019--").
 
 On the other hand, shifting to an invalid date with day number
@@ -56,10 +63,10 @@ example, if you add -2-29 with count 1 to 2019-01-01, you end up with
 2020-02-29, because 2019-02-29 is not a valid date.  If the count is 2
 you get 2024-02-29 instead.
 
-Shifting to invalid date by month will cause the date to moved
-backwards until the date is valid.  E.g., if you shift by -6- with
-count 1 (next June) from 2019-05-31, you get 2019-06-30.  With count 2
-you get 2020-06-30.
+Shifting to an invalid date by a partial date with just a month number
+will cause the date to moved backwards until the date is valid.  E.g.,
+if you shift by -6- with count 1 (next June) from 2019-05-31, you get
+2019-06-30.  With count 2 you get 2020-06-30.
 
 This library is grown out of frustration that it is tedious to have a
 shell script or program to get a datetime like "the next 6pm from now"
@@ -77,16 +84,18 @@ is observed.  Contributions are welcome.
 
 """
 
+import contextlib
+import datetime
 import re
+import typing
 
 import dateutil.relativedelta as dr
 
 
-__metaclass__ = type
-
+__version__ = '0.3'
 
 class ParseError(ValueError):
-    pass
+    """Represent an error in parsing."""
 
 
 class Period:
@@ -105,14 +114,18 @@ class Period:
         period (str): The period
 
     """
-    def __init__(self, count, period):
-        assert period in ('year', 'month', 'week', 'day',
-                          'hour', 'minute', 'second')
+    def __init__(self, count: float, period: str):
+        if period not in ('year', 'month', 'week', 'day',
+                          'hour', 'minute', 'second'):
+            raise ValueError(f'Invalid period: {period}')
+        if period in ('year', 'month') and count != int(count):
+            raise ValueError(f'Invalid count {count} for period {period}')
         self._count = count
         self._period = period
 
-    def __radd__(self, dt):
-        return dt + dr.relativedelta(**{self._period + 's': self._count})
+    def __radd__(self, dt: datetime.datetime) -> datetime.datetime:
+        return dt + dr.relativedelta(
+            **{self._period + 's': self._count})  # type: ignore
 
     PARSE_RE = re.compile(r'''
     ^
@@ -122,7 +135,7 @@ class Period:
     ''', re.X)
 
     @classmethod
-    def parse(cls, cmdstr):
+    def parse(cls, cmdstr: str) -> 'Period':
         """Parse a command string to a Period object
 
         The command string should be of the form "<N><period>", where
@@ -138,11 +151,13 @@ class Period:
         if not match:
             raise ParseError('Cannot parse string %s' % cmdstr)
         gdt = match.groupdict()
+        cnt: float
+        with contextlib.suppress(ValueError):
+            return cls(int(gdt['count']), gdt['period'])
         try:
-            cnt = int(gdt['count'])
-        except Exception:
-            cnt = float(gdt['count'])
-        return cls(cnt, gdt['period'])
+            return cls(float(gdt['count']), gdt['period'])
+        except ValueError as err:
+            raise ParseError('Cannot parse string %s' % cmdstr)
 
 
 _WEEKDAY_CLS = [dr.SU, dr.MO, dr.TU, dr.WE, dr.TH, dr.FR, dr.SA]
@@ -169,13 +184,14 @@ class Weekday:
         day (int): The weekday
 
     """
-    def __init__(self, count, day):
+    def __init__(self, count: int, day: int):
         self._count = count
-        assert day in range(7)
+        if day not in range(7):
+            raise ValueError('Invalid weekday: %d' % day)
         self._day = day
         self._drcls = _WEEKDAY_CLS[day]
 
-    def __radd__(self, dt):
+    def __radd__(self, dt: datetime.datetime) -> datetime.datetime:
         if self._count > 0:
             return dt + dr.relativedelta(
                 days=1, weekday=self._drcls(self._count))
@@ -189,13 +205,13 @@ class Weekday:
 
     PARSE_RE = re.compile(r'''
     ^
-    (?P<count> [+-] (?: [0-9]+ | [0-9]*\.[0-9]*) )?
+    (?P<count> [+-] (?: [0-9]+) )?
     (?P<weekday> sun|mon|tue|wed|thu|fri|sat)
     $
     ''', re.X)
 
     @classmethod
-    def parse(cls, cmdstr):
+    def parse(cls, cmdstr: str) -> 'Weekday':
         """Parse a command string to a Weekday object
 
         The command string should be of the form "<N><weekday>", where
@@ -235,31 +251,44 @@ class PartialDate:
 
     Args:
 
-        count (int): The number of periods to shift
-        year (int): The year number
-        month (int): The month number (1 to 12)
-        day (int): The day number (1 to 31)
-        hour (int): The hour number (0 to 23)
-        minute (int): The minute number (0 to 59)
-        second (int or float): The second number (0 to smaller than 60)
-        microsecond (int): The microsecond number (0 to 999999)
+        count: The number of periods to shift
+        year: The year number
+        month: The month number (1 to 12)
+        day: The day number (1 to 31)
+        hour: The hour number (0 to 23)
+        minute: The minute number (0 to 59)
+        second: The second number (0 to smaller than 60)
+        microsecond: The microsecond number (0 to 999999)
+        zero: Whether to zero out the fields after the last specified one
 
     """
 
     _INVALID_SIG_RE = re.compile('10+1')
 
-    def __init__(self, count=0, year=None, month=None, day=None,
-                 hour=None, minute=None, second=None, microsecond=None):
-        assert not count or not year, 'Absolute date with non-zero count'
-        assert not isinstance(second, float) or \
-            microsecond is None, 'Doubly specified microsecond'
-        vals = [year, month, day, hour, minute, second, microsecond]
-        sig = ''.join([("0" if v is None else "1") for v in vals])
-        assert not self._INVALID_SIG_RE.search(sig), \
-            'Non-consecutive components'
+    def __init__(
+        self, count: int = 0, year: typing.Optional[int] = None,
+        month: typing.Optional[int] = None, day: typing.Optional[int] = None,
+        hour: typing.Optional[int] = None, minute: typing.Optional[int] = None,
+        second: typing.Optional[typing.Union[int, float]] = None,
+        microsecond: typing.Optional[int] = None,
+        zero: bool = False
+    ):
+        if count and year:
+            raise ValueError('Absolute date with non-zero count')
+        if isinstance(second, float) and microsecond is not None:
+            raise ValueError('Doubly specified microsecond')
         if isinstance(second, float):
             second, orig_second = int(second), second
             microsecond = int((orig_second - second) * 1000000 + 0.5)
+        vals = [year, month, day, hour, minute, second, microsecond]
+        sig = ''.join([("0" if v is None else "1") for v in vals])
+        if self._INVALID_SIG_RE.search(sig):
+            raise ValueError('Non-consecutive components')
+        if zero:
+            lastset = sig.rfind('1')
+            for i in range(lastset + 1, 7):
+                vals[i] = 0
+            year, month, day, hour, minute, second, microsecond = vals
         self._count = count
         self._year = year
         self._month = month
@@ -274,7 +303,7 @@ class PartialDate:
         '', 'years', 'months', 'days', 'hours', 'minutes', 'seconds'
     ]
 
-    def __radd__(self, dt):
+    def __radd__(self, dt: datetime.datetime) -> datetime.datetime:
         if self._firstset == -1:
             return dt
         if not(self._count):
@@ -288,7 +317,7 @@ class PartialDate:
             return self._monthshift(dt)
         return self._dayshift(dt)
 
-    def _rset(self, dt):
+    def _rset(self, dt: datetime.datetime) -> datetime.datetime:
         updater = {'year': self._year,
                    'month': self._month,
                    'day': self._day,
@@ -297,9 +326,9 @@ class PartialDate:
                    'second': self._second,
                    'microsecond': self._microsecond}
         updater = {k: v for k, v in updater.items() if v is not None}
-        return dt.replace(**updater)
+        return dt.replace(**updater)  # type: ignore
 
-    def _simpleshift(self, dt):
+    def _simpleshift(self, dt: datetime.datetime) -> datetime.datetime:
         remain = self._count
         ret = self._rset(dt)
         if self._count < 0:
@@ -309,9 +338,9 @@ class PartialDate:
             if ret > dt:
                 remain -= 1
         mod_field = self._FIRSTSET_MOD[self._firstset]
-        return ret + dr.relativedelta(**{mod_field: remain})
+        return ret + dr.relativedelta(**{mod_field: remain})  # type: ignore
 
-    def _dayshift(self, dt):
+    def _dayshift(self, dt: datetime.datetime) -> datetime.datetime:
         # Day specified
         if self._firstset == 2:  # modify month
             shift = dr.relativedelta(months=1 if self._count > 0 else -1)
@@ -344,8 +373,9 @@ class PartialDate:
                 continue
             count -= 1
 
-    def _monthshift(self, dt):
+    def _monthshift(self, dt: datetime.datetime) -> datetime.datetime:
         # Only month specified, shift by month rather than by year
+        assert self._month is not None
         if self._count > 0:
             num_months = self._month - dt.month
             sign = 1
@@ -389,7 +419,7 @@ class PartialDate:
     ''', re.X)
 
     @classmethod
-    def parse(cls, cmdstr):
+    def parse(cls, cmdstr: str) -> 'PartialDate':
         """Parse a command string to a PartialDate object
 
         The command string should be of the form
@@ -399,13 +429,17 @@ class PartialDate:
         empty string.  If all date parts are not specified the "--T"
         may be omitted.  If all the time parts are not specified the
         "T::." may be omitted.  If the microsecond part is not
-        specified the "." part may be omitted.
+        specified the "." part may be omitted.  A trailing "/" causes
+        all fields after the last specified field to be set to 0.
 
         Args:
 
             cmdstr (str): The command string
 
         """
+        zero = cmdstr.endswith('/')
+        if zero:
+            cmdstr = cmdstr[:-1]
         match = cls.PARSE_RE1.match(cmdstr.lower())
         if not match:
             match = cls.PARSE_RE2.match(cmdstr)
@@ -413,7 +447,7 @@ class PartialDate:
             raise ParseError('Cannot parse string %s' % cmdstr)
         gdt = match.groupdict()
 
-        def _matchval(key):
+        def _matchval(key: str) -> typing.Optional[int]:
             val = gdt.get(key)
             if not val:
                 return None
@@ -430,10 +464,11 @@ class PartialDate:
                    _matchval('hour'),
                    _matchval('minute'),
                    _matchval('second'),
-                   microsecond)
+                   microsecond,
+                   zero)
 
 
-def parse(cmdstr):
+def parse(cmdstr: str) -> typing.Union[Period, Weekday, PartialDate]:
     """Attempt to parse one of the possible date command
 
     Args:

{datec-0.1 → datec-0.3}/datec/__main__.py

@@ -1,21 +1,25 @@
 from __future__ import print_function
 
-import sys
 import datetime
+import sys
+import time
 
 import datec
 
 
-def main():
+def main() -> None:
     dt = datetime.datetime.now()
+    wait = False
     for cmd in sys.argv[1:]:
         if cmd == '-h':
             print('''Date command
 
-Usage: datec [<command>] ...
+Usage: datec [-w] [<command>] ...
 
-Datec starts from the current time and apply commands.  The ending
-datetime is printed in ISO YYYY-MM-DDTHH:MM:SS.ffffff format.
+Datec starts from the current time and apply commands.  Normally the
+ending datetime is printed in ISO YYYY-MM-DDTHH:MM:SS.ffffff format.
+But if -w is given, no output is printed; instead the program sleeps
+until the ending datetime.
 
 <command> may be of the following forms:
 
@@ -28,8 +32,16 @@ datetime is printed in ISO YYYY-MM-DDTHH:MM:SS.ffffff format.
 
 ''', file=sys.stderr)
             sys.exit(0)
+        if cmd == '-w':
+            wait = True
+            continue
         dt = dt + datec.parse(cmd.lower())
-    print(dt.isoformat())
+    if wait:
+        delta = (dt - datetime.datetime.now()).total_seconds()
+        if delta > 0:
+            time.sleep(delta)
+    else:
+        print(dt.isoformat())
 
 
 if __name__ == '__main__':

datec-0.3/pyproject.toml

@@ -0,0 +1,42 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+dynamic = ["version"]
+name = "datec"
+readme = "README.md"
+requires-python = ">= 3.9"
+dependencies = [
+    "python-dateutil"
+]
+authors = [
+    { name="Isaac To", email="isaac.to@gmail.com" },
+]
+description = "Date Command"
+license = "MIT"
+license-files = ["LICENSE"]
+classifiers=[
+    "Development Status :: 4 - Beta",
+    "Intended Audience :: Developers",
+    "Topic :: Software Development :: Libraries",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+    "Operating System :: OS Independent",
+]
+
+[project.scripts]
+datec = "datec:__main__.main"
+
+[project.urls]
+Homepage = "https://github.com/isaacto/datec"
+Repository = "https://github.com/isaacto/datec.git"
+Issues = "https://github.com/isaacto/datec/issues"
+
+[tool.hatch.version]
+source = "regex"
+path = "datec/__init__.py"

datec-0.3/requirements-dev.in

@@ -0,0 +1,9 @@
+mypy
+pylint
+pytest
+pytest-cov
+python-dateutil
+twine
+types-python-dateutil
+wheel
+makefilemenu

datec-0.3/tests/datec_test.py

@@ -0,0 +1,118 @@
+import datetime
+import unittest
+
+import datec
+
+
+class DatecTest(unittest.TestCase):
+    def test_period(self):
+        dt = datetime.datetime(2019, 5, 15)
+        self.assertEqual(dt + datec.Period(1, 'month'),
+                         datetime.datetime(2019, 6, 15))
+        self.assertEqual(dt + datec.parse('+1.5second'),
+                         datetime.datetime(2019, 5, 15, 0, 0, 1, 500000))
+        with self.assertRaises(datec.ParseError):
+            datec.Period.parse('+1mon')
+        with self.assertRaises(datec.ParseError):
+            datec.Period.parse('+.day')
+
+    def test_weekday(self):
+        dt = datetime.datetime(2019, 5, 15)
+        self.assertEqual(dt + datec.Weekday(1, datec.MON),
+                         datetime.datetime(2019, 5, 20))
+        self.assertEqual(dt + datec.Weekday.parse('+2mon'),
+                         datetime.datetime(2019, 5, 27))
+        self.assertEqual(dt + datec.Weekday.parse('-2WED'),
+                         datetime.datetime(2019, 5, 1))
+        self.assertEqual(dt + datec.parse('MON'),
+                         datetime.datetime(2019, 5, 13))
+        self.assertEqual(dt + datec.Weekday(0, datec.FRI),
+                         datetime.datetime(2019, 5, 17))
+        with self.assertRaises(datec.ParseError):
+            datec.Weekday.parse('MO')
+
+    def test_partialdate_simple(self):
+        dt = datetime.datetime(2019, 5, 15, 8, 15)
+        self.assertEqual(dt + datec.PartialDate(1),
+                         datetime.datetime(2019, 5, 15, 8, 15))
+        self.assertEqual(dt + datec.PartialDate(0, minute=7, second=16),
+                         datetime.datetime(2019, 5, 15, 8, 7, 16))
+        self.assertEqual(dt + datec.PartialDate(1, minute=7, second=16),
+                         datetime.datetime(2019, 5, 15, 9, 7, 16))
+        self.assertEqual(dt + datec.PartialDate(1, minute=17, second=16),
+                         datetime.datetime(2019, 5, 15, 8, 17, 16))
+        self.assertEqual(dt + datec.PartialDate(2, minute=7, second=16),
+                         datetime.datetime(2019, 5, 15, 10, 7, 16))
+        self.assertEqual(dt + datec.PartialDate(2, minute=7, second=16.5),
+                         datetime.datetime(2019, 5, 15, 10, 7, 16, 500000))
+        self.assertEqual(dt + datec.PartialDate.parse(':7:16'),
+                         datetime.datetime(2019, 5, 15, 8, 7, 16))
+        self.assertEqual(dt + datec.PartialDate.parse('-1x:7:16'),
+                         datetime.datetime(2019, 5, 15, 8, 7, 16))
+        self.assertEqual(dt + datec.PartialDate.parse('-1x:17:16'),
+                         datetime.datetime(2019, 5, 15, 7, 17, 16))
+        self.assertEqual(dt + datec.parse('-1x:17:16.2'),
+                         datetime.datetime(2019, 5, 15, 7, 17, 16, 200000))
+        with self.assertRaises(datec.ParseError):
+            datec.PartialDate.parse('---')
+
+    def test_partialdate_monthshift(self):
+        dt = datetime.datetime(2019, 5, 15)
+        self.assertEqual(dt + datec.PartialDate(1, month=2),
+                         datetime.datetime(2020, 2, 15))
+        self.assertEqual(dt + datec.PartialDate(-1, month=2),
+                         datetime.datetime(2019, 2, 15))
+        dt = datetime.datetime(2019, 5, 15)
+        self.assertEqual(dt + datec.PartialDate.parse('+1x-2-'),
+                         datetime.datetime(2020, 2, 15))
+        dt = datetime.datetime(2019, 5, 30)
+        self.assertEqual(dt + datec.PartialDate(1, month=2),
+                         datetime.datetime(2020, 2, 29))
+
+    def test_partialdate_dayshift(self):
+        dt = datetime.datetime(2019, 5, 30)
+        self.assertEqual(dt + datec.PartialDate(1, month=5, day=30),
+                         datetime.datetime(2020, 5, 30))
+        self.assertEqual(dt + datec.PartialDate(1, day=31),
+                         datetime.datetime(2019, 5, 31))
+        self.assertEqual(dt + datec.PartialDate(2, day=31),
+                         datetime.datetime(2019, 7, 31))
+        self.assertEqual(dt + datec.PartialDate(-1, day=31),
+                         datetime.datetime(2019, 3, 31))
+        dt = datetime.datetime(2019, 2, 15)
+        self.assertEqual(dt + datec.PartialDate(1, day=30),
+                         datetime.datetime(2019, 3, 30))
+        with self.assertRaises(ValueError):
+            dt + datec.PartialDate(1, month=2, day=30)
+
+    def test_partialdate_zero(self):
+        dt = datetime.datetime(2019, 5, 15, 8, 15)
+        self.assertEqual(dt + datec.PartialDate(0, hour=12, zero=True),
+                         datetime.datetime(2019, 5, 15, 12, 0, 0))
+        self.assertEqual(dt + datec.PartialDate(0, minute=30, zero=True),
+                         datetime.datetime(2019, 5, 15, 8, 30, 0))
+        self.assertEqual(dt + datec.parse('12::/'),
+                         datetime.datetime(2019, 5, 15, 12, 0, 0))
+        self.assertEqual(dt + datec.parse('12:30:/'),
+                         datetime.datetime(2019, 5, 15, 12, 30, 0))
+        self.assertEqual(dt + datec.parse('2020-03-15/'),
+                         datetime.datetime(2020, 3, 15, 0, 0, 0))
+        # without zero, minute/second are unchanged
+        self.assertEqual(dt + datec.PartialDate(0, hour=12),
+                         datetime.datetime(2019, 5, 15, 12, 15))
+        self.assertEqual(dt + datec.parse('12::'),
+                         datetime.datetime(2019, 5, 15, 12, 15))
+
+    def test_validation(self):
+        with self.assertRaises(ValueError):
+            datec.Period(1, 'invalid')
+        with self.assertRaises(ValueError):
+            datec.Period(1.5, 'month')
+        with self.assertRaises(ValueError):
+            datec.Weekday(1, 7)
+        with self.assertRaises(ValueError):
+            datec.PartialDate(1, year=2020)
+        with self.assertRaises(ValueError):
+            datec.PartialDate(second=1.5, microsecond=500)
+        with self.assertRaises(ValueError):
+            datec.PartialDate(hour=12, second=30)

datec-0.1/PKG-INFO

@@ -1,92 +0,0 @@
-Metadata-Version: 1.1
-Name: datec
-Version: 0.1
-Summary: Date Command
-Home-page: https://github.com/isaacto/datec
-Author: Isaac To
-Author-email: isaac.to@gmail.com
-License: UNKNOWN
-Description: # Date command: A command-based date computation engine
-        
-        datec allows you to use "date commands" to modify datetime's by adding
-        to them, like datetime.datetime.now() + Period(2, 'week').
-        
-        A date command can be parsed from string using the parse() function,
-        which create a command from a string representation.  This forms the
-        basis of the datec command, which is a command-line program to output
-        datetime after applying date commands.  In general the date
-        representation is NxYYYY-mm-ddTHH:MM:SS.ffffff, where unspecified
-        parts are omitted leaving the symbols intact, like "2x-2-29T3::." (see
-        the following for the meaning).  If fractional part is not specified
-        the "." may be omitted, if all time parts are not specified the "T::."
-        can be omitted, if all date parts are not specified the "--T" can be
-        omitted, and if N is 0 the x may be omitted.  By there are a couple
-        other more formats like +3week and -2wed for shifting by period and
-        weekday.
-        
-        Date commands are in two forms: period shifting commands and partial
-        datetime shifting commands.  The first type is more familiar: they
-        look like
-        
-          * +2week (shift the datetime forward by 2 week)
-          * -1month (shift the datetime backward by 1 month)
-        
-        Period is one of year, month, week, day, hour, minute and second,
-        represented by an object of the Period class.  Fractional numbers are
-        acceptable except for year and month.  If shifting a period leads to
-        an invalid date (e.g., shift backward 1 month from 2019-07-31), it
-        moves backwards the closest valid date (here, 2019-06-30).  In general
-        the parts finer than the shifted part is unaffected (e.g., shifting 1
-        month from 2019-07-31 02:00 gives you 2019-06-30 02:00).
-        
-        Partial datetime shifting is less familiar.  It looks like:
-        
-          * 12:: (set the hour number to 12)
-          * +2x12:: (move forward to the second hour 12)
-          * +4x--31 (move forward to the fourth occurrence of day 31 of a month)
-          * -3x-02-29 (move backward to the third occurrence of February 29)
-          * wed (set to the Wednesday of the same week, week starts on Sunday)
-          * -3wed (move to the third Wednesday before the current datetime)
-        
-        They are represented by either a Weekday object or a PartialDate
-        object with a count.  A count of 0 means setting instead of shifting.
-        Only integer counts are acceptable.
-        
-        It is an error to set to an invalid date (e.g., --31 applied on
-        2019-06-25 is an error).  The datetime parts which are specified must
-        be consecutive (it is an error to specify 12::05).  It is also an
-        error to shift for occurrence of partial date with year specified
-        (e.g., "+2x2019--").
-        
-        On the other hand, shifting to an invalid date with day number
-        specified will shift more until a specified date is valid.  For
-        example, if you add -2-29 with count 1 to 2019-01-01, you end up with
-        2020-02-29, because 2019-02-29 is not a valid date.  If the count is 2
-        you get 2024-02-29 instead.
-        
-        Shifting to invalid date by month will cause the date to moved
-        backwards until the date is valid.  E.g., if you shift by -6- with
-        count 1 (next June) from 2019-05-31, you get 2019-06-30.  With count 2
-        you get 2020-06-30.
-        
-        This library is grown out of frustration that it is tedious to have a
-        shell script or program to get a datetime like "the next 6pm from now"
-        or "the next 3rd of any month from two days ago".  With this module
-        they can be specified like "+1x18:00:00.0" and "-2day +1x--3"
-        respectively.  In the expected use cases, counts are small numbers.
-        So the library is not always efficient (at times we just loop "count"
-        times to step forward or backward).  Whenever it is simple to do so,
-        the implementation just forward to relativedelta, in which case they
-        are more efficient.
-        
-        At present the program does not handle timezone and daylight saving.
-        This is bacause the author lives at a place where no daylight saving
-        is observed.  Contributions are welcome.
-        
-Platform: UNKNOWN
-Classifier: Development Status :: 4 - Beta
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Topic :: Software Development :: Libraries
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent

datec-0.1/datec.egg-info/PKG-INFO

@@ -1,92 +0,0 @@
-Metadata-Version: 1.1
-Name: datec
-Version: 0.1
-Summary: Date Command
-Home-page: https://github.com/isaacto/datec
-Author: Isaac To
-Author-email: isaac.to@gmail.com
-License: UNKNOWN
-Description: # Date command: A command-based date computation engine
-        
-        datec allows you to use "date commands" to modify datetime's by adding
-        to them, like datetime.datetime.now() + Period(2, 'week').
-        
-        A date command can be parsed from string using the parse() function,
-        which create a command from a string representation.  This forms the
-        basis of the datec command, which is a command-line program to output
-        datetime after applying date commands.  In general the date
-        representation is NxYYYY-mm-ddTHH:MM:SS.ffffff, where unspecified
-        parts are omitted leaving the symbols intact, like "2x-2-29T3::." (see
-        the following for the meaning).  If fractional part is not specified
-        the "." may be omitted, if all time parts are not specified the "T::."
-        can be omitted, if all date parts are not specified the "--T" can be
-        omitted, and if N is 0 the x may be omitted.  By there are a couple
-        other more formats like +3week and -2wed for shifting by period and
-        weekday.
-        
-        Date commands are in two forms: period shifting commands and partial
-        datetime shifting commands.  The first type is more familiar: they
-        look like
-        
-          * +2week (shift the datetime forward by 2 week)
-          * -1month (shift the datetime backward by 1 month)
-        
-        Period is one of year, month, week, day, hour, minute and second,
-        represented by an object of the Period class.  Fractional numbers are
-        acceptable except for year and month.  If shifting a period leads to
-        an invalid date (e.g., shift backward 1 month from 2019-07-31), it
-        moves backwards the closest valid date (here, 2019-06-30).  In general
-        the parts finer than the shifted part is unaffected (e.g., shifting 1
-        month from 2019-07-31 02:00 gives you 2019-06-30 02:00).
-        
-        Partial datetime shifting is less familiar.  It looks like:
-        
-          * 12:: (set the hour number to 12)
-          * +2x12:: (move forward to the second hour 12)
-          * +4x--31 (move forward to the fourth occurrence of day 31 of a month)
-          * -3x-02-29 (move backward to the third occurrence of February 29)
-          * wed (set to the Wednesday of the same week, week starts on Sunday)
-          * -3wed (move to the third Wednesday before the current datetime)
-        
-        They are represented by either a Weekday object or a PartialDate
-        object with a count.  A count of 0 means setting instead of shifting.
-        Only integer counts are acceptable.
-        
-        It is an error to set to an invalid date (e.g., --31 applied on
-        2019-06-25 is an error).  The datetime parts which are specified must
-        be consecutive (it is an error to specify 12::05).  It is also an
-        error to shift for occurrence of partial date with year specified
-        (e.g., "+2x2019--").
-        
-        On the other hand, shifting to an invalid date with day number
-        specified will shift more until a specified date is valid.  For
-        example, if you add -2-29 with count 1 to 2019-01-01, you end up with
-        2020-02-29, because 2019-02-29 is not a valid date.  If the count is 2
-        you get 2024-02-29 instead.
-        
-        Shifting to invalid date by month will cause the date to moved
-        backwards until the date is valid.  E.g., if you shift by -6- with
-        count 1 (next June) from 2019-05-31, you get 2019-06-30.  With count 2
-        you get 2020-06-30.
-        
-        This library is grown out of frustration that it is tedious to have a
-        shell script or program to get a datetime like "the next 6pm from now"
-        or "the next 3rd of any month from two days ago".  With this module
-        they can be specified like "+1x18:00:00.0" and "-2day +1x--3"
-        respectively.  In the expected use cases, counts are small numbers.
-        So the library is not always efficient (at times we just loop "count"
-        times to step forward or backward).  Whenever it is simple to do so,
-        the implementation just forward to relativedelta, in which case they
-        are more efficient.
-        
-        At present the program does not handle timezone and daylight saving.
-        This is bacause the author lives at a place where no daylight saving
-        is observed.  Contributions are welcome.
-        
-Platform: UNKNOWN
-Classifier: Development Status :: 4 - Beta
-Classifier: Programming Language :: Python :: 2.7
-Classifier: Programming Language :: Python :: 3
-Classifier: Topic :: Software Development :: Libraries
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent

datec-0.1/datec.egg-info/SOURCES.txt

@@ -1,9 +0,0 @@
-setup.py
-datec/__init__.py
-datec/__main__.py
-datec.egg-info/PKG-INFO
-datec.egg-info/SOURCES.txt
-datec.egg-info/dependency_links.txt
-datec.egg-info/entry_points.txt
-datec.egg-info/requires.txt
-datec.egg-info/top_level.txt

datec-0.1/datec.egg-info/dependency_links.txt

@@ -1 +0,0 @@
-

datec-0.1/datec.egg-info/entry_points.txt

@@ -1,3 +0,0 @@
-[console_scripts]
-datec = datec.__main__:main
-

datec-0.1/datec.egg-info/requires.txt

@@ -1 +0,0 @@
-python-dateutil

datec-0.1/datec.egg-info/top_level.txt

@@ -1 +0,0 @@
-datec

datec-0.1/setup.cfg

@@ -1,4 +0,0 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-

datec-0.1/setup.py

@@ -1,32 +0,0 @@
-import setuptools
-
-with open('README.md', 'r') as fh:
-    long_description = fh.read()
-
-setuptools.setup(
-    name='datec',
-    version='0.1',
-    author='Isaac To',
-    author_email='isaac.to@gmail.com',
-    description='Date Command',
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    url='https://github.com/isaacto/datec',
-    packages=setuptools.find_packages(),
-    install_requires=[
-        'python-dateutil'
-    ],
-    entry_points={
-        "console_scripts": [
-            "datec=datec.__main__:main",
-        ]
-    },
-    classifiers=[
-        'Development Status :: 4 - Beta',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Topic :: Software Development :: Libraries',
-        'License :: OSI Approved :: MIT License',
-        'Operating System :: OS Independent',
-    ],
-)