test_launcher 2.25.0 → 2.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d48dd23ffd366923066ff7af6bac9db3498da3452cae8947baaf4b115b740fb
-  data.tar.gz: 8a3f716b8565ba819d1ba07b63c23fffaf9610238806f6aa53bb3f43f6a168fe
+  metadata.gz: d701813c0d24be54c1c0f223458a92aeeabde95cb3e16f5566e109c974c65d9b
+  data.tar.gz: 23d5de708bc2c0149a84717b3f7aa32bc21337de5caf43d2eb58247e0953bbd6
 SHA512:
-  metadata.gz: 2f43dddddba62e2c0eafb256ad3774301e04fc7deb3459391bd89f80f39125ffa0d2dcbd45f751aba7fc154cc74ab3e352a02fb23812a7be81dee5aaa8ef353d
-  data.tar.gz: c0d58207139463c19f4bb610a0a9bf8d86e762088e22fc84e3fca6ba5ea437c17cc21e4d3e60142867c304a57c5661ace04649157cb0b0287cc5c408c24a74d5
+  metadata.gz: b0d5ffa22d663d1cef852209b0be15e4c56d449723d1a70d9728b6156116cac589dbacae882eb149c867f053357d8b238f29e0a79be3f2abffa125d81f2f3ef8
+  data.tar.gz: cf11dce1e04306f1e9e81f9378450ea6956df294136dcb8b7b948da142c986feb7044559e51101b5e04b24913adaef4f1ae203fde9a913a57a18ae45963eed4a

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
 

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/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.25.0"
+  VERSION = "2.28.0"
 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.25.0
+  version: 2.28.0
 platform: ruby
 authors:
 - Pete Kinnecom
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-04 00:00:00.000000000 Z
+date: 2022-02-22 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
@@ -92,8 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Easily run tests
 test_files: []