Changeset 9140

Timestamp:

03/30/08 02:17:28 (2 months ago)

Author:

rick

Message:

Added config.gem for specifying which gems are required by the application, as well as rake tasks for installing and freezing gems. [rick]

Files:

• trunk/railties/CHANGELOG (modified) (1 diff)
• trunk/railties/lib/initializer.rb (modified) (8 diffs)
• trunk/railties/lib/rails/gem_dependency.rb (added)
• trunk/railties/lib/tasks/gems.rake (added)
• trunk/railties/test/gem_dependency_test.rb (added)

trunk/railties/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Added config.gem for specifying which gems are required by the application, as well as rake tasks for installing and freezing gems. [rick]
+
+  Rails::Initializer.run do |config|
+    config.gems "bj"
+    config.gems "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
+    config.gems "aws-s3", :lib => "aws/s3"
+  end
+  
+  # List required gems.
+  rake gems
+  
+  # Install all required gems:
+  rake gems:install
+  
+  # Unpack specified gem to vendor/gems/gem_name-x.x.x
+  rake gems:unpack GEM=bj
-
-* Removed the default .htaccess configuration as there are so many good deployment options now (kept it as an example in README) [DHH]

trunk/railties/lib/initializer.rb

@@ -8 +8 @@
-require 'rails/plugin/locator'
-require 'rails/plugin/loader'
+require 'rails/gem_dependency'
-
-
@@ -78 +79 @@
-      require_frameworks
-      set_autoload_paths
+      add_gem_load_paths
-      add_plugin_load_paths
-      load_environment
@@ -99 +101 @@
-      add_support_load_paths
-
+      load_gems
-      load_plugins
-
-      load_application_initializers
-
@@ -184 +186 @@
-    def add_plugin_load_paths
-      plugin_loader.add_plugin_load_paths
+    end
+
+    def add_gem_load_paths
+      unless @configuration.gems.empty?
+        require "rubygems"
+        @configuration.gems.each &:add_load_paths
+      end
+    end
+
+    def load_gems
+      @configuration.gems.each &:load
-    end
-
@@ -230 +243 @@
-    def load_observers
-      if configuration.frameworks.include?(:active_record)
-
+
+
+
+
+
-      end
-    end
@@ -495 +512 @@
-    # the implementation of Rails::Plugin::Loader for more details.
-    attr_accessor :plugin_loader
+
+    # An array of gems that this rails application depends on.  Rails will automatically load
+    # these gems during installation, and allow you to install any missing gems with:
+    #
+    #   rake gems:install
+    #
+    # You can add with the #gem method.
+    attr_accessor :gems
+
+    # Adds a single Gem dependency to the rails application.
+    #
+    #   # gem 'aws-s3', '>= 0.4.0'
+    #   # require 'aws/s3'
+    #   config.gem 'aws-s3', :lib => 'aws/s3', :version => '>= 0.4.0', \
+    #     :source => "http://code.whytheluckystiff.net"
+    #
+    def gem(name, options = {})
+      @gems << Rails::GemDependency.new(name, options)
+    end
-    
-    # Deprecated options:
@@ -530 +566 @@
-      self.plugin_loader                = default_plugin_loader
-      self.database_configuration_file  = default_database_configuration_file
+      self.gems                         = default_gems
-
-      for framework in default_frameworks
@@ -713 +750 @@
-        end
-      end
+      
+      def default_gems
+        []
+      end
-  end
-end