diff options
Diffstat (limited to 'test/rubygems/test_gem_request_set_gem_dependency_api.rb')
-rw-r--r-- | test/rubygems/test_gem_request_set_gem_dependency_api.rb | 473 |
1 files changed, 238 insertions, 235 deletions
diff --git a/test/rubygems/test_gem_request_set_gem_dependency_api.rb b/test/rubygems/test_gem_request_set_gem_dependency_api.rb index cc4f99df91..4b5eaa38ed 100644 --- a/test/rubygems/test_gem_request_set_gem_dependency_api.rb +++ b/test/rubygems/test_gem_request_set_gem_dependency_api.rb @@ -1,19 +1,18 @@ # frozen_string_literal: true -require_relative 'helper' -require 'rubygems/request_set' + +require_relative "helper" +require "rubygems/request_set" class TestGemRequestSetGemDependencyAPI < Gem::TestCase def setup super - @GDA = Gem::RequestSet::GemDependencyAPI - @set = Gem::RequestSet.new @git_set = Gem::Resolver::GitSet.new @vendor_set = Gem::Resolver::VendorSet.new - @gda = @GDA.new @set, 'gem.deps.rb' + @gda = Gem::RequestSet::GemDependencyAPI.new @set, "gem.deps.rb" @gda.instance_variable_set :@git_set, @git_set @gda.instance_variable_set :@vendor_set, @vendor_set end @@ -44,45 +43,45 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase end def test_gempspec_with_multiple_runtime_deps - save_gemspec 'foo', '1.0' do |s| - s.add_runtime_dependency 'bar', '>= 1.6.0', '< 1.6.4' + save_gemspec "foo", "1.0" do |s| + s.add_dependency "bar", ">= 1.6.0", "< 1.6.4" end @gda.gemspec - assert_equal %w[ foo bar ].sort, @set.dependencies.map(&:name).sort - bar = @set.dependencies.find {|d| d.name == 'bar' } - assert_equal [["<", Gem::Version.create('1.6.4')], - [">=", Gem::Version.create('1.6.0')]], bar.requirement.requirements.sort + assert_equal %w[foo bar].sort, @set.dependencies.map(&:name).sort + bar = @set.dependencies.find {|d| d.name == "bar" } + assert_equal [["<", Gem::Version.create("1.6.4")], + [">=", Gem::Version.create("1.6.0")]], bar.requirement.requirements.sort end def test_gemspec_without_group - @gda.send :add_dependencies, [:development], [dep('a', '= 1')] + @gda.send :add_dependencies, [:development], [dep("a", "= 1")] - assert_equal [dep('a', '= 1')], @set.dependencies + assert_equal [dep("a", "= 1")], @set.dependencies @gda.without_groups << :development - @gda.send :add_dependencies, [:development], [dep('b', '= 2')] + @gda.send :add_dependencies, [:development], [dep("b", "= 2")] - assert_equal [dep('a', '= 1')], @set.dependencies + assert_equal [dep("a", "= 1")], @set.dependencies end def test_gem - @gda.gem 'a' + @gda.gem "a" - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies - assert_equal %w[a], @gda.requires['a'] + assert_equal %w[a], @gda.requires["a"] - expected = { 'a' => Gem::Requirement.default } + expected = { "a" => Gem::Requirement.default } assert_equal expected, @gda.dependencies end def test_gem_duplicate - @gda.gem 'a' + @gda.gem "a" _, err = capture_output do - @gda.gem 'a' + @gda.gem "a" end expected = "Gem dependencies file gem.deps.rb requires a more than once." @@ -91,147 +90,147 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase end def test_gem_git - @gda.gem 'a', :git => 'git/a' + @gda.gem "a", git: "git/a" - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies - assert_equal %w[git/a master], @git_set.repositories['a'] + assert_equal ["git/a", nil], @git_set.repositories["a"] - expected = { 'a' => Gem::Requirement.create('!') } + expected = { "a" => Gem::Requirement.create("!") } assert_equal expected, @gda.dependencies end def test_gem_bitbucket - @gda.gem 'a', :bitbucket => 'example/repository' + @gda.gem "a", bitbucket: "example/repository" - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies - assert_equal %w[https://example@bitbucket.org/example/repository.git master], - @git_set.repositories['a'] + assert_equal ["https://example@bitbucket.org/example/repository.git", nil], + @git_set.repositories["a"] - expected = { 'a' => Gem::Requirement.create('!') } + expected = { "a" => Gem::Requirement.create("!") } assert_equal expected, @gda.dependencies end def test_gem_bitbucket_expand_path - @gda.gem 'a', :bitbucket => 'example' + @gda.gem "a", bitbucket: "example" - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies - assert_equal %w[https://example@bitbucket.org/example/example.git master], - @git_set.repositories['a'] + assert_equal ["https://example@bitbucket.org/example/example.git", nil], + @git_set.repositories["a"] - expected = { 'a' => Gem::Requirement.create('!') } + expected = { "a" => Gem::Requirement.create("!") } assert_equal expected, @gda.dependencies end def test_gem_git_branch _, err = capture_output do - @gda.gem 'a', :git => 'git/a', :branch => 'other', :tag => 'v1' + @gda.gem "a", git: "git/a", branch: "other", tag: "v1" end expected = "Gem dependencies file gem.deps.rb includes git reference for both ref/branch and tag but only ref/branch is used." assert_match expected, err - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies - assert_equal %w[git/a other], @git_set.repositories['a'] + assert_equal %w[git/a other], @git_set.repositories["a"] end def test_gem_git_gist - @gda.gem 'a', :gist => 'a' + @gda.gem "a", gist: "a" - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies - assert_equal %w[https://gist.github.com/a.git master], - @git_set.repositories['a'] + assert_equal ["https://gist.github.com/a.git", nil], + @git_set.repositories["a"] end def test_gem_git_ref _, err = capture_output do - @gda.gem 'a', :git => 'git/a', :ref => 'abcd123', :branch => 'other' + @gda.gem "a", git: "git/a", ref: "abcd123", branch: "other" end expected = "Gem dependencies file gem.deps.rb includes git reference for both ref and branch but only ref is used." assert_match expected, err - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies - assert_equal %w[git/a abcd123], @git_set.repositories['a'] + assert_equal %w[git/a abcd123], @git_set.repositories["a"] end def test_gem_git_submodules - @gda.gem 'a', :git => 'git/a', :submodules => true + @gda.gem "a", git: "git/a", submodules: true - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies - assert_equal %w[git/a master], @git_set.repositories['a'] + assert_equal ["git/a", nil], @git_set.repositories["a"] assert_equal %w[git/a], @git_set.need_submodules.keys end def test_gem_git_tag - @gda.gem 'a', :git => 'git/a', :tag => 'v1' + @gda.gem "a", git: "git/a", tag: "v1" - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies - assert_equal %w[git/a v1], @git_set.repositories['a'] + assert_equal %w[git/a v1], @git_set.repositories["a"] end def test_gem_github - @gda.gem 'a', :github => 'example/repository' + @gda.gem "a", github: "example/repository" - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies - assert_equal %w[git://github.com/example/repository.git master], - @git_set.repositories['a'] + assert_equal ["https://github.com/example/repository.git", nil], + @git_set.repositories["a"] - expected = { 'a' => Gem::Requirement.create('!') } + expected = { "a" => Gem::Requirement.create("!") } assert_equal expected, @gda.dependencies end def test_gem_github_expand_path - @gda.gem 'a', :github => 'example' + @gda.gem "a", github: "example" - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies - assert_equal %w[git://github.com/example/example.git master], - @git_set.repositories['a'] + assert_equal ["https://github.com/example/example.git", nil], + @git_set.repositories["a"] - expected = { 'a' => Gem::Requirement.create('!') } + expected = { "a" => Gem::Requirement.create("!") } assert_equal expected, @gda.dependencies end def test_gem_group - @gda.gem 'a', :group => :test + @gda.gem "a", group: :test - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies end def test_gem_group_without @gda.without_groups << :test - @gda.gem 'a', :group => :test + @gda.gem "a", group: :test assert_empty @set.dependencies - expected = { 'a' => Gem::Requirement.default } + expected = { "a" => Gem::Requirement.default } assert_equal expected, @gda.dependencies end def test_gem_groups - @gda.gem 'a', :groups => [:test, :development] + @gda.gem "a", groups: [:test, :development] - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies end def test_gem_path name, version, directory = vendor_gem - @gda.gem name, :path => directory + @gda.gem name, path: directory assert_equal [dep(name)], @set.dependencies @@ -239,16 +238,17 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase assert_equal "#{name}-#{version}", loaded.full_name - expected = { name => Gem::Requirement.create('!') } + expected = { name => Gem::Requirement.create("!") } assert_equal expected, @gda.dependencies end def test_gem_platforms - win_platform, Gem.win_platform = Gem.win_platform?, false + win_platform = Gem.win_platform? + Gem.win_platform = false - with_engine_version 'ruby', '2.0.0' do - @gda.gem 'a', :platforms => :ruby + with_engine_version "ruby", "2.0.0" do + @gda.gem "a", platforms: :ruby refute_empty @set.dependencies end @@ -257,46 +257,47 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase end def test_gem_platforms_bundler_ruby - win_platform, Gem.win_platform = Gem.win_platform?, false + win_platform = Gem.win_platform? + Gem.win_platform = false - with_engine_version 'ruby', '2.0.0' do + with_engine_version "ruby", "2.0.0" do set = Gem::RequestSet.new - gda = @GDA.new set, 'gem.deps.rb' - gda.gem 'a', :platforms => :ruby + gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb" + gda.gem "a", platforms: :ruby refute_empty set.dependencies end - with_engine_version 'rbx', '2.0.0' do + with_engine_version "rbx", "2.0.0" do set = Gem::RequestSet.new - gda = @GDA.new set, 'gem.deps.rb' - gda.gem 'a', :platforms => :ruby + gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb" + gda.gem "a", platforms: :ruby refute_empty set.dependencies end - with_engine_version 'truffleruby', '2.0.0' do + with_engine_version "truffleruby", "2.0.0" do set = Gem::RequestSet.new - gda = @GDA.new set, 'gem.deps.rb' - gda.gem 'a', :platforms => :ruby + gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb" + gda.gem "a", platforms: :ruby refute_empty set.dependencies end - with_engine_version 'jruby', '1.7.6' do + with_engine_version "jruby", "1.7.6" do set = Gem::RequestSet.new - gda = @GDA.new set, 'gem.deps.rb' - gda.gem 'a', :platforms => :ruby + gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb" + gda.gem "a", platforms: :ruby assert_empty set.dependencies end Gem.win_platform = true - with_engine_version 'ruby', '2.0.0' do + with_engine_version "ruby", "2.0.0" do set = Gem::RequestSet.new - gda = @GDA.new set, 'gem.deps.rb' - gda.gem 'a', :platforms => :ruby + gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb" + gda.gem "a", platforms: :ruby assert_empty set.dependencies end @@ -305,32 +306,33 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase end def test_gem_platforms_engine - with_engine_version 'jruby', '1.7.6' do - @gda.gem 'a', :platforms => :mri + with_engine_version "jruby", "1.7.6" do + @gda.gem "a", platforms: :mri assert_empty @set.dependencies end - with_engine_version 'truffleruby', '1.2.3' do - @gda.gem 'a', :platforms => :mri + with_engine_version "truffleruby", "1.2.3" do + @gda.gem "a", platforms: :mri assert_empty @set.dependencies end end def test_gem_platforms_maglev - win_platform, Gem.win_platform = Gem.win_platform?, false + win_platform = Gem.win_platform? + Gem.win_platform = false - with_engine_version 'maglev', '1.0.0' do + with_engine_version "maglev", "1.0.0" do set = Gem::RequestSet.new - gda = @GDA.new set, 'gem.deps.rb' - gda.gem 'a', :platforms => :ruby + gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb" + gda.gem "a", platforms: :ruby refute_empty set.dependencies set = Gem::RequestSet.new - gda = @GDA.new set, 'gem.deps.rb' - gda.gem 'a', :platforms => :maglev + gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb" + gda.gem "a", platforms: :maglev refute_empty set.dependencies end @@ -339,39 +341,40 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase end def test_gem_platforms_truffleruby - with_engine_version 'truffleruby', '1.0.0' do + with_engine_version "truffleruby", "1.0.0" do set = Gem::RequestSet.new - gda = @GDA.new set, 'gem.deps.rb' - gda.gem 'a', :platforms => :truffleruby + gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb" + gda.gem "a", platforms: :truffleruby refute_empty set.dependencies set = Gem::RequestSet.new - gda = @GDA.new set, 'gem.deps.rb' - gda.gem 'a', :platforms => :maglev + gda = Gem::RequestSet::GemDependencyAPI.new set, "gem.deps.rb" + gda.gem "a", platforms: :maglev assert_empty set.dependencies end end def test_gem_platforms_multiple - win_platform, Gem.win_platform = Gem.win_platform?, false + win_platform = Gem.win_platform? + Gem.win_platform = false - with_engine_version 'ruby', '2.0.0' do - @gda.gem 'a', :platforms => [:mswin, :jruby] + with_engine_version "ruby", "2.0.0" do + @gda.gem "a", platforms: [:mswin, :jruby] assert_empty @set.dependencies end - ensure Gem.win_platform = win_platform end def test_gem_platforms_platform - win_platform, Gem.win_platform = Gem.win_platform?, false + win_platform = Gem.win_platform? + Gem.win_platform = false - with_engine_version 'ruby', '2.0.0' do - @gda.gem 'a', :platforms => :jruby, :platform => :ruby + with_engine_version "ruby", "2.0.0" do + @gda.gem "a", platforms: :jruby, platform: :ruby refute_empty @set.dependencies end @@ -380,8 +383,8 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase end def test_gem_platforms_version - with_engine_version 'ruby', '2.0.0' do - @gda.gem 'a', :platforms => :ruby_18 + with_engine_version "ruby", "2.0.0" do + @gda.gem "a", platforms: :ruby_18 assert_empty @set.dependencies end @@ -389,26 +392,26 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase def test_gem_platforms_unknown e = assert_raise ArgumentError do - @gda.gem 'a', :platforms => :unknown + @gda.gem "a", platforms: :unknown end - assert_equal 'unknown platform :unknown', e.message + assert_equal "unknown platform :unknown", e.message end def test_gem_requires - @gda.gem 'a', :require => %w[b c] - @gda.gem 'd', :require => 'e' + @gda.gem "a", require: %w[b c] + @gda.gem "d", require: "e" - assert_equal [dep('a'), dep('d')], @set.dependencies + assert_equal [dep("a"), dep("d")], @set.dependencies - assert_equal %w[b c], @gda.requires['a'] - assert_equal %w[e], @gda.requires['d'] + assert_equal %w[b c], @gda.requires["a"] + assert_equal %w[e], @gda.requires["d"] end def test_gem_requires_false - @gda.gem 'a', :require => false + @gda.gem "a", require: false - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies assert_empty @gda.requires end @@ -416,55 +419,55 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase def test_gem_requires_without_group @gda.without_groups << :test - @gda.gem 'a', :group => :test + @gda.gem "a", group: :test assert_empty @set.dependencies - assert_empty @gda.requires['a'] + assert_empty @gda.requires["a"] end def test_gem_requirement - @gda.gem 'a', '~> 1.0' + @gda.gem "a", "~> 1.0" - assert_equal [dep('a', '~> 1.0')], @set.dependencies + assert_equal [dep("a", "~> 1.0")], @set.dependencies - expected = { 'a' => Gem::Requirement.create(['~> 1.0']) } + expected = { "a" => Gem::Requirement.create(["~> 1.0"]) } assert_equal expected, @gda.dependencies end def test_gem_requirements - @gda.gem 'b', '~> 1.0', '>= 1.0.2' + @gda.gem "b", "~> 1.0", ">= 1.0.2" - assert_equal [dep('b', '~> 1.0', '>= 1.0.2')], @set.dependencies + assert_equal [dep("b", "~> 1.0", ">= 1.0.2")], @set.dependencies - expected = { 'b' => Gem::Requirement.create(['~> 1.0', '>= 1.0.2']) } + expected = { "b" => Gem::Requirement.create(["~> 1.0", ">= 1.0.2"]) } assert_equal expected, @gda.dependencies end def test_gem_requirements_options - @gda.gem 'c', :git => 'https://example/c.git' + @gda.gem "c", git: "https://example/c.git" - assert_equal [dep('c')], @set.dependencies + assert_equal [dep("c")], @set.dependencies end def test_gem_source_mismatch name, _, directory = vendor_gem - gda = @GDA.new @set, nil + gda = Gem::RequestSet::GemDependencyAPI.new @set, nil gda.gem name e = assert_raise ArgumentError do - gda.gem name, :path => directory + gda.gem name, path: directory end assert_equal "duplicate source path: #{directory} for gem #{name}", e.message - gda = @GDA.new @set, nil + gda = Gem::RequestSet::GemDependencyAPI.new @set, nil gda.instance_variable_set :@vendor_set, @vendor_set - gda.gem name, :path => directory + gda.gem name, path: directory e = assert_raise ArgumentError do gda.gem name @@ -475,47 +478,47 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase end def test_gem_deps_file - assert_equal 'gem.deps.rb', @gda.gem_deps_file + assert_equal "gem.deps.rb", @gda.gem_deps_file - gda = @GDA.new @set, 'foo/Gemfile' + gda = Gem::RequestSet::GemDependencyAPI.new @set, "foo/Gemfile" - assert_equal 'Gemfile', gda.gem_deps_file + assert_equal "Gemfile", gda.gem_deps_file end def test_gem_group_method groups = [] @gda.group :a do - groups = @gda.send :gem_group, 'a', :group => :b, :groups => [:c, :d] + groups = @gda.send :gem_group, "a", group: :b, groups: [:c, :d] end - assert_equal [:a, :b, :c, :d], groups.sort_by {|group| group.to_s } + assert_equal [:a, :b, :c, :d], groups.sort_by(&:to_s) end def test_gemspec - save_gemspec 'a', 1 do |s| - s.add_dependency 'b', 2 - s.add_development_dependency 'c', 3 + save_gemspec "a", 1 do |s| + s.add_dependency "b", 2 + s.add_development_dependency "c", 3 end @gda.gemspec - assert_equal [dep('a', '= 1'), dep('b', '= 2'), dep('c', '=3')], + assert_equal [dep("a", "= 1"), dep("b", "= 2"), dep("c", "=3")], @set.dependencies - assert_equal %w[a], @gda.requires['a'] + assert_equal %w[a], @gda.requires["a"] expected = { - 'a' => Gem::Requirement.create('!'), - 'b' => req('= 2'), - 'c' => req('= 3'), + "a" => Gem::Requirement.create("!"), + "b" => req("= 2"), + "c" => req("= 3"), } assert_equal expected, @gda.dependencies end def test_gemspec_bad - FileUtils.touch 'a.gemspec' + FileUtils.touch "a.gemspec" e = assert_raise ArgumentError do capture_output do @@ -523,31 +526,31 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase end end - assert_equal 'invalid gemspec ./a.gemspec', e.message + assert_equal "invalid gemspec ./a.gemspec", e.message end def test_gemspec_development_group - save_gemspec 'a', 1 do |s| - s.add_dependency 'b', 2 - s.add_development_dependency 'c', 3 + save_gemspec "a", 1 do |s| + s.add_dependency "b", 2 + s.add_development_dependency "c", 3 end @gda.without_groups << :other - @gda.gemspec :development_group => :other + @gda.gemspec development_group: :other - assert_equal [dep('a', '= 1'), dep('b', '= 2')], @set.dependencies + assert_equal [dep("a", "= 1"), dep("b", "= 2")], @set.dependencies - assert_equal %w[a], @gda.requires['a'] + assert_equal %w[a], @gda.requires["a"] end def test_gemspec_multiple - save_gemspec 'a', 1 do |s| - s.add_dependency 'b', 2 + save_gemspec "a", 1 do |s| + s.add_dependency "b", 2 end - save_gemspec 'b', 2 do |s| - s.add_dependency 'c', 3 + save_gemspec "b", 2 do |s| + s.add_dependency "c", 3 end e = assert_raise ArgumentError do @@ -558,27 +561,27 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase end def test_gemspec_name - save_gemspec 'a', 1 do |s| - s.add_dependency 'b', 2 + save_gemspec "a", 1 do |s| + s.add_dependency "b", 2 end - save_gemspec 'b', 2 do |s| - s.add_dependency 'c', 3 + save_gemspec "b", 2 do |s| + s.add_dependency "c", 3 end - @gda.gemspec :name => 'b' + @gda.gemspec name: "b" - assert_equal [dep('b', '= 2'), dep('c', '= 3')], @set.dependencies + assert_equal [dep("b", "= 2"), dep("c", "= 3")], @set.dependencies end def test_gemspec_named - save_gemspec 'a', 1 do |s| - s.add_dependency 'b', 2 + save_gemspec "a", 1 do |s| + s.add_dependency "b", 2 end @gda.gemspec - assert_equal [dep('a', '= 1'), dep('b', '= 2')], @set.dependencies + assert_equal [dep("a", "= 1"), dep("b", "= 2")], @set.dependencies end def test_gemspec_none @@ -590,27 +593,27 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase end def test_gemspec_path - FileUtils.mkdir 'other' + FileUtils.mkdir "other" - save_gemspec 'a', 1, 'other' do |s| - s.add_dependency 'b', 2 + save_gemspec "a", 1, "other" do |s| + s.add_dependency "b", 2 end - @gda.gemspec :path => 'other' + @gda.gemspec path: "other" - assert_equal [dep('a', '= 1'), dep('b', '= 2')], @set.dependencies + assert_equal [dep("a", "= 1"), dep("b", "= 2")], @set.dependencies end def test_git - @gda.git 'git://example/repo.git' do - @gda.gem 'a' - @gda.gem 'b' + @gda.git "git://example/repo.git" do + @gda.gem "a" + @gda.gem "b" end - assert_equal [dep('a'), dep('b')], @set.dependencies + assert_equal [dep("a"), dep("b")], @set.dependencies - assert_equal %w[git://example/repo.git master], @git_set.repositories['a'] - assert_equal %w[git://example/repo.git master], @git_set.repositories['b'] + assert_equal ["git://example/repo.git", nil], @git_set.repositories["a"] + assert_equal ["git://example/repo.git", nil], @git_set.repositories["b"] end def test_git_source @@ -618,21 +621,21 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase "git://example/#{repo_name}.git" end - @gda.gem 'a', :example => 'repo' + @gda.gem "a", example: "repo" - assert_equal %w[git://example/repo.git master], @git_set.repositories['a'] + assert_equal ["git://example/repo.git", nil], @git_set.repositories["a"] end def test_group @gda.group :test do - @gda.gem 'a' + @gda.gem "a" end - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies end def test_load - tf = Tempfile.open 'gem.deps.rb' do |io| + tf = Tempfile.open "gem.deps.rb" do |io| io.write <<-GEM_DEPS gem 'a' @@ -642,31 +645,31 @@ end GEM_DEPS io.flush - gda = @GDA.new @set, io.path + gda = Gem::RequestSet::GemDependencyAPI.new @set, io.path assert_equal gda, gda.load - assert_equal [dep('a'), dep('b')], @set.dependencies + assert_equal [dep("a"), dep("b")], @set.dependencies io end tf.close! end def test_pin_gem_source - gda = @GDA.new @set, nil + gda = Gem::RequestSet::GemDependencyAPI.new @set, nil - gda.send :pin_gem_source, 'a' - gda.send :pin_gem_source, 'a' + gda.send :pin_gem_source, "a" + gda.send :pin_gem_source, "a" e = assert_raise ArgumentError do - gda.send :pin_gem_source, 'a', :path, 'vendor/a' + gda.send :pin_gem_source, "a", :path, "vendor/a" end assert_equal "duplicate source path: vendor/a for gem a", e.message e = assert_raise ArgumentError do - gda.send :pin_gem_source, 'a', :git, 'git://example/repo.git' + gda.send :pin_gem_source, "a", :git, "git://example/repo.git" end assert_equal "duplicate source git: git://example/repo.git for gem a", @@ -674,19 +677,19 @@ end end def test_platform_mswin - if win_platform? - util_set_arch 'x86-mswin32-60' do + if Gem.win_platform? + util_set_arch "x86-mswin32-60" do @gda.platform :mswin do - @gda.gem 'a' + @gda.gem "a" end - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies refute_empty @set.dependencies end else - util_set_arch 'i686-darwin8.10.1' do + util_set_arch "i686-darwin8.10.1" do @gda.platform :mswin do - @gda.gem 'a' + @gda.gem "a" end assert_empty @set.dependencies @@ -695,23 +698,24 @@ end end def test_platform_multiple - win_platform, Gem.win_platform = Gem.win_platform?, false + win_platform = Gem.win_platform? + Gem.win_platform = false - gda = @GDA.new @set, nil + gda = Gem::RequestSet::GemDependencyAPI.new @set, nil - with_engine_version 'ruby', '1.8.7' do + with_engine_version "ruby", "1.8.7" do gda.platform :mri_19, :mri_20 do - gda.gem 'a' + gda.gem "a" end end assert_empty @set.dependencies - gda = @GDA.new @set, nil + gda = Gem::RequestSet::GemDependencyAPI.new @set, nil - with_engine_version 'ruby', '2.0.0' do + with_engine_version "ruby", "2.0.0" do gda.platform :mri_19, :mri_20 do - gda.gem 'a' + gda.gem "a" end end @@ -721,31 +725,32 @@ end end def test_platform_ruby - win_platform, Gem.win_platform = Gem.win_platform?, false + win_platform = Gem.win_platform? + Gem.win_platform = false @gda.platform :ruby do - @gda.gem 'a' + @gda.gem "a" end - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies ensure Gem.win_platform = win_platform end def test_platforms - unless win_platform? - util_set_arch 'i686-darwin8.10.1' do + unless Gem.win_platform? + util_set_arch "i686-darwin8.10.1" do @gda.platforms :ruby do - @gda.gem 'a' + @gda.gem "a" end - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies @gda.platforms :mswin do - @gda.gem 'b' + @gda.gem "b" end - assert_equal [dep('a')], @set.dependencies + assert_equal [dep("a")], @set.dependencies end end end @@ -755,53 +760,51 @@ end end def test_ruby_engine - with_engine_version 'jruby', '1.7.6' do + with_engine_version "jruby", "1.7.6" do assert @gda.ruby RUBY_VERSION, - :engine => 'jruby', :engine_version => '1.7.6' - + engine: "jruby", engine_version: "1.7.6" end - with_engine_version 'truffleruby', '1.0.0-rc11' do + with_engine_version "truffleruby", "1.0.0-rc11" do assert @gda.ruby RUBY_VERSION, - :engine => 'truffleruby', :engine_version => '1.0.0-rc11' - + engine: "truffleruby", engine_version: "1.0.0-rc11" end end def test_ruby_engine_mismatch_engine - with_engine_version 'ruby', '2.0.0' do + with_engine_version "ruby", "2.0.0" do e = assert_raise Gem::RubyVersionMismatch do - @gda.ruby RUBY_VERSION, :engine => 'jruby', :engine_version => '1.7.4' + @gda.ruby RUBY_VERSION, engine: "jruby", engine_version: "1.7.4" end - assert_equal 'Your Ruby engine is ruby, but your gem.deps.rb requires jruby', + assert_equal "Your Ruby engine is ruby, but your gem.deps.rb requires jruby", e.message end end def test_ruby_engine_mismatch_version - with_engine_version 'jruby', '1.7.6' do + with_engine_version "jruby", "1.7.6" do e = assert_raise Gem::RubyVersionMismatch do - @gda.ruby RUBY_VERSION, :engine => 'jruby', :engine_version => '1.7.4' + @gda.ruby RUBY_VERSION, engine: "jruby", engine_version: "1.7.4" end - assert_equal 'Your Ruby engine version is jruby 1.7.6, but your gem.deps.rb requires jruby 1.7.4', + assert_equal "Your Ruby engine version is jruby 1.7.6, but your gem.deps.rb requires jruby 1.7.4", e.message end end def test_ruby_engine_no_engine_version e = assert_raise ArgumentError do - @gda.ruby RUBY_VERSION, :engine => 'jruby' + @gda.ruby RUBY_VERSION, engine: "jruby" end - assert_equal 'You must specify engine_version along with the Ruby engine', + assert_equal "You must specify engine_version along with the Ruby engine", e.message end def test_ruby_mismatch e = assert_raise Gem::RubyVersionMismatch do - @gda.ruby '1.8.0' + @gda.ruby "1.8.0" end assert_equal "Your Ruby version is #{RUBY_VERSION}, but your gem.deps.rb requires 1.8.0", e.message @@ -810,19 +813,19 @@ end def test_ruby_mismatch_installing @gda.installing = true - assert @gda.ruby '1.8.0' + assert @gda.ruby "1.8.0" end def test_source sources = Gem.sources - @gda.source 'http://first.example' + @gda.source "http://first.example" assert_equal %w[http://first.example], Gem.sources assert_same sources, Gem.sources - @gda.source 'http://second.example' + @gda.source "http://second.example" assert_equal %w[http://first.example http://second.example], Gem.sources end @@ -832,9 +835,9 @@ end engine = Gem.ruby_engine engine_version = RUBY_ENGINE_VERSION - with_engine_version 'other', '1.2.3' do - assert_equal 'other', Gem.ruby_engine - assert_equal '1.2.3', RUBY_ENGINE_VERSION + with_engine_version "other", "1.2.3" do + assert_equal "other", Gem.ruby_engine + assert_equal "1.2.3", RUBY_ENGINE_VERSION assert_equal version, RUBY_VERSION end |