Merge pull request #31 from lamont-granquist/COOK-3219

COOK-3219:  Using omnibus bundler for your app is bad

Author: Joshua Timberman

providers/rails.rb

@@ -30,10 +30,16 @@
     new_resource.migration_command command
   end
 
-  new_resource.environment.update({
+  new_resource.environment.merge!({
     "RAILS_ENV" => new_resource.environment_name,
-    "PATH" => [Gem.default_bindir, ENV['PATH']].join(':')
-  })
+  }) { |k, v1, v2| v1 }  # user's environment settings will override
+
+  if new_resource.use_omnibus_ruby
+    Chef::Log.warn("Tying your Application to the Chef Omnibus Ruby is not recommended.")
+    new_resource.environment.merge!({
+      "PATH" => [Gem.default_bindir, ENV['PATH']].join(':')
+    }) { |k, v1, v2| v1 }  # user's environment settings will override
+  end
 
   new_resource.symlink_before_migrate.update({
     "database.yml" => "config/database.yml"

resources/rails.rb

@@ -29,6 +29,7 @@
 attribute :bundler_without_groups, :kind_of => [Array], :default => []
 attribute :bundle_command, :kind_of => [String, NilClass], :default => "bundle"
 attribute :precompile_assets, :kind_of => [NilClass, TrueClass, FalseClass], :default => nil
+attribute :use_omnibus_ruby, :kind_of => [TrueClass, FalseClass], :default => true
 
 def database(*args, &block)
   @database ||= Mash.new