add support for ruby 3

rock-core · Jan 15, 2024 · c11aeb9 · c11aeb9
1 parent e10dd92
commit c11aeb9
Show file tree

Hide file tree

Showing 23 changed files with 161 additions and 76 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ["2.7", "2.6", "2.5"]
+        ruby-version: ["3.0", "2.7"]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ["2.7", "2.6", "2.5"]
+        ruby-version: ["3.0", "2.7"]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,7 @@
 source "https://rubygems.org"
 
 gem "autobuild", git: "https://github.com/rock-core/autobuild", branch: "master"
+gem "rubygems-server" unless RUBY_VERSION < "3"
 
 group :dev do
     gem "rubocop", "~> 1.28.0"
@@ -14,4 +15,5 @@ group :vscode do
     gem "ruby-debug-ide", ">= 0.6.0"
     gem "solargraph"
 end
+
 gemspec
diff --git a/autoproj.gemspec b/autoproj.gemspec
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency "utilrb", "~> 3.0.0", ">= 3.0.0"
     s.add_runtime_dependency "xdg", "= 2.2.5"
     s.add_development_dependency "aruba", "~> 2.1.0"
-    s.add_development_dependency "flexmock", "~> 2.0", ">= 2.0.0"
+    s.add_development_dependency "flexmock"
     s.add_development_dependency "minitest", "~> 5.0", ">= 5.0"
     s.add_development_dependency "simplecov"
     s.add_development_dependency "timecop"

diff --git a/lib/autoproj/cli/main_doc.rb b/lib/autoproj/cli/main_doc.rb
@@ -28,10 +28,11 @@ def report(report_options = Hash.new)
                           desc: "controls whether the dependencies of the packages given on the command line should be enabled as well (the default is not)"
             def enable(*packages)
                 require "autoproj/cli/doc"
+                options = self.options.merge(parent_options)
                 report(silent: true) do
                     cli = Doc.new
-                    args = cli.validate_options(packages, options)
-                    cli.enable(*args)
+                    *args, options = cli.validate_options(packages, options)
+                    cli.enable(*args, **options)
                 end
             end
 
@@ -40,10 +41,11 @@ def enable(*packages)
                           desc: "controls whether the dependencies of the packages given on the command line should be disabled as well (the default is not)"
             def disable(*packages)
                 require "autoproj/cli/doc"
+                options = self.options.merge(parent_options)
                 report(silent: true) do
                     cli = Doc.new
-                    args = cli.validate_options(packages, options)
-                    cli.disable(*args)
+                    *args, options = cli.validate_options(packages, options)
+                    cli.disable(*args, **options)
                 end
             end
 
@@ -52,10 +54,11 @@ def disable(*packages)
                           desc: "controls whether the dependencies of the packages given on the command line should be disabled as well (the default is not)"
             def list(*packages)
                 require "autoproj/cli/doc"
+                options = self.options.merge(parent_options)
                 report(silent: true) do
                     cli = Doc.new
-                    args = cli.validate_options(packages, options)
-                    cli.list(*args)
+                    *args, options = cli.validate_options(packages, options)
+                    cli.list(*args, **options)
                 end
             end
 
@@ -78,8 +81,8 @@ def exec(*packages)
                 report do |extra_options|
                     cli = Doc.new
                     options.delete(:tool)
-                    args = cli.validate_options(packages, options.merge(extra_options))
-                    cli.run(*args)
+                    *args, options = cli.validate_options(packages, options.merge(extra_options))
+                    cli.run(*args, **options)
                 end
             end
         end

diff --git a/lib/autoproj/cli/main_test.rb b/lib/autoproj/cli/main_test.rb
@@ -45,8 +45,9 @@ def enable(*packages)
                 require "autoproj/cli/test"
                 report(silent: true) do
                     cli = Test.new
-                    args = cli.validate_options(packages, options)
-                    cli.enable(*args)
+                    options = self.options.merge(parent_options)
+                    *args, options = cli.validate_options(packages, options)
+                    cli.enable(*args, **options)
                 end
             end
 
@@ -57,8 +58,9 @@ def disable(*packages)
                 require "autoproj/cli/test"
                 report(silent: true) do
                     cli = Test.new
-                    args = cli.validate_options(packages, options)
-                    cli.disable(*args)
+                    options = self.options.merge(parent_options)
+                    *args, options = cli.validate_options(packages, options)
+                    cli.disable(*args, **options)
                 end
             end
 
@@ -69,8 +71,9 @@ def list(*packages)
                 require "autoproj/cli/test"
                 report(silent: true) do
                     cli = Test.new
