Changeset 671

Show
Ignore:
Timestamp:
09/22/07 08:12:50 (1 year ago)
Author:
iv..@gweezlebur.com
Message:

Merb will now add gems/ to the Gem Search Path, instead of deps/ ... and Rails-style plugin support is removed ... watch for merb_with_rails_plugins plugin coming soon (Closes #205)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app_generators/merb/merb_generator.rb

    r660 r671  
    104104      spec/controllers 
    105105      test/unit 
    106       deps/plugins 
     106      gems 
    107107    ) 
    108108     

  • trunk/app_generators/merb/templates/config/dependencies.rb

    r589 r671  
    11puts "Loading dependencies..." 
    22 
    3 # Make the app's "deps" directory a place where gems are loaded from 
     3# Make the app's "gems" directory a place where gems are loaded from 
    44Gem.clear_paths 
    5 Gem.path.unshift(MERB_ROOT / "deps") 
     5Gem.path.unshift(MERB_ROOT / "gems") 
    66 
    77# Make the app's "lib" directory a place where ruby files get "require"d from 
    …… 
    2727  # dependency "magic_admin" # this gem uses the app's model classes 
    2828end 
    29  
    30  
    31 # We pick up any old-style plugins in deps/plugins as a last-effort 
    32 Dir["#{MERB_ROOT}/deps/plugins/*/init.rb"].each do |m|  
    33   plugin_lib = File.dirname(m) / 'lib' 
    34   $LOAD_PATH << plugin_lib if File.directory?(plugin_lib) 
    35   require m 
    36 end 

  • trunk/doc/site/src/plugins.page

    r601 r671  
    2121 
    2222If you don't have (or want to use) sudo access, you can install the gem into 
    23 your Merb app's local gem repo, which is in a directory named 'deps' 
    24   cd my_merb_app ; gem install merb_foo -i deps 
     23your Merb app's local gem repo, which is in a directory named 'gems' 
     24  cd my_merb_app ; gem install merb_foo -i gems 
    2525  -or- 
    26   cd my_merb_app ; gem install ../merb_foo-1.2.1.gem -i deps 
     26  cd my_merb_app ; gem install ../merb_foo-1.2.1.gem -i gems 
    2727 
    2828 
    …… 
    4343h3. Old-Style (Rails) Plugins 
    4444If you look at your config/dependencies.rb you'll see that the last few lines 
    45 load all the plugins in deps/plugins.  If you have Rails ActiveRecord plugins 
     45load all the plugins in gems/plugins.  If you have Rails ActiveRecord plugins 
    4646you want to use, you can try dropping them in there and see what happens. 
    4747 

  • trunk/lib/autotest/merb_rspec.rb

    r638 r671  
    2929  def initialize # :nodoc: 
    3030    super 
    31     @exceptions = %r%^\./(?:coverage|deps|doc|log|public|schema|script|previous_failures.txt)% 
     31    @exceptions = %r%^\./(?:coverage|gems|doc|log|public|schema|script|previous_failures.txt)% 
    3232    @test_mappings = { 
    3333      %r%^(test|spec)/fixtures/(.*).yml$% => proc { |_, m|