Added version release changes.

Aids new installs with the correct option to choose from the menu
prompt.

.github/ISSUE_TEMPLATE.md

@@ -1,16 +1,11 @@
-## Expected Behavior
+## Overview
-<!-- Required. Describe, in detail, the behavior experienced. -->
+<!-- Required. Describe, in detail, the behavior experienced and what is desired. -->
-
-## Actual Behavior
-<!-- Required. Describe, in detail, what should be the correct behavior. -->
 
 ## Steps to Recreate
-<!-- Required. List the exact steps to the reproduce errant behavior. -->
+<!-- Optional. List exact steps (numbered list) to reproduce errant behavior. Delete if unused. -->
 
-0.
+## Screenshots/Screencasts
+<!-- Optional. Attach screenshot/screencast(s) that demo the behavior. Delete if unused. -->
 
 ## Environment
 <!-- Optional. What is your operating system, software version(s), etc. Delete if unused. -->
-
-## Screenshots/Screencasts
-<!-- Optional. Attach screenshots/screencasts that demo the behavior. Delete if unused. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,10 +2,10 @@
 <!-- Required. Why is this important/necessary? -->
 
 ## Details
-<!-- Optional. List the key features/highlights as bullet points. -->
+<!-- Optional. List the key features/highlights as bullet points. Delete if unused. -->
 
 ## Notes
 <!-- Optional. List additional notes/references as bullet points. Delete if unused. -->
 
 ## Screenshots/Screencasts
-<!-- Optional. Provide image/video support. Delete if unused. -->
+<!-- Optional. Provide supporting image/video. Delete if unused. -->

.ruby-version

@@ -0,0 +1 @@
+2.4.2

CHANGES.md

@@ -1,3 +1,44 @@
+# v3.1.0 (2017-11-26)
+
+- Updated Gemfile.lock file.
+- Updated boot disk documenation to mention APFS.
+- Updated to Bundler 1.16.0.
+- Updated to Git Cop 1.7.0.
+- Updated to Rake 12.3.0.
+- Updated to Rubocop 0.51.0.
+
+# v3.0.0 (2017-10-01)
+
+- Fixed table of contents.
+- Updated boot disk creation to use macOS High Sierra.
+- Updated gem dependencies.
+- Updated to Git Cop 1.6.0.
+- Updated to Ruby 2.4.2.
+
+# v2.2.0 (2017-07-16)
+
+- Added Git Cop support.
+- Updated CONTRIBUTING documentation.
+- Updated GitHub templates.
+- Updated README headers.
+- Updated gem dependencies.
+
+# v2.1.0 (2017-04-29)
+
+- Fixed Java SE Development Kit install.
+- Fixed install-all command
+
+# v2.0.0 (2017-04-09)
+
+- Added Homebrew Casks install script.
+- Updated README semantic versioning order.
+- Updated contributing documentation.
+- Refactored Homebrew software as Homebrew Formulas.
+
+# v1.3.1 (2017-01-08)
+
+- Fixed install of zip app downloads with sub-directories.
+
 # v1.3.0 (2017-01-01)
 
 - Updated README versioning documentation.

CONTRIBUTING.md

@@ -1,35 +1,22 @@
-# Overview
+# Contributing
 
-Thanks for taking an interest in this open source project. Your support and involvement is greatly appreciated. The
+Thanks for taking an interest in this open source project. Your support and involvement is greatly
-following details what you need to know in order to contribute.
+appreciated. The following sections detail what you need to know in order to contribute.
 
-# Requirements
+## Code
 
