Fix CircleCI

Author: schneems

.circleci/config.yml

@@ -10,31 +10,25 @@ references:
 jobs:
   "ruby-2-5":
     docker:
-      - image: 'cimg/base:stable'
+      - image: circleci/ruby:2.5
     steps:
       - checkout
-      - ruby/install:
-          version: "2.5"
       - ruby/install-deps
       - <<: *unit
 
   "ruby-2-6":
     docker:
-      - image: 'cimg/base:stable'
+      - image: circleci/ruby:2.6
     steps:
       - checkout
-      - ruby/install:
-          version: "2.6"
       - ruby/install-deps
       - <<: *unit
 
   "ruby-2-7":
     docker:
-      - image: 'cimg/base:stable'
+      - image: circleci/ruby:2.7
     steps:
       - checkout
-      - ruby/install:
-          version: "2.7"
       - ruby/install-deps
       - <<: *unit
 

lib/syntax_search.rb

@@ -16,6 +16,7 @@ def self.handle_error(e, search_source_on_error: SEARCH_SOURCE_ON_ERROR_DEFAULT)
 
     filename = e.message.split(":").first
 
+    $stderr.sync = true
     $stderr.puts "Run `$ syntax_search #{filename}` for more options\n"
 
     if search_source_on_error

spec/unit/exe_spec.rb

@@ -15,7 +15,7 @@ def exe(cmd)
     it "parses valid code" do
       ruby_file = exe_path
       out = exe(ruby_file)
-      expect(out.strip).to eq("Syntax OK")
+      expect(out.strip).to include("Syntax OK")
     end
 
     it "parses invalid code" do

spec/unit/syntax_search_spec.rb

@@ -46,9 +46,13 @@ def run_ruby(script)
         dir = Pathname(dir)
         gemfile = dir.join("Gemfile")
         gemfile.write(<<~EOM)
+          source "https://rubygems.org"
           gem "syntax_search", path: "#{root_dir}", require: "syntax_search/auto"
         EOM
-        run!("BUNDLE_GEMFILE=#{gemfile} bundle install --local")
+        dir.join("Gemfile.lock").write(root_dir.join("Gemfile.lock").read)
+        out = run!("BUNDLE_GEMFILE=#{gemfile} bundle install")
+        puts out
+
         script = dir.join("script.rb")
         script.write <<~EOM
           describe "things" do
@@ -63,20 +67,18 @@ def run_ruby(script)
           end
         EOM
 
-        Bundler.with_original_env do
-          require_rb = dir.join("require.rb")
-          require_rb.write <<~EOM
-            Bundler.require
+        require_rb = dir.join("require.rb")
+        require_rb.write <<~EOM
+          Bundler.require
 
-            require_relative "./script.rb"
-          EOM
+          require_relative "./script.rb"
+        EOM
 
-          out = `BUNDLE_GEMFILE=#{gemfile} bundle exec ruby #{require_rb} 2>&1`
+        out = `BUNDLE_GEMFILE=#{gemfile} bundle exec ruby #{require_rb} 2>&1`
 
-          expect($?.success?).to be_falsey
-          expect(out).to include("This code has an unmatched")
-          expect(out).to include("Run `$ syntax_search")
-        end
+        expect($?.success?).to be_falsey
+        expect(out).to include("This code has an unmatched")
+        expect(out).to include("Run `$ syntax_search")
       end
     end
 
@@ -85,9 +87,12 @@ def run_ruby(script)
         dir = Pathname(dir)
         gemfile = dir.join("Gemfile")
         gemfile.write(<<~EOM)
+          source "https://rubygems.org"
           gem "syntax_search", path: "#{root_dir}", require: "syntax_search/fyi"
         EOM
-        run!("BUNDLE_GEMFILE=#{gemfile} bundle install --local")
+        out = run!("BUNDLE_GEMFILE=#{gemfile} bundle install")
+        puts out
+
         script = dir.join("script.rb")
         script.write <<~EOM
           describe "things" do
@@ -102,20 +107,18 @@ def run_ruby(script)
           end
         EOM
 
-        Bundler.with_original_env do
-          require_rb = dir.join("require.rb")
-          require_rb.write <<~EOM
-            Bundler.require
+        require_rb = dir.join("require.rb")
+        require_rb.write <<~EOM
+          Bundler.require
 
-            require_relative "./script.rb"
-          EOM
+          require_relative "./script.rb"
+        EOM
 
-          out = `BUNDLE_GEMFILE=#{gemfile} bundle exec ruby #{require_rb} 2>&1`
+        out = `BUNDLE_GEMFILE=#{gemfile} bundle exec ruby #{require_rb} 2>&1`
 
-          expect($?.success?).to be_falsey
-          expect(out).to_not include("This code has an unmatched")
-          expect(out).to include("Run `$ syntax_search")
-        end
+        expect($?.success?).to be_falsey
+        expect(out).to_not include("This code has an unmatched")
+        expect(out).to include("Run `$ syntax_search")
       end
     end
   end