Merge pull request #133 from apiology/update-from-cookiecutter-2024-1…

…0-10-0819 Update from cookiecutter
apiology · Oct 10, 2024 · 0a4da3d · 0a4da3d
2 parents 4a8995e + 9934cb5
commit 0a4da3d
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 17 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,5 +3,6 @@
 source 'https://rubygems.org'
 
 gem 'mdl'
-gem 'overcommit', ['>=0.61.0', '<0.62.0']
+gem 'ostruct'
+gem 'overcommit', ['>=0.64.0', '<0.65.0']
 gem 'punchlist'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -3,13 +3,15 @@ GEM
   specs:
     chef-utils (18.5.0)
       concurrent-ruby
-    childprocess (4.1.0)
+    childprocess (5.1.0)
+      logger (~> 1.5)
     concurrent-ruby (1.3.4)
     iniparse (1.5.0)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
+    logger (1.6.1)
     mdl (0.13.0)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.1)
@@ -21,29 +23,31 @@ GEM
       tomlrb
     mixlib-shellout (3.2.8)
       chef-utils
-    overcommit (0.61.0)
-      childprocess (>= 0.6.3, < 5)
+    ostruct (0.6.0)
+    overcommit (0.64.0)
+      childprocess (>= 0.6.3, < 6)
       iniparse (~> 1.4)
       rexml (~> 3.2)
-    punchlist (1.3.0)
+    punchlist (1.3.2)
       source_finder (>= 2)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.8)
     source_finder (3.2.1)
-    strscan (3.1.0)
     tomlrb (2.0.3)
 
 PLATFORMS
+  arm64-darwin-23
   ruby
   x86_64-darwin-20
   x86_64-darwin-21
+  x86_64-darwin-23
   x86_64-linux
   x86_64-linux-musl
 
 DEPENDENCIES
   mdl
-  overcommit (>= 0.61.0, < 0.62.0)
+  ostruct
+  overcommit (>= 0.64.0, < 0.65.0)
   punchlist
 
 BUNDLED WITH
-   2.2.22
+   2.5.21
diff --git a/Makefile b/Makefile
@@ -85,7 +85,7 @@ update_from_cookiecutter: ## Bring in changes from template project used to crea
 	git checkout cookiecutter-template && git push && git checkout main
 	git checkout main && git pull && git checkout -b update-from-cookiecutter-$$(date +%Y-%m-%d-%H%M)
 	git merge cookiecutter-template || true
-	bundle exec overcommit --install
+	bundle exec overcommit --install || true
 	@echo
 	@echo "Please resolve any merge conflicts below and push up a PR with:"
 	@echo

diff --git a/fix.sh b/fix.sh
@@ -87,10 +87,11 @@ ensure_dev_library() {
   header_file_name=${1:?header file name}
   homebrew_package=${2:?homebrew package}
   apt_package=${3:-${homebrew_package}}
-  if ! [ -f /usr/include/"${header_file_name}" ] && \
+  if ! [ -f /opt/homebrew/include/"${header_file_name}" ] && \
+      ! [ -f /usr/include/"${header_file_name}" ] && \
       ! [ -f /usr/include/x86_64-linux-gnu/"${header_file_name}" ] && \
       ! [ -f /usr/local/include/"${header_file_name}" ] && \
-      ! [ -f  /usr/local/opt/"${homebrew_package}"/include/"${header_file_name}" ]
+      ! [ -f /usr/local/opt/"${homebrew_package}"/include/"${header_file_name}" ]
   then
     install_package "${homebrew_package}" "${apt_package}"
   fi

diff --git a/{{cookiecutter.project_slug}}/Gemfile b/{{cookiecutter.project_slug}}/Gemfile
@@ -3,7 +3,8 @@
 source 'https://rubygems.org'
 
 gem 'mdl'
-gem 'overcommit', ['>=0.61.0', '<0.62.0']
+gem 'ostruct'
+gem 'overcommit', ['>=0.64.0', '<0.65.0']
 gem 'punchlist'
 gem 'rake'
 gem 'rspec'

diff --git a/{{cookiecutter.project_slug}}/Makefile b/{{cookiecutter.project_slug}}/Makefile
@@ -95,7 +95,7 @@ update_from_cookiecutter: ## Bring in changes from template project used to crea
 	git checkout cookiecutter-template && git push && git checkout main
 	git checkout main && git pull && git checkout -b update-from-cookiecutter-$$(date +%Y-%m-%d-%H%M)
 	git merge cookiecutter-template || true
-	bundle exec overcommit --install
+	bundle exec overcommit --install || true
 	@echo
 	@echo "Please resolve any merge conflicts below and push up a PR with:"
 	@echo

diff --git a/{{cookiecutter.project_slug}}/fix.sh b/{{cookiecutter.project_slug}}/fix.sh
@@ -87,10 +87,11 @@ ensure_dev_library() {
   header_file_name=${1:?header file name}
   homebrew_package=${2:?homebrew package}
   apt_package=${3:-${homebrew_package}}
-  if ! [ -f /usr/include/"${header_file_name}" ] && \
+  if ! [ -f /opt/homebrew/include/"${header_file_name}" ] && \
+      ! [ -f /usr/include/"${header_file_name}" ] && \
       ! [ -f /usr/include/x86_64-linux-gnu/"${header_file_name}" ] && \
       ! [ -f /usr/local/include/"${header_file_name}" ] && \
-      ! [ -f  /usr/local/opt/"${homebrew_package}"/include/"${header_file_name}" ]
+      ! [ -f /usr/local/opt/"${homebrew_package}"/include/"${header_file_name}" ]
   then
     install_package "${homebrew_package}" "${apt_package}"
   fi