diff options
author | Serdar Sutay <serdar@opscode.com> | 2014-11-25 11:04:34 -0800 |
---|---|---|
committer | Serdar Sutay <serdar@opscode.com> | 2014-11-25 11:04:34 -0800 |
commit | dd19a97fbc7bf586db9b5d28e7b622b2dd1b87d4 (patch) | |
tree | cc3ffae800e998ea3e0f745fc6a51d49b785a901 | |
parent | 90ac5191358550e5521b2ecb8df027cde6a5e44a (diff) | |
parent | 924d75fd5b79b03e623cc657c5bef73e96f94465 (diff) | |
download | chef-dd19a97fbc7bf586db9b5d28e7b622b2dd1b87d4.tar.gz |
Merge branch 'empty_version' of github.com:lucywyman/chef
-rw-r--r-- | lib/chef/provider/package/rubygems.rb | 2 | ||||
-rw-r--r-- | spec/unit/provider/package/rubygems_spec.rb | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/chef/provider/package/rubygems.rb b/lib/chef/provider/package/rubygems.rb index 6304a7ef63..dd731adee4 100644 --- a/lib/chef/provider/package/rubygems.rb +++ b/lib/chef/provider/package/rubygems.rb @@ -536,7 +536,7 @@ class Chef else src = @new_resource.source && " --source=#{@new_resource.source} --source=https://rubygems.org" end - if version + if !version.nil? && version.length > 0 shell_out!("#{gem_binary_path} install #{name} -q --no-rdoc --no-ri -v \"#{version}\"#{src}#{opts}", :env=>nil) else shell_out!("#{gem_binary_path} install \"#{name}\" -q --no-rdoc --no-ri #{src}#{opts}", :env=>nil) diff --git a/spec/unit/provider/package/rubygems_spec.rb b/spec/unit/provider/package/rubygems_spec.rb index a3a4772229..b4960b2af3 100644 --- a/spec/unit/provider/package/rubygems_spec.rb +++ b/spec/unit/provider/package/rubygems_spec.rb @@ -536,6 +536,14 @@ describe Chef::Provider::Package::Rubygems do expect(@provider.action_install).to be_truthy end + it "installs the gem by shelling out when options are provided but no version is given" do + @new_resource.options('-i /alt/install/location') + @new_resource.version('') + expected ="gem install \"rspec-core\" -q --no-rdoc --no-ri -i /alt/install/location" + expect(@provider).to receive(:shell_out!).with(expected, :env => nil) + expect(@provider.action_install).to be_truthy + end + it "installs the gem via the gems api when options are given as a Hash" do @new_resource.options(:install_dir => '/alt/install/location') expect(@provider.gem_env).to receive(:install).with(@gem_dep, :sources => nil, :install_dir => '/alt/install/location') |