mikes-macos-developer-disk-cleanup 1.0.4 → 1.0.8

package/.conventional-changelog-config.json

@@ -0,0 +1,26 @@
+{
+  "options": {
+    "infile": "CHANGELOG.md",
+    "header": "# Changelog",
+    "preset": {
+      "name": "conventionalchangelog",
+      "types": [
+        { "type": "feat", "section": "Features" },
+        { "type": "feature", "section": "Features" },
+        { "type": "fix", "section": "Bug Fixes" },
+        { "type": "perf", "section": "Performance Improvements" },
+        { "type": "revert", "section": "Reverts" },
+        { "type": "docs", "section": "Documentation" },
+        { "type": "style", "section": "Styles" },
+        { "type": "chore", "section": "Miscellaneous Chores" },
+        { "type": "refactor", "section": "Code Refactoring" },
+        { "type": "test", "section": "Tests" },
+        { "type": "build", "section": "Build System" },
+        { "type": "ci", "section": "Continuous Integration" }
+      ]
+    },
+    "writerOpts": {
+      "groupBy": "type"
+    }
+  }
+}

package/.env

@@ -0,0 +1,8 @@
+#/-------------------[DOTENV_PUBLIC_KEY]--------------------/
+#/            public-key encryption for .env files          /
+#/       [how it works](https://dotenvx.com/encryption)     /
+#/----------------------------------------------------------/
+DOTENV_PUBLIC_KEY="036dc3b1c538f3b753f28504685c42364d6aa3fd3cdc0d544ffab9dbe9c8d2afef"
+
+# .env
+GITHUB_TOKEN="encrypted:BNnSFezPjmz67d7bbIftawwuKLB65j8o5QStETBFPmMqZMlWMk0V1qF1NkhYKFvMcnjsv/qIV+1gT/Dkt4IzGZu8bXGhJ6cBfpZJ/QP79YvYGvrn/4qCLj/QsBtsNZc2iCpDJvU7dAzey7gi+2qCCDkZpjv042tsZtTcviAK+JbF31UBqsYTjxSM2FcaXwlbGlQjx6ygDk5AXJbTtQpCa1iAjfeW7ma9MypeKGGfSUBkCDMW42MZmXJZ+TN/Dw=="

package/.husky/commit-msg

@@ -0,0 +1 @@
+npx --no -- commitlint --edit $1

package/.husky/pre-commit

@@ -0,0 +1 @@
+

package/.nvmrc

@@ -0,0 +1 @@
+20

package/.release-it.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "https://unpkg.com/release-it@17/schema/release-it.json",
+  "git": {
+    "commitMessage": "chore: release ${version}",
+    "requireCleanWorkingDir": false
+  },
+  "github": {
+    "release": true
+  },
+  "npm": {
+    "publish": true
+  },
+  "hooks": {
+    "after:bump": "npm run release-changelog ${version}"
+  }
+}

package/.vscode/settings.json

@@ -0,0 +1,22 @@
+{
+    "conventionalCommits.scopes": [
+        "android-avd",
+        "android-build-folders",
+        "android-sdk",
+        "bun-cache",
+        "cocoapods",
+        "docker-files",
+        "gradle-shared",
+        "hints",
+        "homebrew-caches",
+        "library-caches",
+        "meteor-builds-and-packages",
+        "node-modules",
+        "npm-cache",
+        "ruby-gems",
+        "trash",
+        "xcode-artifacts",
+        "yarn-cache",
+        "infra"
+    ]
+}

package/CHANGELOG.md

