isolate 3.5.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2b55d89acb0e5982a52f30273070453a540483ea7c67572dcf356da83a63406
-  data.tar.gz: cb87cf7176af4cf28030ec9b8f341d8c8e360b1ac3e8e72c22b24d031043cde9
+  metadata.gz: 9f19145cae66a4d26ee98d417052a9afaf99199583c91da97d57488ede521552
+  data.tar.gz: 24cd809cf0e9531b2b6383379c7d155333b9331bd9ed84dd50035289ce01b260
 SHA512:
-  metadata.gz: '00971ffc02710b27fd3b582c9f5e15e27d26a59cea9467190c22da1e54fd6bdd84c03aad4c31382a0fc57b277efecbfb859f65c17cb4fba866d6e137871137da'
-  data.tar.gz: a19cb7d860e05bd8b19a3bc74941e7777067c55b7a144c210061e165452a705abb3ebbec29700b037aba70dae246e393686152cf19a8c78480ca06d76c46b9c8
+  metadata.gz: 9534c7b2d7c32238591b6d58e528adfa6b37b82e5576e2f7575c2f1dac6fa906aabf9394296286d5c43262f838d266a303e0996ccbf6dec49d3d3098b81caa3f
+  data.tar.gz: 882c8c1928d21d9caad63f52f1ca25f52e96c8ef20fb486f7db0329c9d072ca966ada93cbcd9f1cc736199c31752e0a16ba190b77ce0f30583df5d49b23e8b35

data/CHANGELOG.rdoc

@@ -1,3 +1,20 @@
+=== v4.0.0 / 2024-06-18
+
+* 3 major enhancements:
+
+  * Bump required ruby to 2.7
+  * Remove Event and all `fire` calls
+  * Removed long deprecated Sandbox#index
+
+* 1 minor enhancement:
+
+  * Added hoe spec accessor to set multiruby.
+
+* 2 bug fixes:
+
+  * Fix Rakefile access to isolated gems (no longer versioned by default).
+  * Fix errors created when string literals are frozen.
+
 === 3.5.1 / 2022-06-14
 
 * 1 bug fix:

data/Manifest.txt

@@ -7,7 +7,6 @@ lib/hoe/isolate.rb
 lib/isolate.rb
 lib/isolate/completely.rb
 lib/isolate/entry.rb
-lib/isolate/events.rb
 lib/isolate/now.rb
 lib/isolate/rake.rb
 lib/isolate/sandbox.rb
@@ -24,5 +23,4 @@ test/fixtures/with-hoe/specifications/rubyforge-1.0.4.gemspec
 test/isolate/test.rb
 test/test_isolate.rb
 test/test_isolate_entry.rb
-test/test_isolate_events.rb
 test/test_isolate_sandbox.rb

data/Rakefile

@@ -4,7 +4,7 @@ require "hoe"
 $:.unshift "lib"
 
 ENV["GEM_PATH"] ||= ""
-ENV["GEM_PATH"] += ":#{Dir["tmp/isolate/ruby-*"].sort.last}"
+ENV["GEM_PATH"] += ":tmp/isolate"
 Gem.paths = ENV
 
 require "isolate/rake"
@@ -17,6 +17,7 @@ Hoe.spec "isolate" do
   developer "Eric Hodel",    "drbrain@segment7.net"
   developer "John Barnette", "code@jbarnette.com"
 
+  require_ruby_version ">= 2.7"
   require_rubygems_version ">= 1.8.2"
 
   self.extra_rdoc_files = Dir["*.rdoc"]

data/lib/hoe/isolate.rb

@@ -22,12 +22,14 @@ class Hoe # :nodoc:
     # FIX: consider removing this and allowing +isolate_options+ instead.
 
     attr_accessor :isolate_dir
+    attr_accessor :isolate_multiruby
 
     def initialize_isolate
       # Tee hee! Move ourselves to the front to beat out :test.
       Hoe.plugins.unshift Hoe.plugins.delete(:isolate)
 
       self.isolate_dir ||= "tmp/isolate"
+      self.isolate_multiruby ||= false
 
       ::Isolate.sandbox ||= ::Isolate::Sandbox.new
 
@@ -46,7 +48,9 @@ class Hoe # :nodoc:
       sandbox = ::Isolate.sandbox
 
       # reset, now that they've had a chance to change it
-      sandbox.options :path => isolate_dir, :system => true
+      sandbox.options(:path       => isolate_dir,
+                      :multiruby  => isolate_multiruby,
+                      :system     => true)
 
       task :isolate do
         self.extra_deps.each do |name, version|

data/lib/isolate/entry.rb

@@ -1,4 +1,3 @@
-require "isolate/events"
 require "rubygems"
 require "rubygems/command"
 require "rubygems/dependency_installer"
@@ -8,13 +7,9 @@ require "rubygems/version"
 module Isolate
 
   # An isolated Gem, with requirement, environment restrictions, and
-  # installation options. Generally intended for internal use. This
-  # class exposes lifecycle events for extension, see Isolate::Events
-  # for more information.
+  # installation options. Generally intended for internal use.
 
   class Entry
-    include Events
-
     # Which environments does this entry care about? Generally an
     # Array of Strings. An empty array means "all", not "none".
 
@@ -62,38 +57,31 @@ module Isolate
       update(*requirements)
     end
 
-    # Activate this entry. Fires <tt>:activating</tt> and
-    # <tt>:activated</tt>.
+    # Activate this entry.
 
     def activate
-      fire :activating, :activated do
-        spec = self.specification
-        raise Gem::LoadError, "Couldn't resolve: #{self}" unless spec
-        spec.activate
-      end
+      spec = self.specification
+      raise Gem::LoadError, "Couldn't resolve: #{self}" unless spec
+      spec.activate
     end
 
-    # Install this entry in the sandbox. Fires <tt>:installing</tt>
-    # and <tt>:installed</tt>.
+    # Install this entry in the sandbox.
 
     def install
       old = Gem.sources.dup
 
       begin
-        fire :installing, :installed do
+        installer =
+          Gem::DependencyInstaller.new(:development   => false,
+                                       :document      => [],
+                                       :generate_rdoc => false,
+                                       :generate_ri   => false,
+                                       :install_dir   => @sandbox.path)
 
-          installer =
-            Gem::DependencyInstaller.new(:development   => false,
-                                         :document      => [],
-                                         :generate_rdoc => false,
-                                         :generate_ri   => false,
-                                         :install_dir   => @sandbox.path)
+        Gem::Command.build_args = Array(options[:args]) if options[:args]
+        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
+        installer.install @file || name, requirement
       ensure
         Gem.sources = old
         Gem::Command.build_args = nil
@@ -123,14 +111,12 @@ module Isolate
 
     # Updates this entry's environments, options, and
     # requirement. Environments and options are merged, requirement is
-    # replaced. Fires <tt>:updating</tt> and <tt>:updated</tt>.
+    # replaced.
 
     def update *reqs
-      fire :updating, :updated do
-        @environments |= @sandbox.environments
-        @options.merge! reqs.pop if Hash === reqs.last
-        @requirement = Gem::Requirement.new reqs unless reqs.empty?
-      end
+      @environments |= @sandbox.environments
+      @options.merge! reqs.pop if Hash === reqs.last
+      @requirement = Gem::Requirement.new reqs unless reqs.empty?
 
       self
     end

data/lib/isolate/sandbox.rb

@@ -1,10 +1,8 @@
 require "fileutils"
 require "isolate/entry"
-require "isolate/events"
 require "rbconfig"
 require "rubygems/defaults"
 require "rubygems/uninstaller"
-require "rubygems/deprecate"
 
 # disable default gems getting in the way of everything.
 
@@ -19,13 +17,10 @@ end
 
 module Isolate
 
-  # An isolated environment. This class exposes lifecycle events for
-  # extension, see Isolate::Events for more information.
+  # An isolated environment.
 
   class Sandbox
-    include Events
-
-    DEFAULT_PATH = "tmp/isolate" # :nodoc:
+    DEFAULT_PATH = +"tmp/isolate" # :nodoc:
 
     attr_reader :entries # :nodoc:
     attr_reader :environments # :nodoc:
@@ -33,8 +28,7 @@ module Isolate
 
     # Create a new Isolate::Sandbox instance. See Isolate.now! for the
     # most common use of the API. You probably don't want to use this
-    # constructor directly.  Fires <tt>:initializing</tt> and
-    # <tt>:initialized</tt>.
+    # constructor directly.
 
     def initialize options = {}, &block
       @enabled      = false
