test_launcher 2.21.0 → 2.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 06b235fa2c06c8c943187511a5e9d59ffe5ce01f
-  data.tar.gz: 34105a1658d9d0152ac73bbc64d643aec0b73b6f
+SHA256:
+  metadata.gz: 969bdf386bd70aad1f3fe5c3a5fdfe4d84f5563830e76fe89df3e26aa8a17ec8
+  data.tar.gz: 6153978e2039b70eff76093d6fd817b90b0c49ff5fdae8b43e686696e756da45
 SHA512:
-  metadata.gz: 4e07fa6bb4ccc1933b27ccd24ef1d814b8cbfc7f89eb707d0ef75f5c29bfc794bcc1d3ba0f9d82a09068679c01f0ad027d91c2858a5a635b56cf2c2a55db6470
-  data.tar.gz: fb39961d66baaba90e75ff23c73c14f35d0716f3c7e642bfdbec65811460301eae9a33b2bda6f78025b13107a26da482f29cb8a351538a02c2d09a4b4b3b916c
+  metadata.gz: b7c8a07385383100bd867642861011c51967e8127069baa83a486af9776350b09c9f4344eec3a36f7bf7fcbdb9effaa3cb1b045e58384e6a375a5dfd8d060a54
+  data.tar.gz: '0139155f5ac50725ca3ac6cba826c1917d9331f9c059dc8b4736668e408bf6a6a56bac67639bf6b6656abbba5d95c6aa3b037c4edc4ad6541f9b8fcc166cd86b'

data/lib/test_launcher/frameworks/implementation/test_case.rb

@@ -1,5 +1,3 @@
-require "pathname"
-
 module TestLauncher
   module Frameworks
     module Implementation
@@ -24,7 +22,7 @@ module TestLauncher
         def mtime
           @mtime ||= File.mtime(file)
         end
