isolate 3.0.0 → 3.0.1

data/.autotest

@@ -1,5 +1,9 @@
+# -*- ruby -*-
+
 require "autotest/restart"
 
 Autotest.add_hook :initialize do |at|
   at.testlib = "minitest/autorun"
+  at.add_exception "tmp"
+  at.add_exception ".git"
 end

data/CHANGELOG.rdoc

@@ -1,3 +1,19 @@
+=== 3.0.1 / 2011-05-11
+
+* 6 minor enhancements:
+
+  * Added Entry#to_s and #inspect to make it much more readable.
+  * Added Isolate.sandbox= and used it from Hoe::Isolate plugin.
+  * Deprecated Sandbox#index.
+  * Entry#specification now returns nil if it doesn't resolve to anything.
+  * Refactored Sandbox's default path so that tests won't collide with our Rakefile.
+  * We now require rubygems >= 1.8.2.
+
+* 2 bug fixes:
+
+  * Cleaned up all warnings caused by rubygems 1.8 deprecations.
+  * Fixed Sandbox#legitimize! to properly deal with Gem::Dependency.
+
 === 3.0.0 / 2010-10-19
 
 * Remove deprecated Isolate.{gems,instance} methods.

data/Rakefile

@@ -1,20 +1,100 @@
 require "rubygems"
 require "hoe"
 
+$:.unshift "lib"
+require "isolate/rake"
+
 Hoe.plugins.delete :rubyforge
-Hoe.plugin :doofus, :git
+Hoe.plugin :isolate, :doofus, :git
 
 Hoe.spec "isolate" do
   developer "John Barnette", "code@jbarnette.com"
   developer "Ryan Davis",    "ryand-ruby@zenspider.com"
 
-  require_ruby_version     ">= 1.8.6"
-  require_rubygems_version ">= 1.3.6"
+  require_rubygems_version ">= 1.8.2"
 
   self.extra_rdoc_files = Dir["*.rdoc"]
   self.history_file     = "CHANGELOG.rdoc"
   self.readme_file      = "README.rdoc"
   self.testlib          = :minitest
 