-                    args = cli.validate_options(packages, options)
-                    cli.list(*args)
+                    options = self.options.merge(parent_options)
+                    *args, options = cli.validate_options(packages, options)
+                    cli.list(*args, **options)
                 end
             end
 
@@ -101,8 +104,8 @@ def exec(*packages)
                     Autobuild.ignore_errors = options.delete(:keep_going)
                     Autobuild::TestUtility.coverage_enabled = options.delete(:coverage)
                     options.delete(:tool)
-                    args = cli.validate_options(packages, options.merge(extra_options))
-                    cli.run(*args)
+                    *args, options = cli.validate_options(packages, options.merge(extra_options))
+                    cli.run(*args, **options)
                 end
             end
         end

diff --git a/lib/autoproj/cli/utility.rb b/lib/autoproj/cli/utility.rb
@@ -17,7 +17,7 @@ def default(enabled)
                 ws.config.save
             end
 
-            def enable(user_selection, options = {})
+            def enable(user_selection, **options)
                 if user_selection.empty?
                     ws.load_config
                     ws.config.utility_enable_all(utility_name)
@@ -33,7 +33,7 @@ def enable(user_selection, options = {})
                 ws.config.save
             end
 
-            def disable(user_selection, options = {})
+            def disable(user_selection, **options)
                 if user_selection.empty?
                     ws.load_config
                     ws.config.utility_disable_all(utility_name)
@@ -49,7 +49,7 @@ def disable(user_selection, options = {})
                 ws.config.save
             end
 
