isolate 1.8.0 → 1.8.1

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+=== 1.8.1 / 2010-01-13
+
+* Allow isolate:dotgems to take an env.
+
 === 1.8.0 / 2010-01-05
 
 * Make build args forgive non-Array input.

data/lib/isolate/rake.rb

@@ -1,9 +1,11 @@
 namespace :isolate do
   desc "Generate a .gems manifest for your isolated gems."
-  task :dotgems do
+  task :dotgems, [:env] do |_, args|
+    env = args.env || Isolate.env
+
     File.open ".gems", "wb" do |f|
       Isolate.instance.entries.each do |entry|
-        next unless entry.environments.empty?
+        next unless entry.matches? env
 
         gems  = [entry.name]
         gems << "--version '#{entry.requirement}'"

data/lib/isolate.rb

@@ -21,11 +21,15 @@ class Isolate
     end
   end
 
-  VERSION = "1.8.0" # :nodoc:
+  VERSION = "1.8.1" # :nodoc:
 
   attr_reader :entries # :nodoc:
   attr_reader :path # :nodoc:
 
+  def self.env # :nodoc:
+    ENV["ISOLATE_ENV"] || ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
+  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.
@@ -81,11 +85,7 @@ class Isolate
   def activate environment = nil
     enable unless enabled?
 
-    env = (environment        ||
-           ENV["ISOLATE_ENV"] ||
-           ENV["RAILS_ENV"]   ||
-           ENV["RACK_ENV"]    ||
-           "development").to_s
+    env = (environment || self.class.env).to_s
 
     install env if install?
 

data/test/test_isolate.rb

@@ -8,6 +8,7 @@ class TestIsolate < MiniTest::Unit::TestCase
 
   def setup
     @isolate = Isolate.new "tmp/gems", :install => false, :verbose => false
+    @env     = ENV.to_hash
   end
 
   def teardown
@@ -16,6 +17,25 @@ class TestIsolate < MiniTest::Unit::TestCase
     Gem::DependencyInstaller.reset_value
     Gem::Uninstaller.reset_value
     FileUtils.rm_rf "tmp/gems"
+    ENV.replace @env
+  end
+
+  def test_self_env
+    assert_equal "development", Isolate.env
+
+    ENV["RAILS_ENV"] = "foo"
+
+    assert_equal "foo", Isolate.env
+
+    ENV["RAILS_ENV"] = nil
+    ENV["RACK_ENV"]  = "bar"
+
+    assert_equal "bar", Isolate.env
+
+    ENV["RACK_ENV"]    = nil
+    ENV["ISOLATE_ENV"] = "baz"
+
+    assert_equal "baz", Isolate.env
   end
 
   def test_self_gems

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: isolate
 version: !ruby/object:Gem::Version 
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors: 
 - John Barnette
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 -08:00
+date: 2010-01-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency