isolate 3.3.1 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9eb0b86b7c9ce1aab1cbedfbf3c01ef00ff877f9
-  data.tar.gz: 8412225a996a3cb80dd4c7ae670482a668d696c9
+SHA256:
+  metadata.gz: b2b55d89acb0e5982a52f30273070453a540483ea7c67572dcf356da83a63406
+  data.tar.gz: cb87cf7176af4cf28030ec9b8f341d8c8e360b1ac3e8e72c22b24d031043cde9
 SHA512:
-  metadata.gz: eae8a1d01f76eed8a91b6e29e97637d56c249aece109005423bd226cfaf7aa20d24932dea359c510d34f618977143f6d6b672ace240278c2ce11aa9b10aa26c0
-  data.tar.gz: 3b332100f7cf6963ffb47867030f51ca8895c3422f7bccc7cccaef0cfc73cebcf0c8f05f43609c7a79df2d5c65e2379acc6be47b7ff74edb9227ca42664a96d0
+  metadata.gz: '00971ffc02710b27fd3b582c9f5e15e27d26a59cea9467190c22da1e54fd6bdd84c03aad4c31382a0fc57b277efecbfb859f65c17cb4fba866d6e137871137da'
+  data.tar.gz: a19cb7d860e05bd8b19a3bc74941e7777067c55b7a144c210061e165452a705abb3ebbec29700b037aba70dae246e393686152cf19a8c78480ca06d76c46b9c8

data/CHANGELOG.rdoc

@@ -1,3 +1,29 @@
+=== 3.5.1 / 2022-06-14
+
+* 1 bug fix:
+
+  * Fixed shadowed variable warning.
+
+=== 3.5.0 / 2020-02-29
+
+* 2 minor enhancements:
+
+  * Added :name option for sandboxes, mapping to path=~/.gem/repos/:name.
+  * Hoe isolate now defaults to system:true for its sandbox.
+
+=== 3.4.0 / 2019-12-17
+
+* 2 minor enhancements:
+
+  * Switched multiruby default value to false.
+  * Added logic to rebuild extensions as needed now that multiruby defaults to false.
+
+* 3 bug fixes:
+
+  * Remove empty path strings. This caused the #include? check to nuke everything.
+  * Only remove paths that look like gem paths: absolute and end in "lib".
+  * Fixed handling of path cleanup when system:false.
+
 === 3.3.1 / 2015-02-02
 
 * 1 bug fix:

data/README.rdoc

@@ -1,6 +1,6 @@
 = Isolate
 
-* http://github.com/jbarnette/isolate
+home :: http://github.com/jbarnette/isolate
 
 == Description
 
@@ -80,7 +80,7 @@ looking at the <tt>ISOLATE_ENV</tt>, <tt>RACK_ENV</tt>, and
 
 === Library Development
 
-If you're using Hoe[http://blog.zenspider.com/hoe] to manage your
+If you're using Hoe[http://www.zenspider.com/projects/hoe.html] to manage your
 library, you can use Isolate's Hoe plugin to automatically install
 your lib's development, runtime, and test dependencies without
 polluting your system RubyGems, and run your tests/specs in total

data/Rakefile

@@ -2,6 +2,11 @@ require "rubygems"
 require "hoe"
 
 $:.unshift "lib"
+
+ENV["GEM_PATH"] ||= ""
+ENV["GEM_PATH"] += ":#{Dir["tmp/isolate/ruby-*"].sort.last}"
+Gem.paths = ENV
+
 require "isolate/rake"
 
 Hoe.plugin :isolate, :doofus, :git
@@ -18,9 +23,23 @@ Hoe.spec "isolate" do
   self.history_file     = "CHANGELOG.rdoc"
   self.readme_file      = "README.rdoc"
 
+  license "MIT"
+
+  # taken from hoe/seattlerb.rb to avoid loading perforce plugin
+  # REFACTOR: hoe/seattlerb.rb should just load plugins
+  base = "/data/www/docs.seattlerb.org"
+  rdoc_locations << "docs-push.seattlerb.org:#{base}/#{remote_rdoc_dir}"
+
   dependency "hoe-seattlerb", "~> 1.2", :development
   dependency "minitest",      "~> 5.0", :development
   dependency "hoe-doofus",    "~> 1.0", :development
   dependency "hoe-git",       "~> 1.3", :development
   dependency "ZenTest",       "~> 4.5", :development
 end
+
+# allow for isolated dependencies
+task :check_extra_deps => :isolate do
+  # but still install non-isolated
+  ENV.delete "GEM_HOME"
+  Gem.paths = ENV
+end

data/lib/hoe/isolate.rb

@@ -46,7 +46,7 @@ class Hoe # :nodoc:
       sandbox = ::Isolate.sandbox
 
       # reset, now that they've had a chance to change it