@@ -48,8 +42,6 @@ module Isolate
       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"
       load user if File.exist? user
 
@@ -63,13 +55,11 @@ module Isolate
       load file if file
 
       if block_given?
-        /\@(.+?):\d+/ =~ block.to_s
-        files << ($1 || "inline block")
+        files << (block.to_s[/ (\/.+):\d+/, 1] || "inline block")
         instance_eval(&block)
       end
 
       load local if local && File.exist?(local)
-      fire :initialized
     end
 
     # Activate this set of isolated entries, respecting an optional
@@ -78,12 +68,10 @@ module Isolate
     # everything, and removes any superfluous gem (again, if
     # necessary). If +environment+ isn't specified, +ISOLATE_ENV+,
     # +RAILS_ENV+, and +RACK_ENV+ are checked before falling back to
-    # <tt>"development"</tt>. Fires <tt>:activating</tt> and
-    # <tt>:activated</tt>.
+    # <tt>"development"</tt>.
 
     def activate environment = nil
       enable unless enabled?
-      fire :activating
 
       env = (environment || Isolate.env).to_s
 
@@ -94,14 +82,11 @@ module Isolate
       end
 
       cleanup if cleanup?
-      fire :activated
 
       self
     end
 
     def cleanup # :nodoc:
-      fire :cleaning
-
       gem_dir = Gem.dir
 
       global, local = Gem::Specification.partition { |s| s.base_dir != gem_dir }
@@ -109,17 +94,14 @@ module Isolate
       extra = (local - legit) + (local & global)
 
       self.remove(*extra)
-
-      fire :cleaned
     end
 
     def cleanup?
       install? and @options.fetch(:cleanup, true)
     end
 
-    def disable &block
-      return self if not enabled?
-      fire :disabling
+    def disable
+      return self unless enabled?
 
       ENV.replace @old_env
       $LOAD_PATH.replace @old_load_path
@@ -127,16 +109,20 @@ module Isolate
       @enabled = false
 
       Isolate.refresh
-      fire :disabled
 
-      begin; return yield ensure enable end if block_given?
+      if block_given? then
+        begin
+          return yield
+        ensure
+          enable
+        end
+      end
 
       self
     end
 
     def enable # :nodoc:
       return self if enabled?
-      fire :enabling
 
       @old_env       = ENV.to_hash
       @old_load_path = $LOAD_PATH.dup
@@ -149,12 +135,13 @@ module Isolate
       unless system?
         isolate_lib = File.expand_path "../..", __FILE__
 
-        # manually deactivate pre-isolate gems...
-        $LOAD_PATH.reject! { |lpath|
+        $LOAD_PATH.reject! { |lpath|  # manually deactivate pre-isolate gems...
           (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) })
+           lpath != isolate_lib    && # that aren't us
+           Gem.path.reject(&:empty?).any? { |gem_path|
+             lpath.include?(gem_path) # and are included in a gem's path(?)
+           })
         }
 
         # HACK: Gotta keep isolate explicitly in the LOAD_PATH in
@@ -183,7 +170,6 @@ module Isolate
       Isolate.refresh
 
       @enabled = true
-      fire :enabled
 
       self
     end
@@ -217,20 +203,10 @@ module Isolate
       entry
     end
 
-    # A source index representing only isolated gems.
-
-    def index
-      @index ||= Gem::SourceIndex.from_gems_in File.join(path, "specifications")
-    end
-
     def install environment # :nodoc:
-      fire :installing
-
       install_missing environment
       rebuild_extensions
 
-      fire :installed
-
       self
     end
 
@@ -367,9 +343,5 @@ module Isolate
 
       specs.uniq
     end
-
-    dep_module = defined?(Gem::Deprecate) ? Gem::Deprecate : Deprecate
-    extend dep_module
-    deprecate :index, :none, 2011, 11
   end
 end

