libgems 0.0.2 → 0.0.3

data/lib/libgems.rb

@@ -98,7 +98,7 @@ require 'thread'
 module LibGems
   NAME = 'LibGems'
   GEM_NAME = 'libgems'
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
   GEM_VERSION = '1.3.8'
 
   ##
@@ -173,40 +173,33 @@ module LibGems
   @pre_uninstall_hooks  ||= []
   @pre_install_hooks    ||= []
 
+
+  def self.rubygems_compat?
+    @using_rubygems_compat
+  end
+
   ##
-  # Specialized eval for gemspecs that sets Gem to LibGems
+  # Run code with Gem = LibGems
 
-  def self.gemspec_eval(str, *args)
-    eval(<<-end_eval, *args)
+  def self.with_rubygems_compat
+    unless LibGems.rubygems_compat?
       begin
+        @using_rubygems_compat = true
         libgems_original_gem = nil
         if Object.const_defined?(:Gem)
           libgems_original_gem = Object::Gem
           Object.send(:remove_const, :Gem)
         end
         Object.const_set(:Gem, LibGems)
-        #{str}
+        yield
       ensure
         Object.send(:remove_const, :Gem)
         Object.const_set(:Gem, libgems_original_gem) if libgems_original_gem
+        @using_rubygems_compat = false
       end
-    end_eval
-  end
-
-  ##
-  # Run code with Gem = LibGems
-
-  def self.with_rubygems_compat
-    libgems_original_gem = nil
-    if Object.const_defined?(:Gem)
-      libgems_original_gem = Object::Gem
-      Object.send(:remove_const, :Gem)
+    else
+      yield
     end
-    Object.const_set(:Gem, LibGems)
-    yield
-  ensure
-    Object.send(:remove_const, :Gem)
-    Object.const_set(:Gem, libgems_original_gem) if libgems_original_gem
   end
 
   ##
@@ -471,7 +464,7 @@ module LibGems
       base = File.basename(gp)
       specfn = File.join(dir, "specifications", base + ".gemspec")
       if File.exist?(specfn)
-        spec = gemspec_eval(File.read(specfn))
+        spec = with_rubygems_compat{ eval(File.read(specfn)) }
         spec.require_paths.each do |rp|
           yield(File.join(gp, rp))
         end
@@ -1251,5 +1244,7 @@ class << LibGems
   end
 end
 
+require 'libgems/custom_require'
+
 LibGems.clear_paths
 LibGems.load_configuration

data/lib/libgems/commands/build_command.rb

@@ -47,7 +47,7 @@ class LibGems::Commands::BuildCommand < LibGems::Command
 
   def yaml?(filename)
     line = open(filename) { |f| line = f.gets }
-    result = line =~ %r{!ruby/object:LibGems::Specification}
+    result = line =~ %r{!ruby/object:Gem::Specification}
     result
   end
 end

data/lib/libgems/custom_require.rb

@@ -26,11 +26,14 @@ module Kernel
   # that file has already been loaded is preserved.
 
   def require(path) # :doc:
-    libgems_original_require path
+    # If we're using rubygems compat mode we don't want to call the original RubyGems require
+    require_method = (LibGems.rubygems_compat? && defined?(gem_original_require)) ?
+                        :gem_original_require : :libgems_original_require
+    send(require_method, path)
   rescue LoadError => load_error
     if load_error.message.end_with?(path)
       if LibGems.try_activate(path)
-        return libgems_original_require(path)
+        return send(require_method, path)
       end
     end
 

data/lib/libgems/requirement.rb

@@ -138,6 +138,10 @@ class LibGems::Requirement
     as_list.join ", "
   end
 
+  def to_yaml_type
+    "!ruby/object:Gem::Requirement"
+  end
+
   def <=> other # :nodoc:
     to_s <=> other.to_s
   end

data/lib/libgems/source_index.rb

@@ -92,7 +92,7 @@ class LibGems::SourceIndex
                   end.untaint
 
       begin
-        gemspec = LibGems.gemspec_eval(spec_code, binding, file_name)
+        gemspec = LibGems.with_rubygems_compat{ eval(spec_code, binding, file_name) }
 
         if gemspec.is_a?(LibGems::Specification)
           gemspec.loaded_from = file_name

data/lib/libgems/specification.rb

