mikes-macos-developer-disk-cleanup 1.0.9 → 1.0.10

package/.env

@@ -5,4 +5,4 @@
 DOTENV_PUBLIC_KEY="036dc3b1c538f3b753f28504685c42364d6aa3fd3cdc0d544ffab9dbe9c8d2afef"
 
 # .env
-GITHUB_TOKEN="encrypted:BNnSFezPjmz67d7bbIftawwuKLB65j8o5QStETBFPmMqZMlWMk0V1qF1NkhYKFvMcnjsv/qIV+1gT/Dkt4IzGZu8bXGhJ6cBfpZJ/QP79YvYGvrn/4qCLj/QsBtsNZc2iCpDJvU7dAzey7gi+2qCCDkZpjv042tsZtTcviAK+JbF31UBqsYTjxSM2FcaXwlbGlQjx6ygDk5AXJbTtQpCa1iAjfeW7ma9MypeKGGfSUBkCDMW42MZmXJZ+TN/Dw=="
+GITHUB_TOKEN="encrypted:BDXSoNLrWFQCQpL2MYnEhmCdGz0TR7znqFIMghNtujL0ADFC5shdKOG/kq7dS1i62whj0gBxZLZYXpg8babGmf9fPM2fBCTxKEgOuSYlRItCYPK4neGRDmonuaj7OOQADGLSw16uHZIb+PnUxQYWk+fkvEA/e53PySLy6H/haK2ld5rFKZLbRjmLk2Rh/JrvWko3DFA5mVQSHqt/gB0m4Rwm/LxTjUAXkeWTBMZP4ZkzGK3v0s87CbqOQN5GOg=="

package/CHANGELOG.md

@@ -2,9 +2,44 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.0.10 - 2025-03-04
+
+[v1.0.9...1.0.10](../../compare/v1.0.9...1.0.10)
+
+### :rocket: New features
+
+- *(xcode-artifacts)* :sparkles: remove iOS runtimes [<sup>(586155a)</sup>][586155a]
+
+### :bug: Bug fixes
+
+- *(ruby-gems)* :bug: remove dry-run flag [<sup>(5525759)</sup>][5525759]
+- *(android-sdk)* :bug: fix obsolete package delete [<sup>(60c184a)</sup>][60c184a]
+
+### :memo: Documentation
+
+- *(infra)* :memo: fix changelog links [<sup>(a81eb4e)</sup>][a81eb4e]
+
+### :recycle: Refactor
+
+- :recycle: main : separate module loading and execution [<sup>(496b562)</sup>][496b562]
+
+### :gear: Miscellaneous Tasks
+
+- *(infra)* :memo: workaround git-cliff bug [<sup>(21e404c)</sup>][21e404c]
+- *(infra)* :wrench: .env (encrypted): rotate GITHUB_TOKEN [<sup>(2582880)</sup>][2582880]
+
+<!-- LINKS -->
+[21e404c]:../../commit/21e404c3062b38ab03beec99b5a1cd35c54c9a49
+[a81eb4e]:../../commit/a81eb4e5c3830d6b9ae01e07ce8f0a9d90e7b575
+[2582880]:../../commit/2582880f7274c54c021d639f87c748a11996e204
+[5525759]:../../commit/5525759d5fabda664b505f1721ddbf661a3b4ebd
+[60c184a]:../../commit/60c184a8ccde88d9ee3a2e51ca9d8fd01877e03a
+[586155a]:../../commit/586155aa21c63b79bf2f026d41f8ee24038852bd
+[496b562]:../../commit/496b562e97e697ff41f68207b319996d8558c143
+
 ## 1.0.9 - 2025-02-12
 
-[v1.0.8...1.0.9](../../compare/v1.0.8...1.0.9)
+[v1.0.8...v1.0.9](../../compare/v1.0.8...v1.0.9)
 
 ### :memo: Documentation
 
@@ -39,7 +74,6 @@ All notable changes to this project will be documented in this file.
 ### :gear: Miscellaneous Tasks
 
 - :construction_worker: release-it - auto-publish NPM module [<sup>(e452923)</sup>][e452923]
