From 2212550fd91c1d458d9c10f60e77af70062b40b0 Mon Sep 17 00:00:00 2001 From: Konstantin Gredeskoul Date: Tue, 9 Nov 2021 15:30:12 -0800 Subject: [PATCH 01/21] Updated Changelog after re-tagging --- CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5efd5e2..9bd6faa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ # Changelog -## [v0.5.2](https://github.com/bazelruby/rules_ruby/tree/v0.5.2) (2021-11-09) +## [v0.6.0](https://github.com/bazelruby/rules_ruby/tree/v0.6.0) (2021-11-09) -[Full Changelog](https://github.com/bazelruby/rules_ruby/compare/v0.6.0...v0.5.2) +[Full Changelog](https://github.com/bazelruby/rules_ruby/compare/v0.5.2...v0.6.0) -## [v0.6.0](https://github.com/bazelruby/rules_ruby/tree/v0.6.0) (2021-11-09) +## [v0.5.2](https://github.com/bazelruby/rules_ruby/tree/v0.5.2) (2021-11-09) -[Full Changelog](https://github.com/bazelruby/rules_ruby/compare/v0.5.1...v0.6.0) +[Full Changelog](https://github.com/bazelruby/rules_ruby/compare/v0.5.1...v0.5.2) **Closed issues:** From 2caa1f20d5ba22080af653470037c72bf219af45 Mon Sep 17 00:00:00 2001 From: Konstantin Gredeskoul Date: Wed, 10 Nov 2021 13:35:54 -0800 Subject: [PATCH 02/21] Fixing 0.5.2 and 0.6.0 --- CHANGELOG.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9bd6faa..3d1c3af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,15 @@ [Full Changelog](https://github.com/bazelruby/rules_ruby/compare/v0.5.2...v0.6.0) -## [v0.5.2](https://github.com/bazelruby/rules_ruby/tree/v0.5.2) (2021-11-09) +**Merged pull requests:** + +- Bump nokogiri from 1.11.7 to 1.12.5 in /examples/simple\_rails\_api [\#120](https://github.com/bazelruby/rules_ruby/pull/120) ([dependabot[bot]](https://github.com/apps/dependabot)) +- Upstream changes from Selenium's fork [\#118](https://github.com/bazelruby/rules_ruby/pull/118) ([p0deje](https://github.com/p0deje)) +- Bump puma from 4.3.8 to 4.3.9 in /examples/simple\_rails\_api [\#117](https://github.com/bazelruby/rules_ruby/pull/117) ([dependabot[bot]](https://github.com/apps/dependabot)) +- Bump nokogiri from 1.11.7 to 1.12.5 in /examples/simple\_rails\_api [\#116](https://github.com/bazelruby/rules_ruby/pull/116) ([dependabot[bot]](https://github.com/apps/dependabot)) +- Bump Ruby primary to 3.0.2 & Add sdk versions: 2.5.9, 2.6.8, 2.7.3, 2.7.4, 3.0.2 [\#114](https://github.com/bazelruby/rules_ruby/pull/114) ([kigster](https://github.com/kigster)) + +## [v0.5.2](https://github.com/bazelruby/rules_ruby/tree/v0.5.2) (2021-07-09) [Full Changelog](https://github.com/bazelruby/rules_ruby/compare/v0.5.1...v0.5.2) @@ -16,11 +24,6 @@ **Merged pull requests:** -- Bump nokogiri from 1.11.7 to 1.12.5 in /examples/simple\_rails\_api [\#120](https://github.com/bazelruby/rules_ruby/pull/120) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Upstream changes from Selenium's fork [\#118](https://github.com/bazelruby/rules_ruby/pull/118) ([p0deje](https://github.com/p0deje)) -- Bump puma from 4.3.8 to 4.3.9 in /examples/simple\_rails\_api [\#117](https://github.com/bazelruby/rules_ruby/pull/117) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump nokogiri from 1.11.7 to 1.12.5 in /examples/simple\_rails\_api [\#116](https://github.com/bazelruby/rules_ruby/pull/116) ([dependabot[bot]](https://github.com/apps/dependabot)) -- Bump Ruby primary to 3.0.2 & Add sdk versions: 2.5.9, 2.6.8, 2.7.3, 2.7.4, 3.0.2 [\#114](https://github.com/bazelruby/rules_ruby/pull/114) ([kigster](https://github.com/kigster)) - Add `includes` option to `ruby_bundle` rule for per-gem load path customization [\#102](https://github.com/bazelruby/rules_ruby/pull/102) ([mmizutani](https://github.com/mmizutani)) ## [v0.5.1](https://github.com/bazelruby/rules_ruby/tree/v0.5.1) (2021-07-08) From d4aa2a2742ed2e3d1730dab003de49eec909e300 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 12 Feb 2022 00:21:46 +0000 Subject: [PATCH 03/21] Bump puma from 4.3.9 to 4.3.11 in /examples/simple_rails_api Bumps [puma](https://github.com/puma/puma) from 4.3.9 to 4.3.11. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v4.3.9...v4.3.11) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- examples/simple_rails_api/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/simple_rails_api/Gemfile.lock b/examples/simple_rails_api/Gemfile.lock index 63737a6..4115c8e 100644 --- a/examples/simple_rails_api/Gemfile.lock +++ b/examples/simple_rails_api/Gemfile.lock @@ -86,7 +86,7 @@ GEM nokogiri (1.12.5) mini_portile2 (~> 2.6.1) racc (~> 1.4) - puma (4.3.9) + puma (4.3.11) nio4r (~> 2.0) racc (1.6.0) rack (2.2.3) From e5d9cbdb0f34497d9d0b01ca62abf2064b6b2e5c Mon Sep 17 00:00:00 2001 From: MATSUBARA Nobutada Date: Thu, 24 Feb 2022 20:51:00 +0900 Subject: [PATCH 04/21] Add SDK versions: 2.6.9,2.7.5,3.0.3,3.1.0,3.1.0 --- ruby/private/sdk.bzl | 5 +++++ ruby/private/toolchains/ruby_runtime.bzl | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ruby/private/sdk.bzl b/ruby/private/sdk.bzl index 40f23a7..7123575 100644 --- a/ruby/private/sdk.bzl +++ b/ruby/private/sdk.bzl @@ -16,13 +16,18 @@ def rules_ruby_select_sdk(version = "host"): "2.6.6", "2.6.7", "2.6.8", + "2.6.9", "2.7.1", "2.7.2", "2.7.3", "2.7.4", + "2.7.5", "3.0.0", "3.0.1", "3.0.2", + "3.0.3", + "3.1.0", + "3.1.1", ] if version in supported_versions: diff --git a/ruby/private/toolchains/ruby_runtime.bzl b/ruby/private/toolchains/ruby_runtime.bzl index d3ec3ed..5e53377 100644 --- a/ruby/private/toolchains/ruby_runtime.bzl +++ b/ruby/private/toolchains/ruby_runtime.bzl @@ -3,9 +3,9 @@ load("//ruby/private/toolchains:repository_context.bzl", "ruby_repository_contex def _install_ruby_version(ctx, version): ctx.download_and_extract( - url = "https://github.com/rbenv/ruby-build/archive/refs/tags/v20210707.tar.gz", - sha256 = "afd8aa2d05fb2f33c09c78dabcd2fc0bfa7e70dfc6b5288a1b5794337497039b", - stripPrefix = "ruby-build-20210707", + url = "https://github.com/rbenv/ruby-build/archive/refs/tags/v20220218.tar.gz", + sha256 = "35c82b13b7bc3713eee5615b0145c79fbbac32873f55f2ab796620d76970d8e3", + stripPrefix = "ruby-build-20220218", ) install_path = "./build" From ac8fa29ed300cae03806b955a42a3e5a37d4268d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Feb 2022 06:13:01 +0000 Subject: [PATCH 05/21] Bump nokogiri from 1.12.5 to 1.13.3 in /examples/simple_rails_api Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.12.5 to 1.13.3. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.12.5...v1.13.3) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] --- examples/simple_rails_api/Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/simple_rails_api/Gemfile.lock b/examples/simple_rails_api/Gemfile.lock index 63737a6..25676f1 100644 --- a/examples/simple_rails_api/Gemfile.lock +++ b/examples/simple_rails_api/Gemfile.lock @@ -79,12 +79,12 @@ GEM marcel (1.0.2) method_source (1.0.0) mini_mime (1.1.1) - mini_portile2 (2.6.1) + mini_portile2 (2.8.0) minitest (5.14.4) msgpack (1.4.2) nio4r (2.5.8) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + nokogiri (1.13.3) + mini_portile2 (~> 2.8.0) racc (~> 1.4) puma (4.3.9) nio4r (~> 2.0) From 25155aa490bd87e7aafbdb4dfbf57b3456bc4ec9 Mon Sep 17 00:00:00 2001 From: MATSUBARA Nobutada Date: Sun, 6 Mar 2022 22:50:38 +0900 Subject: [PATCH 06/21] Use git source in Gemfile of example (Test-driven) --- examples/simple_script/Gemfile | 2 +- examples/simple_script/Gemfile.lock | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/examples/simple_script/Gemfile b/examples/simple_script/Gemfile index ae4893b..9fade23 100644 --- a/examples/simple_script/Gemfile +++ b/examples/simple_script/Gemfile @@ -5,5 +5,5 @@ source 'https://rubygems.org' gem 'awesome_print' gem 'colored2' gem 'rspec', '~> 3.7.0' -gem 'rspec-its' +gem 'rspec-its', github: "rspec/rspec-its", ref: "3d36b4a7b004ffa204a0e392f27c8b6b0b674ecf" # v1.3.0 gem 'rubocop' diff --git a/examples/simple_script/Gemfile.lock b/examples/simple_script/Gemfile.lock index 002c127..ee74d25 100644 --- a/examples/simple_script/Gemfile.lock +++ b/examples/simple_script/Gemfile.lock @@ -1,3 +1,12 @@ +GIT + remote: https://github.com/rspec/rspec-its.git + revision: 3d36b4a7b004ffa204a0e392f27c8b6b0b674ecf + ref: 3d36b4a7b004ffa204a0e392f27c8b6b0b674ecf + specs: + rspec-its (1.3.0) + rspec-core (>= 3.0.0) + rspec-expectations (>= 3.0.0) + GEM remote: https://rubygems.org/ specs: @@ -20,9 +29,6 @@ GEM rspec-expectations (3.7.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.7.0) - rspec-its (1.3.0) - rspec-core (>= 3.0.0) - rspec-expectations (>= 3.0.0) rspec-mocks (3.7.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.7.0) @@ -48,7 +54,7 @@ DEPENDENCIES awesome_print colored2 rspec (~> 3.7.0) - rspec-its + rspec-its! rubocop BUNDLED WITH From d61b643a1dc7c2de538a8ca761bd24a42228789e Mon Sep 17 00:00:00 2001 From: MATSUBARA Nobutada Date: Sun, 6 Mar 2022 22:51:00 +0900 Subject: [PATCH 07/21] Support git source in Gemfile --- .../bundle/create_bundle_build_file.rb | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/ruby/private/bundle/create_bundle_build_file.rb b/ruby/private/bundle/create_bundle_build_file.rb index 52626cf..ab77593 100755 --- a/ruby/private/bundle/create_bundle_build_file.rb +++ b/ruby/private/bundle/create_bundle_build_file.rb @@ -252,12 +252,23 @@ def register_gem(spec, template_out, bundle_lib_paths, bundle_binaries) # Do not register local gems return if spec.source.path? - gem_path = GEM_PATH[ruby_version, spec.name, spec.version] - spec_path = SPEC_PATH[ruby_version, spec.name, spec.version] - base_dir = "lib/ruby/#{ruby_version}" + if spec.source.is_a?(Bundler::Source::Git) + stub = spec.source.specs.find { |s| s.name == spec.name }.stub + base_dir = "lib/ruby/#{ruby_version}" + gem_path = "#{base_dir}/bundler/gems/#{Pathname(stub.full_gem_path).relative_path_from(stub.base_dir)}" + spec_path = "#{base_dir}/bundler/gems/#{Pathname(stub.loaded_from).relative_path_from(stub.base_dir)}" + + # paths to register to $LOAD_PATH + require_paths = stub.require_paths + else + gem_path = GEM_PATH[ruby_version, spec.name, spec.version] + spec_path = SPEC_PATH[ruby_version, spec.name, spec.version] + base_dir = "lib/ruby/#{ruby_version}" + + # paths to register to $LOAD_PATH + require_paths = Gem::StubSpecification.gemspec_stub(spec_path, base_dir, "#{base_dir}/gems").require_paths + end - # paths to register to $LOAD_PATH - require_paths = Gem::StubSpecification.gemspec_stub(spec_path, base_dir, "#{base_dir}/gems").require_paths # Usually, registering the directory paths listed in the `require_paths` of gemspecs is sufficient, but # some gems also require additional paths to be included in the load paths. require_paths += include_array(spec.name) From ecb0e811737dc2caf3ffd4a5b61a3e0b31dc855b Mon Sep 17 00:00:00 2001 From: MATSUBARA Nobutada Date: Thu, 24 Mar 2022 01:38:58 +0900 Subject: [PATCH 08/21] Refactor to move same def var before if --- ruby/private/bundle/create_bundle_build_file.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ruby/private/bundle/create_bundle_build_file.rb b/ruby/private/bundle/create_bundle_build_file.rb index ab77593..74de1d2 100755 --- a/ruby/private/bundle/create_bundle_build_file.rb +++ b/ruby/private/bundle/create_bundle_build_file.rb @@ -252,9 +252,9 @@ def register_gem(spec, template_out, bundle_lib_paths, bundle_binaries) # Do not register local gems return if spec.source.path? + base_dir = "lib/ruby/#{ruby_version}" if spec.source.is_a?(Bundler::Source::Git) stub = spec.source.specs.find { |s| s.name == spec.name }.stub - base_dir = "lib/ruby/#{ruby_version}" gem_path = "#{base_dir}/bundler/gems/#{Pathname(stub.full_gem_path).relative_path_from(stub.base_dir)}" spec_path = "#{base_dir}/bundler/gems/#{Pathname(stub.loaded_from).relative_path_from(stub.base_dir)}" @@ -263,7 +263,6 @@ def register_gem(spec, template_out, bundle_lib_paths, bundle_binaries) else gem_path = GEM_PATH[ruby_version, spec.name, spec.version] spec_path = SPEC_PATH[ruby_version, spec.name, spec.version] - base_dir = "lib/ruby/#{ruby_version}" # paths to register to $LOAD_PATH require_paths = Gem::StubSpecification.gemspec_stub(spec_path, base_dir, "#{base_dir}/gems").require_paths From fc705bb0b7f2eeeccebe533074ee94d6c784e72d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Apr 2022 10:16:14 +0000 Subject: [PATCH 09/21] Bump nokogiri from 1.13.3 to 1.13.4 in /examples/simple_rails_api Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.3 to 1.13.4. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/v1.13.4/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.3...v1.13.4) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] --- examples/simple_rails_api/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/simple_rails_api/Gemfile.lock b/examples/simple_rails_api/Gemfile.lock index 4f92eb2..89bc816 100644 --- a/examples/simple_rails_api/Gemfile.lock +++ b/examples/simple_rails_api/Gemfile.lock @@ -83,7 +83,7 @@ GEM minitest (5.14.4) msgpack (1.4.2) nio4r (2.5.8) - nokogiri (1.13.3) + nokogiri (1.13.4) mini_portile2 (~> 2.8.0) racc (~> 1.4) puma (4.3.11) From a792f8e7854c0d208b9f816892b8bc41f8a42967 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Apr 2022 20:30:46 +0000 Subject: [PATCH 10/21] Bump puma from 4.3.11 to 4.3.12 in /examples/simple_rails_api Bumps [puma](https://github.com/puma/puma) from 4.3.11 to 4.3.12. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v4.3.11...v4.3.12) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- examples/simple_rails_api/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/simple_rails_api/Gemfile.lock b/examples/simple_rails_api/Gemfile.lock index 89bc816..9da3cb4 100644 --- a/examples/simple_rails_api/Gemfile.lock +++ b/examples/simple_rails_api/Gemfile.lock @@ -86,7 +86,7 @@ GEM nokogiri (1.13.4) mini_portile2 (~> 2.8.0) racc (~> 1.4) - puma (4.3.11) + puma (4.3.12) nio4r (~> 2.0) racc (1.6.0) rack (2.2.3) From 1007b5fb364fdb32cfec0dd6b431f1ea083f1948 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 May 2022 17:02:47 +0000 Subject: [PATCH 11/21] Bump rack from 2.2.3 to 2.2.3.1 in /examples/simple_rails_api Bumps [rack](https://github.com/rack/rack) from 2.2.3 to 2.2.3.1. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/2.2.3...2.2.3.1) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] --- examples/simple_rails_api/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/simple_rails_api/Gemfile.lock b/examples/simple_rails_api/Gemfile.lock index 9da3cb4..91f607d 100644 --- a/examples/simple_rails_api/Gemfile.lock +++ b/examples/simple_rails_api/Gemfile.lock @@ -89,7 +89,7 @@ GEM puma (4.3.12) nio4r (~> 2.0) racc (1.6.0) - rack (2.2.3) + rack (2.2.3.1) rack-test (1.1.0) rack (>= 1.0, < 3) rails (6.0.4.1) From 66d65469edf607547c01ca42b2647ddcdb8d1080 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Jul 2022 04:50:29 +0000 Subject: [PATCH 12/21] Bump tzinfo from 1.2.9 to 1.2.10 in /examples/simple_rails_api Bumps [tzinfo](https://github.com/tzinfo/tzinfo) from 1.2.9 to 1.2.10. - [Release notes](https://github.com/tzinfo/tzinfo/releases) - [Changelog](https://github.com/tzinfo/tzinfo/blob/master/CHANGES.md) - [Commits](https://github.com/tzinfo/tzinfo/compare/v1.2.9...v1.2.10) --- updated-dependencies: - dependency-name: tzinfo dependency-type: indirect ... Signed-off-by: dependabot[bot] --- examples/simple_rails_api/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/simple_rails_api/Gemfile.lock b/examples/simple_rails_api/Gemfile.lock index 9da3cb4..6274359 100644 --- a/examples/simple_rails_api/Gemfile.lock +++ b/examples/simple_rails_api/Gemfile.lock @@ -136,7 +136,7 @@ GEM sqlite3 (1.4.2) thor (1.1.0) thread_safe (0.3.6) - tzinfo (1.2.9) + tzinfo (1.2.10) thread_safe (~> 0.1) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) From cf1c86b27ac649790bfc5058460bcf8f937063db Mon Sep 17 00:00:00 2001 From: Tomas Volf Date: Wed, 19 Oct 2022 14:00:55 +0200 Subject: [PATCH 13/21] Update list of supported ruby versions * Add latest patch versions * Drop versions that are EOL-ed --- ruby/private/sdk.bzl | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/ruby/private/sdk.bzl b/ruby/private/sdk.bzl index 7123575..fa7a90d 100644 --- a/ruby/private/sdk.bzl +++ b/ruby/private/sdk.bzl @@ -8,26 +8,21 @@ def rules_ruby_select_sdk(version = "host"): supported_versions = [ "host", - "2.5.8", - "2.5.9", - "2.6.3", - "2.6.4", - "2.6.5", - "2.6.6", - "2.6.7", - "2.6.8", - "2.6.9", + "2.7.0", "2.7.1", "2.7.2", "2.7.3", "2.7.4", "2.7.5", + "2.7.6", "3.0.0", "3.0.1", "3.0.2", "3.0.3", + "3.0.4", "3.1.0", "3.1.1", + "3.1.2", ] if version in supported_versions: From 0a3275b235dd4093a2a44e2f08d96a9f07ecbe0a Mon Sep 17 00:00:00 2001 From: Konstantin Gredeskoul Date: Mon, 7 Nov 2022 13:47:42 -0800 Subject: [PATCH 14/21] Update README.adoc --- README.adoc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/README.adoc b/README.adoc index 758e9bb..8f52a49 100644 --- a/README.adoc +++ b/README.adoc @@ -11,9 +11,14 @@ :license: apache -==== -This repo is primarily maintained by https://github.com/kigster[Konstantin Gredeskoul] and https://github.com/yugui[Yuki "Yugui" Sonoda]. We are both very busy and would really love more contributors to join the core team. If you are interested in developing Ruby Rules for Bazel, please submit a couple of PRs and then lets talk! -==== +== Contributors Wanted + +This repo is primarily maintained by https://github.com/kigster[Konstantin Gredeskoul] and https://github.com/yugui[Yuki "Yugui" Sonoda]. + +We are both very busy and would really *love more contributors to join the core team*. + +If you are interested in developing Ruby Rules for Bazel, please submit a couple of PRs and then lets talk! + TIP: You can read or print this README in a proper PDF format by grabbing our link:README.pdf[README.pdf]. From 8e7f62f548cb22d3f639f428dc7df6edd7dc4ad7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Jan 2023 21:54:13 +0000 Subject: [PATCH 15/21] Bump globalid from 0.5.2 to 1.0.1 in /examples/simple_rails_api Bumps [globalid](https://github.com/rails/globalid) from 0.5.2 to 1.0.1. - [Release notes](https://github.com/rails/globalid/releases) - [Commits](https://github.com/rails/globalid/compare/v0.5.2...v1.0.1) --- updated-dependencies: - dependency-name: globalid dependency-type: indirect ... Signed-off-by: dependabot[bot] --- examples/simple_rails_api/Gemfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/simple_rails_api/Gemfile.lock b/examples/simple_rails_api/Gemfile.lock index 9da3cb4..cc953ce 100644 --- a/examples/simple_rails_api/Gemfile.lock +++ b/examples/simple_rails_api/Gemfile.lock @@ -60,13 +60,13 @@ GEM msgpack (~> 1.0) builder (3.2.4) byebug (11.1.3) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) crass (1.0.6) erubi (1.10.0) ffi (1.15.4) - globalid (0.5.2) + globalid (1.0.1) activesupport (>= 5.0) - i18n (1.8.10) + i18n (1.12.0) concurrent-ruby (~> 1.0) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) @@ -80,7 +80,7 @@ GEM method_source (1.0.0) mini_mime (1.1.1) mini_portile2 (2.8.0) - minitest (5.14.4) + minitest (5.17.0) msgpack (1.4.2) nio4r (2.5.8) nokogiri (1.13.4) @@ -136,12 +136,12 @@ GEM sqlite3 (1.4.2) thor (1.1.0) thread_safe (0.3.6) - tzinfo (1.2.9) + tzinfo (1.2.10) thread_safe (~> 0.1) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.4.2) + zeitwerk (2.6.6) PLATFORMS ruby From 557572503211f76ac7471a2ae4c63e534d0ee379 Mon Sep 17 00:00:00 2001 From: Dominic Baratta Date: Sat, 28 Jan 2023 02:08:35 -0800 Subject: [PATCH 16/21] Add Ruby 3.2.0 as a valid ruby version --- ruby/private/sdk.bzl | 1 + 1 file changed, 1 insertion(+) diff --git a/ruby/private/sdk.bzl b/ruby/private/sdk.bzl index fa7a90d..77e1114 100644 --- a/ruby/private/sdk.bzl +++ b/ruby/private/sdk.bzl @@ -23,6 +23,7 @@ def rules_ruby_select_sdk(version = "host"): "3.1.0", "3.1.1", "3.1.2", + "3.2.0", ] if version in supported_versions: From aaa7949fecf32a1f7059fd4895131fb94b8416eb Mon Sep 17 00:00:00 2001 From: Jason Lunn Date: Fri, 14 Jul 2023 10:26:58 -0400 Subject: [PATCH 17/21] Handle absolute paths in required_paths --- ruby/private/bundle/create_bundle_build_file.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ruby/private/bundle/create_bundle_build_file.rb b/ruby/private/bundle/create_bundle_build_file.rb index 74de1d2..2dcc6d4 100755 --- a/ruby/private/bundle/create_bundle_build_file.rb +++ b/ruby/private/bundle/create_bundle_build_file.rb @@ -84,6 +84,8 @@ Dir.glob("lib/#{RbConfig::CONFIG['RUBY_INSTALL_NAME']}/#{ruby_version}/specifications/#{gem_name}-#{gem_version}*.gemspec").first end +HERE = File.absolute_path '.' + require 'bundler' require 'json' require 'stringio' @@ -271,7 +273,15 @@ def register_gem(spec, template_out, bundle_lib_paths, bundle_binaries) # Usually, registering the directory paths listed in the `require_paths` of gemspecs is sufficient, but # some gems also require additional paths to be included in the load paths. require_paths += include_array(spec.name) - gem_lib_paths = require_paths.map { |require_path| File.join(gem_path, require_path) } + gem_lib_paths = require_paths.map do |require_path| + # Gems with native extensions (like ffi) will sometimes have elements of + # require_paths that are absolute rather than gem-path relative paths. + # It is incorrect to prepend those paths with the gem_path and Bazel will + # only allow relative paths as inputs to its glob() function. + pathname = Pathname.new(require_path) + pathname.absolute? ? pathname.relative_path_from(HERE).to_s : File.join(gem_path, require_path) + end + bundle_lib_paths.push(*gem_lib_paths) # paths to search for executables From c95ff43e46ed53c9961f07e702f0a3aaf477d7e5 Mon Sep 17 00:00:00 2001 From: Konstantin Gredeskoul Date: Wed, 23 Aug 2023 19:18:52 -0700 Subject: [PATCH 18/21] Update README.adoc --- README.adoc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.adoc b/README.adoc index 8f52a49..bc7fc9b 100644 --- a/README.adoc +++ b/README.adoc @@ -10,6 +10,12 @@ :icons: font :license: apache +== Please Donate + +I need to go through a long backlog of items, but my hands are tied with paid projects. Please consider donating to expedite pull request merges. You can also apply to join to become one of the primary maintainers. + +https://liberapay.com/kigster/donate[image:https://liberapay.com/assets/widgets/donate.svg[Donate using Liberapay,height=30]]   https://liberapay.com/kigster/donate[image:https://img.shields.io/liberapay/goal/kigster.svg?logo=liberapay[https://img.shields.io/liberapay/goal/kigster,height=30]] + == Contributors Wanted From 40f403adc542b20d05801f52152ae6ceb8754b92 Mon Sep 17 00:00:00 2001 From: Konstantin Gredeskoul Date: Tue, 28 Nov 2023 03:16:31 -0800 Subject: [PATCH 19/21] Update README.adoc --- README.adoc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.adoc b/README.adoc index bc7fc9b..ceec91b 100644 --- a/README.adoc +++ b/README.adoc @@ -10,6 +10,8 @@ :icons: font :license: apache +CAUTION: These rules have not been actively maintained and are in the process of being replaced by the new rules, which you can find here: https://github.com/p0deje/rules_ruby + == Please Donate I need to go through a long backlog of items, but my hands are tied with paid projects. Please consider donating to expedite pull request merges. You can also apply to join to become one of the primary maintainers. From ecefcd0861c630a3e3ad597a5c8649faea14b242 Mon Sep 17 00:00:00 2001 From: Konstantin Gredeskoul Date: Wed, 13 Dec 2023 12:25:04 -0800 Subject: [PATCH 20/21] Removing donations and emphasizing the new rules --- README.adoc | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/README.adoc b/README.adoc index ceec91b..5dab559 100644 --- a/README.adoc +++ b/README.adoc @@ -10,23 +10,13 @@ :icons: font :license: apache -CAUTION: These rules have not been actively maintained and are in the process of being replaced by the new rules, which you can find here: https://github.com/p0deje/rules_ruby +== New Rules Ruby! -== Please Donate +This repo will be retired eventually, as these rules have not been actively maintained and are in the process of being replaced by the new rules, which you can find here: https://github.com/bazel-contrib/rules_ruby -I need to go through a long backlog of items, but my hands are tied with paid projects. Please consider donating to expedite pull request merges. You can also apply to join to become one of the primary maintainers. -https://liberapay.com/kigster/donate[image:https://liberapay.com/assets/widgets/donate.svg[Donate using Liberapay,height=30]]   https://liberapay.com/kigster/donate[image:https://img.shields.io/liberapay/goal/kigster.svg?logo=liberapay[https://img.shields.io/liberapay/goal/kigster,height=30]] -== Contributors Wanted - -This repo is primarily maintained by https://github.com/kigster[Konstantin Gredeskoul] and https://github.com/yugui[Yuki "Yugui" Sonoda]. - -We are both very busy and would really *love more contributors to join the core team*. - -If you are interested in developing Ruby Rules for Bazel, please submit a couple of PRs and then lets talk! - TIP: You can read or print this README in a proper PDF format by grabbing our link:README.pdf[README.pdf]. From 7ace2b7a804c3a7d42b325bad01ba14c6a49921a Mon Sep 17 00:00:00 2001 From: Alexandre Terrasa <583144+Morriar@users.noreply.github.com> Date: Tue, 20 Feb 2024 11:24:42 -0500 Subject: [PATCH 21/21] Fix typo in README code examples Replacing `}` by `)`. --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 5dab559..d5cac3c 100644 --- a/README.adoc +++ b/README.adoc @@ -208,7 +208,7 @@ ruby_rspec( specs = glob(["spec/**/*.rb"]), rspec_args = { "--format": "progress" }, deps = [":foo"] -} +) ---- ==== Package Ruby files as a Gem