@@ -505,7 +505,7 @@ class LibGems::Specification
     raise "NESTED Specification.load calls not allowed!" if @@gather
     @@gather = proc { |gs| gemspec = gs }
     data = File.read filename
-    LibGems.gemspec_eval(data, nil, filename)
+    LibGems.with_rubygems_compat{ eval(data, nil, filename) }
     gemspec
   ensure
     @@gather = nil
@@ -708,10 +708,14 @@ class LibGems::Specification
           encode_with map
         end
       end
-      ret.gsub("!ruby/object:LibGems", "!ruby/object:Gem")
+      ret #.to_s.gsub("!ruby/object:LibGems", "!ruby/object:Gem").to_yaml
     end
   end
 
+  def to_yaml_type
+    "!ruby/object:Gem::Specification"
+  end
+
   def init_with coder # :nodoc:
     yaml_initialize coder.tag, coder.map
   end

data/lib/libgems/version.rb

@@ -313,4 +313,9 @@ class LibGems::Version
 
     return 0
   end
+
+  def to_yaml_type
+    "!ruby/object:Gem::Version"
+  end
+
 end

data/test/simple_gem.rb

@@ -23,10 +23,10 @@ SIMPLE_GEM = <<-GEMDATA
 end
 
 __END__
---- !ruby/object:LibGems::Specification
+--- !ruby/object:Gem::Specification
 rubygems_version: "1.0"
 name: testing
-version: !ruby/object:LibGems::Version
+version: !ruby/object:Gem::Version
   version: 1.2.3
 date: 2004-03-18 22:01:52.859121 -05:00
 platform:

data/test/test_gem_commands_specification_command.rb

@@ -19,7 +19,7 @@ class TestGemCommandsSpecificationCommand < RubyGemTestCase
       @cmd.execute
     end
 
-    assert_match %r|LibGems::Specification|, @ui.output
+    assert_match %r|Gem::Specification|, @ui.output
     assert_match %r|name: foo|, @ui.output
     assert_equal '', @ui.error
   end
@@ -35,7 +35,7 @@ class TestGemCommandsSpecificationCommand < RubyGemTestCase
       @cmd.execute
     end
 
-    assert_match %r|LibGems::Specification|, @ui.output
+    assert_match %r|Gem::Specification|, @ui.output
     assert_match %r|name: foo|, @ui.output
     assert_match %r|version: 0.0.1|, @ui.output
     assert_match %r|version: 0.0.2|, @ui.output
@@ -65,7 +65,7 @@ class TestGemCommandsSpecificationCommand < RubyGemTestCase
       @cmd.execute
     end
 
-    assert_match %r|LibGems::Specification|, @ui.output
+    assert_match %r|Gem::Specification|, @ui.output
     assert_match %r|name: foo|, @ui.output
     assert_equal '', @ui.error
   end
@@ -115,7 +115,7 @@ class TestGemCommandsSpecificationCommand < RubyGemTestCase
       @cmd.execute
     end
 
-    assert_match %r|\A--- !ruby/object:LibGems::Specification|, @ui.output
+    assert_match %r|\A--- !ruby/object:Gem::Specification|, @ui.output
     assert_match %r|name: foo|, @ui.output
   end
 
@@ -130,7 +130,7 @@ class TestGemCommandsSpecificationCommand < RubyGemTestCase
       @cmd.execute
     end
 
-    assert_match %r|LibGems::Specification.new|, @ui.output
+    assert_match %r|Gem::Specification.new|, @ui.output
     assert_match %r|s.name = %q\{foo\}|, @ui.output
     assert_equal '', @ui.error
   end

data/test/test_gem_indexer.rb

@@ -520,7 +520,7 @@ eighty characters.</pre>
     yaml_path = File.join @tempdir, 'yaml'
     dump_path = File.join @tempdir, "Marshal.#{@marshal_version}"
 
-    yaml_index = YAML.load_file yaml_path
+    yaml_index = LibGems.with_rubygems_compat{ YAML.load_file yaml_path }
     dump_index = Marshal.load LibGems.read_binary(dump_path)
 
     dump_index.each do |_,gem|

data/test/test_gem_installer.rb

@@ -840,7 +840,7 @@ load LibGems.bin_path('a', 'my_exec', version)
     @installer.write_spec
 
     assert File.exist?(spec_file)
