checkoff 0.211.0 → 0.213.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2de28358e0d67efa1305a6e6adb28e3fd8a748797b1de586edbf298acc57a9c0
-  data.tar.gz: 72de5747a927d7db32c02b0e583805a9460b6eafadc3f92cf0ca10da92c21ff8
+  metadata.gz: aeb9d34366fc0ca26614cd8d25941a680ba7fb0fb5fca6e1ffd4c0fc12a2b778
+  data.tar.gz: fc51855eabddefea447704e85fdb9f28eda888fd9a1abe7c435f4885dec6c90e
 SHA512:
-  metadata.gz: 4f4b3e6183d0c5a392de7f05ced74ca6c5b95adc3351f6a1a95ecb128b1a86ecc5ef9cdc173195cf6abf0b08423d6e111f8bd4c7b934fb85d6517cb6dd76659e
-  data.tar.gz: 7c01074f53358048e04b852a66b08fa5ea29f9d9d156e35f093f4f600f7319ed862118a92fa34711b71297aa16e17aacc88e043f676071836d30df3b6cf32ed4
+  metadata.gz: a841034f314c778221fa2b614bcdc39bb40f665a998123d58f61a0a80622b2e1ce9caabc2ce5741fcb4f74dae7ff6b96e0607b8f2d64813eb71c2f2e7f670f30
+  data.tar.gz: 678ce73f44ac1afdae1361d6e53d71ff688a0b8d0d92ad14a5b5d6f2b1de9d8b315e865194f6b12e5e0676f2c1c3878fdbcc62d38a6aa8efe5f7fde90e3db97e

data/.circleci/config.yml

@@ -22,8 +22,12 @@ commands:
             eval "$(pyenv init --path)"
             eval "$(pyenv virtualenv-init -)"
             eval "$(rbenv init -)"
+
             # keep this in a single place for both main and child builds for cachability
-            export BUNDLE_PATH="$(pwd)/vendor/bundle"
+            BUNDLE_PATH="$(pwd)/vendor/bundle"
+            export BUNDLE_PATH
+            GEM_HOME="${BUNDLE_PATH}"
+            export GEM_HOME
 
             <<parameters.command>>
           environment:
@@ -34,23 +38,30 @@ commands:
     description: "Install source environment"
     steps:
       - checkout
+      - run:
+          name: Update timestamps to original commit time
+          command: |
+            git ls-tree -r --name-only HEAD | while read filename; do \
+              unixtime=$(git log -1 --format="%at" -- "${filename}")
+              touchtime=$(date -d @$unixtime +'%Y%m%d%H%M.%S')
+              touch -t ${touchtime} "${filename}"
+            done
       - restore_cache:
           keys:
-            - gems-v4-{{ checksum "Gemfile.lock" }}-
-            - gems-v4-
-            - gems-
+            - rbenv-v3-{{ checksum "Gemfile.lock" }}-
+            - rbenv-v3-
+            - rbenv-
+            - ruby-
       - restore_cache:
           keys:
-            - solargraph-v2-{{ checksum "Gemfile.lock" }}-{{ .Branch }}
-            - solargraph-v2-{{ checksum "Gemfile.lock" }}-
-            - solargraph-v2-
-            - solargraph-
+            - pyenv-v2-{{ checksum "requirements_dev.txt" }}-
+            - pyenv-v2-
+            - pyenv-
       - restore_cache:
           keys:
-            - wheels-v1-3.12.7-{{ checksum "requirements_dev.txt" }}
-            - wheels-v1-3.12.7-
-            - wheels-v1-
-            - wheels-
+            - solargraph-v1-{{ checksum "Gemfile.lock" }}-
+            - solargraph-v1-
+            - solargraph-
       - run:
           name: Initialize packages
           command: |
@@ -59,7 +70,11 @@ commands:
 
             # export FIX_SH_TIMING_LOG=/tmp/fix_sh_timing.log
 
-            export BUNDLE_PATH="$(pwd)/vendor/bundle"
+            BUNDLE_PATH="$(pwd)/vendor/bundle"
+            export BUNDLE_PATH
+            GEM_HOME="${BUNDLE_PATH}"
+            export GEM_HOME
+
             './fix.sh'
       - store_artifacts:
           path: /tmp/fix_sh_timing.log
@@ -72,17 +87,19 @@ commands:
               exit 1
             fi
       - save_cache:
-          key: gems-v4-{{ checksum "Gemfile.lock" }}-{{ checksum ".ruby-version" }}
+          key: rbenv-v3-{{ checksum "Gemfile.lock" }}-{{ checksum ".ruby-version" }}
           paths:
+            - "Gemfile.lock.installed"
+            - "types.installed"
             - "vendor/bundle"
