@@ -1,36 +1,6 @@ #!/usr/bin/env ruby -# See also: merb-gen scripts and script/merb - -# Try to use minigems instead of the fully rubygems library -begin - require 'minigems' -rescue LoadError - require 'rubygems' -end - -# Load script helpers if available - either local or system-wide. -begin - # Figure out the merb root - defaults to the current directory. - root_key = %w[-m --merb-root].detect { |o| ARGV.index(o) } - root = ARGV[ARGV.index(root_key) + 1] if root_key - __DIR__ = root.to_a.empty? ? Dir.getwd : root - - # Piggyback on the merb-core rubygem for initial setup scripts. - # Requiring it doesn't affect the local gem version of merb-core - # we might effectively want to load here after. - if merb_core_dir = Dir[File.join(__DIR__, 'gems', 'gems', 'merb-core-*')].last - require File.join(merb_core_dir, 'lib', 'merb-core', 'script') - else - require 'merb-core/script' - end - # Now setup local gems to be incorporated into the normal loaded gems. - # Unless the option --no-bundle is given, bundled gems are enabled. - include Merb::ScriptHelpers - setup_local_gems!(__DIR__) -rescue LoadError -end - +require 'rubygems' require 'merb-core' ARGV.push '-H' if ARGV[0] && ARGV[0] =~ /^[^-]/ bin/merb @@ -356,12 +356,8 @@ module Merb Merb.klass_hashes = [] - attr_accessor :frozen - # ==== Returns # Boolean:: True if Merb is running as an application with bundled gems. - # Can only be disabled by --no-bundle option on startup (or for Rakefile - # use NO_BUNDLE=true to disable local gems). # # ==== Notes # Bundling required gems makes your application independent from the @@ -369,7 +365,7 @@ module Merb # framework and gems it uses and very useful when application is run in # some sort of sandbox, for instance, shared hosting with preconfigured gems. def bundled? - ENV.key?("BUNDLE") || Merb::Config[:bundle] || ENV.key?("NO_BUNDLE") + $BUNDLE || ENV.key?("BUNDLE") end # Load configuration and assign logger. lib/merb-core.rb @@ -116,9 +116,6 @@ module Merb # Environment variables always win options[:environment] = ENV["MERB_ENV"] if ENV["MERB_ENV"] - # Enable bundled gems by default; used by bundled? - options[:bundle] = true - # Build a parser for the command line arguments opts = OptionParser.new do |opts| opts.version = Merb::VERSION @@ -242,10 +239,6 @@ module Merb options[:verbose] = true end - opts.on("-B", "--[no-]bundle", "Run application using bundled gems. Enabled by default.") do |b| - options[:bundle] = b - end - opts.on("-?", "-H", "--help", "Show this help message") do puts opts exit lib/merb-core/config.rb lib/merb-core/script.rb 06e97c30bb03d802c0ca7b7e5d41127bc4982449 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/78b96e43f8f85d3e3381a72afde92fbc9d284bf3 78b96e43f8f85d3e3381a72afde92fbc9d284bf3 2008-09-12T15:30:42-07:00 2008-09-12T15:30:42-07:00 Removed MerbScriptHelper - simplified loading bundled gems - see merb.thor e783a1f7494df15055498c29cf5d430b2c143157 Fabien Franzen info@atelierfabien.be