-    assert_equal @spec, LibGems.gemspec_eval(File.read(spec_file))
+    assert_equal @spec, LibGems.with_rubygems_compat{ eval(File.read(spec_file)) }
   end
 
   def old_ruby_required

data/test/test_gem_server.rb

@@ -119,7 +119,7 @@ class TestGemServer < RubyGemTestCase
     assert @res['date']
     assert_equal 'application/x-deflate', @res['content-type']
 
-    spec = YAML.load LibGems.inflate(@res.body)
+    spec = LibGems.with_rubygems_compat{ YAML.load LibGems.inflate(@res.body) }
     assert_equal 'a', spec.name
     assert_equal LibGems::Version.new(1), spec.version
   end
@@ -136,7 +136,7 @@ class TestGemServer < RubyGemTestCase
     assert @res['date']
     assert_equal 'application/x-deflate', @res['content-type']
 
-    spec = YAML.load LibGems.inflate(@res.body)
+    spec = LibGems.with_rubygems_compat{ YAML.load LibGems.inflate(@res.body) }
     assert_equal 'a', spec.name
     assert_equal LibGems::Version.new(1), spec.version
     assert_equal LibGems::Platform.local, spec.platform
@@ -154,7 +154,7 @@ class TestGemServer < RubyGemTestCase
     assert @res['date']
     assert_equal 'application/x-deflate', @res['content-type']
 
-    spec = YAML.load LibGems.inflate(@res.body)
+    spec = LibGems.with_rubygems_compat{ YAML.load LibGems.inflate(@res.body) }
     assert_equal 'a', spec.name
     assert_equal LibGems::Version.new(1), spec.version
   end
@@ -318,7 +318,7 @@ class TestGemServer < RubyGemTestCase
     si = LibGems::SourceIndex.new
     si.add_specs @a1, @a2
 
-    assert_equal si, YAML.load(@res.body)
+    assert_equal si, LibGems.with_rubygems_compat{ YAML.load(@res.body) }
   end
 
   def test_yaml_Z
@@ -334,7 +334,7 @@ class TestGemServer < RubyGemTestCase
     si = LibGems::SourceIndex.new
     si.add_specs @a1, @a2
 
-    assert_equal si, YAML.load(LibGems.inflate(@res.body))
+    assert_equal si, LibGems.with_rubygems_compat{ YAML.load(LibGems.inflate(@res.body)) }
   end
 
   def util_listen

data/test/test_gem_specification.rb

@@ -152,7 +152,7 @@ EOF
   end
 
   def test_self_load_legacy_ruby
-    spec = LibGems.gemspec_eval LEGACY_RUBY_SPEC
+    spec = LibGems.with_rubygems_compat{ eval LEGACY_RUBY_SPEC }
     assert_equal 'keyedlist', spec.name
     assert_equal '0.4.0', spec.version.to_s
     assert_equal true, spec.has_rdoc?
@@ -162,7 +162,7 @@ EOF
   end
 
   def test_self_load_rubygems_style
-    spec = LibGems.gemspec_eval RUBYGEMS_SPEC
+    spec = LibGems.with_rubygems_compat{ eval RUBYGEMS_SPEC }
     assert_equal LibGems::Specification, spec.class
     assert_equal 'rubygems-compatible', spec.name
     assert_equal '1.0', spec.version.to_s
@@ -811,11 +811,11 @@ EOF
     expected = <<-SPEC
 # -*- encoding: utf-8 -*-
 
-LibGems::Specification.new do |s|
+Gem::Specification.new do |s|
   s.name = %q{a}
   s.version = \"2\"
 
