From cce2b65c615ec811d5a5a6ac190113442e549802 Mon Sep 17 00:00:00 2001 From: Marcin Kulik Date: Sun, 22 Nov 2009 14:54:47 +0100 Subject: [PATCH] removed 'require "rubygems", acting better when used with Bundler --- bin/racksh | 7 ++++--- lib/racksh.rb | 5 ----- lib/racksh/boot.rb | 3 +++ lib/racksh/version.rb | 2 +- racksh.gemspec | 6 +++--- 5 files changed, 11 insertions(+), 12 deletions(-) delete mode 100644 lib/racksh.rb create mode 100644 lib/racksh/boot.rb diff --git a/bin/racksh b/bin/racksh index b42379c..716f81d 100755 --- a/bin/racksh +++ b/bin/racksh @@ -2,10 +2,11 @@ ENV['RACK_ENV'] ||= 'development' +boot_path = File.expand_path(File.join(File.dirname(__FILE__), "..", "lib", "racksh", "boot.rb")) + if ARGV.empty? - racksh_path = File.join(File.expand_path(File.dirname(__FILE__)), "..", "lib", "racksh.rb") - exec "irb -r irb/completion -r #{racksh_path} --simple-prompt" + exec "irb -r irb/completion -r #{boot_path} --simple-prompt" else - require 'racksh' + require boot_path p eval(ARGV.join(" ")) end diff --git a/lib/racksh.rb b/lib/racksh.rb deleted file mode 100644 index 2e05ebf..0000000 --- a/lib/racksh.rb +++ /dev/null @@ -1,5 +0,0 @@ -require 'rubygems' -dir = File.join(File.expand_path(File.dirname(__FILE__)), 'racksh') -%w(session version init).each { |f| require File.join(dir, f) } - -Rack::Shell.start! diff --git a/lib/racksh/boot.rb b/lib/racksh/boot.rb new file mode 100644 index 0000000..9b08db4 --- /dev/null +++ b/lib/racksh/boot.rb @@ -0,0 +1,3 @@ +dir = File.expand_path(File.dirname(__FILE__)) +%w(session version init).each { |f| require File.join(dir, f) } +Rack::Shell.start! diff --git a/lib/racksh/version.rb b/lib/racksh/version.rb index 39fb844..bbed338 100644 --- a/lib/racksh/version.rb +++ b/lib/racksh/version.rb @@ -1,5 +1,5 @@ module Rack module Shell - VERSION = '0.9.4'.freeze + VERSION = '0.9.4.1'.freeze end end diff --git a/racksh.gemspec b/racksh.gemspec index 3ced518..a61396d 100644 --- a/racksh.gemspec +++ b/racksh.gemspec @@ -2,16 +2,16 @@ Gem::Specification.new do |s| s.name = %q{racksh} - s.version = "0.9.4" + s.version = "0.9.4.1" s.platform = Gem::Platform::RUBY - s.date = %q{2009-11-19} + s.date = %q{2009-11-22} s.authors = ["Marcin Kulik"] s.email = %q{marcin.kulik@gmail.com} s.has_rdoc = false s.homepage = %q{http://github.com/sickill/racksh} s.summary = %q{Console for any Rack based ruby web app} s.executables = ["racksh"] - s.files = [ "bin/racksh", "lib/racksh.rb", "lib/racksh/init.rb", "lib/racksh/session.rb", "lib/racksh/version.rb", "README.markdown" ] + s.files = [ "bin/racksh", "lib/racksh/boot.rb", "lib/racksh/init.rb", "lib/racksh/session.rb", "lib/racksh/version.rb", "README.markdown" ] s.add_dependency 'rack', '>= 1.0' s.add_dependency 'rack-test', '>= 0.5' end