@@ -0,0 +1,77 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+## 1.0.8 - 2025-02-05
+
+[64546f9](64546f9fb87b06d86703311de819256761e2f7ad)...[e452923](e452923ade48217127cc9c786a6e12af2eab3829)
+
+### Bug Fixes
+
+- :bug: docker daemon detection ([24321d5](24321d58fb062a28cacaa1fd809da5c37f7d6e79))
+- :bug: docker daemon detection ([6045125](604512591d2763cb5be4bc425b79d968c1697de6))
+- :pencil2: typo ([720298f](720298fedd74c008c8b888d5169188a1aaca865b))
+- :pencil2: typo ([e6620de](e6620deacacfbce8ae0292d208f4a1c2f3117aee))
+- :bug: handle permissions issue ([7c56838](7c56838eee1fa245bf81b040ac4ee4b17dbca9bb))
+
+### Documentation
+
+- :memo: README - fix ref to changelog ([4bfc4a4](4bfc4a4f01631e5a1b6c49e71aefc918251845fc))
+
+### Miscellaneous Tasks
+
+- :construction_worker: release-it - auto-publish NPM module ([e452923](e452923ade48217127cc9c786a6e12af2eab3829))
+
+## 1.0.7 - 2025-02-05
+
+[88faf33](88faf333e35787b53a8988f8a42647e5fde4bfdc)...[30f323d](30f323da067b92b69f912cea5ce85b90997cef44)
+
+### Bug Fixes
+
+- :recycle: try to detect brew location ([2aace79](2aace79ab5570049af7bfd87908cbfd4a5f9334f))
+- :bug: fix avdmanager path error ([9b28ba2](9b28ba2f4163454a5d36e48af93c3e51509a8b9c))
+
+### Documentation
+
+- :bookmark: fix changelog for previous version ([8792d75](8792d759de54c46be3cf3471a7ef3c18f937a41c))
+
+### Miscellaneous Tasks
+
+- :construction_worker: fix changelog generation ([30f323d](30f323da067b92b69f912cea5ce85b90997cef44))
+
+## 1.0.6 - 2024-12-09
+
+[462ee69](462ee6964edfa65a224b1cc56f1f7cc15fdc600a)...[88faf33](88faf333e35787b53a8988f8a42647e5fde4bfdc)
+
+### Miscellaneous Tasks
+
+- :hammer: add GITHUB_TOKEN ([4d14cbf](4d14cbfae18980d645d60f10a7feef9ce7650b06))
+- :arrow_up: update dependency to node >= 18 ([ca92511](ca925115cb3137e795d55769dfa7332cf38b89cf))
+- Release 1.0.6 ([88faf33](88faf333e35787b53a8988f8a42647e5fde4bfdc))
+
+## 1.0.5 - 2024-12-09
+
+[bc39b3e](bc39b3e006b19b68acd7deb3b30a8be93b50a52b)...[462ee69](462ee6964edfa65a224b1cc56f1f7cc15fdc600a)
+
+### Bug Fixes
+
+- :bug: fix issue with android sdkmanager path ([6bb0ba6](6bb0ba6fcca63f56f44808eff220eda86579ce85))
+
+### Features
+
+- Add commit linting and release-it ([12729bd](12729bd019abd9219e6cb3eeda040fc90e836228))
+
+### Miscellaneous Tasks
+
+- :hammer: add vscode conventional commit scopes ([84e7ca5](84e7ca516dccec2ea1a798859480fbd65e77b935))
+- :hammer: add vscode conventional commit scopes ([5979eed](5979eed216a65ef6faa733bf71d2a5f47ffb708b))
+- :hammer: add release-it config ([639b8bb](639b8bb2122be6c4d7a83267c516636458d1743c))
+- Release 1.0.5 ([462ee69](462ee6964edfa65a224b1cc56f1f7cc15fdc600a))
+
+## 1.0.4 - 2024-10-03
+
+[d44b8c0](d44b8c0a12b30f9b4d8f15f89a1ee80150d147cd)...[bc39b3e](bc39b3e006b19b68acd7deb3b30a8be93b50a52b)
+
+## 1.0.3 - 2024-10-03
+
+<!-- generated by git-cliff -->

package/README.md

@@ -42,7 +42,7 @@ Currently it searches for (and cleans) the following items:
 
 ## Version History
 
-- v1.0: Initial release
+- See [Changelog][Changelog]
 
 
 <!-- 