-  s.required_rubygems_version = LibGems::Requirement.new(\"> 0\") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(\"> 0\") if s.respond_to? :required_rubygems_version=
   s.authors = [\"A User\"]
   s.date = %q{#{LibGems::Specification::TODAY.strftime "%Y-%m-%d"}}
   s.description = %q{This is a test description}
@@ -827,9 +827,9 @@ LibGems::Specification.new do |s|
   s.summary = %q{this is a summary}
 
   if s.respond_to? :specification_version then
-    s.specification_version = #{LibGems::Specification::CURRENT_SPECIFICATION_VERSION}
+    s.specification_version = #{Gem::Specification::CURRENT_SPECIFICATION_VERSION}
 
-    if LibGems::Version.new(LibGems::GEM_VERSION) >= LibGems::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::GEM_VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<b>, [\"= 1\"])
     else
       s.add_dependency(%q<b>, [\"= 1\"])
@@ -842,7 +842,7 @@ end
 
     assert_equal expected, ruby_code
 
-    same_spec = LibGems.gemspec_eval ruby_code
+    same_spec = LibGems.with_rubygems_compat{ eval ruby_code }
 
     assert_equal @a2, same_spec
   end
@@ -857,12 +857,12 @@ end
     expected = <<-SPEC
 # -*- encoding: utf-8 -*-
 
-LibGems::Specification.new do |s|
+Gem::Specification.new do |s|
   s.name = %q{a}
   s.version = \"1\"
-  s.platform = LibGems::Platform.new(#{expected_platform})
+  s.platform = Gem::Platform.new(#{expected_platform})
 
-  s.required_rubygems_version = LibGems::Requirement.new(\">= 0\") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(\">= 0\") if s.respond_to? :required_rubygems_version=
   s.authors = [\"A User\"]
   s.date = %q{#{LibGems::Specification::TODAY.strftime "%Y-%m-%d"}}
   s.default_executable = %q{exec}
@@ -884,7 +884,7 @@ LibGems::Specification.new do |s|
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
-    if LibGems::Version.new(LibGems::GEM_VERSION) >= LibGems::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::GEM_VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rake>, [\"> 0.4\"])
       s.add_runtime_dependency(%q<jabber4r>, [\"> 0.0.0\"])
       s.add_runtime_dependency(%q<pqa>, [\"> 0.4\", \"<= 0.6\"])
@@ -903,15 +903,15 @@ end
 
     assert_equal expected, ruby_code
 
-    same_spec = LibGems.gemspec_eval ruby_code
+    same_spec = LibGems.with_rubygems_compat{ eval ruby_code }
 
     assert_equal @a1, same_spec
   end
 
   def test_to_ruby_legacy
-    gemspec1 = LibGems.gemspec_eval LEGACY_RUBY_SPEC
+    gemspec1 = LibGems.with_rubygems_compat{ eval LEGACY_RUBY_SPEC }
     ruby_code = gemspec1.to_ruby
-    gemspec2 = LibGems.gemspec_eval ruby_code
+    gemspec2 = LibGems.with_rubygems_compat{ eval ruby_code }
 
     assert_equal gemspec1, gemspec2
   end
@@ -922,7 +922,7 @@ end
 
     ruby_code = @a2.to_ruby
 
-    same_spec = LibGems.gemspec_eval ruby_code
+    same_spec = LibGems.with_rubygems_compat{ eval ruby_code }
 
     assert_equal 'old_platform', same_spec.original_platform
   end
@@ -932,7 +932,7 @@ end
 
     refute_match '!!null', yaml_str
 
-    same_spec = YAML.load(yaml_str)
+    same_spec = LibGems.with_rubygems_compat{ YAML.load(yaml_str) }
 
     assert_equal @a1, same_spec
   end
@@ -941,7 +941,7 @@ end
     @a1.platform = LibGems::Platform.local
     yaml_str = @a1.to_yaml
 
-    same_spec = YAML.load(yaml_str)
+    same_spec = LibGems.with_rubygems_compat{ YAML.load(yaml_str) }
 
     assert_equal LibGems::Platform.local, same_spec.platform
 
@@ -960,7 +960,7 @@ end
 
     yaml_str = @a1.to_yaml
 
-    same_spec = YAML.load yaml_str
+    same_spec = LibGems.with_rubygems_compat{ YAML.load yaml_str }
 
     assert_equal LibGems::Platform.new('powerpc-darwin7'), same_spec.platform
     assert_equal 'powerpc-darwin7.9.0', same_spec.original_platform

metadata

@@ -2,7 +2,7 @@
 name: libgems
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Jim Weirich
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-11 00:00:00 Z
+date: 2011-06-14 00:00:00 Z
 dependencies: []
 
 description: |
@@ -290,7 +290,7 @@ files:
 homepage: http://rubygems.org
 licenses: []
 
-post_install_message: "Upgraded from LibGems to LibGems 0.0.2\n\
+post_install_message: "Upgraded from LibGems to LibGems 0.0.3\n\
   \xEF\xBB\xBF=== 1.3.8 / 2011-05-16\n\n\
   SlimGems is born! SlimGems is a fork of RubyGems, see README.md for more.\n\n"
 rdoc_options: []