data/lib/isolate.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isolate
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -12,9 +12,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBBjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBCDANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTIxMTIyMzIzMTkwNFoXDTIyMTIyMzIzMTkwNFowRTETMBEGA1UE
+  GRYDY29tMB4XDTI0MDEwMjIxMjEyM1oXDTI1MDEwMTIxMjEyM1owRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -24,14 +24,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   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
+  AQCygvpmncmkiSs9r/Kceo4bBPDszhTv6iBi4LwMReqnFrpNLMOWJw7xi8x+3eL2
+  XS09ZPNOt2zm70KmFouBMgOysnDY4k2dE8uF6B8JbZOO8QfalW+CoNBliefOTcn2
+  bg5IOP7UoGM5lC174/cbDJrJnRG9bzig5FAP0mvsgA8zgTRXQzIUAZEo92D5K7p4
+  B4/O998ho6BSOgYBI9Yk1ttdCtti6Y+8N9+fZESsjtWMykA+WXWeGUScHqiU+gH8
+  S7043fq9EbQdBr2AXdj92+CDwuTfHI6/Hj5FVBDULufrJaan4xUgL70Hvc6pTTeW
+  deKfBjgVAq7EYHu1AczzlUly
   -----END CERTIFICATE-----
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2024-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-seattlerb
@@ -129,14 +129,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.23'
+        version: '4.2'
 description: |-
   Isolate is a very simple RubyGems sandbox. It provides a way to
   express and automatically install your project's Gem dependencies.
@@ -160,7 +160,6 @@ files:
 - lib/isolate.rb
 - lib/isolate/completely.rb
 - lib/isolate/entry.rb
-- lib/isolate/events.rb
 - lib/isolate/now.rb
 - lib/isolate/rake.rb
 - lib/isolate/sandbox.rb
@@ -177,7 +176,6 @@ files:
 - test/isolate/test.rb
 - test/test_isolate.rb
 - test/test_isolate_entry.rb
-- test/test_isolate_events.rb
 - test/test_isolate_sandbox.rb
 homepage: http://github.com/jbarnette/isolate
 licenses:
@@ -194,14 +192,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.2
 requirements: []
-rubygems_version: 3.3.12
+rubygems_version: 3.5.14
 signing_key:
 specification_version: 4
 summary: Isolate is a very simple RubyGems sandbox

data/lib/isolate/events.rb

@@ -1,42 +0,0 @@
-module Isolate
-
-  # A simple way to watch and extend the Isolate lifecycle.
-  #
-  #    Isolate::Events.watch Isolate::Sandbox, :initialized do |sandbox|
-  #      puts "A sandbox just got initialized: #{sandbox}"
-  #    end
-  #
-  # Read the source for Isolate::Sandbox and Isolate::Entry to see
-  # what sort of events are fired.
-
-  module Events
-
-    # Watch for an event called +name+ from an instance of
-    # +klass+. +block+ will be called when the event occurs. Block
-    # args vary by event, but usually an instance of the relevant
-    # class is passed.
-
-    def self.watch klass, name, &block
-      watchers[[klass, name]] << block
-    end
-
-    def self.fire klass, name, *args #:nodoc:
-      watchers[[klass, name]].each do |block|
-        block[*args]
-      end
-    end
-
-    def self.watchers #:nodoc:
-      @watchers ||= Hash.new { |h, k| h[k] = [] }
-    end
-
-    def fire name, after = nil, *args, &block #:nodoc:
-      Isolate::Events.fire self.class, name, self, *args
-
-      if after && block_given?
-        yield self
-        Isolate::Events.fire self.class, after, *args
-      end
-    end
-  end
-end

data/test/test_isolate_events.rb

@@ -1,44 +0,0 @@
-require "isolate/events"
-require "isolate/test"
-
-class TestIsolateEvents < Isolate::Test
-  include Isolate::Events
-
-  def setup
-    Isolate::Events.watchers.clear
-    super
-  end
-
-  def test_self_watch
-    b = lambda {}
-    Isolate::Events.watch String, :foo, &b
-    assert_equal [b], Isolate::Events.watchers[[String, :foo]]
-  end
-
-  def test_fire
-    count = 0
-
-    Isolate::Events.watch self.class, :increment do
-      count += 1
-    end
-
-    fire :increment
-    assert_equal 1, count
-  end
-
-  def test_fire_block
-    count = 0
-
-    [:increment, :incremented].each do |name|
-      Isolate::Events.watch self.class, name do
-        count += 1
-      end
-    end
-
-    fire :increment, :incremented do |x|
-      assert_same self, x
-    end
-
-    assert_equal 2, count
-  end
-end