-      sandbox.options :path => isolate_dir, :system => false
+      sandbox.options :path => isolate_dir, :system => true
 
       task :isolate do
         self.extra_deps.each do |name, version|

data/lib/isolate/sandbox.rb

@@ -43,6 +43,11 @@ module Isolate
       @files        = []
       @options      = options
 
+      path, name = options.values_at :path, :name
+
+      raise ArgumentError, "can't specify both name and path!" if name && path
+      options[:path] = File.expand_path("~/.gem/repos/#{name}") if name
+
       fire :initializing
 
       user = File.expand_path "~/.isolate/user.rb"
@@ -144,10 +149,13 @@ module Isolate
       unless system?
         isolate_lib = File.expand_path "../..", __FILE__
 
-        # manually deactivate pre-isolate gems... is this just for 1.9.1?
-        $LOAD_PATH.reject! do |p|
-          p != isolate_lib && Gem.path.any? { |gp| p.include?(gp) }
-        end
+        # manually deactivate pre-isolate gems...
+        $LOAD_PATH.reject! { |lpath|
+          (lpath.start_with?("/")  && # only full paths
+           lpath.end_with?("/lib") && # and that end in lib
+           lpath != isolate_lib    &&
+           Gem.path.reject(&:empty?).any? { |gem_path| lpath.include?(gem_path) })
+        }
 
         # HACK: Gotta keep isolate explicitly in the LOAD_PATH in
         # subshells, and the only way I can think of to do that is by
@@ -218,6 +226,15 @@ module Isolate
     def install environment # :nodoc:
       fire :installing
 
+      install_missing environment
+      rebuild_extensions
+
+      fire :installed
+
+      self
+    end
+
+    def install_missing environment
       installable = entries.select do |e|
         !e.specification && e.matches?(environment)
       end
@@ -233,10 +250,27 @@ module Isolate
 
         Gem::Specification.reset
       end
+    end
 
-      fire :installed
+    def rebuild_extensions
+      broken = entries.find_all { |e|
+        e.specification && e.specification.missing_extensions?
+      }
 
-      self
+      unless broken.empty?
+        padding = Math.log10(broken.size).to_i + 1
+        format  = "[%0#{padding}d/%d] Building extensions for %s (ruby v%s)."
+
+        broken.each_with_index do |e, i|
+          spec = e.specification
+          log format % [i + 1, broken.size, e.name, RUBY_VERSION]
+
+          builder = Gem::Ext::Builder.new spec
+          builder.build_extensions
+        end
+
+        Gem::Specification.reset
+      end
     end
 
     def install? # :nodoc:
@@ -253,7 +287,7 @@ module Isolate
     end
 
     def multiruby?
-      @options.fetch :multiruby, true
+      @options.fetch :multiruby, false
     end
 
     def options options = nil
@@ -264,7 +298,7 @@ module Isolate
     def path
       base = @options.fetch :path, DEFAULT_PATH
 
-      unless @options.key?(:multiruby) && @options[:multiruby] == false
+      if multiruby? then
         suffix = "#{Gem.ruby_engine}-#{RbConfig::CONFIG['ruby_version']}"
         base   = File.join(base, suffix) unless base =~ /#{suffix}/
       end

data/lib/isolate.rb

@@ -8,7 +8,7 @@ module Isolate
 
   # Duh.
 
-  VERSION = "3.3.1"
+  VERSION = "3.5.1"
 
   # Disable Isolate. If a block is provided, isolation will be
   # disabled for the scope of the block.
@@ -59,12 +59,14 @@ module Isolate
   #
   # :multiruby:: Should Isolate assume that multiple Ruby versions
   #              will be used simultaneously? If so, gems will be
-  #              segregated by Ruby version. Default is +true+.
+  #              segregated by Ruby version. Default is +false+.
   #
   # :path:: Where should isolated gems be kept? Default is
   #         <tt>"tmp/isolate"</tt>, and a Ruby version specifier suffix
   #         will be added if <tt>:multiruby</tt> is +true+.
   #
+  # :name:: Like path, but expands to: ~/.gem/repos/#{name}/ (like ohmygems)
+  #
   # :system:: Should system gems be allowed to satisfy dependencies?
   #           Default is +true+.
   #

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

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/test/fixtures/with-hoe/specifications/hoe-2.3.3.gemspec

@@ -43,7 +43,7 @@ See class rdoc for help. Hint: ri Hoe}
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rubyforge>, [">= 1.0.4"])
       s.add_runtime_dependency(%q<rake>, [">= 0.8.7"])
     else

data/test/fixtures/with-hoe/specifications/rake-0.8.7.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/test/fixtures/with-hoe/specifications/rubyforge-1.0.4.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/test/test_isolate_sandbox.rb

@@ -294,7 +294,7 @@ class TestIsolateSandbox < Isolate::Test
     assert s.install?
     assert s.system?
     assert s.verbose?
