@@ -1,4 +1,6 @@ == 0.8.0 Dodgy Dentist release + * Add --require (-r) option to require a library, before executing your script. + * Rename --rackup short option to -R, warn and load as rackup when file ends with .ru. * List supported adapters in command usage. * Add file adapter to built-in adapter, serve static files in current directory. * Allow disabling signal handling in Server with :signals => false CHANGELOG @@ -14,10 +14,10 @@ module Thin # Raised when an option is not valid. class InvalidOption < RunnerError; end - # Build and control one Thin server. + # Build and control Thin servers. # Hey Controller pattern is not only for web apps yo! module Controllers - # Controls a Thin server. + # Controls one Thin server. # Allow to start, stop, restart and configure a single thin server. class Controller include Logging lib/thin/controllers/controller.rb @@ -64,7 +64,7 @@ module Thin opts.on("-y", "--swiftiply [KEY]", "Run using swiftiply") { |key| @options[:swiftiply] = key } opts.on("-A", "--adapter NAME", "Rack adapter to use (default: autodetect)", "(#{Rack::ADAPTERS.keys.join(', ')})") { |name| @options[:adapter] = name } - opts.on("-r", "--rackup FILE", "Load a Rack config file instead of " + + opts.on("-R", "--rackup FILE", "Load a Rack config file instead of " + "Rack adapter") { |file| @options[:rackup] = file } opts.on("-c", "--chdir DIR", "Change to dir before starting") { |dir| @options[:chdir] = File.expand_path(dir) } opts.on( "--stats PATH", "Mount the Stats adapter under PATH") { |path| @options[:stats] = path } @@ -113,6 +113,7 @@ module Thin opts.separator "" opts.separator "Common options:" + opts.on_tail("-r", "--require FILE", "require the library") { |file| ruby_require file } opts.on_tail("-D", "--debug", "Set debbuging on") { Logging.debug = true } opts.on_tail("-V", "--trace", "Set tracing on (log raw request/response)") { Logging.trace = true } opts.on_tail("-h", "--help", "Show this message") { puts opts; exit } @@ -186,5 +187,14 @@ module Thin YAML.load_file(file).each { |key, value| @options[key.to_sym] = value } end end + + def ruby_require(file) + if File.extname(file) == '.ru' + warn 'WARNING: Use the -R option to load a Rack config file' + @options[:rackup] = file + else + require file + end + end end end \ No newline at end of file lib/thin/runner.rb @@ -61,7 +61,20 @@ describe Runner do it "should consider as a cluster with :only option" do Runner.new(%w(start --only 3000)).should be_a_cluster - end + end + + it "should warn when require a rack config file" do + STDERR.stub!(:write) + STDERR.should_receive(:write).with(/WARNING:/) + + runner = Runner.new(%w(start -r config.ru)) + + runner.options[:rackup].should == 'config.ru' + end + + it "should require file" do + proc { Runner.new(%w(start -r unexisting)) }.should raise_error(LoadError) + end end describe Runner, 'with config file' do spec/runner_spec.rb dc472b681619c0134db30e7d68b2edbfb1a02076 macournoyer macournoyer@gmail.com http://github.com/macournoyer/thin/commit/a3a783e2ffe03eebde8c329479b8e15dc0b3d21a a3a783e2ffe03eebde8c329479b8e15dc0b3d21a 2008-04-05T13:32:56-07:00 2008-04-05T13:32:56-07:00 Add --require (-r) option to require a library, before executing your script. Rename --rackup short option to -R, warn and load as rackup when file ends with .ru. ae75ab61b967a3e7173e2e67f1d40ab0f2ca859d macournoyer macournoyer@gmail.com