CHEF-5092: chef_gem should use omnibus `gem` binary

2 files changed, 7 insertions, 1 deletions

diff --git a/lib/chef/resource/chef_gem.rb b/lib/chef/resource/chef_gem.rb
index d8de0edc00..af45cb93e6 100644
--- a/lib/chef/resource/chef_gem.rb
+++ b/lib/chef/resource/chef_gem.rb
@@ -28,6 +28,7 @@ class Chef
       def initialize(name, run_context=nil)
         super
         @resource_name = :chef_gem
+        @gem_binary = RbConfig::CONFIG['bindir'] + "/gem"
         @provider = Chef::Provider::Package::Rubygems
       end
 
@@ -37,7 +38,7 @@ class Chef
           raise ArgumentError, "The chef_gem resource is restricted to the current gem environment, use gem_package to install to other environments."
         end
 
-        nil
+        @gem_binary
       end
 
       def after_created
diff --git a/spec/unit/resource/chef_gem_spec.rb b/spec/unit/resource/chef_gem_spec.rb
index 1d7ca8a81e..dda65f8741 100644
--- a/spec/unit/resource/chef_gem_spec.rb
+++ b/spec/unit/resource/chef_gem_spec.rb
@@ -40,10 +40,15 @@ end
 
 describe Chef::Resource::ChefGem, "gem_binary" do
   before(:each) do
+    expect(RbConfig::CONFIG).to receive(:[]).with('bindir').and_return("/opt/chef/embedded/bin")
     @resource = Chef::Resource::ChefGem.new("foo")
   end
 
   it "should raise an exception when gem_binary is set" do
     lambda { @resource.gem_binary("/lol/cats/gem") }.should raise_error(ArgumentError)
   end
+
+  it "should set the gem_binary based on computing it from RbConfig" do
+    expect(@resource.gem_binary).to eql("/opt/chef/embedded/bin/gem")
+  end
 end