-- Release 1.0.8 [<sup>(6424ffc)</sup>][6424ffc]
 
 <!-- LINKS -->
 [4bfc4a4]:../../commit/4bfc4a4f01631e5a1b6c49e71aefc918251845fc
@@ -50,7 +84,6 @@ All notable changes to this project will be documented in this file.
 [e6620de]:../../commit/e6620deacacfbce8ae0292d208f4a1c2f3117aee
 [7c56838]:../../commit/7c56838eee1fa245bf81b040ac4ee4b17dbca9bb
 [e452923]:../../commit/e452923ade48217127cc9c786a6e12af2eab3829
-[6424ffc]:../../commit/6424ffcda40491db4ff9ef84a8adf38acdb67df1
 
 ## 1.0.7 - 2025-02-05
 
@@ -68,14 +101,12 @@ All notable changes to this project will be documented in this file.
 ### :gear: Miscellaneous Tasks
 
 - :construction_worker: fix changelog generation [<sup>(30f323d)</sup>][30f323d]
-- Release 1.0.7 [<sup>(64546f9)</sup>][64546f9]
 
 <!-- LINKS -->
 [8792d75]:../../commit/8792d759de54c46be3cf3471a7ef3c18f937a41c
 [2aace79]:../../commit/2aace79ab5570049af7bfd87908cbfd4a5f9334f
 [9b28ba2]:../../commit/9b28ba2f4163454a5d36e48af93c3e51509a8b9c
 [30f323d]:../../commit/30f323da067b92b69f912cea5ce85b90997cef44
-[64546f9]:../../commit/64546f9fb87b06d86703311de819256761e2f7ad
 
 ## 1.0.6 - 2024-12-09
 
@@ -85,12 +116,10 @@ All notable changes to this project will be documented in this file.
 
 - :hammer: add GITHUB_TOKEN [<sup>(4d14cbf)</sup>][4d14cbf]
 - :arrow_up: update dependency to node >= 18 [<sup>(ca92511)</sup>][ca92511]
-- Release 1.0.6 [<sup>(88faf33)</sup>][88faf33]
 
 <!-- LINKS -->
 [4d14cbf]:../../commit/4d14cbfae18980d645d60f10a7feef9ce7650b06
 [ca92511]:../../commit/ca925115cb3137e795d55769dfa7332cf38b89cf
-[88faf33]:../../commit/88faf333e35787b53a8988f8a42647e5fde4bfdc
 
 ## 1.0.5 - 2024-12-09
 
@@ -109,7 +138,6 @@ All notable changes to this project will be documented in this file.
 - *(infra)* :hammer: add vscode conventional commit scopes [<sup>(84e7ca5)</sup>][84e7ca5]
 - *(infra)* :hammer: add vscode conventional commit scopes [<sup>(5979eed)</sup>][5979eed]
 - *(infra)* :hammer: add release-it config [<sup>(639b8bb)</sup>][639b8bb]
-- Release 1.0.5 [<sup>(462ee69)</sup>][462ee69]
 
 <!-- LINKS -->
 [6bb0ba6]:../../commit/6bb0ba6fcca63f56f44808eff220eda86579ce85
@@ -117,24 +145,11 @@ All notable changes to this project will be documented in this file.
 [5979eed]:../../commit/5979eed216a65ef6faa733bf71d2a5f47ffb708b
 [639b8bb]:../../commit/639b8bb2122be6c4d7a83267c516636458d1743c
 [12729bd]:../../commit/12729bd019abd9219e6cb3eeda040fc90e836228
-[462ee69]:../../commit/462ee6964edfa65a224b1cc56f1f7cc15fdc600a
 
 ## 1.0.4 - 2024-10-03
 
 [v1.0.3...v1.0.4](../../compare/v1.0.3...v1.0.4)
 
-<!-- LINKS -->
-[bc39b3e]:../../commit/bc39b3e006b19b68acd7deb3b30a8be93b50a52b
-
 ## 1.0.3 - 2024-10-03
 