-- Follow these [Basic Programming Styles](https://github.com/bkuhlmann/style_guides/blob/master/programming/basic.md).
+0. Read the project README before starting.
-- Follow these [Code Review Styles](https://github.com/bkuhlmann/style_guides/blob/master/programming/code_reviews.md).
+0. Fork the `master` branch of this repository and clone the fork locally.
-- Follow these [Git Styles](https://github.com/bkuhlmann/style_guides/blob/master/programming/git.md).
+0. Ensure there are no setup, usage, and/or test issues.
-- Follow these [Bash Styles](https://github.com/bkuhlmann/style_guides/blob/master/programming/languages/bash.md).
+0. Add tests for new functionality and ensure they pass.
-- Follow these [CSS Styles](https://github.com/bkuhlmann/style_guides/blob/master/programming/languages/css.md).
+0. Submit a pull request, follow the instructions it provides, and ensure the build passes.
-- Follow these [Ruby Styles](https://github.com/bkuhlmann/style_guides/blob/master/programming/languages/ruby/ruby.md).
 
-# Contributing Code
+## Issues
 
-0. Read the project README thoroughly before starting.
+0. Submit an issue via the GitHub Issues tab (assuming one does not
-0. Fork the master branch of the repository.
+   already exist) and follow the instructions it provides.
-0. Ensure there are no setup, usage, and/or test issues (again, follow the README).
-0. Add tests for new functionality (refactoring and documentation changes can be excluded).
-0. Ensure all tests pass.
-0. Push your feature branch and submit a pull request.
 
-# Submitting Issues
+## Feedback
 
-0. Submit an issue via the GitHub Issues tab (assuming one does not already exist).
+- Expect a response within one to three business days.
-0. Clearly describe the issue (including steps to reproduce).
+- Changes, alternatives, and/or improvements might be suggested upon review.
-0. Specify your enviroment setup (OS, browser, language, etc. with version info).
-0. Provide a stack dump (if possible).
-0. Explain any additional details that might help diagnose the problem quickly.
-
-# Feedback
-
-Expect a response within one to three business days.
-Changes, alternatives, and/or improvements might be suggested upon review.

Gemfile

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "rake", "~> 12.0"
+gem "git-cop", "~> 1.7"

Gemfile.lock

@@ -0,0 +1,28 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    equatable (0.5.0)
+    git-cop (1.7.1)
+      pastel (~> 0.7)
+      refinements (~> 4.2)
+      runcom (~> 1.3)
+      thor (~> 0.20)
+    pastel (0.7.2)
+      equatable (~> 0.5.0)
+      tty-color (~> 0.4.0)
+    rake (12.3.0)
+    refinements (4.3.0)
+    runcom (1.4.0)
+      refinements (~> 4.2)
+    thor (0.20.0)
+    tty-color (0.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  git-cop (~> 1.7)
+  rake (~> 12.0)
+
+BUNDLED WITH
+   1.16.0

README.md

@@ -1,5 +1,6 @@
 # macOS
 
+[![Circle CI Status](https://circleci.com/gh/bkuhlmann/mac_os.svg?style=svg)](https://circleci.com/gh/bkuhlmann/mac_os)
 [![Patreon](https://img.shields.io/badge/patreon-donate-brightgreen.svg)](https://www.patreon.com/bkuhlmann)
 
 Shell scripts for automated macOS machine setup.
@@ -19,24 +20,24 @@ the two projects are meant to be used:
 
 <!-- Tocer[start]: Auto-generated, don't remove. -->
 
-# Table of Contents
+## Table of Contents
 
-- [Features](#features)
+  - [Features](#features)
-- [Screencast](#screencast)
+  - [Screencast](#screencast)
-- [Requirements](#requirements)
+  - [Requirements](#requirements)
-- [Setup](#setup)
+  - [Setup](#setup)
-- [Usage](#usage)
+  - [Usage](#usage)
     - [Customization](#customization)
-- [Versioning](#versioning)
+  - [Versioning](#versioning)
-- [Code of Conduct](#code-of-conduct)
+  - [Code of Conduct](#code-of-conduct)
-- [Contributions](#contributions)
+  - [Contributions](#contributions)
-- [License](#license)
+  - [License](#license)
-- [History](#history)
+  - [History](#history)
-- [Credits](#credits)
+  - [Credits](#credits)
 
 <!-- Tocer[finish]: Auto-generated, don't remove. -->
 
-# Features
+## Features
 
 - Provides a command line interface, written in Bash with no additional dependencies, for
   installation and management of a macOS machine.
@@ -45,7 +46,8 @@ the two projects are meant to be used:
 - Downloads and installs development tools (required by Homebrew):
     - [Xcode Command Line Tools](https://developer.apple.com/xcode)
     - [Java SE Development Kit](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html)
-- Downloads, installs, and configures [Homebrew](http://brew.sh) command line software.
+- Downloads, installs, and configures [Homebrew Formulas](http://brew.sh).
+- Downloads, installs, and configures [Homebrew Casks](https://caskroom.github.io).
 - Downloads, installs, and configures
   [App Store](http://www.apple.com/macosx/whats-new/app-store.html) software.
 - Downloads, installs, and configures non-App Store software applications.
@@ -54,16 +56,16 @@ the two projects are meant to be used:
 - Sets up and configures installed software for use.
 - Supports restoration of machine backups.
 
-# Screencast
+## Screencast
 
 [![asciicast](https://asciinema.org/a/88971.png)](https://asciinema.org/a/88971)
 
-# Requirements
+## Requirements
 
-0. [macOS Sierra](https://www.apple.com/macos) (with latest software updates applied)
+0. [macOS High Sierra](https://www.apple.com/macos) (with latest software updates applied)
 0. [Xcode](https://developer.apple.com/xcode) (with accepted license agreement)
 
-# Setup
+## Setup
 
 Open a terminal window and execute one of the following setup sequences depending on your version
 preference:
@@ -72,14 +74,14 @@ Current Version (stable):
 
     git clone https://github.com/bkuhlmann/mac_os.git
     cd mac_os
-    git checkout v1.3.0
+    git checkout v3.1.0
 
 Master Version (unstable):
 
     git clone https://github.com/bkuhlmann/mac_os.git
     cd mac_os
 
-# Usage
+## Usage
 
 Run the following script:
 
@@ -92,7 +94,8 @@ You will be presented with the following options:
     Install:
        b:  Apply basic settings.
        t:  Install development tools.
-      h:  Install Homebrew software.
+      hf:  Install Homebrew Formulas.
+      hc:  Install Homebrew Casks.
        m:  Install Mac App Store software.
        a:  Install application software.
        x:  Install application software extensions.
@@ -124,7 +127,7 @@ been loaded.
 It is recommended that the `mac_os` project directory not be deleted and kept on the local machine
 in order to manage installed software and benefit from future upgrades.
 
-## Customization
+### Customization
 
 All executable scripts can be found in the `bin` folder:
 
@@ -140,7 +143,8 @@ All executable scripts can be found in the `bin` folder:
 - `bin/install_dev_tools`: Installs macOS development tools required by Homebrew.
 - `bin/install_extensions`: Installs macOS application extensions and add-ons. *This is meant to be
   customized.*
-- `bin/install_homebrew`: Installs Homebrew managed software. *This is meant to be customized.*
+- `bin/install_homebrew_casks`: Installs Homebrew Formulas. *This is meant to be customized.*
+- `bin/install_homebrew_formulas`: Installs Homebrew Casks. *This is meant to be customized.*
 - `bin/restore_backup`: Restores system/application settings from backup image. *This is meant to be
   customized.*
 - `bin/run`: The main script and interface for macOS setup.
@@ -154,34 +158,34 @@ project is built upon the functions found in the `lib` folder. See the
 
   - `lib/settings.sh`: Defines global settings for software applications, extensions, etc.
 
-# Versioning
+## Versioning
 
 Read [Semantic Versioning](http://semver.org) for details. Briefly, it means:
 
-- Patch (x.y.Z) - Incremented for small, backwards compatible, bug fixes.
-- Minor (x.Y.z) - Incremented for new, backwards compatible, public API enhancements/fixes.
 - Major (X.y.z) - Incremented for any backwards incompatible public API changes.
+- Minor (x.Y.z) - Incremented for new, backwards compatible, public API enhancements/fixes.
+- Patch (x.y.Z) - Incremented for small, backwards compatible, bug fixes.
 
-# Code of Conduct
+## Code of Conduct
 
 Please note that this project is released with a [CODE OF CONDUCT](CODE_OF_CONDUCT.md). By
 participating in this project you agree to abide by its terms.
 
-# Contributions
+## Contributions
 
 Read [CONTRIBUTING](CONTRIBUTING.md) for details.
 
-# License
+## License
 
 Copyright (c) 2016 [Alchemists](https://www.alchemists.io).
 Read [LICENSE](LICENSE.md) for details.
 
-# History
+## History
 
 Read [CHANGES](CHANGES.md) for details.
 Built with [Bashsmith](https://github.com/bkuhlmann/bashsmith).
 
-# Credits
+## Credits
 
 Developed by [Brooke Kuhlmann](https://www.alchemists.io) at
 [Alchemists](https://www.alchemists.io).

Rakefile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+begin
+  require "git/cop/rake/setup"
+rescue LoadError => error
+  puts error.message
+end
+
+task default: :git_cop

bin/create_boot_disk

@@ -12,7 +12,7 @@ printf "  1. Insert the USB boot disk into the machine to be upgraded.\n"
 printf "  2. Reboot the machine.\n"
 printf "  3. Hold down the OPTION key before the Apple logo appears.\n"
 printf "  4. Select the USB boot disk from the menu.\n"
-printf "  5. Format the machine's internal drive using Disk Utility.\n"
+printf "  5. Format the machine's internal drive using Disk Utility (choose APFS).\n"
 printf "  6. Install the new operating system.\n"
 printf "\nmacOS Reinstall:\n"
 printf "  1. Click the Apple icon from the operating system main menu.\n"

bin/install_dev_tools

@@ -6,11 +6,18 @@
 printf "Installing Xcode CLI tools...\n"
 xcode-select --install
 
-read -p "Have you completed the Xcode CLI tools install (y/n)? " response
+read -p "Have you completed the Xcode CLI tools install (y/n)? " xcode_response
-if [[ "$response" != "y" ]]; then
+if [[ "$xcode_response" != "y" ]]; then
   printf "ERROR: Xcode CLI tools must be installed before proceeding.\n"
   exit 1
 fi
 
-printf "Installing Java...\n"
+printf "Installing $JAVA_LABEL...\n"
-install_java "$JAVA_URL" "$JAVA_VOLUME_NAME"
+printf "%s\n" "You must manually accept the license and download the $JAVA_LABEL: $JAVA_DOWNLOAD_URL."
+open $JAVA_DOWNLOAD_URL
+
+read -p "Have you completed the $JAVA_LABEL install (y/n)? " java_response
+if [[ "$java_response" != "y" ]]; then
+  printf "ERROR: $JAVA_LABEL must be installed before proceeding.\n"
+  exit 1
+fi

bin/install_homebrew

@@ -1,18 +0,0 @@
-#! /usr/bin/env bash
-
-# DESCRIPTION
-# Installs Homebrew software.
-
-# SETTINGS
-set -o nounset
-set -o errexit
-set -o pipefail
-IFS=$'\n\t'
-SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/install_homebrew"
-
-# EXECUTION
-if [[ -x "$SCRIPT_PATH" ]]; then
-  "$SCRIPT_PATH"
-else
-  printf "WARNING: Homebrew install script does not exist or is not executable.\n"
-fi

bin/install_homebrew_casks

@@ -0,0 +1,18 @@
+#! /usr/bin/env bash
+
+# DESCRIPTION
+# Installs Homebrew Cask software.
+
+# SETTINGS
+set -o nounset
+set -o errexit
+set -o pipefail
+IFS=$'\n\t'
+SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/install_homebrew_casks"
+
+# EXECUTION
+if [[ -x "$SCRIPT_PATH" ]]; then
+  "$SCRIPT_PATH"
+else
+  printf "WARNING: Homebrew Casks install script does not exist or is not executable.\n"
+fi

bin/install_homebrew_formulas

@@ -0,0 +1,18 @@
+#! /usr/bin/env bash
+
+# DESCRIPTION
+# Installs Homebrew Formula software.
+
+# SETTINGS
+set -o nounset
+set -o errexit
+set -o pipefail
+IFS=$'\n\t'
+SCRIPT_PATH="$MAC_OS_CONFIG_PATH/bin/install_homebrew_formulas"
+
+# EXECUTION
+if [[ -x "$SCRIPT_PATH" ]]; then
+  "$SCRIPT_PATH"
+else
+  printf "WARNING: Homebrew Formulas install script does not exist or is not executable.\n"
+fi

bin/run

@@ -39,7 +39,8 @@ while true; do
     printf "  Install:\n"
     printf "     b:  Apply basic settings.\n"
     printf "     t:  Install development tools.\n"
-    printf "    h:  Install Homebrew software.\n"
+    printf "    hf:  Install Homebrew Formulas.\n"
+    printf "    hc:  Install Homebrew Casks.\n"
     printf "     m:  Install Mac App Store software.\n"
     printf "     a:  Install application software.\n"
     printf "     x:  Install application software extensions.\n"

circle.yml

@@ -0,0 +1,7 @@
+dependencies:
+  pre:
+    - gem update --system
+    - gem update bundler
+test:
+  override:
+    - bundle exec rake

lib/installers.sh

@@ -191,6 +191,7 @@ install_zip_app() {
       printf "Preparing...\n"
       cd "$MAC_OS_WORK_PATH"
       unzip -q "$download_file"
+      find . -type d -name "$app_name" -print -exec cp -pR {} . > /dev/null 2>&1 \;
     )
 
     install_app "$MAC_OS_WORK_PATH" "$app_name"

lib/options.sh

@@ -14,8 +14,10 @@ process_option() {
       bin/apply_basic_settings;;
     't')
       bin/install_dev_tools;;
-    'h')
+    'hf')
-      bin/install_homebrew;;
+      bin/install_homebrew_formulas;;
+    'hc')
+      bin/install_homebrew_casks;;
     'm')
       bin/install_app_store;;
     'a')
@@ -30,7 +32,8 @@ process_option() {
       caffeinate_machine
       bin/apply_basic_settings
       bin/install_dev_tools
-      bin/install_homebrew
+      bin/install_homebrew_formulas
+      bin/install_homebrew_casks
       bin/install_app_store
       bin/install_applications
       bin/install_extensions

lib/settings.sh

@@ -11,12 +11,12 @@ set -o pipefail
 IFS=$'\n\t'
 
 # Globals
-export MAC_OS_BOOT_DISK_CREATOR="/Applications/Install macOS Sierra.app/Contents/Resources/createinstallmedia"
+export MAC_OS_BOOT_DISK_CREATOR="/Applications/Install macOS High Sierra.app/Contents/Resources/createinstallmedia"
 export MAC_OS_BOOT_DISK_PATH="/Volumes/Untitled"
-export MAC_OS_INSTALLER_PATH="/Applications/Install macOS Sierra.app"
+export MAC_OS_INSTALLER_PATH="/Applications/Install macOS High Sierra.app"
 export MAC_OS_WORK_PATH=/tmp/downloads
 export MAC_OS_CONFIG_PATH="../mac_os-config"
 
 # Java
-export JAVA_VOLUME_NAME="JDK 8 Update 101"
+export JAVA_LABEL="Java SE Development Kit"
-export JAVA_URL="http://download.oracle.com/otn-pub/java/jdk/8u101-b13/jdk-8u101-macosx-x64.dmg"
+export JAVA_DOWNLOAD_URL="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"