Merge branch 'master' of github.com:clio/ten_years_rails

Author: pendletons

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ten_years_rails (0.1.0)
+    ten_years_rails (0.2.0)
       actionview
       activesupport
       colorize (>= 0.8.1)
@@ -10,63 +10,63 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionview (5.2.0)
-      activesupport (= 5.2.0)
+    actionview (5.2.3)
+      activesupport (= 5.2.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.2.0)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     builder (3.2.3)
     colorize (0.8.1)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
     crass (1.0.4)
     diff-lcs (1.3)
     domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    erubi (1.7.1)
+    erubi (1.8.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (1.0.1)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.2.2)
+    loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.3.0)
+    mime-types-data (3.2019.0331)
+    mini_portile2 (2.4.0)
     minitest (5.11.3)
     netrc (0.11.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
+    nokogiri (1.10.2)
+      mini_portile2 (~> 2.4.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    rake (10.4.2)
+    rake (10.5.0)
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
@@ -84,4 +84,4 @@ DEPENDENCIES
   ten_years_rails!
 
 BUNDLED WITH
-   1.16.1
+   1.17.2

exe/next.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 if [[ "${@}" == "--init" ]]; then
-  echo "doing a thing"
   # Add next? top of Gemfile
   cat <<-STRING > Gemfile.tmp
 def next?
@@ -11,6 +10,19 @@ STRING
   mv Gemfile.tmp Gemfile
 
   ln -s Gemfile Gemfile.next
+  echo <<-MESSAGE
+Created Gemfile.next (a symlink to your Gemfile). Your Gemfile has been modified to support dual-booting!
+
+There's just one more step: modify your Gemfile to use a newer version of Rails using the \`next?\` helper method.
+
+For example, here's how to go from 5.2.3 to 6.0:
+
+if next?
+  gem "rails", "6.0.0"
+else
+  gem "rails", "5.2.3"
+end
+MESSAGE
   exit $?
 fi
 

lib/deprecation_tracker.rb

@@ -1,3 +1,4 @@
+require "colorize"
 require "json"
 
 # A shitlist for deprecation warnings during test runs. It has two modes: "save" and "compare"

spec/deprecation_tracker_spec.rb

@@ -1,7 +1,8 @@
 require "tempfile"
-require_relative "../support/deprecation_tracker"
+require_relative "spec_helper"
+require_relative "../lib/deprecation_tracker"
 
-describe DeprecationTracker do
+RSpec.describe DeprecationTracker do
   let(:shitlist_path) do
     shitlist_path = Tempfile.new.path
     FileUtils.rm(shitlist_path)
@@ -218,4 +219,3 @@
     end
   end
 end
-

spec/ten_years_rails_spec.rb

@@ -2,8 +2,4 @@
   it "has a version number" do
     expect(TenYearsRails::VERSION).not_to be nil
   end
-
-  it "does something useful" do
-    expect(false).to eq(true)
-  end
 end