@@ -50,7 +50,7 @@ Currently it searches for (and cleans) the following items:
 --->
 
 <!-- LINKS -->
-
+[Changelog]:./CHANGELOG.md
 
 <!-- IMAGES -->
 

package/cliff.toml

@@ -0,0 +1,67 @@
+# git-cliff ~ configuration file
+# https://git-cliff.org/docs/configuration
+
+[changelog]
+# template for the changelog header
+header = """
+# Changelog\n
+All notable changes to this project will be documented in this file.\n
+"""
+# template for the changelog body
+# https://keats.github.io/tera/docs/#introduction
+body = """
+{% if version %}\
+    ## {{ version | trim_start_matches(pat="v") }} - {{ timestamp | date(format="%Y-%m-%d") }}
+{% else %}\
+    ## Unreleased
+{% endif %}\
+{% if previous %}\
+    {% if previous.commit_id and commit_id %}
+        [{{ previous.commit_id | truncate(length=7, end="") }}]({{ previous.commit_id }})...\
+            [{{ commit_id | truncate(length=7, end="") }}]({{ commit_id }})
+    {% endif %}\
+{% endif %}\
+{% for group, commits in commits | group_by(attribute="group") %}
+    ### {{ group | upper_first }}
+    {% for commit in commits %}
+        - {{ commit.message | split(pat="\n") | first | upper_first | trim }} ([{{ commit.id | truncate(length=7, end="") }}]({{ commit.id }}))\
+          {% for footer in commit.footers -%}
+            , {{ footer.token }}{{ footer.separator }}{{ footer.value }}\
+          {% endfor %}\
+    {% endfor %}
+{% endfor %}\n
+"""
+# template for the changelog footer
+footer = """
+<!-- generated by git-cliff -->
+"""
+# remove the leading and trailing whitespace from the templates
+trim = true
+
+[git]
+# parse the commits based on https://www.conventionalcommits.org
+conventional_commits = true
+# filter out the commits that are not conventional
+filter_unconventional = false
+# regex for parsing and grouping commits
+commit_parsers = [
+    { message = "^feat", group = "Features" },
+    { message = "^fix", group = "Bug Fixes" },
+    { message = "^doc", group = "Documentation" },
+    { message = "^perf", group = "Performance" },
+    { message = "^refactor", group = "Refactor" },
+    { message = "^style", group = "Styling" },
+    { message = "^test", group = "Testing" },
+    { message = "^chore\\(deps.*\\)", skip = true },
+    { message = "^chore\\(pr\\)", skip = true },
+    { message = "^chore\\(pull\\)", skip = true },
+    { message = "^chore\\(release\\): prepare for", skip = true },
+    { message = "^chore|^ci", group = "Miscellaneous Tasks" },
+    { body = ".*security", group = "Security" },
+]
+# filter out the commits that are not matched by commit parsers
+filter_commits = false
+# sort the tags topologically
+topo_order = false
+# sort the commits inside sections by oldest/newest order
+sort_commits = "oldest"

package/commitlint.config.js

@@ -0,0 +1 @@
+module.exports = { extends: ['@commitlint/config-conventional'] };

package/modules/android-avd.sh