-
-<!-- LINKS -->
-[9ae79ca]:../../commit/9ae79caa43c647f21aee76bab842286e1b9b10ff
-[1d768b4]:../../commit/1d768b473316daacb557b0cbe8a25ab69f6c7f94
-[c33840f]:../../commit/c33840f3acdee816ec75861bc7d96c9b9497579d
-[dd9c730]:../../commit/dd9c73025a7e2fc9f07766dd76e67a85eafe4c1c
-[5b23c45]:../../commit/5b23c45d8ee2ce2a051a99295c8701e1c747ec8f
-[d44b8c0]:../../commit/d44b8c0a12b30f9b4d8f15f89a1ee80150d147cd
-
 <!-- generated by git-cliff -->

package/cliff.toml

@@ -10,6 +10,7 @@ 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 = """\
+{% set orig_version = version %}\
 {% if version %}\
     ## {{ version | trim_start_matches(pat="v") }} - {{ timestamp | date(format="%Y-%m-%d") }}
 {% else %}\
@@ -17,7 +18,7 @@ body = """\
 {% endif %}{% raw %}\n{% endraw %}\
 {% if previous %}\
     {% if previous.version and version %}\
-        [{{ previous.version }}...{{ version }}](../../compare/{{ previous.version }}...{{ version }})
+        [{{ previous.version }}...{{ orig_version }}](../../compare/{{ previous.version }}...{{ orig_version }})
     {% endif %}\
 {% endif %}\
 {% for group, commits in commits | group_by(attribute="group") %}

package/mikes-macos-disk-cleanup.sh

@@ -133,58 +133,67 @@ source "${DIR}/modules/hints.sh"
 
 # CocoaPods
 source "${DIR}/modules/cocoapods.sh"
-cocoapods
 
 # remove everything in ~/Library/Caches
 source "${DIR}/modules/library-caches.sh"
-libraryCaches
 
 # remove everything from Trash - this sometimes prompts for confirmation
 source "${DIR}/modules/trash.sh"
-trash
 
 # meteor
 source "${DIR}/modules/meteor-builds-and-packages.sh"
-meteorBuildsAndPackages
 
 # npm cache
 source "${DIR}/modules/npm-cache.sh"
-npmCache
 
 # yarn cache
 source "${DIR}/modules/yarn-cache.sh"
-yarnCache
 
 # bun cache
 source "${DIR}/modules/bun-cache.sh"
-bunCache
 
 # ### XCode ###
 source "${DIR}/modules/xcode-artifacts.sh"
-xcodeArtifacts
 
 # Clear shared gradle caches
 source "${DIR}/modules/gradle-shared.sh"
-gradleShared
 
 # node_modules folders
 source "${DIR}/modules/node-modules.sh"
-nodeModules
 
 # ruby gems
 source "${DIR}/modules/ruby-gems.sh"
-rubyGems
 
 # Docker
 source "${DIR}/modules/docker-files.sh"
-dockerFiles
 
 # Android projects - remove build folders
 source "${DIR}/modules/android-build-folders.sh"
-androidBuildFolders
 
 # Android SDKs
 source "${DIR}/modules/android-sdk.sh"
+
+# Android AVDs
+source "${DIR}/modules/android-avd.sh"
+
+# Homebrew Caches
+source "${DIR}/modules/homebrew-caches.sh"
+
+# ======
+# Now run all our modules
+cocoapods
+libraryCaches
+trash
+meteorBuildsAndPackages
+npmCache
+yarnCache
+bunCache
+xcodeArtifacts
+gradleShared
+nodeModules
+rubyGems
+dockerFiles
+androidBuildFolders
 set +e ; # don't exit on error
 androidSDK
 RETCODE=$?
@@ -199,13 +208,7 @@ if [ ${RETCODE} -ne 0 ]; then
     exit ${RETCODE}
   fi
 fi
-
-# Android AVDs
-source "${DIR}/modules/android-avd.sh"
 androidAVD
