isolate 1.2.1 → 1.3.0

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 1.3.0 / 2009-09-23
+
+* Add support for Gem build args. See the README for details.
+
 === 1.2.1 / 2009-09-22
 
 * I am a moron. Made the Hoe plugin work again.

data/README.rdoc

@@ -31,15 +31,14 @@ YMMV, but I haven't tried Isolate with anything older than RubyGems
 === Defining Your Isolated Environment
 
 It's pretty easy: <tt>gem</tt> is similar to RubyGems' method of the
-same name. Version specifiers are optional, and any hash args tacked
-on to the end are passed through to Gem::DependencyInstaller as flags.
+same name. Version specifiers are optional.
 
     require "rubygems"
     require "isolate"
 
     Isolate.gems "vendor/isolated" do
       gem "johnson", "~> 1.1" # or maybe...
-      gem "jbarnette-johnson", :source => "http://gems.github.com"
+      gem "jbarnette-johnson"
     end
 
 At the end of the <tt>Isolate.gems</tt> block, you're completely
@@ -65,6 +64,18 @@ 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.
 
+=== Options
+
+Any trailing hash args to <tt>gem</tt> are passed to
+<tt>Gem::DependencyInstaller</tt> as options. There are two special
+exceptions, <tt>:source</tt> and <tt>:args</tt>.
+
+    # explicitly specify gem source
+    gem "jbarnette-johnson", :source => "http://gems.github.com"
+
+    # pass gem install args (the part after the '--')
+    gem "pg", :args => "ARCHFLAGS='-arch x86_64'"
+
 === Installing Isolated Gems
 
 By default, Isolate will install your gems automatically. You can pass

data/lib/isolate.rb

@@ -16,7 +16,7 @@ class Isolate
     end
   end
 
-  VERSION = "1.2.1" # :nodoc:
+  VERSION = "1.3.0" # :nodoc:
 
   attr_reader :entries # :nodoc:
 
@@ -171,14 +171,18 @@ class Isolate
         warn "#{progress} Isolating #{e.name} (#{e.requirement})."
       end
 
-      options     = e.options.dup.merge :install_dir => path
       old         = Gem.sources.dup
+      options     = e.options.merge :install_dir => path
       source      = options.delete :source
+      args        = options.delete :args
       Gem.sources = Array(source) if source
       installer   = Gem::DependencyInstaller.new options
 
+      Gem::Command.build_args = args if args
       installer.install e.name, e.requirement
+
       Gem.sources = old
+      Gem::Command.build_args = nil if args
     end
 
     Gem.source_index.refresh!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: isolate
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors: 
 - John Barnette
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-22 00:00:00 -07:00
+date: 2009-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency