Merge branch 'feature/ci-caching' into develop

Author: bcylin

.travis.yml

@@ -13,8 +13,7 @@ before_install:
   - brew bundle
 install:
   - bundle install --without development --deployment --jobs=3 --retry=3
-  - bundle exec pod repo update
-  - bundle exec pod install
+  - sh ./scripts/pod-install-if-needed.sh
 before_script:
   - bundle exec danger
 script:

Dangerfile

@@ -2,24 +2,23 @@
 
 # Sometimes it's a README fix, or something like that - which isn't relevant for
 # including in a project's CHANGELOG for example
-declared_trivial = pr_title.include? "#trivial"
+declared_trivial = (github.pr_title + github.pr_body).include?("#trivial")
 
 # Make it more obvious that a PR is a work in progress and shouldn't be merged yet
 warn("PR is classed as Work in Progress") if pr_title.include? "[WIP]"
 
 # Warn when there is a big PR
 warn("Big PR") if lines_of_code > 500
 
-# Don't let testing shortcuts get into master by accident
-fail("fdescribe left in tests") if `grep -r fdescribe specs/`.length > 1
-fail("fit left in tests") if `grep -r "fit specs/ `.length > 1
+# Ensure there is a summary for a PR
+fail "Please provide a summary in the Pull Request description" if github.pr_body.length < 5
 
 # Add a CHANGELOG entry for app changes
 if git.lines_of_code > 50 && !github.modified_files.include?("CHANGELOG.md") && !declared_trivial
   fail("Please update [CHANGELOG.md](https://github.com/polydice/iCook-tvOS/blob/develop/CHANGELOG.md).")
 end
 
 # Ensure a clean commits history
-if git.commits.any? { |c| c.message =~ /^Merge branch '#{github.branch_for_base}'/ }
+if git.commits.any? { |c| c.message =~ /^Merge branch/ }
   fail('Please rebase to get rid of the merge commits in this PR')
 end

Gemfile

@@ -3,6 +3,6 @@ ruby "2.3.1"
 
 gem "cocoapods", "~> 1.1.0"
 gem "cocoapods-keys"
-gem "danger", "~> 0.10.0"
+gem "danger", "~> 4.0.0"
 gem "scan"
 gem "slather"

Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    CFPropertyList (2.3.3)
     RubyInline (3.12.4)
       ZenTest (~> 4.3)
     ZenTest (4.11.1)
@@ -13,7 +14,7 @@ GEM
     addressable (2.4.0)
     babosa (1.0.2)
     claide (1.0.1)
-    claide-plugins (0.9.1)
+    claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
@@ -63,16 +64,16 @@ GEM
       commander (>= 4.3.5)
       highline (>= 1.7.1)
       security
-    danger (0.10.1)
+    danger (4.0.0)
       claide (~> 1.0)
-      claide-plugins (~> 0.9)
+      claide-plugins (>= 0.9.2)
       colored (~> 1.2)
       cork (~> 0.1)
-      faraday (~> 0)
+      faraday (~> 0.9)
       faraday-http-cache (~> 1.0)
       git (~> 1)
+      kramdown (~> 1.5)
       octokit (~> 4.2)
-      redcarpet (~> 3.3)
       terminal-table (~> 1)
     dotenv (2.1.1)
     escape (0.0.4)
@@ -101,34 +102,33 @@ GEM
     highline (1.7.8)
     i18n (0.7.0)
     json (1.8.3)
+    kramdown (1.12.0)
     mini_portile2 (2.1.0)
     minitest (5.9.1)
     molinillo (0.5.2)
     multi_json (1.12.1)
     multipart-post (2.0.0)
+    nanaimo (0.2.2)
     nap (1.1.0)
     netrc (0.7.8)
-    nokogiri (1.6.8)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    octokit (4.3.0)
+    octokit (4.4.1)
       sawyer (~> 0.7.0, >= 0.5.3)
     open4 (1.3.4)
     osx_keychain (1.0.1)
       RubyInline (~> 3)
-    pkg-config (1.1.7)
     plist (3.2.0)
-    redcarpet (3.3.4)
     rouge (1.11.1)
     rubyzip (1.1.7)
     sawyer (0.7.0)
       addressable (>= 2.3.5, < 2.5)
       faraday (~> 0.8, < 0.10)
-    scan (0.13.1)
-      fastlane_core (>= 0.52.1, < 1.0.0)
+    scan (0.14.1)
+      fastlane_core (>= 0.53.0, < 1.0.0)
       slack-notifier (~> 1.3)
-      terminal-table
-      xcpretty (>= 0.2.2)
+      terminal-table (>= 1.4.5, < 2.0.0)
+      xcpretty (>= 0.2.4, < 1.0.0)
       xcpretty-travis-formatter (>= 0.0.3)
     security (0.1.3)
     slack-notifier (1.5.1)
@@ -143,10 +143,12 @@ GEM
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unicode-display_width (1.1.1)
-    xcodeproj (1.3.3)
+    xcodeproj (1.4.1)
+      CFPropertyList (~> 2.3.3)
       activesupport (>= 3)
       claide (>= 1.0.1, < 2.0)
       colored (~> 1.2)
+      nanaimo (~> 0.2.0)
     xcpretty (0.2.4)
       rouge (~> 1.8)
     xcpretty-travis-formatter (0.0.4)
@@ -158,12 +160,12 @@ PLATFORMS
 DEPENDENCIES
   cocoapods (~> 1.1.0)
   cocoapods-keys
-  danger (~> 0.10.0)
+  danger (~> 4.0.0)
   scan
   slather
 
 RUBY VERSION
-   ruby 2.3.0p0
+   ruby 2.3.1p112
 
 BUNDLED WITH
-   1.12.5
+   1.13.6

scripts/pod-install-if-needed.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if cmp -s Podfile.lock Pods/Podfile.lock; then
+  echo "Using cached CocoaPods dependencies"
+else
+  bundle exec pod repo update
+  bundle exec pod install
+  cp -v Podfile.lock Pods
+fi