diff options
| author | Logan McDonald <lmcdonald@chef.io> | 2016-09-09 09:58:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-09 09:58:03 -0700 |
| commit | 0c164dd972eee162390e583f94dd57906f7bb31b (patch) | |
| tree | 2356352353a3696ba5bae992cae95705e4609d37 | |
| parent | 63f6059c4c4165ccf8d350e2f30b8490f1be0416 (diff) | |
| parent | d622a1a8234c228ec617d932aff376ea157d66b7 (diff) | |
| download | chef-0c164dd972eee162390e583f94dd57906f7bb31b.tar.gz | |
Merge pull request #5098 from jyaworski/gh_4955
Fixes GH-4955, allowing local gems with remote dependencies
| -rw-r--r-- | lib/chef/provider/package/rubygems.rb | 4 | ||||
| -rw-r--r-- | spec/unit/provider/package/rubygems_spec.rb | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/lib/chef/provider/package/rubygems.rb b/lib/chef/provider/package/rubygems.rb index b5f2340faf..187197d143 100644 --- a/lib/chef/provider/package/rubygems.rb +++ b/lib/chef/provider/package/rubygems.rb @@ -522,9 +522,7 @@ class Chef install_via_gem_command(name, version) end elsif @new_resource.gem_binary.nil? - # domain is used by Gem::DependencyInstaller rather than by Chef code - # domain can be :local, :remote or :both - @gem_env.install(@new_resource.source, domain: :local) + @gem_env.install(@new_resource.source) else install_via_gem_command(name, version) end diff --git a/spec/unit/provider/package/rubygems_spec.rb b/spec/unit/provider/package/rubygems_spec.rb index b1ebde2b7d..4934505583 100644 --- a/spec/unit/provider/package/rubygems_spec.rb +++ b/spec/unit/provider/package/rubygems_spec.rb @@ -594,10 +594,9 @@ describe Chef::Provider::Package::Rubygems do context "when source is a path" do let(:source) { CHEF_SPEC_DATA + "/gems/chef-integration-test-0.1.0.gem" } - let(:domain) { { domain: :local } } it "installs the gem from file via the gems api" do - expect(provider.gem_env).to receive(:install).with(source, domain) + expect(provider.gem_env).to receive(:install).with(source) provider.run_action(:install) expect(new_resource).to be_updated_by_last_action end @@ -605,11 +604,10 @@ describe Chef::Provider::Package::Rubygems do context "when the gem name is a file path and source is nil" do let(:gem_name) { CHEF_SPEC_DATA + "/gems/chef-integration-test-0.1.0.gem" } - let(:domain) { { domain: :local } } it "installs the gem from file via the gems api" do expect(new_resource.source).to eq(gem_name) - expect(provider.gem_env).to receive(:install).with(gem_name, domain) + expect(provider.gem_env).to receive(:install).with(gem_name) provider.run_action(:install) expect(new_resource).to be_updated_by_last_action end |