Remove code shims now that upstream rvm gem is fixed (in v1.2.7).

sous-chefs · Feb 25, 2011 · 14784bb · 14784bb
1 parent ed22d5e
commit 14784bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/providers/ruby.rb b/providers/ruby.rb
@@ -39,10 +39,9 @@
       env = RVM::Environment.new
       env.use rubie
       update_installed_rubies
+
       Chef::Log.info("Importing initial gemsets for rvm_ruby[#{rubie}]")
-      # TODO: the RVM api here is mis-spelled. Will need to be updated when
-      # upstream fixes.
-      if env.gemset_intial
+      if env.gemset_initial
         Chef::Log.debug("Initial gemsets for rvm_ruby[#{rubie}] are installed")
       else
         Chef::Log.warn(

diff --git a/providers/wrapper.rb b/providers/wrapper.rb
@@ -35,13 +35,6 @@
     e.run_action(:create)
   end
 
-  # Patch RVM::Environment to include wrapper functionality. Not yet sure
-  # if this was an oversight or by design (to follow up with @wayneeseguin
-  # on #rvm)
-  class RVM::Environment
-    require ::File.join("rvm", "environment", "wrapper")
-  end
-
   env = RVM::Environment.new
   env.use ruby_string