v4.0.3

===================================================================== - circleci: additional branch/tag trigger tweaks
v4.0.2
2024-02-21 00:13:21 -07:00 · 2024-02-21 00:05:40 -07:00 · 2024-02-20 23:57:43 -07:00 · 2024-02-20 23:51:32 -07:00
4 changed files with 77 additions and 27 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -13,32 +13,40 @@ executors:
  nodejs:
    docker:
      - image: node:18
-    resource_class: small
+    resource_class: medium


 jobs:
  python-test:
    executor: python
-    working_directory: ./py/lib
+    working_directory: ~/scwrypts/py/lib
    steps:
-      - run: |
+      - checkout:
+          path: ~/scwrypts
+      - run:
+          name: pytest
+          command: |
            : \
-            && pip install -e . \
+              && pip install . .[test] \
              && pytest \
              ;
+      - run: pip install build && python -m build

  python-publish:
    executor: python
+    working_directory: ~/scwrypts/py/lib
    steps:
-      - checkout
-      - python/dist
+      - checkout:
+          path: ~/scwrypts
+      - run: pip install build && python -m build
      - run: pip install twine && twine upload dist/*

-  nodesjs-test:
+  nodejs-test:
    executor: nodejs
-    working_directory: ./zx/lib
+    working_directory: ~/scwrypts/zx/lib
    steps:
-      - checkout
+      - checkout:
+          path: ~/scwrypts

      - restore_cache:
          name: restore pnpm cache
@ -61,12 +69,14 @@ jobs:

      - run: pnpm test
      - run: pnpm lint
+      - run: pnpm build

-  nodesjs-publish:
+  nodejs-publish:
    executor: nodejs
-    working_directory: ./zx/lib
+    working_directory: ~/scwrypts/zx/lib
    steps:
-      - checkout
+      - checkout:
+          path: ~/scwrypts

      - restore_cache:
          name: restore pnpm cache
@ -87,23 +97,62 @@ jobs:
          paths:
            - .pnpm-store

-      - run: pnpm build
-      - run: pnpm version $(git describe --tags)
-
+      - run:
+          name: publish
+          command: |
+            : \
+              && [ $CIRCLE_TAG ] \
+              && pnpm build \
+              && pnpm version $CIRCLE_TAG \
+              && pnpm set //registry.npmjs.org/:_authToken=$NPM_TOKEN \
+              && pnpm publish --no-git-checks \
+              ;

 workflows:
-  build:
+  python-dev:
    jobs:
-      - python-test
+      - python-test:
+          filters:
+            branches:
+              ignore: /^main$/
+
+  python:
+    jobs:
+      - python-test:
+          filters:
+            tags:
+              only: /^v\d+\.\d+\.\d+.*$/
+            branches:
+              ignore: /^.*$/
      - python-publish:
          requires: [python-test]
+          context: [pypi-yage]
+          filters:
+            tags:
+              only: /^v\d+\.\d+\.\d+.*$/
+            branches:
+              ignore: /^.*$/
+
+  nodejs-dev:
+    jobs:
+      - nodejs-test:
          filters:
            branches:
-              only: main
+              ignore: /^main$/

-      - nodejs-test
+  nodejs:
+    jobs:
+      - nodejs-test:
+          filters:
+            tags:
+              only: /^v\d+\.\d+\.\d+.*$/
+            branches:
+              ignore: /^.*$/
      - nodejs-publish:
          requires: [nodejs-test]
+          context: [npm-wrynegade]
          filters:
+            tags:
+              only: /^v\d+\.\d+\.\d+.*$/
            branches:
-              only: main
+              ignore: /^.*$/
--- a/zx/lib/package.json
+++ b/zx/lib/package.json
@ -26,6 +26,7 @@
 		"prettier": "^3.2.5",
 		"ts-jest": "^29.1.2",
 		"ts-node": "^10.9.2",
+		"typescript": "^5.3.3",
 		"uuid": "^9.0.1"
 	},
 	"eslintConfig": {
--- a/zx/lib/pnpm-lock.yaml
+++ b/zx/lib/pnpm-lock.yaml
@ -43,6 +43,9 @@ devDependencies:
  ts-node:
    specifier: ^10.9.2
    version: 10.9.2(@types/node@20.11.19)(typescript@5.3.3)
+  typescript:
+    specifier: ^5.3.3
+    version: 5.3.3
  uuid:
    specifier: ^9.0.1
    version: 9.0.1
--- a/zx/lib/src/scwrypts/scwrypts.test.ts
+++ b/zx/lib/src/scwrypts/scwrypts.test.ts
@ -64,11 +64,9 @@ afterEach(() => {
 });

 describe('exact lookup', () => {
-  let output;
  beforeEach(async () => {
    sample.spy.getScwryptsLookup.mockReturnValue(sample.lookup.exact);
-
-    output = await scwrypts(sample.options);
+    await scwrypts(sample.options);
  });

  test('gets the correct lookup', () => {
@ -98,7 +96,6 @@ describe('exact lookup', () => {
 describe('patterns lookup', () => {
  beforeEach(async () => {
    sample.spy.getScwryptsLookup.mockReturnValue(sample.lookup.patterns);
-
    await scwrypts(sample.options);
  });
Author	SHA1	Message	Date
yage	e43c07f75a	v4.0.3 ===================================================================== - circleci: additional branch/tag trigger tweaks	2024-02-21 00:13:21 -07:00
yage	fc5f80232e	v4.0.2 ===================================================================== - circleci: more trigger fixes; add python build to python test	2024-02-21 00:05:40 -07:00
yage	695eea2985	v4.0.1 ===================================================================== - circleci: trigger test workflows on tags too	2024-02-20 23:57:43 -07:00
yage	a739d3b5a2	v4.0.0 ===================================================================== Big day! V4 is finally live. This INCLUDES some BREAKING CHANGES to ZSH TYPE scwrypts! Please refer to the readme for upgrade details (more specifically docs/upgrade/v3-to-v4.md) Upgrade is SUPER EASY, so please take the time to do so. --- New Features ---------------------------------------------------- - zsh type scwrypts have an upgraded runstring to improve context setup and simplicity to the scwrypt-writer - scwrypts now publishes the package (scwrypts) to PyPi; this provides a simple way to invoke scwrypts from python-based environments as well as the entire scwrypts python library suite pip install scwrypts - scwrypts now publishes the package (scwrypts) to npm; this provides a simple way to invoke scwrypts from nodesjs environments npm install scwrypts --- Bug Fixes ------------------------------------------------------- - scwrypts runner prompts which use the zshbuiltin "read" now appropriately read input from tty, pipe, files, and user input - virtualenv refresh now loads and prepares the scwrypts virtual environments correctly --- Changes --------------------------------------------------------- - created the (-v, --log-level) scwrypts arguments as improvements of and replacements to the --verbose and --no-log flags - (-n) is now an alias for (--log-level 0) - (--no-log) is the same as (-n) for compatibility, but will be removed in 4.2 - zsh/lib/utils/io print functions now interact with log-level various log levels will now only display the appropriate console prints for the specified log level - zsh/lib/utils/io:INFO has been renamed to DEBUG to align with log-level output; please use DEBUG for debug messages and REMINDER for important user messages - created zsh/lib/utils/io:FZF_USER_INPUT as a drop-in replacement for the confusing FZF_HEAD and FZF_TAIL commands. Update by literally changing any instances of FZF_HEAD or FZF_TAIL with FZF_USER_INPUT - FZF_HEAD and FZF_TAIL will be removed in 4.2 - zsh/lib/utils/io:READ (and other zshbuiltin/read-based prompts) now accept a --force-user-input flag in case important checks should require an admin's approval. This flag will ensure that piped input and the `scwrypts -y` flag are ignored for the single prompt. - zsh/lib/utils/color has been updated to use color names which match the ANSI color names - zsh/hello-world has been reduced to a minimal example; this is to emphasize ease-of-use with v4 - zsh/sanity-check is a scwrypts/run testing helper and detailed starting reference (helpful since hello-world is now minimal) - various refactor, updates, and improvements to the scwrypts runner - migrated all zsh scwrypts and plugins to use v4 runner syntax - zsh - plugins/kubectl - plugins/ci - refactored py/lib into py/lib/scwrypts (PyPi)	2024-02-20 23:51:32 -07:00