Add GitHub Action to replace Travis

mcmire · mcmire · commit 5a26702d9a44 · 2020-12-23T12:59:12.000-07:00
Also, fix the build, as Appraisals did not reflect new version number
and ActiveSupport integration tests were not set up properly.
diff --git a/.github/workflows/super_diff.yml b/.github/workflows/super_diff.yml
@@ -0,0 +1,35 @@
+name: SuperDiff
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        ruby:
+          - 2.5
+          - 2.6
+          - 2.7
+        gemfile:
+          - gemfiles/rails_5_0.gemfile
+          - gemfiles/rails_5_1.gemfile
+          - gemfiles/rails_5_2.gemfile
+          - gemfiles/rails_6_0.gemfile
+          - gemfiles/no_rails.gemfile
+    env:
+      BUNDLE_GEMFILE: ${{ matrix.gemfile }}
+      JAVA_OPTS: "--add-opens java.base/sun.nio.ch=org.jruby.dist --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.security.cert=ALL-UNNAMED --add-opens=java.base/java.util.zip=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.util.regex=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED  --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/javax.crypto=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/java.io=org.jruby.dist"
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        id: set-up-ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: v1-rubygems-local-${{ runner.os }}-${{ matrix.ruby }}-${{ hashFiles(format('{0}.lock', matrix.gemfile)) }}
+      - name: Install dependencies
+        run: bin/ci/install
+      - name: Run tests
+        run: bin/ci/run-tests
diff --git a/.travis.yml b/.travis.yml
diff --git a/bin/ci/install b/bin/ci/install
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+bundle config set path $PWD/vendor/bundle
+bundle install --jobs=3 --retry=3
+
+if ! which zeus &>/dev/null; then
+  gem install zeus
+fi
diff --git a/bin/ci/run-tests b/bin/ci/run-tests
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+bin/start-dev --background --debug
+bundle exec rake --trace
diff --git a/bin/start-dev b/bin/start-dev
@@ -43,7 +43,7 @@ done
 if [[ -S .zeus.sock ]]; then
   error "It looks like Zeus is already running."
   echo "Try running 'pkill zeus' to stop it, then run this again."
-  exit 1
+  exit 2
 fi
 
 if [[ $background -eq 1 ]]; then
@@ -69,7 +69,10 @@ if [[ $background -eq 1 ]]; then
     fi
   fi
 
-  exec zeus confirm_started
+  if ! [[ -S .zeus.sock ]]; then
+    echo "It looks like Zeus failed to run. Bummer."
+    exit 3
+  fi
 else
   if [[ $debug -eq 1 ]]; then
     exec zeus --log zeus.server.log start
diff --git a/config/zeus_plan.rb b/config/zeus_plan.rb
@@ -11,11 +11,13 @@ class CustomZeusPlan < Zeus::Plan
     :@test_plan,
     :after_fork,
     :boot,
+    :boot_active_support,
     :boot_active_record,
+    :boot_rails,
     :run_plain_test,
+    :run_rspec_active_support_test,
     :run_rspec_active_record_test,
     :run_rspec_rails_test,
-    :confirm_started,
   )
 
   def initialize(using_outside_of_zeus: false, color_enabled: false)
diff --git a/gemfiles/no_rails.gemfile.lock b/gemfiles/no_rails.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    super_diff (0.5.2)
+    super_diff (0.5.3)
       attr_extras (>= 6.2.4)
       diff-lcs
       patience_diff
diff --git a/gemfiles/rails_5_0.gemfile.lock b/gemfiles/rails_5_0.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    super_diff (0.5.2)
+    super_diff (0.5.3)
       attr_extras (>= 6.2.4)
       diff-lcs
       patience_diff
diff --git a/gemfiles/rails_5_1.gemfile.lock b/gemfiles/rails_5_1.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    super_diff (0.5.2)
+    super_diff (0.5.3)
       attr_extras (>= 6.2.4)
       diff-lcs
       patience_diff
diff --git a/gemfiles/rails_5_2.gemfile.lock b/gemfiles/rails_5_2.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    super_diff (0.5.2)
+    super_diff (0.5.3)
       attr_extras (>= 6.2.4)
       diff-lcs
       patience_diff
diff --git a/gemfiles/rails_6_0.gemfile.lock b/gemfiles/rails_6_0.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    super_diff (0.5.2)
+    super_diff (0.5.3)
       attr_extras (>= 6.2.4)
       diff-lcs
       patience_diff
diff --git a/lib/super_diff/csi.rb b/lib/super_diff/csi.rb
@@ -58,6 +58,7 @@ def self.inspect_colors_in(text)
         end
     end
 
