merb-core/spec/Gemfile merb-core/spec/public/webrat/test_app/Gemfile @@ -16,8 +16,8 @@ require __DIR__ + "/tools/annotation_extract" include FileUtils -require "lib/merb-core/version" -require 'lib/merb-core/tasks/merb_rake_helper' +require __DIR__ + "/lib/merb-core/version" +require __DIR__ + "/lib/merb-core/tasks/merb_rake_helper" ############################################################################## # Package && release merb-core/Rakefile @@ -1,7 +1,5 @@ #!/usr/bin/env ruby -require 'rubygems' -require 'bundler' require 'merb-core' ARGV.push '-H' if ARGV[0] && ARGV[0] =~ /^[^-]/ merb-core/bin/merb @@ -1,20 +1,19 @@ # require 'merb' must happen after Merb::Config is instantiated -require "rubygems" # Add the local gems dir if found within the app root; any dependencies loaded # hereafter will try to load from the local gems before loading system gems. root_key = %w[-m --merb-root].detect { |o| ARGV.index(o) } root = ARGV[ARGV.index(root_key) + 1] if root_key root = root.to_a.empty? ? Dir.getwd : root -if File.directory?(gems_dir = File.join(root, "gems")) && !$BUNDLE - $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(gems_dir) +if File.directory?(gems_dir = File.join(root, "vendor", "gems")) && !$BUNDLE # Warn if local merb-core is available but not loaded. if File.expand_path($0).index(root) != 0 && (local_mc = Dir[File.join(gems_dir, "specifications", "merb-core-*.gemspec")].last) - puts "Warning: please use bin/#{File.basename($0)} to load #{File.basename(local_mc, ".gemspec")} from ./gems" + puts "Warning: please use bin/#{File.basename($0)} to load #{File.basename(local_mc, ".gemspec")} from ./vendor/gems" end end +require 'bundler' require "thread" require "set" require "fileutils" merb-core/lib/merb-core.rb @@ -362,6 +362,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader # Array[Gem::Dependency]:: The dependencies registered in init.rb. # # :api: plugin + # FIXME: PK: This should go, there is no need for this anymore? cattr_accessor :dependencies self.dependencies = [] @@ -389,8 +390,8 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader load_env_config end expand_ruby_path - enable_json_gem unless Merb::disabled?(:json) load_dependencies + enable_json_gem unless Merb::disabled?(:json) update_logger nil end @@ -402,7 +403,21 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader # # :api: private def self.load_dependencies - Bundler.require_env(Merb.environment) + begin + if (ENV['DEBUG'] || $DEBUG || Merb::Config[:verbose]) && Merb.logger + if Merb::Config[:gemfile] + Merb.logger.debug!("Loading Gemfile from #{Merb::Config[:gemfile]}") + else + Merb.logger.debug!("Loading default Gemfile from Merb.root/Gemfile") + end + end + + Bundler::Environment.load(Merb::Config[:gemfile]).require_env(Merb.environment) + rescue Bundler::DefaultManifestNotFound => e + Merb.fatal! "You didn't create Bundler Gemfile manifest or you are not " \ + "in a Merb application. If you are trying to create a new " \ + "merb application, use merb-gen app." + end nil end @@ -416,6 +431,7 @@ class Merb::BootLoader::Dependencies < Merb::BootLoader require "json/ext" rescue LoadError require "json/pure" + # FIXME: PK: Remove this and add the json 1.1.7 dependency instead require "merb-core/core_ext/json_pure_fix" end merb-core/lib/merb-core/bootloader.rb @@ -29,7 +29,8 @@ module Merb :disabled_components => Merb.on_windows? ? [:signals] : [], :deferred_actions => [], :verbose => false, - :name => "merb" + :name => "merb", + :gemfile => nil } end merb-core/lib/merb-core/config.rb @@ -3,9 +3,6 @@ module Kernel # after the logger has been instantiated and the framework directory # structure is defined. # - # If that has already happened, the gem will be activated - # immediately, but it will still be registered. - # # ==== Parameters # name<String> The name of the gem to load. # *ver<Gem::Requirement, Gem::Version, Array, #to_str> @@ -18,68 +15,13 @@ module Kernel # :immediate when true, gem is loaded immediately even if framework is not yet ready. # :require_as file name to require for this gem. # - # See examples below. - # - # ==== Notes - # - # If block is given, it is called after require is called. If you use a block to - # require multiple files, require first using :require_as option and the rest - # in the block. - # - # ==== Examples - # - # Usage scenario is typically one of the following: - # - # 1. Gem name and loaded file names are the same (ex.: amqp gem uses amqp.rb). - # In this case no extra options needed. - # - # dependency "amqp" - # - # 2. Gem name is different from the file needs to be required - # (ex.: ParseTree gem uses parse_tree.rb as main file). - # - # dependency "ParseTree", :require_as => "parse_tree" - # - # 3. You need to require a number of files from the library explicitly - # (ex.: cherry pick features from xmpp4r). Pass an array to :require_as. - # - # dependency "xmpp4r", :require_as => %w(xmpp4r/client xmpp4r/sasl xmpp4r/vcard) - # - # 4. You need to require a specific version of the gem. - # - # dependency "RedCloth", "3.0.4" - # - # 5. You want to load dependency as soon as the method is called. - # - # dependency "syslog", :immediate => true - # - # 6. You need to execute some arbitraty code after dependency is loaded: - # - # dependency "ruby-growl" do - # g = Growl.new "localhost", "ruby-growl", - # ["ruby-growl Notification"] - # g.notify "ruby-growl Notification", "Ruby-Growl is set up", - # "Ruby-Growl is set up" - # end - # - # When specifying a gem version to use, you can use the same syntax RubyGems - # support, for instance, >= 3.0.2 or >~ 1.2. - # - # See rubygems.org/read/chapter/16 for a complete reference. - # # ==== Returns # Gem::Dependency:: The dependency information. # # :api: public def dependency(name, *opts, &blk) - warn('User bundler for dependencies.') + warn("DEPRECATED: Use bundler to setup and load dependency #{name}.") return - immediate = opts.last.delete(:immediate) if opts.last.is_a?(Hash) - if immediate || Merb::BootLoader.finished?(Merb::BootLoader::Dependencies) - load_dependency(name, caller, *opts, &blk) - else - track_dependency(name, caller, *opts, &blk) - end end # Loads both gem and library dependencies that are passed in as arguments. @@ -94,15 +36,8 @@ module Kernel # # :api: public def dependencies(*args) - warn('User bundler for dependencies.') + warn("DEPRECATED: Use bundler to setup and load dependencies #{args.join(', ')}.") return - args.map do |arg| - case arg - when String then dependency(arg) - when Hash then arg.map { |r,v| dependency(r, v) } - when Array then arg.map { |r| dependency(r) } - end - end end # Used in Merb.root/config/init.rb to tell Merb which ORM (Object Relational @@ -127,16 +62,7 @@ module Kernel # # :api: public def use_orm(orm, &blk) - begin - Merb.orm = orm - orm_plugin = "merb_#{orm}" - require orm_plugin - #TODO: Handle block - rescue LoadError => e - Merb.logger.warn!("The #{orm_plugin} gem was not found. You may need to install it.") - raise e - end - nil + Merb.orm = orm end # Used in Merb.root/config/init.rb to tell Merb which testing framework to @@ -157,14 +83,7 @@ module Kernel # # :api: public def use_testing_framework(test_framework, *test_dependencies) - begin - Merb.test_framework = test_framework - require test_framework if Merb.env == "test" || Merb.env.nil? - nil - rescue LoadError => e - Merb.logger.warn!("The #{test_framework} gem was not found. You may need to install it.") - raise e - end + Merb.test_framework = test_framework end def use_test(*args) @@ -189,24 +108,7 @@ module Kernel # # :api: public def use_template_engine(template_engine, &blk) - begin - Merb.template_engine = template_engine - - if template_engine != :erb - if template_engine.in?(:haml, :builder) - template_engine_plugin = "merb-#{template_engine}" - else - template_engine_plugin = "merb_#{template_engine}" - end - require template_engine_plugin - #TODO: Handle block - end - - nil - rescue LoadError => e - Merb.logger.warn!("The #{template_engine_plugin} gem was not found. You may need to install it.") - raise e - end + Merb.template_engine = template_engine end merb-core/lib/merb-core/core_ext/kernel.rb @@ -8,12 +8,11 @@ module Spec module Formatter class BaseTextFormatter def dump_failure(counter, failure) - output = @options.error_stream - output.puts - output.puts "#{counter.to_s})" - output.puts colourise("#{failure.header}\n#{failure.exception.message}", failure) - output.puts format_backtrace(failure.exception.backtrace) - output.flush + @output.puts + @output.puts "#{counter.to_s})" + @output.puts colorize_failure("#{failure.header}\n#{failure.exception.message}", failure) + @output.puts format_backtrace(failure.exception.backtrace) + @output.flush end end end merb-core/lib/merb-core/test/run_spec.rb @@ -1,4 +1,3 @@ -require 'rubygems' require 'benchmark' require 'spec' require 'spec/runner/formatter/base_text_formatter' @@ -111,9 +110,13 @@ def run_specs(globs, spec_cmd='spec', run_opts = "-c", except = []) else `NOW=1 #{Gem.ruby} #{File.dirname(__FILE__) / "run_spec.rb"} \"#{spec}\"` end - out = File.read(base_dir / "results" / "#{File.basename(spec)}_out") - err = File.read(base_dir / "results" / "#{File.basename(spec)}_err") - counter.add(spec, out, err) + begin + out = File.read(base_dir / "results" / "#{File.basename(spec)}_out") + err = File.read(base_dir / "results" / "#{File.basename(spec)}_err") + counter.add(spec, out, err) + rescue Errno::ENOENT => e + STDOUT.puts e.message + end end end end merb-core/lib/merb-core/test/run_specs.rb @@ -13,7 +13,6 @@ describe "Kernel#caller" do end - describe "Kernel#extract_options_from_args!" do it "should extract options from args" do args = ["foo", "bar", {:baz => :bar}] @@ -24,71 +23,17 @@ end describe "Kernel#dependencies" do - it "deferres load of dependencies given as String" do - self.should_receive(:dependency).with("hpricot").and_return(true) - - begin - dependencies("hpricot") - rescue LoadError => e - # sanity check, should never happen - end - end - - it "deferres load of dependencies given as Array" do - self.should_receive(:dependency).with("hpricot").and_return(true) - self.should_receive(:dependency).with("rake").and_return(true) - - begin - dependencies("hpricot", "rake") - rescue LoadError => e - # sanity check, should never happen - end - end - - it "defers load of dependencies given as Hash" do - self.should_receive(:dependency).with("hpricot", "0.6").and_return(true) - self.should_receive(:dependency).with("rake", "0.8.1").and_return(true) - - begin - dependencies("hpricot" => "0.6", "rake" => "0.8.1") - rescue LoadError => e - # sanity check, should never happen - end - end -end - - -describe "Kernel#load_dependencies" do - it "loads dependencies given as String immediately" do - self.should_receive(:load_dependency).with("hpricot").and_return(true) - - begin - load_dependencies("hpricot") - rescue LoadError => e - # sanity check, should never happen - end + it "should warn that dependency() is deprecated" do + warning = 'DEPRECATED: Use bundler to setup and load dependency hpricot.' + Kernel.should_receive(:warn).with(warning) + Kernel.dependency("hpricot") end - it "loads dependencies given as Array immediately" do - self.should_receive(:load_dependency).with("hpricot").and_return(true) - self.should_receive(:load_dependency).with("rake").and_return(true) - - begin - load_dependencies("hpricot", "rake") - rescue LoadError => e - # sanity check, should never happen - end + it "should warn that dependency() is deprecated" do + warning = 'DEPRECATED: Use bundler to setup and load dependencies hpricot, rspec.' + Kernel.should_receive(:warn).with(warning) + Kernel.dependencies("hpricot", "rspec") end - it "loads dependencies given as Hash immediately" do - self.should_receive(:load_dependency).with("hpricot", "0.6").and_return(true) - self.should_receive(:load_dependency).with("rake", "0.8.1").and_return(true) - - begin - load_dependencies("hpricot" => "0.6", "rake" => "0.8.1") - rescue LoadError => e - # sanity check, should never happen - end - end end merb-core/spec/private/core_ext/kernel_spec.rb @@ -8,8 +8,6 @@ require File.expand_path(File.join(__DIR__, "controllers", "partial")) require File.expand_path(File.join(__DIR__, "controllers", "display")) require File.expand_path(File.join(__DIR__, "controllers", "helpers")) -Merb.start :environment => 'test' - module Merb::Test::Behaviors include Merb::Test::RequestHelper @@ -28,4 +26,4 @@ end Spec::Runner.configure do |config| config.include Merb::Test::Behaviors -end \ No newline at end of file +end merb-core/spec/public/abstract_controller/spec_helper.rb @@ -1,7 +1,8 @@ __DIR__ = File.dirname(__FILE__) require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper")) -startup_merb + +startup_merb(:init_file => File.join(__DIR__, 'config', 'init')) require File.join(__DIR__, "controllers", "base") require File.join(__DIR__, "controllers", "responder") @@ -12,4 +13,3 @@ require File.join(__DIR__, "controllers", "cookies") require File.join(__DIR__, "controllers", "conditional_get") require File.join(__DIR__, "controllers", "streaming") -Merb.start :environment => 'test', :init_file => File.join(__DIR__, 'config', 'init') merb-core/spec/public/controller/spec_helper.rb @@ -1,3 +1,4 @@ +# FIXME: PK: Delete this when removing the json pure fix require File.join(File.dirname(__FILE__), "spec_helper") require "benchmark" @@ -31,4 +32,4 @@ describe "JSON pure vulnerability" do time.should_not > 0.1 end end -end \ No newline at end of file +end merb-core/spec/public/core_ext/json_pure_spec.rb @@ -15,8 +15,8 @@ describe Kernel, "#use_orm" do Merb.orm.should == :activerecord end - it "should add the the orm plugin as a dependency" do - Kernel.should_receive(:dependency).with('merb_activerecord') + it "should not add dependency" do + Kernel.should_not_receive(:dependency) Kernel.use_orm(:activerecord) end @@ -26,7 +26,7 @@ describe Kernel, "#use_template_engine" do before do Kernel.stub!(:dependency) - Merb.template_engine = :erb # reset orm + Merb.template_engine = :erb # reset template engine end it "should set Merb.template_engine" do @@ -34,33 +34,17 @@ describe Kernel, "#use_template_engine" do Merb.template_engine.should == :haml end - it "should add merb-haml as a dependency for :haml" do - Kernel.should_receive(:dependency).with('merb-haml') - Kernel.use_template_engine(:haml) - end - - it "should add merb-builder as a dependency for :builder" do - Kernel.should_receive(:dependency).with('merb-builder') - Kernel.use_template_engine(:builder) - end - - it "should add no dependency for :erb" do + it "should add no dependency" do Kernel.should_not_receive(:dependency) - Kernel.use_template_engine(:erb) - end - - it "should add other plugins as a dependency" do - Kernel.should_receive(:dependency).with('merb_liquid') - Kernel.use_template_engine(:liquid) + Kernel.use_template_engine(:haml) end - end describe Kernel, "#use_test" do before do - Merb.test_framework = :rspec # reset orm Merb.stub!(:dependencies) + Merb.test_framework = :rspec # reset test framework end it "should set Merb.test_framework" do @@ -74,10 +58,10 @@ describe Kernel, "#use_test" do Merb.use_test(:test_unit, 'hpricot', 'webrat') end - it "should require test dependencies when in 'test' env" do + it "should nor require test dependencies when in 'test' env" do Merb.stub!(:env).and_return("test") - Kernel.should_receive(:dependencies).with(["hpricot", "webrat"]) + Kernel.should_not_receive(:dependencies) Merb.use_test(:test_unit, 'hpricot', 'webrat') end -end \ No newline at end of file +end merb-core/spec/public/core_ext/kernel_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper")) require "merb-core/two-oh" -Merb.start :environment => 'test', :log_level => :fatal +startup_merb(:log_level => :fatal) Dir[File.join(File.dirname(__FILE__), "controllers/**/*.rb")].each do |f| require f merb-core/spec/public/test/20_multipart_request_helper_spec.rb @@ -1,6 +1,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper")) -Merb.start :environment => 'test', :log_level => :fatal +startup_merb(:log_level => :fatal) class TestController < Merb::Controller attr_accessor :redirect_to merb-core/spec/public/test/controller_matchers_spec.rb @@ -1,6 +1,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper")) -Merb.start :environment => 'test', :log_level => :fatal +startup_merb(:log_level => :fatal) Dir[File.join(File.dirname(__FILE__), "controllers/**/*.rb")].each do |f| require f merb-core/spec/public/test/mock_request_helper_spec.rb @@ -1,6 +1,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper")) -Merb.start :environment => 'test', :log_level => :fatal +startup_merb(:log_level => :fatal) Dir[File.join(File.dirname(__FILE__), "controllers/**/*.rb")].each do |f| require f merb-core/spec/public/test/multipart_request_helper_spec.rb @@ -1,6 +1,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper")) -Merb.start :environment => 'test', :log_level => :fatal +startup_merb(:log_level => :fatal) require File.dirname(__FILE__) / "controllers/request_controller" merb-core/spec/public/test/request_helper_spec.rb @@ -1,6 +1,6 @@ require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper")) -Merb.start :environment => 'test', :log_level => :fatal +startup_merb(:log_level => :fatal) class TestController < Merb::Controller def get(id = nil); end merb-core/spec/public/test/route_matchers_spec.rb @@ -1,8 +1,10 @@ # Go to http://wiki.merbivore.com/pages/init-rb ::Gem.clear_paths; ::Gem.path.unshift(File.dirname(__FILE__) + "/../gems/") - -require 'config/dependencies.rb' + +Merb::BootLoader.before_app_loads do + require Merb.framework_root / ".." / ".." / "merb-helpers" / "lib" / "merb-helpers.rb" +end use_test :rspec use_template_engine :erb merb-core/spec/public/webrat/test_app/config/init.rb @@ -1,7 +1,8 @@ require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper")) -Merb.start( +startup_merb( :merb_root => File.dirname(__FILE__) / "test_app", + :gemfile => File.dirname(__FILE__) / "test_app" / "Gemfile", :fork_for_class_load => false ) Merb::Config[:log_stream] = File.open("/dev/null", "w") @@ -79,4 +80,4 @@ describe "an app tested using the webrat proxies" do end end -end \ No newline at end of file +end merb-core/spec/public/webrat/webrat_spec.rb @@ -1,9 +1,12 @@ -require "rubygems" require "spec" require File.join(File.dirname(__FILE__), "..", "lib", "merb-core") def startup_merb(opts = {}) - default_options = {:environment => 'test', :adapter => 'runner'} + default_options = { + :environment => 'test', + :adapter => 'runner', + :gemfile => File.join(File.dirname(__FILE__), "Gemfile") + } options = default_options.merge(opts) Merb.start_environment(options) end merb-core/spec/spec_helper.rb merb-core/spec/private/bundler/bootloader_spec.rb merb-core/spec/private/bundler/fixture/Gemfile merb-core/spec/public/core_ext/dependency_after_load_spec.rb merb-core/spec/public/core_ext/fixtures/bad_require_gem/Rakefile merb-core/spec/public/core_ext/fixtures/bad_require_gem/lib/BadRequireGem.rb merb-core/spec/public/core_ext/fixtures/core_ext_dependency.rb merb-core/spec/public/core_ext/fixtures/gems/bin/edit_json.rb merb-core/spec/public/core_ext/fixtures/gems/gems/bad_require_gem-0.0.1/Rakefile merb-core/spec/public/core_ext/fixtures/gems/gems/bad_require_gem-0.0.1/lib/BadRequireGem.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/CHANGES merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/GPL merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/README merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/RUBY merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/Rakefile merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/TODO merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/VERSION merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/benchmarks/benchmark.txt merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/benchmarks/benchmark_generator.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/benchmarks/benchmark_parser.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/benchmarks/benchmark_rails.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/bin/edit_json.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/bin/prettify_json.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/data/example.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/data/index.html merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/data/prototype.js merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/generator/extconf.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/generator/generator.c merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/generator/unicode.c merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/generator/unicode.h merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/parser/extconf.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/parser/parser.c merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/parser/parser.rl merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/parser/unicode.c merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/ext/json/ext/parser/unicode.h merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/install.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/Array.xpm merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/FalseClass.xpm merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/Hash.xpm merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/Key.xpm merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/NilClass.xpm merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/Numeric.xpm merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/String.xpm merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/TrueClass.xpm merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/add/core.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/add/rails.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/common.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/editor.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/ext.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/json.xpm merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/pure.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/pure/generator.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/pure/parser.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/lib/json/version.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail1.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail10.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail11.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail12.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail13.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail14.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail18.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail19.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail2.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail20.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail21.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail22.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail23.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail24.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail25.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail27.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail28.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail3.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail4.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail5.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail6.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail7.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail8.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/fail9.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/pass1.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/pass15.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/pass16.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/pass17.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/pass2.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/pass26.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/fixtures/pass3.json merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/runner.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/test_json.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/test_json_addition.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/test_json_fixtures.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/test_json_generate.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/test_json_rails.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tests/test_json_unicode.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tools/fuzz.rb merb-core/spec/public/core_ext/fixtures/gems/gems/json_pure-1.1.3/tools/server.rb merb-core/spec/public/core_ext/fixtures/gems/gems/simple_gem-0.0.1/Rakefile merb-core/spec/public/core_ext/fixtures/gems/gems/simple_gem-0.0.1/lib/simple_gem.rb merb-core/spec/public/core_ext/fixtures/gems/gems/simple_gem-0.0.2/Rakefile merb-core/spec/public/core_ext/fixtures/gems/gems/simple_gem-0.0.2/lib/simple_gem.rb merb-core/spec/public/core_ext/fixtures/gems/specifications/bad_require_gem-0.0.1.gemspec merb-core/spec/public/core_ext/fixtures/gems/specifications/json_pure-1.1.3.gemspec merb-core/spec/public/core_ext/fixtures/gems/specifications/simple_gem-0.0.1.gemspec merb-core/spec/public/core_ext/fixtures/gems/specifications/simple_gem-0.0.2.gemspec merb-core/spec/public/core_ext/fixtures/simple_gem/Rakefile merb-core/spec/public/core_ext/fixtures/simple_gem/lib/simple_gem.rb merb-core/spec/public/core_ext/fixtures/simple_gem_2/Rakefile merb-core/spec/public/core_ext/fixtures/simple_gem_2/lib/simple_gem.rb merb-core/spec/public/core_ext/immediate_spec.rb merb-core/spec/public/core_ext/multi_versions_spec.rb merb-core/spec/public/core_ext/require_as_fail_spec.rb merb-core/spec/public/core_ext/require_as_immediate_spec.rb merb-core/spec/public/core_ext/require_as_version_spec.rb merb-core/spec/public/core_ext/require_as_working_spec.rb merb-core/spec/public/core_ext/simple_dependency_spec.rb merb-core/spec/public/core_ext/version_dependency_spec.rb 2bedad6c09fab90191f1059585a0aad7e72ba2be Pavel Kunc pavel.kunc@gmail.com http://github.com/wycats/merb/commit/1ceacbcead8a14ad7bfb3b2e4fe706ff84b86219 1ceacbcead8a14ad7bfb3b2e4fe706ff84b86219 2009-09-11T09:02:25-07:00 2009-09-11T09:02:25-07:00 Integration of the Bundler to Merb. You nou use Bundler instead of the Thor to bundle your dependencies. Also Merb NOW DOESN'T CARE about gem dependencies. So Kernel#dependency and Kernel#dependencies are now deprecated and you get warning about that. These two methods also doesn't do anything now. All Kernel#use_orm, Kernel#use_testing_framework and Kernel#use_template_engine, just sets Merb to use appropriate option. They DON'T ADD dependency in runtime, you need to do it on your OWN! Merb will refuse to boot if you don't have Gemfile in your Merb.root directory. See http://wiki.github.com/pk/merb/bundler how to migrate your dependencies.rb. You should change all your Merb Plugins or Slices to not use Kernel#dependency and set your dependencies in your GEM Rakefile or *.gemspec file. All MRI specs should now pass. I quite a few things in Specs to run on the latest versions of RSpec and Ruby. 2b3819ff4318eb25008739584da2a4979938132f Pavel Kunc pavel.kunc@gmail.com