From 6095a5745dc8a702a0942027ffd2813ee3ea3d95 Mon Sep 17 00:00:00 2001
From: Joshua Clayton <jclayton@fusionary.com>
Date: Sat, 4 Jul 2009 15:50:20 -0400
Subject: [PATCH] Fix irb includes

---
 irbrc                      | 6 +++---
 irbrc.d/completion.rb      | 2 +-
 irbrc.d/core_extensions.rb | 2 +-
 irbrc.d/history.rb         | 6 +++---
 irbrc.d/snip.rb            | 4 +++-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/irbrc b/irbrc
index 3717ddd..59647c8 100644
--- a/irbrc
+++ b/irbrc
@@ -1,11 +1,11 @@
-require 'rubygems'
+require "rubygems"
 
 def require_rb_files_from(dir)
-  Dir.glob(File.join(dir, '*.rb')) do |file|
+  Dir.glob(File.join(dir, "*.rb")) do |file|
     require file
   end
 end
 
-require_rb_files_from(File.join(ENV['HOME'], '.irb_scripts.d'))
+require_rb_files_from(File.join(ENV["HOME"], ".irbrc.d"))
 
 IRB.conf[:PROMPT_MODE] = :SIMPLE
diff --git a/irbrc.d/completion.rb b/irbrc.d/completion.rb
index 4178dc3..cb1ca68 100644
--- a/irbrc.d/completion.rb
+++ b/irbrc.d/completion.rb
@@ -1 +1 @@
-require 'irb/completion'
\ No newline at end of file
+require "irb/completion"
diff --git a/irbrc.d/core_extensions.rb b/irbrc.d/core_extensions.rb
index 3e7b79b..28b4085 100644
--- a/irbrc.d/core_extensions.rb
+++ b/irbrc.d/core_extensions.rb
@@ -12,6 +12,6 @@ def self.file_to_string(path)
   def self.string_to_file(string, path)
     directory = File.dirname(path)
     FileUtils.mkdir_p directory unless File.directory?(directory)
-    File.open(path, 'w') { |f| f << string }
+    File.open(path, "w") { |file| file << string }
   end
 end
diff --git a/irbrc.d/history.rb b/irbrc.d/history.rb
index 13c79bf..1a51a37 100644
--- a/irbrc.d/history.rb
+++ b/irbrc.d/history.rb
@@ -2,7 +2,7 @@
 
 module Readline
   module History
-    LOG = "#{ENV['HOME']}/.irb-save-history"
+    LOG = "#{ENV["HOME"]}/.irb-save-history"
     def self.write_log(line)
       File.open(LOG, 'ab') {|f| f << "#{line}\n"} unless line == "exit"
     end
@@ -19,6 +19,6 @@ def readline(*args)
   end
 end
 
-require 'irb/ext/save-history'
+require "irb/ext/save-history"
 IRB.conf[:SAVE_HISTORY] = 100
-IRB.conf[:HISTORY_FILE] = "#{ENV['HOME']}/.irb-save-history"
+IRB.conf[:HISTORY_FILE] = "#{ENV["HOME"]}/.irb-save-history"
diff --git a/irbrc.d/snip.rb b/irbrc.d/snip.rb
index ecbe181..db67141 100644
--- a/irbrc.d/snip.rb
+++ b/irbrc.d/snip.rb
@@ -9,7 +9,9 @@ def self.create(name, &blk)
   end
 
   def self.[](name)
-    raise SnippetNotFoundError, "the snippet '#{name.to_s}' was not found" unless @@snips.has_key?(name.to_s)
+    unless @@snips.has_key?(name.to_s)
+      raise SnippetNotFoundError, "the snippet '#{name.to_s}' was not found"
+    end
     @@snips[name.to_s].call
   end