isolate 1.7.1 → 1.8.0

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+=== 1.8.0 / 2010-01-05
+
+* Make build args forgive non-Array input.
+* OMG, heaven forbid I use math.
+* Remove deprecated Isolate.activate method.
+* Remove passthrough, that's what conditionals are for.
+
 === 1.7.1 / 2009-12-08
 
 * Move to 1-phase activation. Deprecate Isolate.activate.

data/README.rdoc

@@ -64,27 +64,6 @@ Unsurprisingly, the <tt>mocha</tt> gem will only be activated in the
 example below for an example of how to use <tt>RAILS_ENV</tt> to set
 your environment.
 
-=== Passthrough
-
-Sometimes (especially on systems with alternative Gem management like
-Heroku) you want Isolate to sit in a corner, be very, very quiet, and
-let all calls pass right through.
-
-If you want to make Isolate a complete no-op in production, and your
-environment sets <tt>RACK_ENV</tt>, you could do something like this:
-
-    Isolate.gems "vendor/isolated" do
-      passthrough { %w(beta production).include? ENV["RACK_ENV"] }
-
-      # the rest of your gems...
-    end
-
-...and nothing will get isolated. The block should evaluate to
-<tt>true</tt> if that's what you want, and it's only evaluated
-once. This is run really early, so don't blindly assume things like
-the <tt>RAILS_ENV</tt> constant are set. Check your environment for
-details.
-
 === Options
 
 Any trailing hash args to <tt>gem</tt> are passed to
@@ -95,7 +74,7 @@ exceptions, <tt>:source</tt> and <tt>:args</tt>.
     gem "jbarnette-johnson", :source => "http://gems.github.com"
 
     # pass gem install args (the part after the '--')
-    gem "pg", :args => "ARCHFLAGS='-arch x86_64'"
+    gem "agem", :args => "--no-blah"
 
 === Installing Isolated Gems
 

data/lib/isolate.rb

@@ -21,18 +21,11 @@ class Isolate
     end
   end
 
-  VERSION = "1.7.1" # :nodoc:
+  VERSION = "1.8.0" # :nodoc:
 
   attr_reader :entries # :nodoc:
   attr_reader :path # :nodoc:
 
-  # Deprecated. This is no a no-op, and will be removed shortly.
-
-  def self.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
   # block given will be <tt>instance_eval</tt>ed, see Isolate#gem and
   # Isolate#environment for the sort of stuff you can do.
@@ -68,7 +61,6 @@ class Isolate
     @enabled      = false
     @entries      = []
     @environments = []
-    @passthrough  = false
     @path         = File.expand_path path
 
     @install      = options.fetch :install, true
@@ -107,18 +99,17 @@ class Isolate
   end
 
   def cleanup # :nodoc:
-    return self if passthrough?
-
     activated = Gem.loaded_specs.values.map { |s| s.full_name }
     extra     = Gem.source_index.gems.values.sort.reject { |spec|
       activated.include? spec.full_name or
         entries.any? { |e| e.matches_spec? spec }
     }
 
-    log "Cleaning..." unless extra.empty?
+    return if extra.empty?
 
-    padding = extra.size.to_s.size # omg... heaven forbid you use math
+    padding = Math.log10(extra.size).to_i + 1
     format  = "[%0#{padding}d/%s] Nuking %s."
+
     extra.each_with_index do |e, i|
       log format % [i + 1, extra.size, e.full_name]
 
@@ -137,7 +128,7 @@ class Isolate
   end
 
   def disable # :nodoc:
-    return self if passthrough? or not enabled?
+    return self if not enabled?
 
     ENV["GEM_PATH"] = @old_gem_path
     ENV["GEM_HOME"] = @old_gem_home
@@ -154,7 +145,7 @@ class Isolate
   end
 
   def enable # :nodoc:
-    return self if passthrough? or enabled?
+    return self if enabled?
 
     @old_gem_path  = ENV["GEM_PATH"]
     @old_gem_home  = ENV["GEM_HOME"]
@@ -220,16 +211,15 @@ class Isolate
   end
 
   def install environment # :nodoc:
-    return self if passthrough?
-
     installable = entries.select do |e|
       !Gem.available?(e.name, *e.requirement.as_list) && e.matches?(environment)
     end
 
-    log "Isolating #{environment}..." unless installable.empty?
+    return self if installable.empty?
 
-    padding = installable.size.to_s.size # omg... heaven forbid you use math
+    padding = Math.log10(installable.size).to_i + 1
     format  = "[%0#{padding}d/%s] Isolating %s (%s)."
+
     installable.each_with_index do |e, i|
       log format % [i + 1, installable.size, e.name, e.requirement]
 
@@ -242,7 +232,7 @@ class Isolate
       Gem.sources = Array(source) if source
       installer   = Gem::DependencyInstaller.new options
 
-      Gem::Command.build_args = args if args
+      Gem::Command.build_args = Array(args) if args
       installer.install e.name, e.requirement
 
       Gem.sources = old
@@ -262,14 +252,6 @@ class Isolate
     $stderr.puts s if verbose?
   end
 
-  def passthrough &block # :nodoc:
-    @passthrough = yield
-  end
-
-  def passthrough? # :nodoc:
-    @passthrough
-  end
-
   def verbose? # :nodoc:
     @verbose
   end

data/test/test_isolate.rb

@@ -209,21 +209,6 @@ class TestIsolate < MiniTest::Unit::TestCase
     i = Isolate.new "foo/gems", :install => false
     refute i.cleanup?, "no install, no cleanup"
   end
-
-  def test_passthrough
-    refute @isolate.passthrough?
-
-    @isolate.passthrough { true }
-    assert @isolate.passthrough?
-
-    idx = Gem.source_index.dup
-    @isolate.activate
-    assert_equal idx, Gem.source_index
-
-
-    @isolate.passthrough { false }
-    refute @isolate.passthrough?
-  end
 end
 
 module BrutalStub

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: isolate
 version: !ruby/object:Gem::Version 
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors: 
 - John Barnette
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-08 00:00:00 -08:00
+date: 2010-01-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.4.0
     version: 
 description: |-
   Isolate is a very simple RubyGems sandbox. It provides a way to