bin/irt in irt-1.2.10 vs bin/irt in irt-1.2.11

@@ -32,19 +32,19 @@
   options[:irb_options] = nil
   opts.on( '-b', '--irb-options [OPTIONS]', 'Sets the irb or Rails Console options' ) do |opt|
     options[:irb_options] = opt
   end
 
-  options[:rails_env] = 'development'
+  options[:rails_env] = ENV['RAILS_ENV'] || 'development'
   opts.on( '-e', '--rails-env [ENVIRONMENT]', 'Sets the Rails Environment' ) do |env|
      options[:rails_env] = env
    end
 
   options[:no_rails] = false
   opts.on( '-n', '--no-rails', 'Does not autoload the Rails Environment' ) do
-     options[:no_rails] = true
-   end
+    options[:no_rails] = true
+  end
 
   opts.on( '-v', '--version', 'Shows the version and exits' ) do
     puts IRT.version
     exit
   end
@@ -83,38 +83,39 @@
   IRT::Prompter.say_notice 'No *.irt files to run'
   exit
 end
 
 cmd_format = if File.exists?('./config/environment.rb') && !options[:no_rails]
-               ENV['RAILS_ENV'] = options[:rails_env]
+               ENV['RAILS_ENV'] = options[:rails_env] if options[:rails_env]
                if File.exists?('./script/rails')
                  gemfile = File.read('Gemfile')
                  unless gemfile.match(/\bgem\b.+\birt\b/)
                    IRT::Prompter.say_warning %(The Gemfile doesn't look to include any 'gem "irt"' statement.\nIRT will probably not work until you add it!)
                    IRT::Prompter.yes?("Do you want to add irt to your Gemfile?", :hint => '[enter=y|n]', :default => 'y') do
                      File.open('Gemfile', 'a') do |f|
                        f.puts %(\ngem "irt")
                      end
                    end
                  end
-                 rails_version = gemfile.match(/\bgem\b.+\brails\b.+3\.0\.\d/) ? '=3.0.*' : '>=3.1.*'
+                 minor, patch = gemfile.match(/\bgem\b.+\brails\b.+3\.(\d+)\.(\d+)/).captures
+                 rails_version = (minor.to_i > 0 || patch.to_i > 9) ? :new : :old
                  'rails c %s %s %s'
                elsif File.exists?('./script/console')
-                 rails_version = '2.*'
+                 rails_version = :old
                  'ruby script/console --irb="irt_rails2 %2$s" %1$s %3$s'
                end
              else
                'irt_irb %s %s'
              end
 
 ENV['IRT_INTERACTIVE_EOF'] = options[:interactive_eof].inspect if options[:interactive_eof]
 
 files.each do |file|
   ENV['IRT_COMMAND'] = case rails_version
-                       when '2.*', '=3.0.*'
-                         sprintf cmd_format, options[:irb_options], file, options[:rails_env]
-                       when '>=3.1.*'
+                       when :new
                          sprintf cmd_format, options[:rails_env], options[:irb_options], file
+                       when :old
+                         sprintf cmd_format, options[:irb_options], file, options[:rails_env]
                        else
                          sprintf cmd_format, options[:irb_options], file
                        end
   exit(1) unless system ENV['IRT_COMMAND']
 end