-    assert s.multiruby?
+    refute s.multiruby?
   end
 
   def test_initialize_override_defaults
@@ -331,22 +331,31 @@ class TestIsolateSandbox < Isolate::Test
     assert_equal Gem::Requirement.new("2.0"), monkey.requirement
   end
 
+  def test_initialize__name
+    exp = File.expand_path "~/.gem/repos/project_name"
+
+    outer = self
+
+    s = sandbox :name => "project_name" do |inner|
+      outer.assert_equal exp, inner.options[:path]
+    end
+
+    assert_equal exp, s.options[:path]
+  end
+
   def test_options
     @sandbox.options :hello => :monkey
     assert_equal :monkey, @sandbox.options[:hello]
   end
 
   def test_path
-    s = sandbox :multiruby => false do
-      options :path => "tmp/foo"
-    end
-
+    s = sandbox :multiruby => false, :path => "tmp/foo"
     assert_equal File.expand_path("tmp/foo"), s.path
 
-    v = [Gem.ruby_engine, RbConfig::CONFIG["ruby_version"]].join "-"
-    s = sandbox :multiruby => true
+    v = "%s-%s" % [Gem.ruby_engine, RbConfig::CONFIG["ruby_version"]]
     p = File.expand_path("tmp/test/#{v}")
 
+    s = sandbox :multiruby => true
     assert_equal p, s.path
 
     s = sandbox :path => "tmp/test/#{v}", :multiruby => false

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: isolate
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.5.1
 platform: ruby
 authors:
 - Ryan Davis
 - Eric Hodel
 - John Barnette
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE0MDkxNzIzMDcwN1oXDTE1MDkxNzIzMDcwN1owRTETMBEGA1UE
+  GRYDY29tMB4XDTIxMTIyMzIzMTkwNFoXDTIyMTIyMzIzMTkwNFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -23,114 +23,120 @@ cert_chain:
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAFoDJRokCQdxFfOrmsKX41KOFlU/zjrbDVM9hgB/Ur999M6OXGSi8FitXNtMwY
-  FVjsiAPeU7HaWVVcZkj6IhINelTkXsxgGz/qCzjHy3iUMuZWw36cS0fiWJ5rvH+e
-  hD7uXxJSFuyf1riDGI1aeWbQ74WMwvNstOxLUMiV5a1fzBhlxPqb537ubDjq/M/h
-  zPUFPVYeL5KjDHLCqI2FwIk2sEMOQgjpXHzl+3NlD2LUgUhHDMevmgVua0e2GT1B
-  xJcC6UN6NHMOVMyAXsr2HR0gRRx4ofN1LoP2KhXzSr8UMvQYlwPmE0N5GQv1b5AO
-  VpzF30vNaJK6ZT7xlIsIlwmH
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
+  AQCKB5jfsuSnKb+t/Wrh3UpdkmX7TrEsjVmERC0pPqzQ5GQJgmEXDD7oMgaKXaAq
+  x2m+KSZDrqk7c8uho5OX6YMqg4KdxehfSLqqTZGoeV78qwf/jpPQZKTf+W9gUSJh
+  zsWpo4K50MP+QtdSbKXZwjAafpQ8hK0MnnZ/aeCsW9ov5vdXpYbf3dpg6ADXRGE7
+  lQY2y1tJ5/chqu6h7dQmnm2ABUqx9O+JcN9hbCYoA5i/EeubUEtFIh2w3SpO6YfB
+  JFmxn4h9YO/pVdB962BdBNNDia0kgIjI3ENnkLq0dKpYU3+F3KhEuTksLO0L6X/V
+  YsuyUzsMz6GQA4khyaMgKNSD
   -----END CERTIFICATE-----
-date: 2015-02-02 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.5'
-- !ruby/object:Gem::Dependency
-  name: rdoc
+  name: hoe-seattlerb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: hoe-seattlerb
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: hoe-doofus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: hoe-git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: ZenTest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.5'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.23'
 description: |-
   Isolate is a very simple RubyGems sandbox. It provides a way to
   express and automatically install your project's Gem dependencies.
@@ -145,8 +151,7 @@ extra_rdoc_files:
 - Manifest.txt
 - README.rdoc
 files:
-- .autotest
-- .gemtest
+- ".autotest"
 - CHANGELOG.rdoc
 - Manifest.txt
 - README.rdoc
@@ -177,31 +182,27 @@ files:
 homepage: http://github.com/jbarnette/isolate
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: http://github.com/jbarnette/isolate
+post_install_message:
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.2
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubygems_version: 3.3.12
+signing_key:
 specification_version: 4
 summary: Isolate is a very simple RubyGems sandbox
-test_files:
-- test/test_isolate.rb
-- test/test_isolate_entry.rb
-- test/test_isolate_events.rb
-- test/test_isolate_sandbox.rb
+test_files: []