-        
+
         def relative_file
           file.sub(/^#{File.join(app_root, '/')}/, '')
         end
@@ -56,7 +54,7 @@ module TestLauncher
         end
 
         def exploded_path
-          Pathname.new(file).each_filename.to_a
+          file.split("/")
         end
       end
     end

data/lib/test_launcher/frameworks/minitest.rb

@@ -45,9 +45,16 @@ module TestLauncher
               .min_by {|r| line_number - r[:line_number]}
 
           if best_result
+            example_name =
+              if match = best_result[:line].match(/def\s+(?<name>test_[\w\?]+)/)
+                match[:name]
+              elsif match = best_result[:line].match(/test\s+['"](?<name>.*)['"]\s+do/)
+                "test_#{match[:name]}"
+              end
+
             [{
               file: best_result[:file],
-              example_name: best_result[:line].match(/(def\s+(?<name>test_[\w\?]+)|test\s+['"](?<name>.*)['"]\s+do)/)[:name],
+              example_name: example_name,
               line_number: best_result[:line_number]
             }]
           else
@@ -101,17 +108,22 @@ Open an issue on https://github.com/petekinnecom/test_launcher if this is someth
 
         def single_example(test_case, name: test_case.example, exact_match: false)
           name_arg =
-            if exact_match
+            if exact_match && name.match(/[^\w]/)
+              Shellwords.escape(name)
+            elsif !exact_match
+              "'/#{name}/'"
+            else
               name
+            end
+
+          file =
+            if test_case.spring_enabled?
+              test_case.relative_file
             else
-              "/#{name}/"
+              test_case.file
             end
 
-          if test_case.spring_enabled?
-            %{cd #{test_case.app_root} && #{test_case.example_runner} #{test_case.relative_file} --name='#{name_arg}'}
-          else
-            %{cd #{test_case.app_root} && #{test_case.example_runner} #{test_case.file} --name='#{name_arg}'}
-          end
+          %{cd #{test_case.app_root} && #{test_case.example_runner} #{file} --name=#{name_arg}}
         end
 
         def multiple_examples_same_file(test_cases)
@@ -135,7 +147,7 @@ Open an issue on https://github.com/petekinnecom/test_launcher if this is someth
       class TestCase < Base::TestCase
         def example_runner
           if spring_enabled?
-            "bundle exec spring rails test"
+            "#{spring_runner} rails test"
           else
             "bundle exec ruby -I test"
           end
@@ -143,7 +155,7 @@ Open an issue on https://github.com/petekinnecom/test_launcher if this is someth
 
         def file_runner
           if spring_enabled?
-            "bundle exec spring rails test"
+            "#{spring_runner} rails test"
           else
             "bundle exec ruby -I test -e 'ARGV.each {|f| require(f)}'"
           end
@@ -157,12 +169,15 @@ Open an issue on https://github.com/petekinnecom/test_launcher if this is someth
           return false if request.disable_spring?
           return true if request.force_spring?
 
-          [
-            "bin/spring",
-            "bin/testunit"
-          ].any? {|f|
-            File.exist?(File.join(app_root, f))
-          }
+          File.exist?(File.join(app_root, "bin/spring"))
+        end
+
+        def spring_runner
+          if File.exist?(File.join(app_root, "bin/spring"))
+            "bin/spring"
+          else
+            "bundle exec spring"
+          end
         end
 
         def example

data/lib/test_launcher/rubymine.rb

@@ -1,41 +1,3 @@
-require "test_launcher/shell/runner"
-require "test_launcher/rubymine/launcher"
-require "test_launcher/rubymine/request"
+require "test_launcher/rubymine/parser"
 
-# To allow us to simply specify our run configuration as:
-#
-#  -r test_launcher/rubymine
-#
-# we need to put the currently executing script in with the args.
-#
-# Consider the following examples:
-#
-#   ruby -r test_launcher/rubymine /path/to/test.rb
-#
-# vs
-#
-#   ruby -r test_launcher/rubymine spring testunit /path/to/test.rb
-#
-# In one case, our test to run is $0 and in another case it's an ARGV.
-# So we throw them in the same bucket and let the launcher figure it
-# out.  It doesn't matter since we will `exec` a new command anyway.
-
-module TestLauncher
-  module Rubymine
-    def self.launch
-      shell = TestLauncher::Shell::Runner.new(log_path: "/dev/null")
-
-      request = Request.new(
-        disable_spring: ENV["DISABLE_SPRING"]
-      )
-
-      Launcher.new(
-        args: [$0].concat(ARGV),
-        shell: shell,
-        request: request
-      ).launch
-    end
-  end
-end
-
-TestLauncher::Rubymine.launch
+TestLauncher::Rubymine::Parser.launch

data/lib/test_launcher/rubymine/launcher.rb

@@ -3,6 +3,9 @@ require "test_launcher/shell/runner"
 
 module TestLauncher
   module Rubymine
+    # Parsing command line args with regex is not ideal ...¯\_(ツ)_/¯
+    TEST_NAME_REGEX = %r{['"]*/?\^?([^/'"\$]*)\$?/?['"]*}
+
     class Launcher
       def initialize(args:, shell:, request:)
         @args = args
@@ -14,7 +17,14 @@ module TestLauncher
         if args.any? {|a| a.match("ruby-debug-ide")}
           shell.puts "test_launcher: hijacking and debugging"
 
-          debug_command = "cd #{test_case.app_root} && bundle exec ruby -I test #{args.join(" ")}"
+          debug_command = (
+            if args.first.match(/bash/)
+              "cd #{test_case.app_root} && #{args.join(" ")}"
+            else
+              "cd #{test_case.app_root} && bundle exec ruby -I test #{args.join(" ")}"
+            end
+          )
+
           shell.puts debug_command
           shell.exec debug_command
         else
@@ -40,7 +50,13 @@ module TestLauncher
           if args[-1].match("--name=")
             Frameworks::Minitest::TestCase.new(
               file: args[-2],
-              example: args[-1][/--name=(.*)/, 1],
+              example: args[-1][%r{--name=#{TEST_NAME_REGEX}}, 1],
+              request: request
+            )
+          elsif args[-2]&.match("--name")
+            Frameworks::Minitest::TestCase.new(
+              file: args[-3],
+              example: args[-1][TEST_NAME_REGEX, 1],
               request: request
             )
           else

data/lib/test_launcher/rubymine/parser.rb

@@ -0,0 +1,51 @@
+require "test_launcher/shell/runner"
+require "test_launcher/rubymine/launcher"
+require "test_launcher/rubymine/request"
+
+# To allow us to simply specify our run configuration as:
+#
+#  -r test_launcher/rubymine
+#
+# we need to put the currently executing script in with the args.
+#
+# Consider the following examples:
+#
+#   ruby -r test_launcher/rubymine /path/to/test.rb
+#
+# vs
+#
+#   ruby -r test_launcher/rubymine spring testunit /path/to/test.rb
+#
+# In one case, our test to run is $0 and in another case it's an ARGV.
+# So we throw them in the same bucket and let the launcher figure it
+# out.  It doesn't matter since we will `exec` a new command anyway.
+
+module TestLauncher
+  module Rubymine
+    module Parser
+      def self.launch(
+        shell: TestLauncher::Shell::Runner.new(log_path: "/dev/null"),
+        argv: ARGV,
+        env: ENV
+      )
+        request = Request.new(
+          disable_spring: ENV["DISABLE_SPRING"]
+        )
+
+        args = [$0].concat(argv).map { |arg|
+          if arg.match("minitest_runner.rb") && env.key?("INTELLIJ_IDEA_RUN_CONF_TEST_FILE_PATH")
+            arg.sub(%r{/.+/minitest_runner.rb['"]?}, env.fetch("INTELLIJ_IDEA_RUN_CONF_TEST_FILE_PATH"))
+          else
+            arg
+          end
+        }
+
+        Launcher.new(
+          args: args,
+          shell: shell,
+          request: request
+        ).launch
+      end
+    end
+  end
+end

data/lib/test_launcher/shell/runner.rb

@@ -1,5 +1,4 @@
 require "test_launcher/shell/color"
-require "bundler"
 require "shellwords"
 
 module TestLauncher

data/lib/test_launcher/version.rb

@@ -1,3 +1,3 @@
 module TestLauncher
-  VERSION = "2.21.0"
+  VERSION = "2.26.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_launcher
 version: !ruby/object:Gem::Version
-  version: 2.21.0
+  version: 2.26.0
 platform: ruby
 authors:
 - Pete Kinnecom
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,6 +64,7 @@ files:
 - lib/test_launcher/queries.rb
 - lib/test_launcher/rubymine.rb
 - lib/test_launcher/rubymine/launcher.rb
+- lib/test_launcher/rubymine/parser.rb
 - lib/test_launcher/rubymine/request.rb
 - lib/test_launcher/search.rb
 - lib/test_launcher/search/ag.rb
@@ -77,7 +78,7 @@ homepage: http://github.com/petekinnecom/test_launcher
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -92,9 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Easily run tests
 test_files: []