test_launcher 2.23.0 → 2.27.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 36291b804b53a382960871ce80a0d4c8f7e970d7
-  data.tar.gz: 04c1e9c5cc445604178eb93f73268f9d7b4e8798
+SHA256:
+  metadata.gz: e7ec057af100586d64b53b846e170557e38d2933deb5c36b311e12372cd64080
+  data.tar.gz: d24c42f24628fce2eb6d1936ac89853b9e0af21d4d1752717d40d87e1c7455c2
 SHA512:
-  metadata.gz: 242965dc63b3cca5bf48fc4c6a16da2ac09e9bf731e1e0e0d9805f8dae8675d4dc85b4555bcc9960873e41953cd4f2b6eede4e199a6bfc813e6ec5247bb43fc3
-  data.tar.gz: ba132f4e999694c2d602e3cd438a200a65369d8c8ae4c1839523870e6587a3db15b6edab8f5d07ff272fc71af5bf608d9a43055a256018d995f4983bf0fb13b0
+  metadata.gz: '049bad337c0799ff8990bab76c1e27ed9699fe549a9a5f2ac01b8f409ba3a9c602e9ae234f88894c9a9ed16d8c78eed16b31eb0afc3758e857e87bb19d38f735'
+  data.tar.gz: a1d4822e25ab350eabcf99e708e20a3eeb9a6f3c19098f691f9aae592c57a71305f6d9a8be1bdb7ca194d8a591cb6fc17ecc3cb234a92d0b943b81da0b0626c5

data/lib/test_launcher/cli/options.rb

@@ -1,20 +1,39 @@
 module TestLauncher
   module CLI
-    class Options < Struct.new(
-      :search_string,
-      :frameworks,
-      :rerun,
-      :run_all,
-      :disable_spring,
-      :force_spring,
-      :example_name,
-      :shell,
-      :searcher
-    )
-      def initialize(**args)
-        raise ArgumentError.new("These keys are allowed and required: #{members}") unless args.keys.sort == members.sort
-        args.each { |k, v| self[k] = v }
+    class Options
+      attr_reader(
+        :disable_spring,
+        :example_name,
+        :force_spring,
+        :frameworks,
+        :rerun,
+        :run_all,
+        :search_string,
+        :searcher,
+        :shell
+      )
+      def initialize(
+        disable_spring:,
+        example_name:,
+        force_spring:,
+        frameworks:,
+        rerun:,
+        run_all:,
+        search_string:,
+        searcher:,
+        shell:
+      )
+        @disable_spring = disable_spring
+        @example_name = example_name
+        @force_spring = force_spring
+        @frameworks = frameworks
+        @rerun = rerun
+        @run_all = run_all
+        @search_string = search_string
+        @searcher = searcher
+        @shell = shell
       end
+
     end
   end
 end

data/lib/test_launcher/cli/request.rb

@@ -51,12 +51,12 @@ module TestLauncher
         framework.searcher(@searcher)
       end
 
-      def runner(*a)
-        framework.runner(*a)
+      def runner(*a, **o)
+        framework.runner(*a, **o)
       end
 
-      def test_case(*a)
-        framework.test_case(*a)
+      def test_case(*a, **o)
+        framework.test_case(*a, **o)
       end
 
       def shell

data/lib/test_launcher/cli.rb

@@ -6,7 +6,12 @@ require "test_launcher/cli/request"
 
 module TestLauncher
   module CLI
-    class MultiFrameworkQuery < Struct.new(:cli_options)
+    class MultiFrameworkQuery
+      attr_reader :cli_options
+      def initialize(cli_options)
+        @cli_options = cli_options
+      end
+
       def command
         command = nil
         command_finders.each do |command_finder|

data/lib/test_launcher/frameworks/base.rb

@@ -3,7 +3,12 @@ require "test_launcher/frameworks/implementation/test_case"
 module TestLauncher
   module Frameworks
     module Base
-      class Searcher < Struct.new(:raw_searcher)
+      class Searcher
+        attr_reader :raw_searcher
+        def initialize(raw_searcher, **)
+          @raw_searcher = raw_searcher
+        end
+
         def test_files(query)
           raw_searcher
             .find_files(query)
@@ -38,6 +43,10 @@ module TestLauncher
       end
 
       class Runner
+        def initialize(*, **)
+          super()
+        end
+
         def by_line_number(test_case)
           raise NotImplementedError
         end

data/lib/test_launcher/frameworks/ex_unit.rb

@@ -9,16 +9,16 @@ module TestLauncher
         `git ls-files '*.exs'`.split("\n").any?
       end
 
-      def self.test_case(*a)
-        TestCase.new(*a)
+      def self.test_case(*a, **o)
+        TestCase.new(*a, **o)
       end
 
-      def self.searcher(*a)
-        Searcher.new(*a)
+      def self.searcher(*a, **o)
+        Searcher.new(*a, **o)
       end
 
-      def self.runner(*a)
-        Runner.new(*a)
+      def self.runner(*a, **o)
+        Runner.new(*a, **o)
       end
 
       class Searcher < Base::Searcher

