Merge branch 'release/0.18.3'

CHANGELOG.md

@@ -1,7 +1,7 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## Unreleased
+## 0.18.3 - 2021-07-23
 ### Changed
 - Address the [Shopify API deprecation of page-based pagination](https://shopify.dev/changelog/page-based-pagination-replaced-by-cursor-based-pagination-across-multiple-rest-endpoints) in favour of cursor-based in the `Synchronises` concern.
 

UPGRADING.md

@@ -3,7 +3,7 @@ This file contains more detailed instructions on what's required when updating
 an application between one release version of the gem to the next. It's intended
 as more in-depth accompaniment to the notes in `CHANGELOG.md` for each version.
 
-## Upgrading from 0.18.2 to unreleased
+## Upgrading from 0.18.2 to 0.18.3
 The `synchronise_all` method for models with the `Synchronises` concern has been updated to use cursor-based pagination per the [Shopify API deprecation](https://shopify.dev/changelog/page-based-pagination-replaced-by-cursor-based-pagination-across-multiple-rest-endpoints). Ad hoc app code updates to address this may now be removed.
 
 ## Upgrading from 0.18.1 to 0.18.2

VERSION

@@ -1 +1 @@
-0.18.2
+0.18.3

initialise.sh

@@ -1,15 +1,46 @@
 #!/bin/bash
 # Usage: initialise.sh example_app
 
+# If $RUBY_VERSION version is not set, attempt to get a sane default
+# ruby version using whatever is returned by calling 'ruby'
+if [ -z "$RUBY_VERSION" ]; then
+  RUBY_VERSION=$(ruby -e 'print RUBY_VERSION')
+  RUBY_VERSION=${RUBY_VERSION:-2.6.5}
+fi
+# Now we're settled on a ruby version, check it is installed by switching to it.
+. $ASDF_DIR/asdf.sh
+asdf shell ruby $RUBY_VERSION
+if [ ! $? -eq 0 ]; then
+  echo "Attempting to use ruby $RUBY_VERSION but it doesn't appear to be installed."
+  echo "You can install it using: asdf install ruby $RUBY_VERSION"
+  exit
+fi
+# Bundler is also a minimum requirement (within our given ruby environment)
+if [ -z $(command -v bundle) ]; then
+  echo "Bundler is not installed. You can install it using: gem install bundler"
+  exit
+fi
+
 APP_NAME="$1"
 RAILS_VERSION="${RAILS_VERSION:-6.0.2}"
-RUBY_VERSION="${RUBY_VERSION:-2.6.5}"
 NODE_VERSION="${NODE_VERSION:-13.7.0}"
-DISCO_APP_VERSION="${DISCO_APP_VERSION:-0.18.2}"
+DISCO_APP_VERSION="${DISCO_APP_VERSION:-0.18.3}"
 
 if [ -z $APP_NAME ]; then
-  echo "Usage: ./initialise.sh app_name (rails_version) (ruby_version) (disco_app_version)"
-  echo "Only app_name is required, defaults to Rails $RAILS_VERSION, Ruby $RUBY_VERSION, Node $NODE_VERSION, Disco App $DISCO_APP_VERSION."
+  echo ''
+  echo 'Usage: ./initialise.sh app_name'
+  echo ''
+  echo 'The app_name parameter is required.'
+  echo ''
+  echo 'You can override the Ruby, Rails, Node, disco_app versions using the following environment variables, respectively:'
+  echo '  $RUBY_VERSION (defaults to '$RUBY_VERSION')'
+  echo '  $RAILS_VERSION (defaults to '$RAILS_VERSION')'
+  echo '  $NODE_VERSION (defaults to '$NODE_VERSION')'
+  echo '  $DISCO_APP_VERSION (defaults to '$DISCO_APP_VERSION')'
+  echo ''
+  echo 'eg. To specify the rails and node versions:'
+  echo ''
+  echo 'RAILS_VERSION=5.0.3 NODE_VERSION=10.0.0 ./initialise.sh app_name'
   exit
 fi
 

lib/disco_app/version.rb

@@ -1,5 +1,5 @@
 module DiscoApp
 
-  VERSION = '0.18.2'.freeze
+  VERSION = '0.18.3'.freeze
 
 end