Merge pull request #1099 from chef/rubygems_requir

Remove the rubygems require in the main app

1 files changed, 3 insertions, 18 deletions

diff --git a/bin/ohai b/bin/ohai
index 4bc6b066..d8e1cc89 100755
--- a/bin/ohai
+++ b/bin/ohai
@@ -19,23 +19,8 @@
 # limitations under the License.
 #
 
-begin
-  require "rubygems"
-rescue LoadError
-  # must be debian! ;)
-  missing_rubygems = true
-end
-begin
-  # if we're in a source code checkout, we want to run the code from that.
-  # have to do this *after* rubygems is loaded.
-  $:.unshift File.expand_path("../../lib", __FILE__)
-  require "ohai/application"
-rescue LoadError
-  if missing_rubygems
-    STDERR.puts "rubygems previously failed to load - is it installed?"
-  end
-
-  raise
-end
+# if we're in a source code checkout, we want to run the code from that.
+$:.unshift File.expand_path("../../lib", __FILE__)
+require "ohai/application"
 
 Ohai::Application.new.run