data/lib/test_launcher/frameworks/generic.rb

@@ -10,16 +10,16 @@ module TestLauncher
         true
       end
 
-      def self.test_case(*a)
-        TestCase.new(*a)
+      def self.test_case(*a, **o)
+        TestCase.new(*a, **o)
       end
 
-      def self.searcher(*a)
-        Searcher.new(*a)
+      def self.searcher(*a, **o)
+        Searcher.new(*a, **o)
       end
 
-      def self.runner(*a)
-        Runner.new(*a)
+      def self.runner(*a, **o)
+        Runner.new(*a, **o)
       end
 
       class Searcher < Base::Searcher

data/lib/test_launcher/frameworks/minitest.rb

@@ -10,16 +10,16 @@ module TestLauncher
         `git ls-files '*_test.rb'`.split("\n").any?
       end
 
-      def self.test_case(*a)
-        TestCase.new(*a)
+      def self.test_case(*a, **o)
+        TestCase.new(*a, **o)
       end
 
-      def self.searcher(*a)
-        Searcher.new(*a)
+      def self.searcher(*a, **o)
+        Searcher.new(*a, **o)
       end
 
-      def self.runner(*a)
-        Runner.new(*a)
+      def self.runner(*a, **o)
+        Runner.new(*a, **o)
       end
 
       class Searcher < Base::Searcher
@@ -84,14 +84,14 @@ module TestLauncher
         end
 
         def multiple_files_error
-          MultipleByLineMatches.new(<<-MSG)
-It looks like you are running a line number in a test file.
+          MultipleByLineMatches.new(<<~MSG)
+            It looks like you are running a line number in a test file.
 
-Multiple files have been found that match your query.
+            Multiple files have been found that match your query.
 
-This case is not supported for Minitest.
+            This case is not supported for Minitest.
 
-Open an issue on https://github.com/petekinnecom/test_launcher if this is something you have run into at least 3 times. :)
+            Open an issue on https://github.com/petekinnecom/test_launcher if this is something you have run into at least 3 times. :)
           MSG
         end
 
@@ -147,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
@@ -155,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
@@ -169,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/frameworks/mochajs.rb

@@ -9,16 +9,16 @@ module TestLauncher
         `git ls-files '*pec.js'`.split("\n").any?
       end
 
-      def self.test_case(*a)
-        TestCase.new(*a)
+      def self.test_case(*a, **o)
+        TestCase.new(*a, **o)
       end
 
-      def self.searcher(*a)
-        Searcher.new(*a)
+      def self.searcher(*a, **o)
+        Searcher.new(*a, **o)
       end
 
-      def self.runner(*a)
-        Runner.new(*a)
+      def self.runner(*a, **o)
+        Runner.new(*a, **o)
       end
 
       class Searcher < Base::Searcher

data/lib/test_launcher/frameworks/rspec.rb

@@ -9,16 +9,16 @@ module TestLauncher
         `git ls-files '*_spec.rb'`.split("\n").any?
       end
 
-      def self.test_case(*a)
-        TestCase.new(*a)
+      def self.test_case(*a, **o)
+        TestCase.new(*a, **o)
       end
 
-      def self.searcher(*a)
-        Searcher.new(*a)
+      def self.searcher(*a, **o)
+        Searcher.new(*a, **o)
       end
 
-      def self.runner(*a)
-        Runner.new(*a)
+      def self.runner(*a, **o)
+        Runner.new(*a, **o)
       end
 
       class Searcher < Base::Searcher

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,13 +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][/\/?([^\/]*)\/?/, 1],
+              example: args[-1][TEST_NAME_REGEX, 1],
               request: request
             )
           else

data/lib/test_launcher/rubymine/parser.rb

@@ -0,0 +1,64 @@
+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")
+            )
+          elsif (
+            arg.match("tunit_or_minitest_in_folder_runner.rb") &&
+              env.key?("INTELLIJ_IDEA_RUN_CONF_FOLDER_PATH"))
+            arg.sub(
+              %r{/.+/tunit_or_minitest_in_folder_runner.rb['"]?},
+              File.join(env.fetch("INTELLIJ_IDEA_RUN_CONF_FOLDER_PATH"), "**/*.rb")
+            )
+          else
+            arg
+          end
+        }
+
+        Launcher.new(
+          args: args,
+          shell: shell,
+          request: request
+        ).launch
+      end
+    end
+  end
+end

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/version.rb

@@ -1,3 +1,3 @@
 module TestLauncher
-  VERSION = "2.23.0"
+  VERSION = "2.27.0.pre"
 end

data/test_launcher.gemspec

@@ -18,6 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 1.7"
+  spec.add_development_dependency "rake", ">= 12.3.3"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: test_launcher
 version: !ruby/object:Gem::Version
-  version: 2.23.0
+  version: 2.27.0.pre
 platform: ruby
 authors:
 - Pete Kinnecom
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-06 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 description: no really
 email:
 - pete.kinnecom@appfolio.com
@@ -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
@@ -88,13 +89,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Easily run tests
 test_files: []