@@ -1,8 +1,9 @@
 androidAVD() {
     # Android Virtual Device Cleanup
-    command -v ${ANDROID_HOME}/tools/bin/avdmanager >/dev/null 2>&1 && {
+    local AVDMANAGER=${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager
+    command -v ${AVDMANAGER} >/dev/null 2>&1 && {
         # get the full path from one of the AVDs
-        local FIRST_AVD_PATH=$(avdmanager list avd | grep  "Path:" | head -1 | tr -s " "| cut -f3 -d" ")
+        local FIRST_AVD_PATH=$(${AVDMANAGER} list avd | grep  "Path:" | head -1 | tr -s " "| cut -f3 -d" ")
 
         if [ -z "${FIRST_AVD_PATH}" ]; then
             echo "no avds found"
@@ -13,15 +14,15 @@ androidAVD() {
         local FIRST_AVD_PARENTPATH=$(dirname "${FIRST_AVD_PATH}")
         local AVDFOLDERSIZEBEFORE=$(du -hs "${FIRST_AVD_PARENTPATH}" | cut -f1)
         echo "=== removing avds from ${FIRST_AVD_PARENTPATH} (${AVDFOLDERSIZEBEFORE}) ==="
-        for AVD in $(avdmanager list avd -c); do
+        for AVD in $(${AVDMANAGER} list avd -c); do
             printf "    - deleting AVD %s ..."
-            avdmanager delete avd -n "${AVD}"
+            ${AVDMANAGER} delete avd -n "${AVD}"
             echo "done"
         done
         local AVDFOLDERSIZEAFTER=$(du -hs "${FIRST_AVD_PARENTPATH}" | cut -f1)
         echo "    AVD folder size before: ${AVDFOLDERSIZEBEFORE}; after: ${AVDFOLDERSIZEAFTER}"
     } || {
-        echo "'${ANDROID_HOME}/tools/bin/avdmanager' command not found"
+        echo "'${AVDMANAGER}' command not found"
         return 1
     }
 }

package/modules/android-sdk.sh

@@ -2,8 +2,8 @@ androidSDK() {
     local THISMODULEDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
     # Android SDK Manager Cleanup
-    command -v ${ANDROID_HOME}/tools/bin/sdkmanager >/dev/null 2>&1 && {
-
+    command -v ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager >/dev/null 2>&1 && {
+        local SDKMANAGER_COMMAND="${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager"
         local ANDROIDHOME_BEFORE=$(du -hs $ANDROID_HOME | cut -f1)
 
         echo "=== android sdkmanager cleanup ==="
@@ -17,13 +17,15 @@ androidSDK() {
         # create temporary output file
         local OUTFILENAME=$(mktemp)
 
-        local SDKMANAGER_OUTPUT=$(sdkmanager --list_installed --include_obsolete)
+        local SDKMANAGER_OUTPUT=$(${SDKMANAGER_COMMAND} --list_installed --include_obsolete)
+
         echo "${SDKMANAGER_OUTPUT}" |
             awk -f "${THISMODULEDIR}/android-sdk.awk" -v outputFile="${OUTFILENAME}"
 
         if [ $? -ne 0 ]; then
-            echo "    WARNING: we couldn't parse the output of 'sdkmanager --list_installed --include_obsolete'"
-            echo "    (very likely there's just nothing to remove)"
+            echo "    WARNING: we could not parse the output of 'sdkmanager --list_installed --include_obsolete'"
+            echo "    \(very likely there is just nothing to remove\)"
+            cat "${OUTFILENAME}"
             return 100
         fi
 
@@ -31,14 +33,14 @@ androidSDK() {
         cat "${OUTFILENAME}" | sed 's/^/      - /'
 
         echo "    - uninstalling packages..."
-        sdkmanager --uninstall --package_file="${OUTFILENAME}"
+        ${SDKMANAGER_COMMAND} --uninstall --package_file="${OUTFILENAME}"
         local ANDROIDHOME_AFTER=$(du -hs $ANDROID_HOME | cut -f1)
 
         echo "  - BEFORE ANDROID SDKMANAGER CLEANUP: ${ANDROIDHOME_BEFORE} (${ANDROID_HOME})"
         echo "  - AFTER ANDROID SDKMANAGER CLEANUP: ${ANDROIDHOME_AFTER}"
         addHint "- You may need to run android's SDK manager to restore the Android SDK versions you were using"
     } || {
-        echo "'${ANDROID_HOME}/tools/bin/sdkmanager' command not found"
+        echo "'${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager' command not found"
         return 1
     }
 }

package/modules/docker-files.sh

@@ -2,11 +2,13 @@ dockerFiles() {
     # Docker
     command -v docker >/dev/null 2>&1 && {
         echo "=== docker ==="
-        echo " BEFORE DOCKER CLEANUP:"
-        docker system df
-        if [ $? -ne 0 ]; then
+        local DOCKER_RUNNING=0;
+        docker version && DOCKER_RUNNING=1 || DOCKER_RUNNING=0;
+        if [ ! $DOCKER_RUNNING == 1 ]; then
             echo "======= ERROR: docker daemon not running; skipping docker cleanup ======="
         else
+            echo " BEFORE DOCKER CLEANUP:"
+            docker system df
             # remove all docker artifacts
             echo "  = removing all docker containers"
             docker ps -a -q | xargs -r docker rm — force

package/modules/homebrew-caches.sh

@@ -1,11 +1,21 @@
 homebrewCaches(){
+    local BREW;
+    if [ -f /opt/homebrew/bin/brew ]; then
+        # apple silicon
+        BREW=/opt/homebrew/bin/brew
+    elif [ -f /usr/local/bin/brew ]; then
+        # intel mac
+        BREW=/usr/local/bin/brew
+    else
+        BREW=/home/linuxbrew/.linuxbrew/bin/brew
+    fi
     # Homebrew Caches
-    command -v brew >/dev/null 2>&1 && {
+    command -v ${BREW} >/dev/null 2>&1 && {
         echo "=== cleaning up homebrew caches ==="
         local SIZEBEFORE=$(du -hs ${HOME}/Library/Caches/Homebrew | cut -f1)
         # set +e: don't exit on error (brew cleanup sometimes has permissions problems)
         set +e
-        brew cleanup --prune=all
+        ${BREW} cleanup --prune=all
         if [ $? -ne 0 ]; then
             echo "!!! failed to clean up homebrew caches !!!"
             echo "    check the output above for more info"
@@ -14,5 +24,8 @@ homebrewCaches(){
         set -e
         local SIZEAFTER=$(du -hs ${HOME}/Library/Caches/Homebrew | cut -f1)
         echo "    cache size before: ${SIZEBEFORE}; after: ${SIZEAFTER}"
+    } || {
+        echo "brew command not found"
+    	return 1;
     }
-}
+}

package/modules/library-caches.sh

@@ -1,6 +1,6 @@
 # remove everything in ~/Library/Caches
 libraryCaches() {
-    local LIBRARYCACHESIZE=$(du -hs "${HOME}/Library/Caches" | cut -f1)
+    local LIBRARYCACHESIZE=$((du -hs "${HOME}/Library/Caches" | cut -f1 ) || echo "ERROR: COULD NOT RUN 'du'")
     echo "=== emptying ~/Library/Caches...(${LIBRARYCACHESIZE}) ==="
-    rm -rf "${HOME}/Library/Caches"    
+    rm -rf "${HOME}/Library/Caches" || echo "=== ERROR! COULD NOT empty ~/Library/Caches. Continuing. ==="
 }

package/package.json

@@ -1,17 +1,31 @@
 {
   "name": "mikes-macos-developer-disk-cleanup",
-  "version": "1.0.4",
+  "version": "1.0.8",
   "description": "Cleans up a developer's mac disk space. Aggressively.",
   "bin": {
     "mikes-macos-disk-cleanup": "mikes-macos-disk-cleanup.sh"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "release-changelog": "git-cliff --unreleased --prepend CHANGELOG.md --tag ",
+    "release": "dotenvx run release-it -- -i -u",
+    "prepare": "husky"
   },
   "keywords": [],
   "author": "Mike Cunneen",
+  "readme": "README.md",
   "repository": {
     "url": "https://github.com/cunneen/mikes-macos-developer-disk-cleanup"
   },
-  "license": "MIT"
+  "license": "MIT",
+  "devDependencies": {
+    "@commitlint/cli": "^19.7.1",
+    "@commitlint/config-conventional": "^19.7.1",
+    "git-cliff": "^2.8.0",
+    "husky": "^9.1.7",
+    "release-it": "^18.1.2"
+  },
+  "engines": {
+    "node": ">=20"
+  }
 }