diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-04-15 13:36:06 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-04-15 15:36:15 +0900 |
commit | 7af7a539bc34fa630ab4dfd178d67cfebbc8699f (patch) | |
tree | 47623fa9afbffcb0f6549201011f5f752d19c3f9 /tool | |
parent | 96741765d880b700933526a97a67345dfcd90c47 (diff) | |
download | ruby-7af7a539bc34fa630ab4dfd178d67cfebbc8699f.tar.gz |
Also merge tool/bundler/*.rb for testing of Bundler
Diffstat (limited to 'tool')
-rw-r--r-- | tool/bundler/rubocop_gems.rb | 11 | ||||
-rw-r--r-- | tool/bundler/rubocop_gems.rb.lock | 59 | ||||
-rw-r--r-- | tool/bundler/standard_gems.rb | 11 | ||||
-rw-r--r-- | tool/bundler/standard_gems.rb.lock | 65 | ||||
-rw-r--r-- | tool/bundler/test_gems.rb | 3 | ||||
-rw-r--r-- | tool/bundler/test_gems.rb.lock | 9 | ||||
-rw-r--r-- | tool/sync_default_gems.rb | 5 |
7 files changed, 157 insertions, 6 deletions
diff --git a/tool/bundler/rubocop_gems.rb b/tool/bundler/rubocop_gems.rb new file mode 100644 index 0000000000..84cb226330 --- /dev/null +++ b/tool/bundler/rubocop_gems.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gem "rubocop", "~> 1.7" + +gem "minitest" +gem "rake" +gem "rake-compiler" +gem "rspec" +gem "test-unit" diff --git a/tool/bundler/rubocop_gems.rb.lock b/tool/bundler/rubocop_gems.rb.lock new file mode 100644 index 0000000000..c30856aa90 --- /dev/null +++ b/tool/bundler/rubocop_gems.rb.lock @@ -0,0 +1,59 @@ +GEM + remote: https://rubygems.org/ + specs: + ast (2.4.2) + diff-lcs (1.4.4) + minitest (5.14.4) + parallel (1.19.2) + parser (3.0.0.0) + ast (~> 2.4.1) + power_assert (2.0.0) + rainbow (3.0.0) + rake (13.0.3) + rake-compiler (1.1.1) + rake + regexp_parser (2.1.1) + rexml (3.2.5) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-support (3.10.2) + rubocop (1.12.1) + parallel (~> 1.10) + parser (>= 3.0.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.2.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.4.1) + parser (>= 2.7.1.5) + ruby-progressbar (1.11.0) + test-unit (3.4.0) + power_assert + unicode-display_width (2.0.0) + +PLATFORMS + universal-java-11 + x86_64-linux + +DEPENDENCIES + minitest + rake + rake-compiler + rspec + rubocop (~> 1.7) + test-unit + +BUNDLED WITH + 2.3.0.dev diff --git a/tool/bundler/standard_gems.rb b/tool/bundler/standard_gems.rb new file mode 100644 index 0000000000..1cd189742d --- /dev/null +++ b/tool/bundler/standard_gems.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gem "standard", "~> 1.0" + +gem "minitest" +gem "rake" +gem "rake-compiler" +gem "rspec" +gem "test-unit" diff --git a/tool/bundler/standard_gems.rb.lock b/tool/bundler/standard_gems.rb.lock new file mode 100644 index 0000000000..d35cb7ad4e --- /dev/null +++ b/tool/bundler/standard_gems.rb.lock @@ -0,0 +1,65 @@ +GEM + remote: https://rubygems.org/ + specs: + ast (2.4.2) + diff-lcs (1.4.4) + minitest (5.14.4) + parallel (1.19.2) + parser (3.0.0.0) + ast (~> 2.4.1) + power_assert (2.0.0) + rainbow (3.0.0) + rake (13.0.3) + rake-compiler (1.1.1) + rake + regexp_parser (2.1.1) + rexml (3.2.5) + rspec (3.10.0) + rspec-core (~> 3.10.0) + rspec-expectations (~> 3.10.0) + rspec-mocks (~> 3.10.0) + rspec-core (3.10.1) + rspec-support (~> 3.10.0) + rspec-expectations (3.10.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-mocks (3.10.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.10.0) + rspec-support (3.10.2) + rubocop (1.11.0) + parallel (~> 1.10) + parser (>= 3.0.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.2.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.4.1) + parser (>= 2.7.1.5) + rubocop-performance (1.10.1) + rubocop (>= 0.90.0, < 2.0) + rubocop-ast (>= 0.4.0) + ruby-progressbar (1.11.0) + standard (1.0.4) + rubocop (= 1.11.0) + rubocop-performance (= 1.10.1) + test-unit (3.4.0) + power_assert + unicode-display_width (2.0.0) + +PLATFORMS + universal-java-11 + x86_64-linux + +DEPENDENCIES + minitest + rake + rake-compiler + rspec + standard (~> 1.0) + test-unit + +BUNDLED WITH + 2.3.0.dev diff --git a/tool/bundler/test_gems.rb b/tool/bundler/test_gems.rb index ef40fc8d0e..215d23183e 100644 --- a/tool/bundler/test_gems.rb +++ b/tool/bundler/test_gems.rb @@ -3,11 +3,10 @@ source "https://rubygems.org" gem "rack", "2.0.8" +gem "webrick", "1.7.0" gem "rack-test", "~> 1.1" gem "artifice", "~> 0.6.0" gem "compact_index", "~> 0.13.0" gem "sinatra", "~> 2.0" gem "rake", "13.0.1" gem "builder", "~> 3.2" -# ruby-graphviz is used by the viz tests -gem "ruby-graphviz", "1.2.4" # for >= Ruby 2.3 diff --git a/tool/bundler/test_gems.rb.lock b/tool/bundler/test_gems.rb.lock index 095eac9f57..f8fa01b59c 100644 --- a/tool/bundler/test_gems.rb.lock +++ b/tool/bundler/test_gems.rb.lock @@ -13,7 +13,6 @@ GEM rack-test (1.1.0) rack (>= 1.0, < 3) rake (13.0.1) - ruby-graphviz (1.2.4) ruby2_keywords (0.0.2) sinatra (2.0.8.1) mustermann (~> 1.0) @@ -21,10 +20,14 @@ GEM rack-protection (= 2.0.8.1) tilt (~> 2.0) tilt (2.0.10) + webrick (1.7.0) PLATFORMS java ruby + universal-java-11 + x64-mingw32 + x86_64-linux DEPENDENCIES artifice (~> 0.6.0) @@ -33,8 +36,8 @@ DEPENDENCIES rack (= 2.0.8) rack-test (~> 1.1) rake (= 13.0.1) - ruby-graphviz (= 1.2.4) sinatra (~> 2.0) + webrick (= 1.7.0) BUNDLED WITH - 2.2.0.dev + 2.3.0.dev diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 130ed4a9a1..1c697857d0 100644 --- a/tool/sync_default_gems.rb +++ b/tool/sync_default_gems.rb @@ -95,11 +95,14 @@ def sync_default_gems(gem) cp_r(Dir.glob("#{upstream}/lib/rubygems*"), "lib") cp_r("#{upstream}/test/rubygems", "test") when "bundler" - rm_rf(%w[lib/bundler lib/bundler.rb libexec/bundler libexec/bundle spec/bundler] + Dir.glob("man/{bundle*,gemfile*}")) + rm_rf(%w[lib/bundler lib/bundler.rb libexec/bundler libexec/bundle spec/bundler tool/bundler/*] + Dir.glob("man/{bundle*,gemfile*}")) cp_r(Dir.glob("#{upstream}/bundler/lib/bundler*"), "lib") cp_r(Dir.glob("#{upstream}/bundler/exe/bundle*"), "libexec") cp_r("#{upstream}/bundler/bundler.gemspec", "lib/bundler") cp_r("#{upstream}/bundler/spec", "spec/bundler") + cp_r(Dir.glob("#{upstream}/bundler/tool/bundler/test_gems*"), "tool/bundler") + cp_r(Dir.glob("#{upstream}/bundler/tool/bundler/rubocop_gems*"), "tool/bundler") + cp_r(Dir.glob("#{upstream}/bundler/tool/bundler/standard_gems*"), "tool/bundler") cp_r(Dir.glob("#{upstream}/bundler/man/*.{1,5,1\.txt,5\.txt,ronn}"), "man") `git checkout lib/bundler/bundler.gemspec` rm_rf(%w[spec/bundler/support/artifice/vcr_cassettes]) |