isolate 1.5.1 → 1.6.0

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+=== 1.6.0 / 2009-10-03
+
+* Add Rake helpers.
+* Expose the bin path to subshells.
+
 === 1.5.1 / 2009-10-02
 
 * Fix passthrough for explicitly false conditions.

data/Manifest.txt

@@ -5,6 +5,7 @@ README.rdoc
 Rakefile
 lib/hoe/isolate.rb
 lib/isolate.rb
+lib/isolate/rake.rb
 test/fixtures/with-hoe/specifications/hoe-2.3.3.gemspec
 test/fixtures/with-hoe/specifications/rake-0.8.7.gemspec
 test/fixtures/with-hoe/specifications/rubyforge-1.0.4.gemspec

data/README.rdoc

@@ -118,6 +118,33 @@ and <tt>:verbose</tt> options to control things:
       ...
     end
 
+=== Interaction and Rake
+
+You don't strictly need them, but Isolate provides a set of Rake tasks
+that make a few common thing easier. To use them, just drop a
+<tt>require</tt> in your <tt>Rakefile</tt>:
+
+    require "isolate/rake"
+
+==== Running Shell Commands
+
+When you're in an isolated subshell, the command-line tools provided
+by any of your gems are available on your PATH.
+
+    # run a single command in an isolated subshell
+    $ rake isolate:sh['gem list']
+
+    # run a new isolated subshell
+    $ rake isolate:sh
+
+==== Exporting
+
+Isolate can generate a <tt>.gems</tt> manifest file in the root
+directory of your project. <tt>.gems</tt> is used (among other things)
+to specify project dependencies on Heroku.
+
+    $ rake isolate:dotgems
+
 === A Rails Example
 
 Here's a quick example (extracted from a real project) of how to use

data/lib/isolate.rb

@@ -21,7 +21,7 @@ class Isolate
     end
   end
 
-  VERSION = "1.5.1" # :nodoc:
+  VERSION = "1.6.0" # :nodoc:
 
   attr_reader :entries # :nodoc:
 
@@ -72,7 +72,7 @@ class Isolate
     @entries      = []
     @environments = []
     @passthrough  = false
-    @path         = path
+    @path         = File.expand_path path
 
     @install      = options.fetch :install, true
     @verbose      = options.fetch :verbose, true
@@ -131,6 +131,7 @@ class Isolate
 
     ENV["GEM_PATH"] = @old_gem_path
     ENV["GEM_HOME"] = @old_gem_home
+    ENV["PATH"]     = @old_path
     ENV["RUBYOPT"]  = @old_ruby_opt
 
     $LOAD_PATH.replace @old_load_path
@@ -146,6 +147,7 @@ class Isolate
 
     @old_gem_path  = ENV["GEM_PATH"]
     @old_gem_home  = ENV["GEM_HOME"]
+    @old_path      = ENV["PATH"]
     @old_ruby_opt  = ENV["RUBYOPT"]
     @old_load_path = $LOAD_PATH.dup
 
@@ -158,6 +160,9 @@ class Isolate
     ENV["RUBYOPT"]  = "#{ENV['RUBYOPT']} -I#{File.dirname(__FILE__)}"
     ENV["GEM_PATH"] = ENV["GEM_HOME"] = path
 
+    bin = File.join path, "bin"
+    ENV["PATH"]= [bin, ENV["PATH"]].join File::PATH_SEPARATOR
+
     self.class.refresh
 
     @enabled = true

data/lib/isolate/rake.rb

@@ -0,0 +1,25 @@
+namespace :isolate do
+  desc "Generate a .gems manifest for your isolated gems."
+  task :dotgems do
+    File.open ".gems", "wb" do |f|
+      Isolate.instance.entries.each do |entry|
+        next unless entry.environments.empty?
+
+        gems  = [entry.name]
+        gems << "--version '#{entry.requirement}'"
+        gems << "--source #{entry.options[:source]}" if entry.options[:source]
+
+        f.puts gems.join " "
+      end
+
+      # this above all: to thine own self be true
+      f.puts "isolate --version '#{Isolate::VERSION}'"
+    end
+  end
+
+  desc "Start an isolated subshell. Run 'command' and exit if specified."
+  task :sh, [:command] do |t, args|
+    exec ENV["SHELL"] unless args.command
+    sh args.command
+  end
+end

data/test/test_isolate.rb

@@ -26,7 +26,7 @@ class TestIsolate < MiniTest::Unit::TestCase
     end
 
     refute_nil Isolate.instance
-    assert_equal WITH_HOE, Isolate.instance.path
+    assert_equal File.expand_path(WITH_HOE), Isolate.instance.path
     assert_equal "hoe", Isolate.instance.entries.first.name
   end
 
@@ -109,19 +109,22 @@ class TestIsolate < MiniTest::Unit::TestCase
   end
 
   def test_disable
-    home, path = ENV.values_at "GEM_HOME", "GEM_PATH"
+    home, path, bin = ENV.values_at "GEM_HOME", "GEM_PATH", "PATH"
     load_path  = $LOAD_PATH.dup
 
     @isolate.enable
 
     refute_equal home, ENV["GEM_HOME"]
     refute_equal path, ENV["GEM_PATH"]
+    refute_equal bin,  ENV["PATH"]
+
     refute_equal load_path, $LOAD_PATH
 
     @isolate.disable
 
     assert_equal home, ENV["GEM_HOME"]
     assert_equal path, ENV["GEM_PATH"]
+    assert_equal bin,  ENV["PATH"]
     assert_equal load_path, $LOAD_PATH
   end
 
@@ -137,6 +140,7 @@ class TestIsolate < MiniTest::Unit::TestCase
 
     assert_equal @isolate.path, ENV["GEM_PATH"]
     assert_equal @isolate.path, ENV["GEM_HOME"]
+    assert ENV["PATH"].include?(File.join(@isolate.path, "bin")), "in path"
 
     assert_equal [], Gem.find_files("minitest/unit.rb"),
       "Can't find minitest/unit now, 'cause we're activated!"
@@ -187,7 +191,7 @@ class TestIsolate < MiniTest::Unit::TestCase
 
   def test_initialize
     i = Isolate.new "foo/gems"
-    assert_equal "foo/gems", i.path
+    assert_equal File.expand_path("foo/gems"), i.path
   end
 
   def test_initialize_options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: isolate
 version: !ruby/object:Gem::Version 
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors: 
 - John Barnette
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-02 00:00:00 -07:00
+date: 2009-10-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,6 +74,7 @@ files:
 - Rakefile
 - lib/hoe/isolate.rb
 - lib/isolate.rb
+- lib/isolate/rake.rb
 - test/fixtures/with-hoe/specifications/hoe-2.3.3.gemspec
 - test/fixtures/with-hoe/specifications/rake-0.8.7.gemspec
 - test/fixtures/with-hoe/specifications/rubyforge-1.0.4.gemspec