[merb-core] [merb-gen] Seamless bundler support from system bin

This merb-gen patch provides newly generated apps with the ability to work seamlessly with the bundler, whether you run merb, rake, spec from either your local system gem path or from bin/merb, bin/rake, bin/spec. No more having to bundle rake and rspec. w00t!
johnny · Nov 17, 2009 · e66a0fc · e66a0fc
1 parent 1faae25
commit e66a0fc
Show file tree

Hide file tree

Showing 16 changed files with 96 additions and 47 deletions.
diff --git a/merb-core/lib/merb-core.rb b/merb-core/lib/merb-core.rb
@@ -5,13 +5,6 @@
 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
-  # 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"
-  end
-end
 
 require 'bundler'
 require "thread"

diff --git a/merb-core/lib/merb-core/bootloader.rb b/merb-core/lib/merb-core/bootloader.rb
@@ -379,6 +379,7 @@ def self.run
       load_initfile
       load_env_config
     end
+    load_bundler_environment
     expand_ruby_path
     load_bundler_dependencies
     load_kernel_dependencies if Merb::Config[:kernel_dependencies]
@@ -387,6 +388,27 @@ def self.run
     nil
   end
 
+  # Try to load the gem environment file (set via Merb::Config[:gemenv])
+  # defaults to ./gems/environment
+  # 
+  # Falls back to rubygems if no bundler environment exists
+  # 
+  # ==== Returns
+  # nil
+  #
+  # :api: private
+  def self.load_bundler_environment
+    begin
+      # Try to load the bundler environment from Merb::Config[:gemenv]
+      # default to ./gems/environment.rb
+      require Merb.root / (Merb::Config[:gemenv] || "gems" / "environment")
+    rescue LoadError
+      # Default to using system rubygems if not bundled
+      require "rubygems"
+    end
+    nil
+  end
+
   # Load each the dependencies defined in the Merb::Config[:gemfile] 
   # using the bundler gem's Bundler::Environment.load
   #

diff --git a/merb-core/lib/merb-core/config.rb b/merb-core/lib/merb-core/config.rb
@@ -31,7 +31,8 @@ def defaults
           :verbose                => false,
           :name                   => "merb",
           :kernel_dependencies    => true,
-          :gemfile                => nil
+          :gemfile                => nil,
+          :gemenv                 => nil
         }
       end
 

diff --git a/merb-gen/lib/generators/templates/application/common/Rakefile b/merb-gen/lib/generators/templates/application/common/Rakefile
@@ -1,3 +1,11 @@
+begin
+  # Load the bundler environment from #{Merb.root}/gems/environment.rb
+  require File.join(File.dirname(__FILE__), "gems", "environment")
+rescue LoadError
+  # Default to using system rubygems if there's no bundle detected
+  require "rubygems"
+end
+
 require 'rake/rdoctask'
 
 require 'merb-core'

diff --git a/merb-gen/lib/generators/templates/application/merb_core/config/init.rb b/merb-gen/lib/generators/templates/application/merb_core/config/init.rb
@@ -1,5 +1,5 @@
 # Go to http://wiki.merbivore.com/pages/init-rb
- 
+
 # Specify your dependencies in the Gemfile
 <%= "use_orm :#{orm}" unless orm == :none %>
 use_test :<%= testing_framework %>

diff --git a/merb-gen/lib/generators/templates/application/merb_core/spec/spec_helper.rb b/merb-gen/lib/generators/templates/application/merb_core/spec/spec_helper.rb
@@ -1,6 +1,13 @@
-require "rubygems"
-require "merb-core"
+begin
+  # Load the bundler environment from #{Merb.root}/gems/environment.rb
+  require File.join(File.dirname(__FILE__), "..", "gems", "environment")
+rescue LoadError
+  # Default to using system rubygems if there's no bundle detected
+  require "rubygems"
+end
+
 require "spec" # Satisfies Autotest and anyone else not using the Rake tasks
+require "merb-core"
 
 # this loads all plugins required in your init file so don't add them
 # here again, Merb will do it for you

diff --git a/merb-gen/lib/generators/templates/application/merb_core/test/test_helper.rb b/merb-gen/lib/generators/templates/application/merb_core/test/test_helper.rb
@@ -1,9 +1,9 @@
-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.
-if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil?
-  $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(local_gem_dir)
+begin
+  # Load the bundler environment from #{Merb.root}/gems/environment.rb
+  require File.join(File.dirname(__FILE__), "..", "gems", "environment")
+rescue LoadError
+  # Default to using system rubygems if there's no bundle detected
+  require "rubygems"
 end
 
 require "merb-core"

diff --git a/merb-gen/lib/generators/templates/application/merb_flat/config/init.rb b/merb-gen/lib/generators/templates/application/merb_flat/config/init.rb
@@ -4,8 +4,7 @@
 use_test :<%= testing_framework %>
 use_template_engine :<%= template_engine %>
 
-# Specify a specific version of a dependency
-# dependency "RedCloth", "> 3.0"
+# Specify your dependencies in the Gemfile
 
 Merb::BootLoader.before_app_loads do
   # This will get executed after dependencies have been loaded but before your app's classes have loaded.

diff --git a/merb-gen/lib/generators/templates/application/merb_flat/spec/spec_helper.rb b/merb-gen/lib/generators/templates/application/merb_flat/spec/spec_helper.rb
@@ -1,4 +1,11 @@
-require "rubygems"
+begin
+  # Load the bundler environment from #{Merb.root}/gems/environment.rb
+  require File.join(File.dirname(__FILE__), "..", "gems", "environment")
+rescue LoadError
+  # Default to using system rubygems if there's no bundle detected
+  require "rubygems"
+end
+
 require "spec"
 require "merb-core"
 

diff --git a/merb-gen/lib/generators/templates/application/merb_flat/test/test_helper.rb b/merb-gen/lib/generators/templates/application/merb_flat/test/test_helper.rb
@@ -1,9 +1,9 @@
-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.
-if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil?
-  $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(local_gem_dir)
+begin
+  # Load the bundler environment from #{Merb.root}/gems/environment.rb
+  require File.join(File.dirname(__FILE__), "..", "gems", "environment")
+rescue LoadError
+  # Default to using system rubygems if there's no bundle detected
+  require "rubygems"
 end
 
 require "merb-core"

diff --git a/merb-gen/lib/generators/templates/application/merb_stack/config.ru b/merb-gen/lib/generators/templates/application/merb_stack/config.ru
@@ -1,11 +1,9 @@
 begin
-  require File.join(File.dirname(__FILE__), "gems/environment")
+  # Load the bundler environment from #{Merb.root}/gems/environment.rb
+  require File.join(File.dirname(__FILE__), "gems", "environment")
 rescue LoadError
-  begin 
-    require 'minigems'
-  rescue LoadError 
-    require 'rubygems'
-  end
+  # Default to using system rubygems if there's no bundle detected
+  require "rubygems"
 end
 
 require 'merb-core'

diff --git a/merb-gen/lib/generators/templates/application/merb_stack/config/init.rb b/merb-gen/lib/generators/templates/application/merb_stack/config/init.rb
@@ -1,5 +1,7 @@
 # Go to http://wiki.merbivore.com/pages/init-rb
 
+# Specify your dependencies in the Gemfile
+
 use_orm :datamapper
 use_test :<%= testing_framework %>
 use_template_engine :<%= template_engine %>

diff --git a/merb-gen/lib/generators/templates/application/merb_stack/spec/spec_helper.rb b/merb-gen/lib/generators/templates/application/merb_stack/spec/spec_helper.rb
@@ -1,6 +1,13 @@
-require "rubygems"
-require "merb-core"
+begin
+  # Load the bundler environment from #{Merb.root}/gems/environment.rb
+  require File.join(File.dirname(__FILE__), "..", "gems", "environment")
+rescue LoadError
+  # Default to using system rubygems if there's no bundle detected
+  require "rubygems"
+end
+
 require "spec" # Satisfies Autotest and anyone else not using the Rake tasks
+require "merb-core"
 
 # this loads all plugins required in your init file so don't add them
 # here again, Merb will do it for you

diff --git a/merb-gen/lib/generators/templates/application/merb_stack/test/test_helper.rb b/merb-gen/lib/generators/templates/application/merb_stack/test/test_helper.rb
@@ -1,9 +1,9 @@
-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.
-if (local_gem_dir = File.join(File.dirname(__FILE__), '..', 'gems')) && $BUNDLE.nil?
-  $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(local_gem_dir)
+begin
+  # Load the bundler environment from #{Merb.root}/gems/environment.rb
+  require File.join(File.dirname(__FILE__), "..", "gems", "environment")
+rescue LoadError
+  # Default to using system rubygems if there's no bundle detected
+  require "rubygems"
 end
 
 require "merb-core"

diff --git a/merb-gen/lib/generators/templates/application/merb_very_flat/spec/spec_helper.rb b/merb-gen/lib/generators/templates/application/merb_very_flat/spec/spec_helper.rb
@@ -1,4 +1,11 @@
-require "rubygems"
+begin
+  # Load the bundler environment from #{Merb.root}/gems/environment.rb
+  require File.join(File.dirname(__FILE__), "..", "gems", "environment")
+rescue LoadError
+  # Default to using system rubygems if there's no bundle detected
+  require "rubygems"
+end
+
 require "spec"
 require "merb-core"
 

diff --git a/merb-gen/lib/generators/templates/component/fcgi/merb.fcgi b/merb-gen/lib/generators/templates/component/fcgi/merb.fcgi
@@ -1,12 +1,10 @@
 #!/usr/bin/env ruby
 begin
-  require File.join(File.dirname(__FILE__), "../gems/environment")
+  # Load the bundler environment from #{Merb.root}/gems/environment.rb
+  require File.join(File.dirname(__FILE__), "..", "gems", "environment")
 rescue LoadError
-  begin 
-    require 'minigems'
-  rescue LoadError 
-    require 'rubygems'
-  end
+  # Default to using system rubygems if there's no bundle detected
+  require "rubygems"
 end
 
 require 'merb-core'