+            - "/home/circleci/.rbenv"
             - ".yardoc"
-            - "/home/circleci/.rbenv/versions/3.1.6/lib/ruby/gems/"
       - save_cache:
-          key: wheels-v1-3.12.7-{{ checksum "requirements_dev.txt" }}
+          key: pyenv-v2-{{ checksum "requirements_dev.txt" }}-{{ checksum ".python-version" }}
           paths:
+            - "requirements_dev.txt.installed"
             - "/home/circleci/.cache/pip/wheels"
-            - "/home/circleci/.pyenv/versions/3.12.7/envs/checkoff-3.12.7"
-            - "/home/circleci/.pyenv/versions/checkoff-3.12.7"
+            - "/home/circleci/.pyenv"
       - run:
           name: Download new circleci tool
           command: |
@@ -196,13 +213,13 @@ jobs:
   quality:
     working_directory: ~/checkoff
     docker:
-      - image: apiology/circleci-ruby:latest
+      - image: cimg/base:current
     steps:
       - quality
   build:
     working_directory: ~/checkoff
     docker:
-      - image: apiology/circleci-ruby:latest
+      - image: cimg/base:current
     steps:
       - set_up_environment
       - when:
@@ -214,21 +231,20 @@ jobs:
       # - run_with_languages:
       #     label: Typecheck
       #     command: make citypecheck citypecoverage
+      - save_cache:
+          key: solargraph-v1-{{ checksum "Gemfile.lock" }}-{{ checksum ".ruby-version" }}
+          paths:
+            - "/home/circleci/.cache/solargraph"
       - run_with_languages:
           label: Test
           command: |
             make citest cicoverage
-      - save_cache:
-          key: solargraph-v2-{{ checksum "Gemfile.lock" }}-{{ .Branch }}
-          paths:
-            - ".yardoc"
-            - "/home/circleci/.cache/solargraph"
     # This seemed to shave 5ish% of the build time off when added
     resource_class: large
   publish_gem:
     working_directory: ~/checkoff
     docker:
-      - image: apiology/circleci-ruby:latest
+      - image: cimg/base:current
     steps:
       - set_up_environment
       - run_with_languages:

data/.envrc

@@ -2,3 +2,8 @@
 PATH_add bin
 
 direnv_load op run --cache --env-file=config/env.1p -- direnv dump
+
+BUNDLE_PATH="$(pwd)/vendor/bundle"
+export BUNDLE_PATH
+GEM_HOME="${BUNDLE_PATH}"
+export GEM_HOME

data/Gemfile.lock

@@ -43,7 +43,7 @@ GIT
 PATH
   remote: .
   specs:
-    checkoff (0.211.0)
+    checkoff (0.213.0)
       activesupport
       asana (> 0.10.0)
       cache_method
@@ -167,16 +167,16 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.3.0)
     mutex_m (0.3.0)
-    nokogiri (1.16.7)
+    nokogiri (1.16.8)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.16.7-aarch64-linux)
+    nokogiri (1.16.8-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.16.7-arm64-darwin)
+    nokogiri (1.16.8-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-darwin)
+    nokogiri (1.16.8-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.7-x86_64-linux)
+    nokogiri (1.16.8-x86_64-linux)
       racc (~> 1.4)
     oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
@@ -198,7 +198,7 @@ GEM
     public_suffix (5.0.4)
     punchlist (1.3.2)
       source_finder (>= 2)
-    racc (1.7.3)
+    racc (1.8.1)
     rack (3.0.8)
     rainbow (3.1.1)
     rake (13.1.0)
@@ -263,6 +263,7 @@ PLATFORMS
   aarch64-linux
   arm64-darwin-23
   arm64-linux
+  ruby
   x86_64-darwin-23
   x86_64-linux
   x86_64-linux-musl

data/Makefile

@@ -17,9 +17,12 @@ help:
 
 default: clean-coverage test coverage clean-typecoverage typecheck typecoverage quality ## run default typechecking, tests and quality
 
-build-typecheck: bundle_install ## Fetch information that type checking depends on
+build-typecheck: types.installed ## Fetch information that type checking depends on
+
+types.installed: Gemfile.lock Gemfile.lock.installed ## Install Ruby dependencies
 	bundle exec yard gems 2>&1 || bundle exec yard gems --safe 2>&1 || bundle exec yard gems 2>&1
 	# bundle exec solargraph scan 2>&1
+	touch types.installed
 
 clean-typecheck: ## Refresh information that type checking depends on
 	bundle exec solargraph clear
@@ -100,7 +103,7 @@ update_from_cookiecutter: ## Bring in changes from template project used to crea
 	git merge cookiecutter-template || true
 	git checkout --ours Gemfile.lock || true
 	# update frequently security-flagged gems while we're here
