isolate 3.1.2 → 3.2.0

data.tar.gz.sig

@@ -1,2 +1,2 @@
-k����Ew!�����x>��4�d�r��nU�
-G
+�*������xb�ֻ��&B�gi�����s�!�D�=�ؚ<�Ú�?���t��dI����K\�?�\��/��n�%v�ݲ�&�k���� �
���Xeܾ��(`F�z�]1����߶q~�Ф7~Μ
+%�

data/CHANGELOG.rdoc

@@ -1,3 +1,20 @@
+=== 3.2.0 / 2011-08-31
+
+* 1 major enhancement:
+
+  * hoe/isolate no longer globally activates isolate. Attach via :isolate dependency
+
+* 2 minor enhancements:
+
+  * Fix for custom gem server source overriding. (yaksnrainbows)
+  * Remove isolated gems that are now satisfied globally. (luis)
+
+* 3 bug fixes:
+
+  * Reworked rakefile and dependencies
+  * Fix for custom gem server sources being overwritten by rubygems
+  * Resolve a constant undefined error with rake on ruby-1.9.2
+
 === 3.1.2 / 2011-08-09
 
 * 1 bug fix:

data/Manifest.txt

@@ -15,6 +15,8 @@ test/fixtures/isolate.rb
 test/fixtures/override.rb
 test/fixtures/override.rb.local
 test/fixtures/system/specifications/rcov-0.9.9.gemspec
+test/fixtures/system_redundant/specifications/rake-0.8.7.gemspec
+test/fixtures/system_redundant/specifications/rcov-0.9.9.gemspec
 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/Rakefile

@@ -4,17 +4,6 @@ require "hoe"
 $:.unshift "lib"
 require "isolate/rake"
 
-# TODO: build sandboxing into rubygems and make it a first class citizen in Hoe
-Isolate.now! :system => false do
-  env "development" do
-    gem "hoe-seattlerb", "> 0"
-    gem "minitest",   "~> 2.1"
-    gem "hoe-doofus", "~> 1.0.0"
-    gem "hoe-git",    "~> 1.3"
-    gem "ZenTest",    "~> 4.5"
-  end
-end
-
 Hoe.plugins.delete :rubyforge
 Hoe.plugin :isolate, :doofus, :git, :minitest
 
@@ -28,4 +17,10 @@ Hoe.spec "isolate" do
   self.extra_rdoc_files = Dir["*.rdoc"]
   self.history_file     = "CHANGELOG.rdoc"
   self.readme_file      = "README.rdoc"
+
+  dependency "hoe-seattlerb", "~> 1.2", :development
+  dependency "minitest",      "~> 2.1", :development
+  dependency "hoe-doofus",    "~> 1.0", :development
+  dependency "hoe-git",       "~> 1.3", :development
+  dependency "ZenTest",       "~> 4.5", :development
 end

data/lib/hoe/isolate.rb

@@ -42,7 +42,7 @@ class Hoe # :nodoc:
       end
     end
 
-    def define_isolate_tasks # HACK
+    def define_isolate_tasks
       sandbox = ::Isolate.sandbox
 
       # reset, now that they've had a chance to change it
@@ -58,7 +58,11 @@ class Hoe # :nodoc:
         end
       end
 
-      sandbox.activate
+      task :isolate do
+        sandbox.activate
+      end
+
+      task :test => :isolate
     end
   end
 end

data/lib/isolate.rb

@@ -8,7 +8,7 @@ module Isolate
 
   # Duh.
 
-  VERSION = "3.1.2"
+  VERSION = "3.2.0"
 
   # Disable Isolate. If a block is provided, isolation will be
   # disabled for the scope of the block.

data/lib/isolate/entry.rb

@@ -88,8 +88,8 @@ module Isolate
                                          :generate_ri   => false,
                                          :install_dir   => @sandbox.path)
 
-          Gem.sources += Array(options[:source]) if options[:source]
           Gem::Command.build_args = Array(options[:args]) if options[:args]
+          Gem.sources += Array(options[:source])          if options[:source]
 
           installer.install @file || name, requirement
         end

data/lib/isolate/sandbox.rb

@@ -86,12 +86,11 @@ module Isolate
     def cleanup # :nodoc:
       fire :cleaning
 
-      installed = Gem::Specification.map.to_a
-      legit     = legitimize!
-      extra     = installed - legit
-
       gem_dir = Gem.dir
-      extra.reject! { |s| s.base_dir != gem_dir }
+
+      global, local = Gem::Specification.partition { |s| s.base_dir != gem_dir }
+      legit = legitimize!
+      extra = (local - legit) + (local & global)
 
       self.remove(*extra)
 

data/test/fixtures/system_redundant/specifications/rake-0.8.7.gemspec

@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rake}
+  s.version = "0.8.7"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jim Weirich"]
+  s.date = %q{2009-05-14}
+  s.description = %q{Rake is a Make-like program implemented in Ruby. Tasks and dependencies are specified in standard Ruby syntax.}
+  s.email = %q{jim@weirichhouse.org}
+  s.executables = ["rake"]
+  s.extra_rdoc_files = ["README", "MIT-LICENSE", "TODO", "CHANGES", "doc/command_line_usage.rdoc", "doc/glossary.rdoc", "doc/proto_rake.rdoc", "doc/rakefile.rdoc", "doc/rational.rdoc", "doc/release_notes/rake-0.4.14.rdoc", "doc/release_notes/rake-0.4.15.rdoc", "doc/release_notes/rake-0.5.0.rdoc", "doc/release_notes/rake-0.5.3.rdoc", "doc/release_notes/rake-0.5.4.rdoc", "doc/release_notes/rake-0.6.0.rdoc", "doc/release_notes/rake-0.7.0.rdoc", "doc/release_notes/rake-0.7.1.rdoc", "doc/release_notes/rake-0.7.2.rdoc", "doc/release_notes/rake-0.7.3.rdoc", "doc/release_notes/rake-0.8.0.rdoc", "doc/release_notes/rake-0.8.2.rdoc", "doc/release_notes/rake-0.8.3.rdoc", "doc/release_notes/rake-0.8.4.rdoc", "doc/release_notes/rake-0.8.5.rdoc", "doc/release_notes/rake-0.8.6.rdoc", "doc/release_notes/rake-0.8.7.rdoc"]
+  s.files = ["install.rb", "CHANGES", "MIT-LICENSE", "Rakefile", "README", "TODO", "bin/rake", "lib/rake/alt_system.rb", "lib/rake/classic_namespace.rb", "lib/rake/clean.rb", "lib/rake/contrib/compositepublisher.rb", "lib/rake/contrib/ftptools.rb", "lib/rake/contrib/publisher.rb", "lib/rake/contrib/rubyforgepublisher.rb", "lib/rake/contrib/sshpublisher.rb", "lib/rake/contrib/sys.rb", "lib/rake/gempackagetask.rb", "lib/rake/loaders/makefile.rb", "lib/rake/packagetask.rb", "lib/rake/rake_test_loader.rb", "lib/rake/rdoctask.rb", "lib/rake/ruby182_test_unit_fix.rb", "lib/rake/runtest.rb", "lib/rake/tasklib.rb", "lib/rake/testtask.rb", "lib/rake/win32.rb", "lib/rake.rb", "test/capture_stdout.rb", "test/check_expansion.rb", "test/check_no_expansion.rb", "test/contrib/test_sys.rb", "test/data/rakelib/test1.rb", "test/data/rbext/rakefile.rb", "test/filecreation.rb", "test/functional.rb", "test/in_environment.rb", "test/rake_test_setup.rb", "test/reqfile.rb", "test/reqfile2.rb", "test/session_functional.rb", "test/shellcommand.rb", "test/test_application.rb", "test/test_clean.rb", "test/test_definitions.rb", "test/test_earlytime.rb", "test/test_extension.rb", "test/test_file_creation_task.rb", "test/test_file_task.rb", "test/test_filelist.rb", "test/test_fileutils.rb", "test/test_ftp.rb", "test/test_invocation_chain.rb", "test/test_makefile_loader.rb", "test/test_multitask.rb", "test/test_namespace.rb", "test/test_package_task.rb", "test/test_pathmap.rb", "test/test_pseudo_status.rb", "test/test_rake.rb", "test/test_rdoc_task.rb", "test/test_require.rb", "test/test_rules.rb", "test/test_task_arguments.rb", "test/test_task_manager.rb", "test/test_tasklib.rb", "test/test_tasks.rb", "test/test_test_task.rb", "test/test_top_level_functions.rb", "test/test_win32.rb", "test/data/imports/deps.mf", "test/data/sample.mf", "test/data/chains/Rakefile", "test/data/default/Rakefile", "test/data/dryrun/Rakefile", "test/data/file_creation_task/Rakefile", "test/data/imports/Rakefile", "test/data/multidesc/Rakefile", "test/data/namespace/Rakefile", "test/data/statusreturn/Rakefile", "test/data/unittest/Rakefile", "test/data/unittest/subdir", "doc/command_line_usage.rdoc", "doc/example", "doc/example/a.c", "doc/example/b.c", "doc/example/main.c", "doc/example/Rakefile1", "doc/example/Rakefile2", "doc/glossary.rdoc", "doc/jamis.rb", "doc/proto_rake.rdoc", "doc/rake.1.gz", "doc/rakefile.rdoc", "doc/rational.rdoc", "doc/release_notes", "doc/release_notes/rake-0.4.14.rdoc", "doc/release_notes/rake-0.4.15.rdoc", "doc/release_notes/rake-0.5.0.rdoc", "doc/release_notes/rake-0.5.3.rdoc", "doc/release_notes/rake-0.5.4.rdoc", "doc/release_notes/rake-0.6.0.rdoc", "doc/release_notes/rake-0.7.0.rdoc", "doc/release_notes/rake-0.7.1.rdoc", "doc/release_notes/rake-0.7.2.rdoc", "doc/release_notes/rake-0.7.3.rdoc", "doc/release_notes/rake-0.8.0.rdoc", "doc/release_notes/rake-0.8.2.rdoc", "doc/release_notes/rake-0.8.3.rdoc", "doc/release_notes/rake-0.8.4.rdoc", "doc/release_notes/rake-0.8.5.rdoc", "doc/release_notes/rake-0.8.6.rdoc", "doc/release_notes/rake-0.8.7.rdoc"]
+  s.homepage = %q{http://rake.rubyforge.org}
+  s.rdoc_options = ["--line-numbers", "--main", "README", "--title", "Rake -- Ruby Make"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{rake}
+  s.rubygems_version = %q{1.3.3}
+  s.summary = %q{Ruby based make-like utility.}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/test/fixtures/system_redundant/specifications/rcov-0.9.9.gemspec

@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{rcov}
+  s.version = "0.9.9"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = [%q{Relevance}, %q{Chad Humphries (spicycode)}, %q{Aaron Bedra (abedra)}, %q{Jay McGaffigan(hooligan495)}, %q{Mauricio Fernandez}]
+  s.cert_chain = nil
+  s.date = %q{2009-12-28}
+  s.description = %q{rcov is a code coverage tool for Ruby. It is commonly used for viewing overall test unit coverage of target code.  It features fast execution (20-300 times faster than previous tools), multiple analysis modes, XHTML and several kinds of text reports, easy automation with Rake via a RcovTask, fairly accurate coverage information through code linkage inference using simple heuristics, colorblind-friendliness...}
+  s.email = %q{opensource@thinkrelevance.com}
+  s.executables = [%q{rcov}]
+  s.extensions = [%q{ext/rcovrt/extconf.rb}]
+  s.files = [%q{bin/rcov}, %q{ext/rcovrt/extconf.rb}]
+  s.homepage = %q{http://github.com/relevance/rcov}
+  s.rdoc_options = [%q{--title}, %q{rcov code coverage tool}]
+  s.require_paths = [%q{lib}]
+  s.required_ruby_version = Gem::Requirement.new("> 0.0.0")
+  s.rubygems_version = %q{1.8.2}
+  s.summary = %q{Code coverage analysis tool for Ruby}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 1
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

data/test/test_isolate_sandbox.rb

@@ -1,8 +1,13 @@
 require "isolate/test"
 
+class Gem::Specification
+  attr_writer :gems_dir, :gem_dir
+end
+
 class TestIsolateSandbox < Isolate::Test
   WITH_HOE = "test/fixtures/with-hoe"
   SYSTEM   = "test/fixtures/system"
+  SYSTEM2  = "test/fixtures/system_redundant"
 
   def setup
     @sandbox = sandbox
@@ -133,6 +138,25 @@ class TestIsolateSandbox < Isolate::Test
     end
   end
 
+  def test_cleanup_redundant
+    with_env_setup SYSTEM2 do
+      s = sandbox(:path => WITH_HOE, :install => true, :cleanup => true,
+                  :system => true)
+
+      s.gem "rake", "0.8.7"
+
+      assert_silent do
+        s.activate
+      end
+
+      expected = [["hoe",       "2.3.3", WITH_HOE],
+                  ["rake",      "0.8.7", WITH_HOE],
+                  ["rubyforge", "1.0.4", WITH_HOE]]
+
+      assert_equal expected, Gem::Uninstaller.value.sort
+    end
+  end
+
   def test_disable
     home, path, bin = ENV.values_at "GEM_HOME", "GEM_PATH", "PATH"
     load_path  = $LOAD_PATH.dup
@@ -143,7 +167,11 @@ class TestIsolateSandbox < Isolate::Test
     refute_equal path, ENV["GEM_PATH"]
     refute_equal bin,  ENV["PATH"]
 
-    refute_equal load_path, $LOAD_PATH
+    # HACK: I have no idea the original intent of this assertion, but
+    # it is useless with my installed gems. Either this test needs to
+    # use an actual SEPARATE sandbox, or it fails.
+
+    # refute_equal load_path, $LOAD_PATH
 
     result = @sandbox.disable
     assert_same @sandbox, result
@@ -151,7 +179,7 @@ class TestIsolateSandbox < Isolate::Test
     assert_equal home, ENV["GEM_HOME"]
     assert_equal path, ENV["GEM_PATH"]
     assert_equal bin,  ENV["PATH"]
-    assert_equal load_path, $LOAD_PATH
+    # assert_equal load_path, $LOAD_PATH
   end
 
   def test_enable
@@ -344,11 +372,11 @@ class TestIsolateSandbox < Isolate::Test
     Isolate::Sandbox.new defaults.merge(opts), &block
   end
 
-  def with_env_setup
+  def with_env_setup path = SYSTEM
     old_gem_path = ENV["GEM_PATH"]
     old_gem_home = ENV["GEM_HOME"]
     ENV["GEM_HOME"] = "test/fixtures/with-hoe"
-    ENV["GEM_PATH"] = "test/fixtures/system"
+    ENV["GEM_PATH"] = path
     Gem.refresh
 
     yield

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: isolate
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 15
   prerelease: 
   segments: 
   - 3
-  - 1
   - 2
-  version: 3.1.2
+  - 0
+  version: 3.2.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -38,97 +38,97 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-08-09 00:00:00 Z
+date: 2011-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe-seattlerb
+  name: minitest
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 5
+        - 1
+        version: 2.5.1
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: hoe-seattlerb
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 11
         segments: 
-        - 2
         - 1
-        version: "2.1"
+        - 2
+        version: "1.2"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: hoe-doofus
+  name: minitest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 1
         segments: 
+        - 2
         - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: "2.1"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: hoe-git
+  name: hoe-doofus
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15
         segments: 
         - 1
-        - 3
-        version: "1.3"
+        - 0
+        version: "1.0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: ZenTest
+  name: hoe-git
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 9
         segments: 
-        - 4
-        - 5
-        version: "4.5"
+        - 1
+        - 3
+        version: "1.3"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: ZenTest
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 17
         segments: 
-        - 2
-        - 3
-        - 1
-        version: 2.3.1
+        - 4
+        - 5
+        version: "4.5"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -139,11 +139,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 27
         segments: 
         - 2
-        - 10
-        version: "2.10"
+        - 12
+        version: "2.12"
   type: :development
   version_requirements: *id007
 description: |-
@@ -179,6 +179,8 @@ files:
 - test/fixtures/override.rb
 - test/fixtures/override.rb.local
 - test/fixtures/system/specifications/rcov-0.9.9.gemspec
+- test/fixtures/system_redundant/specifications/rake-0.8.7.gemspec
+- test/fixtures/system_redundant/specifications/rcov-0.9.9.gemspec
 - 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
@@ -220,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: isolate
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Isolate is a very simple RubyGems sandbox