-  extra_dev_deps << ["minitest", "~> 1.7"]
+  dependency "minitest",   "~> 2.1.0", :development
+  dependency "hoe-doofus", "~> 1.0.0", :development
+  dependency "hoe-git",    "~> 1.3.0", :development
+end
+
+def changelog_section code
+  name = {
+    :major   => "major enhancement",
+    :minor   => "minor enhancement",
+    :bug     => "bug fix",
+    :unknown => "unknown",
+  }[code]
+
+  changes = $changes[code]
+  count = changes.size
+  name += "s" if count > 1
+  name.sub!(/fixs/, 'fixes')
+
+  return if count < 1
+
+  puts "* #{count} #{name}:"
+  puts
+  changes.sort.each do |line|
+    puts "  * #{line}"
+  end
+  puts
+end
+
+desc "Print the current changelog."
+task "git:newchangelog" do
+  # This must be in here until rubygems depends on the version of hoe that has
+  # git_tags
+  # TODO: get this code back into hoe-git
+  module Hoe::Git
+    module_function :git_tags, :git_svn?, :git_release_tag_prefix
+  end
+
+  tag   = ENV["FROM"] || Hoe::Git.git_tags.last
+  range = [tag, "HEAD"].compact.join ".."
+  cmd   = "git log #{range} '--format=tformat:%B|||%aN|||%aE|||'"
+  now   = Time.new.strftime "%Y-%m-%d"
+
+  changes = `#{cmd}`.split(/\|\|\|/).each_slice(3).map do |msg, author, email|
+    msg.split(/\n/).reject { |s| s.empty? }
+  end
+
+  changes = changes.flatten
+
+  next if changes.empty?
+
+  $changes = Hash.new { |h,k| h[k] = [] }
+
+  codes = {
+    "!" => :major,
+    "+" => :minor,
+    "*" => :minor,
+    "-" => :bug,
+    "?" => :unknown,
+  }
+
+  codes_re = Regexp.escape codes.keys.join
+
+  changes.each do |change|
+    if change =~ /^\s*([#{codes_re}])\s*(.*)/ then
+      code, line = codes[$1], $2
+    else
+      code, line = codes["?"], change.chomp
+    end
+
+    $changes[code] << line
+  end
+
+  puts "=== #{ENV['VERSION'] || 'NEXT'} / #{now}"
+  puts
+  changelog_section :major
+  changelog_section :minor
+  changelog_section :bug
+  changelog_section :unknown
+  puts
 end

data/lib/hoe/isolate.rb

@@ -51,6 +51,8 @@ class Hoe # :nodoc:
         @sandbox.gem name, *Array(version)
       end
 
+      ::Isolate.sandbox = @sandbox
+
       @sandbox.activate
     end
   end

data/lib/isolate/entry.rb

@@ -67,7 +67,9 @@ module Isolate
 
     def activate
       fire :activating, :activated do
-        Gem.activate name, *requirement.as_list
+        spec = self.specification
+        raise Gem::LoadError, "Couldn't resolve: #{self}" unless spec
+        spec.activate
       end
     end
 
@@ -79,9 +81,12 @@ module Isolate
 
       begin
         fire :installing, :installed do
-          installer = Gem::DependencyInstaller.new :development => false,
-            :generate_rdoc => false, :generate_ri => false,
-            :install_dir => @sandbox.path
+
+          installer =
+            Gem::DependencyInstaller.new(:development   => false,
+                                         :generate_rdoc => false,
+                                         :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]
@@ -107,10 +112,12 @@ module Isolate
       name == spec.name and requirement.satisfied_by? spec.version
     end
 
-    # The Gem::Specification for this entry.
+    # The Gem::Specification for this entry or nil if it isn't resolveable.
 
     def specification
-      Gem.source_index.find_name(name, requirement).first
+      Gem::Specification.find_by_name(name, requirement)
+    rescue Gem::LoadError
+      nil
     end
 
     # Updates this entry's environments, options, and
@@ -126,5 +133,11 @@ module Isolate
 
       self
     end
+
+    def to_s
+      "Entry[#{name.inspect}, #{requirement.to_s.inspect}]"
+    end
+
+    alias :inspect :to_s
   end
 end

data/lib/isolate/rake.rb

@@ -1,3 +1,5 @@
+require "isolate"
+
 namespace :isolate do
   desc "Show current isolated environment."
   task :env do
@@ -48,22 +50,14 @@ namespace :isolate do
 
   desc "Which isolated gems have updates available?"
   task :stale do
-    require "rubygems/source_index"
-    require "rubygems/spec_fetcher"
-
-    index    = Gem::SourceIndex.new
     outdated = []
+    sandbox  = Isolate.sandbox
+    outdated = sandbox.entries.reject { |entry| entry.specification }
 
-    Isolate.sandbox.entries.each do |entry|
-      if entry.specification
-        index.add_spec entry.specification
-      else
-        outdated << entry
-      end
-    end
-
-    index.outdated.each do |name|
-      outdated << Isolate.sandbox.entries.find { |e| e.name == name }
+    Gem::Specification.outdated.each do |name|
+      entry = sandbox.entries.find { |e| e.name == name }
+      next unless entry
+      outdated << entry
     end
 
     outdated.sort_by { |e| e.name }.each do |entry|

data/lib/isolate/sandbox.rb

@@ -4,6 +4,7 @@ require "isolate/events"
 require "rbconfig"
 require "rubygems/defaults"
 require "rubygems/uninstaller"
+require "rubygems/deprecate"
 
 module Isolate
 
@@ -13,6 +14,8 @@ module Isolate
   class Sandbox
     include Events
 
+    DEFAULT_PATH = "tmp/isolate" # :nodoc:
+
     attr_reader :entries # :nodoc:
     attr_reader :environments # :nodoc:
     attr_reader :files # :nodoc:
@@ -83,7 +86,7 @@ module Isolate
     def cleanup # :nodoc:
       fire :cleaning
 
-      installed = index.gems.values.sort
+      installed = Gem::Specification.map
       legit     = legitimize!
       extra     = installed - legit
 
@@ -95,11 +98,13 @@ module Isolate
           log format % [i + 1, extra.size, e.full_name]
 
           Gem::DefaultUserInteraction.use_ui Gem::SilentUI.new do
-            Gem::Uninstaller.new(e.name,
-                                 :version     => e.version,
-                                 :ignore      => true,
-                                 :executables => true,
-                                 :install_dir => path).uninstall
+            uninstaller =
+              Gem::Uninstaller.new(e.name,
+                                   :version     => e.version,
+                                   :ignore      => true,
+                                   :executables => true,
+                                   :install_dir => path)
+            uninstaller.uninstall
           end
         end
       end
@@ -135,24 +140,25 @@ module Isolate
       @old_env       = ENV.to_hash
       @old_load_path = $LOAD_PATH.dup
 
+      path = self.path
+
       FileUtils.mkdir_p path
       ENV["GEM_HOME"] = path
 
-      lib = File.expand_path "../..", __FILE__
-
       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 != lib && Gem.path.any? { |gp| p.include?(gp) }
+          p != isolate_lib && Gem.path.any? { |gp| p.include?(gp) }
         end
 
         # HACK: Gotta keep isolate explicitly in the LOAD_PATH in
         # subshells, and the only way I can think of to do that is by
         # abusing RUBYOPT.
 
-        dirname = Regexp.escape lib
-
-        unless ENV["RUBYOPT"] =~ /\s+-I\s*#{lib}\b/
-          ENV["RUBYOPT"] = "#{ENV['RUBYOPT']} -I#{lib}"
+        unless ENV["RUBYOPT"] =~ /\s+-I\s*#{Regexp.escape isolate_lib}\b/
+          ENV["RUBYOPT"] = "#{ENV['RUBYOPT']} -I#{isolate_lib}"
         end
 
         ENV["GEM_PATH"] = path
@@ -214,8 +220,7 @@ module Isolate
       fire :installing
 
       installable = entries.select do |e|
-        !Gem.available?(e.name, *e.requirement.as_list) &&
-          e.matches?(environment)
+        not e.specification && e.matches?(environment)
       end
 
       unless installable.empty?
@@ -227,8 +232,7 @@ module Isolate
           entry.install
         end
 
-        index.refresh!
-        Gem.source_index.refresh!
+        Gem::Specification.reset
       end
 
       fire :installed
@@ -249,7 +253,6 @@ module Isolate
       $stderr.puts s if verbose?
     end
 
-
     def multiruby?
       @options.fetch :multiruby, true
     end
@@ -260,7 +263,7 @@ module Isolate
     end
 
     def path
-      base = @options.fetch :path, "tmp/isolate"
+      base = @options.fetch :path, DEFAULT_PATH
 
       unless @options.key?(:multiruby) && @options[:multiruby] == false
         suffix = "#{Gem.ruby_engine}-#{RbConfig::CONFIG['ruby_version']}"
@@ -289,9 +292,20 @@ module Isolate
       specs = []
 
       deps.flatten.each do |dep|
-        spec = index.find_name(dep.name, dep.requirement).last
-
-        if spec
+        spec = case dep
+               when Gem::Dependency then
+                 begin
+                   dep.to_spec
+                 rescue Gem::LoadError
+                   nil
+                 end
+               when Isolate::Entry then
+                 dep.specification
+               else
+                 raise "unknown dep: #{dep.inspect}"
+               end
+
+        if spec then
           specs.concat legitimize!(spec.runtime_dependencies)
           specs << spec
         end
@@ -299,5 +313,8 @@ module Isolate
 
       specs.uniq
     end
+
+    extend Deprecate
+    deprecate :index, :none, 2011, 11
   end
 end

data/lib/isolate.rb

@@ -8,7 +8,7 @@ module Isolate
 
   # Duh.
 
-  VERSION = "3.0.0"
+  VERSION = "3.0.1"
 
   # Disable Isolate. If a block is provided, isolation will be
   # disabled for the scope of the block.
@@ -34,6 +34,13 @@ module Isolate
     @@sandbox
   end
 
+  # Set the singleton. Intended for Hoe::Isolate and other tools that
+  # make their own.
+
+  def self.sandbox= o
+    @@sandbox = o
+  end
+
   # Declare an isolated RubyGems environment, installed in +path+. Any
   # block given will be <tt>instance_eval</tt>ed, see
   # Isolate::Sandbox#gem and Isolate::Sandbox#environment for the sort
@@ -75,6 +82,6 @@ module Isolate
   def self.refresh # :nodoc:
     Gem.loaded_specs.clear
     Gem.clear_paths
-    Gem.source_index.refresh!
+    Gem::Specification.reset
   end
 end

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

@@ -7,7 +7,6 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Davis"]
   s.date = %q{2009-08-07}
-  s.default_executable = %q{sow}
   s.description = %q{Hoe is a rake/rubygems helper for project Rakefiles. It helps generate
 rubygems and includes a dynamic plug-in system allowing for easy
 extensibility. Hoe ships with plug-ins for all your usual project

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

@@ -7,7 +7,6 @@ Gem::Specification.new do |s|
   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.default_executable = %q{rake}
   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"]

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

@@ -7,7 +7,6 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Davis", "Eric Hodel", "Ara T Howard"]
   s.date = %q{2009-07-21}
-  s.default_executable = %q{rubyforge}
   s.description = %q{A script which automates a limited set of rubyforge operations.
 
 * Run 'rubyforge help' for complete usage.

data/test/isolate/test.rb

@@ -1,7 +1,11 @@
 require "isolate"
 require "minitest/autorun"
 
+ENV.delete "RUBYOPT" # Rakefile uses isolate, so we don't want this
+
 module Isolate
+  Sandbox::DEFAULT_PATH.replace "tmp/test" # change isolate dir for testing
+
   class Test < MiniTest::Unit::TestCase
     def setup
       Isolate.refresh
@@ -19,7 +23,7 @@ module Isolate
       $LOAD_PATH.replace @lp
       $LOADED_FEATURES.replace @lf
 
-      FileUtils.rm_rf "tmp/isolate"
+      FileUtils.rm_rf "tmp/test"
     end
   end
 end

data/test/test_isolate.rb

@@ -31,7 +31,10 @@ class TestIsolate < Isolate::Test
   def test_self_now!
     assert_nil Isolate.sandbox
 
-    Isolate.now! :path => WITH_HOE, :multiruby => false, :system => false do
+    Isolate.now!(:path      => WITH_HOE,
+                 :multiruby => false,
+                 :system    => false,
+                 :verbose   => false) do
       gem "hoe"
     end
 

data/test/test_isolate_entry.rb

@@ -5,7 +5,7 @@ class TestIsolateEntry < Isolate::Test
   def setup
     @sandbox = Object.new
     def @sandbox.environments; @e ||= [] end
-    def @sandbox.path; "tmp/gems" end
+    def @sandbox.path; "tmp/test" end
 
     super
   end

data/test/test_isolate_sandbox.rb

@@ -57,7 +57,10 @@ class TestIsolateSandbox < Isolate::Test
 
   def test_cleanup
     s = sandbox :path => WITH_HOE, :install => true, :cleanup => true
-    s.activate # no gems on purpose
+
+    assert_silent do
+      s.activate # no gems on purpose
+    end
 
     expected = [["hoe",       "2.3.3", WITH_HOE],
                 ["rake",      "0.8.7", WITH_HOE],
@@ -113,6 +116,8 @@ class TestIsolateSandbox < Isolate::Test
   end
 
   def test_idempotent_rubyopt_env
+    assert_nil ENV["RUBYOPT"], "sanity check to make sure ENV isn't infecting"
+
     @sandbox.enable
     rubyopt = ENV["RUBYOPT"]
     @sandbox.disable
@@ -189,7 +194,7 @@ class TestIsolateSandbox < Isolate::Test
 
     assert_equal [], s.entries
     assert_equal [], s.environments
-    assert_match(/tmp\/isolate/, s.path)
+    assert_match(/tmp\/test/, s.path)
 
     assert s.cleanup?
     assert s.install?
@@ -243,11 +248,11 @@ class TestIsolateSandbox < Isolate::Test
 
     v = [Gem.ruby_engine, RbConfig::CONFIG["ruby_version"]].join "-"
     s = sandbox :multiruby => true
-    p = File.expand_path("tmp/isolate/#{v}")
+    p = File.expand_path("tmp/test/#{v}")
 
     assert_equal p, s.path
 
-    s = sandbox :path => "tmp/isolate/#{v}", :multiruby => false
+    s = sandbox :path => "tmp/test/#{v}", :multiruby => false
     assert_equal p, s.path
   end
 

data.tar.gz.sig

@@ -0,0 +1 @@
+��&n̲wI^ȓ]����@���j�茺?"[m�A�-��;4�@?%|��c,:����^

metadata

@@ -1,22 +1,43 @@
 --- !ruby/object:Gem::Specification 
 name: isolate
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 5
+  prerelease: 
   segments: 
   - 3
   - 0
-  - 0
-  version: 3.0.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - John Barnette
 - Ryan Davis
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
+  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
+  AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
+  JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
+  b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
+  taCPaLmfYIaFcHHCSY4hYDJijRQkLxPeB3xbOfzfLoBDbjvx5JxgJxUjmGa7xhcT
+  oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
+  GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
+  qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
+  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
+  AQAY59gYvDxqSqgC92nAP9P8dnGgfZgLxP237xS6XxFGJSghdz/nI6pusfCWKM8m
+  vzjjH2wUMSSf3tNudQ3rCGLf2epkcU13/rguI88wO6MrE0wi4ZqLQX+eZQFskJb/
+  w6x9W1ur8eR01s397LSMexySDBrJOh34cm2AlfKr/jokKCTwcM0OvVZnAutaovC0
+  l1SVZ0ecg88bsWHA0Yhh7NFxK1utWoIhtB6AFC/+trM0FQEB/jZkIS8SaNzn96Rl
+  n0sZEf77FLf5peR8TP/PtmIg7Cyqz23sLM4mCOoTGIy5OcZ8TdyiyINUHtb5ej/T
+  FBHgymkyj/AOSqKRIpXPhjC6
+  -----END CERTIFICATE-----
 
-date: 2010-10-19 00:00:00 -07:00
-default_executable: 
+date: 2011-05-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -26,27 +47,62 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
+        - 2
         - 1
-        - 7
-        version: "1.7"
+        - 0
+        version: 2.1.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: hoe-doofus
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hoe-git
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 35
         segments: 
         - 2
-        - 6
-        - 2
-        version: 2.6.2
+        - 9
+        - 4
+        version: 2.9.4
   type: :development
-  version_requirements: *id002
+  version_requirements: *id004
 description: |-
   Isolate is a very simple RubyGems sandbox. It provides a way to
   express and automatically install your project's Gem dependencies.
@@ -86,7 +142,7 @@ files:
 - test/test_isolate_entry.rb
 - test/test_isolate_events.rb
 - test/test_isolate_sandbox.rb
-has_rdoc: true
+- .gemtest
 homepage: http://github.com/jbarnette/isolate
 licenses: []
 
@@ -101,25 +157,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
-      - 1
-      - 8
-      - 6
-      version: 1.8.6
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 51
       segments: 
       - 1
-      - 3
-      - 6
-      version: 1.3.6
+      - 8
+      - 2
+      version: 1.8.2
 requirements: []
 
 rubyforge_project: isolate
-rubygems_version: 1.3.7
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Isolate is a very simple RubyGems sandbox