-	bundle update --conservative rexml || true
+	bundle update --conservative rexml nokogiri || true
 	git add Gemfile.lock || true
 	bundle install || true
 	bundle exec overcommit --install || true

data/fix.sh

@@ -127,7 +127,7 @@ ensure_binary_library() {
       ! [ -f /usr/local/lib/"${library_base_name}.so" ] && \
       ! [ -f /usr/local/opt/"${homebrew_package}/lib/${library_base_name}*.dylib" ]
   then
-      if ! compgen -G "/opt/homebrew/Cellar/${homebrew_package}"*/*/"lib/${library_base_name}"*.dylib
+      if ! compgen -G "/opt/homebrew/Cellar/${homebrew_package}"*/*/"lib/${library_base_name}"*.dylib >/dev/null 2>&1
       then
         install_package "${homebrew_package}" "${apt_package}"
       fi
@@ -148,10 +148,21 @@ ensure_latest_ruby_build_definitions() {
 #  # if not pulled in last 24 hours
 #  if [ $(( $(date +%s) - last_pulled_unix_epoch )) -gt $(( 24 * 60 * 60 )) ]
 #  then
-      git -C "$(rbenv root)"/plugins/ruby-build pull
+      git -C "$HOME"/.rbenv/plugins/ruby-build pull
 #  fi
 }
 
+# https://stackoverflow.com/questions/2829613/how-do-you-tell-if-a-string-contains-another-string-in-posix-sh
+contains() {
+  string="$1"
+  substring="$2"
+  if [ "${string#*"$substring"}" != "$string" ]; then
+    return 0    # $substring is in $string
+  else
+    return 1    # $substring is not in $string
+  fi
+}
+
 # You can find out which feature versions are still supported / have
 # been release here: https://www.ruby-lang.org/en/downloads/
 ensure_ruby_versions() {
@@ -161,14 +172,21 @@ ensure_ruby_versions() {
   # been release here: https://www.ruby-lang.org/en/downloads/
   ruby_versions="$(latest_ruby_version 3.1)"
 
-  echo "Latest Ruby versions: ${ruby_versions}"
+  installed_ruby_versions="$(rbenv versions --bare --skip-aliases)"
 
-  ensure_ruby_build_requirements
+  echo "Latest Ruby versions: ${ruby_versions}"
 
   for ver in $ruby_versions
   do
-    rbenv install -s "${ver}"
-    hash -r  # ensure we are seeing latest bundler etc
+    if ! contains "${installed_ruby_versions}"$'\n' "${ver}"$'\n'; then
+      echo "Installing Ruby version $ver - existing versions: $installed_ruby_versions"
+      ensure_ruby_build_requirements
+
+      rbenv install -s "${ver}"
+      hash -r  # ensure we are seeing latest bundler etc
+    else
+      echo "Found Ruby version $ver already installed"
+    fi
   done
 }
 
@@ -178,7 +196,7 @@ ensure_bundle() {
   # https://app.circleci.com/pipelines/github/apiology/source_finder/21/workflows/88db659f-a4f4-4751-abc0-46f5929d8e58/jobs/107
   set_rbenv_env_variables
   type bundle >/dev/null 2>&1 || gem install --no-document bundler
-  bundler_version=$(bundle --version | cut -d ' ' -f3)
+  bundler_version="$(ruby -e 'require "rubygems"; puts Gem::BundlerVersionFinder.bundler_version')"
   bundler_version_major=$(cut -d. -f1 <<< "${bundler_version}")
   bundler_version_minor=$(cut -d. -f2 <<< "${bundler_version}")
   bundler_version_patch=$(cut -d. -f3 <<< "${bundler_version}")
@@ -233,7 +251,14 @@ ensure_bundle() {
   #
   # This affects nokogiri, which will try to reinstall itself in
   # Docker builds where it's already installed if this is not run.
-  bundle lock --add-platform arm64-darwin-23 x86_64-darwin-23 x86_64-linux x86_64-linux-musl aarch64-linux arm64-linux
+  PLATFORMS="ruby arm64-darwin-23 x86_64-darwin-23 x86_64-linux x86_64-linux-musl aarch64-linux arm64-linux"
+  for platform in ${PLATFORMS}
+  do
+    if ! grep -q "^  ${platform}$" Gemfile.lock
+    then
+      bundle lock --add-platform "${platform}"
+    fi
+  done
   make bundle_install
 }
 
@@ -364,24 +389,32 @@ ensure_python_versions() {
 
   echo "Latest Python versions: ${python_versions}"
 
-  ensure_python_build_requirements
+  installed_python_versions="$(pyenv versions --skip-envs --skip-aliases --bare)"
 
   for ver in $python_versions
   do
-    if [ "$(uname)" == Darwin ]
-    then
-      if [ -z "${HOMEBREW_OPENSSL_PREFIX:-}" ]
+    if ! contains "${installed_python_versions}"$'\n' "${ver}"$'\n'; then
+      echo "Installing Python version $ver - existing versions: $installed_python_versions"
+      ensure_python_build_requirements
+
+      if [ "$(uname)" == Darwin ]
       then
-        HOMEBREW_OPENSSL_PREFIX="$(brew --prefix openssl)"
+        if [ -z "${HOMEBREW_OPENSSL_PREFIX:-}" ]
+        then
+          HOMEBREW_OPENSSL_PREFIX="$(brew --prefix openssl)"
+        fi
+        pyenv_install() {
+          CFLAGS="-I/usr/local/opt/zlib/include -I/usr/local/opt/bzip2/include -I${HOMEBREW_OPENSSL_PREFIX}/include" LDFLAGS="-L/usr/local/opt/zlib/lib -L/usr/local/opt/bzip2/lib -L${HOMEBREW_OPENSSL_PREFIX}/lib" pyenv install --skip-existing "$@"
+        }
+
+        major_minor="$(cut -d. -f1-2 <<<"${ver}")"
+        pyenv_install "${ver}"
+      else
+        pyenv install -s "${ver}"
       fi
-      pyenv_install() {
-        CFLAGS="-I/usr/local/opt/zlib/include -I/usr/local/opt/bzip2/include -I${HOMEBREW_OPENSSL_PREFIX}/include" LDFLAGS="-L/usr/local/opt/zlib/lib -L/usr/local/opt/bzip2/lib -L${HOMEBREW_OPENSSL_PREFIX}/lib" pyenv install --skip-existing "$@"
-      }
-
-      major_minor="$(cut -d. -f1-2 <<<"${ver}")"
-      pyenv_install "${ver}"
+      hash -r
     else
-      pyenv install -s "${ver}"
+      echo "Found Python version $ver already installed"
     fi
   done
 }
@@ -404,7 +437,7 @@ ensure_pyenv_virtualenvs() {
 
 ensure_pip_and_wheel() {
   # https://cve.mitre.org/cgi-bin/cvename.cgi?name=2023-5752
-  pip_version=$(pip --version | cut -d' ' -f2)
+  pip_version=$(python -c "import pip; print(pip.__version__)" | cut -d' ' -f2)
   major_pip_version=$(cut -d '.' -f 1 <<< "${pip_version}")
   minor_pip_version=$(cut -d '.' -f 2 <<< "${pip_version}")
   if [[ major_pip_version -lt 23 ]]
@@ -415,7 +448,7 @@ ensure_pip_and_wheel() {
       pip install 'pip>=23.3'
   fi
   # wheel is helpful for being able to cache long package builds
-  type wheel || pip install wheel
+  type wheel >/dev/null 2>&1 || pip install wheel
 }
 
 ensure_python_requirements() {
@@ -443,9 +476,26 @@ ensure_overcommit() {
 }
 
 ensure_rugged_packages_installed() {
-  ensure_binary_library libicuio icu4c libicu-dev # needed by rugged, needed by undercover
-  ensure_package pkg-config # needed by rugged, needed by undercover
-  ensure_package cmake # needed by rugged, needed by undercover
+  # only needed if we don't already have rugged installed
+  if ! ls vendor/bundle/ruby/*/gems/rugged-* &>/dev/null
+  then
+    echo "Current directory"
+    pwd
+    echo "Vendor dir"
+    ls -l vendor
+    echo "List of vendor/bundle/gems:"
+    ls vendor/bundle/gems
+    echo "Did not find rugged gem installed; installing packages needed for rugged"
+    echo "Installed gems:"
+    gem list
+    echo "Gem environment:"
+    gem environment
+    echo "Bundle list:"
+    bundle list
+    ensure_binary_library libicuio icu4c libicu-dev # needed by rugged, needed by undercover
+    ensure_package pkg-config # needed by rugged, needed by undercover
+    ensure_package cmake # needed by rugged, needed by undercover
+  fi
 }
 
 ensure_rbenv

data/lib/checkoff/version.rb

@@ -3,5 +3,5 @@
 # Command-line and gem client for Asana (unofficial)
 module Checkoff
   # Version of library
-  VERSION = '0.211.0'
+  VERSION = '0.213.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: checkoff
 version: !ruby/object:Gem::Version
-  version: 0.211.0
+  version: 0.213.0
 platform: ruby
 authors:
 - Vince Broz