-
-# Homebrew Caches
-source "${DIR}/modules/homebrew-caches.sh"
 homebrewCaches
 
 # get the disk usage now that we've run the cleanup

package/modules/android-sdk.awk

@@ -61,39 +61,51 @@ BEGIN{
     } 
     lastPath="";
     lastCat="";
+    processedHeading=0;
     delete itemsToRemove[0]; # initializes a new array
     itemsToRemoveLength=0; # length of array
 }
 /Installed packages:/{
     inInstalled=1;
     inObsolete=0;
+    processedHeading=0;
 }
 /Installed Obsolete Packages:/{
     inInstalled=0;
     inObsolete=1;
+    processedHeading=0;
 }
-/\;/{
-    path=$1; 
-    version=$3;
-    loc=$NF; # last field is location; description has spaces to hard to grab
-    cat=path; 
-    gsub(/;.+$/,"",cat); # the category is just the first portion of the path before the semicolon e.g. "platforms"
-    if (inInstalled) {
-        # If this category is the same as the last one, add the 
-        #  previous record to our list of ones to remove (and keep only the most recent).
-        if (cat == lastCat) {
-            # add the last category as a new item on the end of our array
+$7 ~ /^-------/ { # this is the end of a heading; move to the next line
+    processedHeading=1;
+    next;
+}
+$0 ~ /^.+$/ { # non-empty line
+    if (processedHeading == 1) {
+        path=$1; 
+        version=$3;
+        loc=$NF; # last field is location; description has spaces to hard to grab
+        cat=path; 
+        gsub(/;.+$/,"",cat); # the category is just the first portion of the path before the semicolon e.g. "platforms"
+
+        if (inInstalled) {
+            # If this category is the same as the last one, add the 
+            #  previous record to our list of ones to remove (and keep only the most recent).
+            if (cat == lastCat) {
+                # add the last category as a new item on the end of our array
+                printf("Adding least-recent\"%s\" to itemsToRemove (superceded by \"%s\")\n", lastPath, path);
+                itemsToRemoveLength++;
+                itemsToRemove[itemsToRemoveLength] = lastPath;
+            } else {
+                # we're in a category we haven't yet seen (or the output is not sorted and everything will fall apart)
+            }
+            lastCat = cat;
+            lastPath = path;
+        } else if (inObsolete) {
+            printf("Obsolete: Adding \"%s\" to itemsToRemove\n", path);
+            # we'll just add all obsolete packages to the list of items to remove
             itemsToRemoveLength++;
-            itemsToRemove[itemsToRemoveLength] = lastPath;
-        } else {
-            # we're in a new category
+            itemsToRemove[itemsToRemoveLength] = path;
         }
-        lastCat = cat;
-        lastPath = path;
-    } else if (inObsolete) {
-        # we'll just add all obsolete packages to the list of items to remove
-        itemsToRemoveLength++;
-        itemsToRemove[itemsToRemoveLength] = path;
     }
 }
 END{

package/modules/ruby-gems.sh

@@ -19,7 +19,7 @@ rubyGems() {
             done
             unset IFS
             # remove gems
-            gem cleanup -d
+            gem cleanup
         }
     }
 

package/modules/xcode-artifacts.sh

@@ -41,5 +41,12 @@ xcodeArtifacts() {
             echo "${DEVICESUPPORTCOMMAND}"
             addHint "${DEVICESUPPORTCOMMAND}"
         fi
+
+        echo "    removing unavailable simulator devices..."
+        xcrun simctl delete unavailable
+
+        echo "    removing all but the most recent iOS simulator runtime..."
+        xcrun simctl runtime list | grep -E '^iOS' | sort -r -n -k 2 | awk 'NR>1{print $5}' | xargs -I{} xcrun simctl runtime delete {}
+
     fi # xcode
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mikes-macos-developer-disk-cleanup",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "Cleans up a developer's mac disk space. Aggressively.",
   "bin": {
     "mikes-macos-disk-cleanup": "mikes-macos-disk-cleanup.sh"