-    self.color_enabled = STDOUT.tty?
+    self.color_enabled = ENV["CI"] == "true" || STDOUT.tty?
+    # puts "(SuperDiff::Csi) Super::Csi.color_enabled: #{color_enabled?}"
   end
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -8,6 +8,8 @@
 rescue LoadError
 end
 
+require "pp"
+
 #---
 
 require_relative "../support/current_bundle"
@@ -18,26 +20,25 @@
 
 begin
   require "active_record"
+
   active_record_available = true
-rescue LoadError
-  active_record_available = false
-end
 
-if active_record_available
   ActiveRecord::Base.establish_connection(
     adapter: "sqlite3",
     database: ":memory:",
   )
-
-  require "super_diff/rspec-rails"
-else
-  require "super_diff/rspec"
+rescue LoadError
+  active_record_available = false
 end
 
-Dir.glob(File.expand_path("support/**/*.rb", __dir__)).each do |file|
-  next if !active_record_available && file.include?('models/active_record')
-  require file
-end
+Dir.glob(File.expand_path("support/**/*.rb", __dir__)).
+  sort.
+  reject do |file|
+    file.include?("/models/active_record/") && !active_record_available
+  end.
+  each do |file|
+    require file
+  end
 
 RSpec.configure do |config|
   config.include(SuperDiff::IntegrationTests, type: :integration)
@@ -65,6 +66,14 @@
 
   config.order = :random
   Kernel.srand config.seed
+
+  if ENV["CI"] == "true"
+    config.color_mode = :on
+  end
 end
 
-require "pp"
+if active_record_available
+  require "super_diff/rspec-rails"
+else
+  require "super_diff/rspec"
+end
diff --git a/spec/support/integration/helpers.rb b/spec/support/integration/helpers.rb
@@ -21,11 +21,15 @@ def make_plain_test_program(
     end
 
     def make_rspec_active_record_program(test, color_enabled:)
-      TestPrograms::RspecActiveRecord.new(test, color_enabled: color_enabled)
+      TestPrograms::RSpecActiveRecord.new(test, color_enabled: color_enabled)
+    end
+
+    def make_rspec_active_support_program(test, color_enabled:)
+      TestPrograms::RSpecActiveSupport.new(test, color_enabled: color_enabled)
     end
 
     def make_rspec_rails_test_program(test, color_enabled:)
-      TestPrograms::RspecRails.new(test, color_enabled: color_enabled)
+      TestPrograms::RSpecRails.new(test, color_enabled: color_enabled)
     end
 
     def build_expected_output(
diff --git a/spec/support/integration/matchers/produce_output_when_run_matcher.rb b/spec/support/integration/matchers/produce_output_when_run_matcher.rb
@@ -36,7 +36,7 @@ def failure_message
             "."
         else
           message =
-            "Expected test to produce output, but it did not.\n\n" +
+            "Expected test to produce #{expect_output_to_contain_color? ? "colored" : "uncolored"} output, but it did not.\n\n" +
             "Expected output to contain:\n\n" +
             CommandRunner::OutputHelpers.bookended(expected_output) +
             "\n" +
diff --git a/spec/support/integration/test_programs/base.rb b/spec/support/integration/test_programs/base.rb
@@ -1,3 +1,5 @@
+require "attr_extras/explicit"
+
 module SuperDiff
   module IntegrationTests
     module TestPrograms
diff --git a/spec/support/integration/test_programs/rspec_active_record.rb b/spec/support/integration/test_programs/rspec_active_record.rb
@@ -1,7 +1,7 @@
 module SuperDiff
   module IntegrationTests
     module TestPrograms
-      class RspecActiveRecord < Base
+      class RSpecActiveRecord < Base
         protected
 
         def test_plan_prelude
diff --git a/spec/support/integration/test_programs/rspec_active_support.rb b/spec/support/integration/test_programs/rspec_active_support.rb
@@ -0,0 +1,17 @@
+module SuperDiff
+  module IntegrationTests
+    module TestPrograms
+      class RSpecActiveSupport < Base
+        protected
+
+        def test_plan_prelude
+          "test_plan.boot_active_support"
+        end
+
+        def test_plan_command
+          "run_rspec_active_support_test"
+        end
+      end
+    end
+  end
+end
diff --git a/spec/support/integration/test_programs/rspec_rails.rb b/spec/support/integration/test_programs/rspec_rails.rb
@@ -1,7 +1,7 @@
 module SuperDiff
   module IntegrationTests
     module TestPrograms
-      class RspecRails < Base
+      class RSpecRails < Base
         protected
 
         def test_plan_prelude
diff --git a/spec/support/shared_examples/hash_with_indifferent_access.rb b/spec/support/shared_examples/hash_with_indifferent_access.rb
diff --git a/support/test_plan.rb b/support/test_plan.rb
diff --git a/zeus.json b/zeus.json
