isolate 1.7.0 → 1.7.1

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 1.7.1 / 2009-12-08
+
+* Move to 1-phase activation. Deprecate Isolate.activate.
+
 === 1.7.0 / 2009-12-07
 
 * Activate gems even in passthrough mode.

data/README.rdoc

@@ -193,15 +193,10 @@ the preinitializer:
     end
 
 Since this is in the preinitializer, Isolate will install and activate
-the fundamental gems before Rails loads.
-
-This is early enough in Rails' lifecycle that <tt>RAILS_ENV</tt> isn't
-set, so we need a way to activate gems for the current
-environment. Let's add one line to <tt>config/environment.rb</tt>,
-right below where <tt>boot.rb</tt> is required:
-
-    require File.join(File.dirname(__FILE__), 'boot')
-    Isolate.activate RAILS_ENV
+the all gems before Rails loads. The current environment is determined
+by looking at the <tt>ISOLATE_ENV</tt>, <tt>RAILS_ENV</tt>, or
+<tt>RACK_ENV</tt> environment variable. If none are set,
+<tt>"development"</tt> is the default.
 
 Pow. Isolated!
 

data/lib/isolate.rb

@@ -17,21 +17,20 @@ class Isolate
     end
 
     def matches_spec? spec
-      self.name == spec.name and self.requirement.satisfied_by? spec.version
+      name == spec.name and requirement.satisfied_by? spec.version
     end
   end
 
-  VERSION = "1.7.0" # :nodoc:
+  VERSION = "1.7.1" # :nodoc:
 
   attr_reader :entries # :nodoc:
   attr_reader :path # :nodoc:
 
-  # Activate (and possibly install) gems for a specific
-  # +environment+. This allows two-stage isolation, which is necessary
-  # for stuff like Rails. See README.rdoc for a detailed example.
+  # Deprecated. This is no a no-op, and will be removed shortly.
 
   def self.activate environment
-    instance.activate environment
+    puts "DEPRECATED: Isolate.activate is a no-op now. " +
+      "It'll be removed in v1.8. See the README for details."
   end
 
   # Declare an isolated RubyGems environment, installed in +path+. The
@@ -63,7 +62,7 @@ class Isolate
   end
 
   # Create a new Isolate instance. See Isolate.gems for the public
-  # API. Don't use this constructor directly.
+  # API. You probably don't want to use this constructor directly.
 
   def initialize path, options = {}, &block
     @enabled      = false
@@ -79,11 +78,24 @@ class Isolate
     instance_eval(&block) if block_given?
   end
 
-  def activate environment = nil # :nodoc:
+  # Activate this set of isolated entries, respecting an optional
+  # +environment+. Points RubyGems to a separate repository, messes
+  # with paths, auto-installs gems (if necessary), activates
+  # everything, and removes any superfluous gem (again, if
+  # necessary). If +environment+ isn't specified, +ISOLATE_ENV+,
+  # +RAILS_ENV+, and +RACK_ENV+ are checked before falling back to
+  # <tt>"development"</tt>.
+
+  def activate environment = nil
     enable unless enabled?
 
-    env = environment.to_s if environment
-    install environment if install?
+    env = (environment        ||
+           ENV["ISOLATE_ENV"] ||
+           ENV["RAILS_ENV"]   ||
+           ENV["RACK_ENV"]    ||
+           "development").to_s
+
+    install env if install?
 
     entries.each do |e|
       Gem.activate e.name, *e.requirement.as_list if e.matches? env
@@ -94,7 +106,7 @@ class Isolate
     self
   end
 
-  def cleanup
+  def cleanup # :nodoc:
     return self if passthrough?
 
     activated = Gem.loaded_specs.values.map { |s| s.full_name }
@@ -115,7 +127,7 @@ class Isolate
                              :version     => e.version,
                              :ignore      => true,
                              :executables => true,
-                             :install_dir => self.path).uninstall
+                             :install_dir => path).uninstall
       end
     end
   end
@@ -207,13 +219,11 @@ class Isolate
     entry
   end
 
-  def install environment = nil # :nodoc:
+  def install environment # :nodoc:
     return self if passthrough?
 
-    env = environment.to_s if environment
-
     installable = entries.select do |e|
-      !Gem.available?(e.name, *e.requirement.as_list) && e.matches?(env)
+      !Gem.available?(e.name, *e.requirement.as_list) && e.matches?(environment)
     end
 
     log "Isolating #{environment}..." unless installable.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: isolate
 version: !ruby/object:Gem::Version 
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors: 
 - John Barnette
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 -08:00
+date: 2009-12-08 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency