Skip to content

Commit

Permalink
Graceful handing of rails root not being detectable.
Browse files Browse the repository at this point in the history
  • Loading branch information
jqr committed Jun 19, 2011
1 parent 3a0e942 commit f1ada15
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 3 additions & 1 deletion railsrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ def detect_rails_root
end
end

DETECTED_RAILS_ROOT = detect_rails_root
if detect_rails_root
DETECTED_RAILS_ROOT = detect_rails_root
end

require_rb_files_from(File.join(ENV['HOME'], '.railsrc.d'))
5 changes: 3 additions & 2 deletions railsrc.d/prompt.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ def setup_rails_irb_prompt
dangerous_envs = %w(production)
rails_env = ENV['RAILS_ENV']
rails_env = rails_env.upcase if dangerous_envs.include?(rails_env)

setup_custom_irb_prompt(File.basename(DETECTED_RAILS_ROOT) + " #{rails_env}")

prompt = defined?(DETECTED_RAILS_ROOT) ? File.basename(DETECTED_RAILS_ROOT) : 'rails'
setup_custom_irb_prompt(prompt + " #{rails_env}")
end

setup_rails_irb_prompt

0 comments on commit f1ada15

Please sign in to comment.