-            def list(user_selection, options = {})
+            def list(user_selection, **options)
                 initialize_and_load
                 resolved_selection, = finalize_setup(
                     user_selection,
@@ -75,7 +75,7 @@ def list(user_selection, options = {})
                 end
             end
 
-            def run(user_selection, options = {})
+            def run(user_selection, **options)
                 options[:parallel] ||= ws.config.parallel_build_level
                 initialize_and_load
 

diff --git a/lib/autoproj/ops/cache.rb b/lib/autoproj/ops/cache.rb
@@ -164,7 +164,8 @@ def create_or_update_gems(keep_going: true, compile_force: false, compile: [])
 
                 platform_suffix = "-#{Gem::Platform.local}.gem"
                 failed = []
-                compile.each do |gem_name, artifacts: []|
+                compile.each do |gem_name, options = {}|
+                    artifacts = options[:artifacts] || []
                     Dir.glob(File.join(cache_dir, "#{gem_name}*.gem")) do |gem|
                         next if gem.end_with?(platform_suffix)
 

diff --git a/lib/autoproj/vcs_definition.rb b/lib/autoproj/vcs_definition.rb
@@ -202,6 +202,7 @@ def self.raw_spec_to_s(spec)
         # @raise ArgumentError if the raw specification does not match an
         #   expected format
         def self.from_raw(spec, from: nil, raw: [], history: [])
+            # spec = spec_str || spec_hash
             normalized_spec = normalize_vcs_hash(spec)
             unless (type = normalized_spec.delete(:type))
                 raise ArgumentError,

diff --git a/test/cli/test_build.rb b/test/cli/test_build.rb
@@ -21,7 +21,8 @@ module CLI
                 describe "-n" do
                     it "turns dependencies off" do
                         flexmock(Update).new_instances
-                                        .should_receive(:run).with([], hsh(deps: false)).once
+                                        .should_receive(:run).with([])
+                                        .with_kw_args(hsh(deps: false)).once
                         in_ws do
                             Main.start(["build", "-n", "--silent"])
                         end

diff --git a/test/cli/test_doc.rb b/test/cli/test_doc.rb
@@ -24,12 +24,33 @@ module CLI
                 end
             end
 
+            %w[enable disable list exec].each do |subcommand|
+                describe "--deps" do
+                    it "turns dependencies on" do
+                        meth = subcommand
+                        meth = "run" if subcommand == "exec"
+
+                        flexmock(Doc).new_instances
+                                     .should_receive(meth.to_sym)
+                                     .with(%w[pkg1 pkg2])
+                                     .with_kw_args(hsh(deps: true))
+                                     .once
+                        in_ws do
+                            Main.start(["doc", subcommand, "--deps", "pkg1", "pkg2"])
+                        end
+                    end
+                end
+            end
+
             describe "-n" do
                 it "turns dependencies off" do
                     flexmock(Doc).new_instances
-                                 .should_receive(:run).with([], hsh(deps: false)).once
+                                 .should_receive(:run)
+                                 .with(%w[pkg1 pkg2])
+                                 .with_kw_args(hsh(deps: false))
+                                 .once
                     in_ws do
-                        Main.start(["doc", "-n"])
+                        Main.start(["doc", "-n", "pkg1", "pkg2"])
                     end
                 end
             end

diff --git a/test/cli/test_status.rb b/test/cli/test_status.rb
@@ -15,7 +15,8 @@ module CLI
             describe "-n" do
                 it "turns dependencies off" do
                     flexmock(Status).new_instances
-                                    .should_receive(:run).with([], hsh(deps: false)).once
+                                    .should_receive(:run).with([])
+                                    .with_kw_args(hsh(deps: false)).once
                     in_ws do
                         Main.start(["status", "-n"])
                     end

diff --git a/test/cli/test_test.rb b/test/cli/test_test.rb
@@ -1,4 +1,5 @@
 require "autoproj/test"
+require "autoproj/cli/main"
 require "autoproj/cli/test"
 require "timecop"
 
@@ -42,6 +43,24 @@ module CLI
                 end
             end
 
+            %w[enable disable list exec].each do |subcommand|
+                describe "--deps" do
+                    it "turns dependencies on" do
+                        meth = subcommand
+                        meth = "run" if subcommand == "exec"
+
+                        flexmock(Test).new_instances
+                                      .should_receive(meth.to_sym)
+                                      .with(%w[pkg1 pkg2])
+                                      .with_kw_args(hsh(deps: true))
+                                      .once
+                        in_ws do
+                            Main.start(["test", subcommand, "--deps", "pkg1", "pkg2"])
+                        end
+                    end
+                end
+            end
+
             describe "#apply_to_packages" do
                 after do
                     Timecop.return

diff --git a/test/cli/test_update.rb b/test/cli/test_update.rb
@@ -16,7 +16,8 @@ module CLI
                 describe "-n" do
                     it "turns dependencies off" do
                         flexmock(Update).new_instances
-                                        .should_receive(:run).with([], hsh(deps: false)).once
+                                        .should_receive(:run).with([])
+                                        .with_kw_args(hsh(deps: false)).once
                         in_ws do
                             Main.start(["update", "-n", "--silent"])
                         end
@@ -189,12 +190,12 @@ module CLI
 
                 it "updates the configuration in checkout_only mode with config: false" do
                     flexmock(ws).should_receive(:load_package_sets)
-                                .with(hsh(checkout_only: true)).once
+                                .with_kw_args(hsh(checkout_only: true)).once
                     cli.run([], config: false)
                 end
                 it "updates the configuration in checkout_only mode if checkout_only is set" do
                     flexmock(ws).should_receive(:load_package_sets)
-                                .with(hsh(checkout_only: true)).once
+                                .with_kw_args(hsh(checkout_only: true)).once
                     cli.run([], checkout_only: true)
                 end
                 it "properly sets up packages while updating configuration only" do
@@ -207,7 +208,8 @@ module CLI
                 it "passes options to the osdep installer for package import" do
                     flexmock(Ops::Import).new_instances
                                          .should_receive(:import_packages)
-                                         .with(PackageSelection, hsh(checkout_only: true, install_vcs_packages: Hash[install_only: true]))
+                                         .with(PackageSelection)
+                                         .with_kw_args(hsh(checkout_only: true, install_vcs_packages: Hash[install_only: true]))
                                          .once
                                          .and_return([[], []])
                     cli.run([], packages: true, checkout_only: true, osdeps: true)
@@ -316,7 +318,7 @@ def mock_package_failure(*errors, **options)
                         flexmock(Ops::Import).new_instances.should_receive(:import_packages)
                                              .and_return([[], ["test"]])
                         flexmock(ws).should_receive(:install_os_packages).once
-                                    .with(["test"], Hash)
+                                    .with(["test"]).with_any_kw_args
                         assert_raises(pkg_set_failure) do
                             cli.run([], keep_going: true, packages: true, osdeps: true)
                         end
@@ -325,7 +327,7 @@ def mock_package_failure(*errors, **options)
                     it "performs osdep import based on the value encoded in the import failure exception if the package import failed" do
                         mock_package_failure(osdep_packages: ["test"])
                         flexmock(ws).should_receive(:install_os_packages).once
-                                    .with(["test"], Hash)
+                                    .with(["test"]).with_any_kw_args
                         assert_raises(pkg_failure) do
                             cli.run([], keep_going: true, packages: true, osdeps: true)
                         end