libgems 0.1.2 → 0.1.3

data/lib/libgems.rb

@@ -95,11 +95,38 @@ require 'thread'
 #
 # -The SlimGems Team
 
+
+
+# Hack to handle syck's DefaultKey bug with psych
+#
+# Quick note! If/when psych loads in 1.9, it will redefine
+# YAML to point to Psych by removing the YAML constant.
+# Thusly, over in LibGems.load_yaml, we define DefaultKey again
+# after proper yaml library has been loaded.
+#
+# All this is so that there is always a YAML::Syck::DefaultKey
+# class no matter if the full yaml library has loaded or not.
+#
+unless defined?(Syck)
+  module Syck
+  end
+end
+
+unless defined?(Syck::DefaultKey)
+  class Syck::DefaultKey
+  end
+end
+
+if defined?(YAML) && !defined?(YAML::Syck)
+  YAML::Syck = Syck
+end
+
+
 module LibGems
   NAME = 'LibGems'
   GEM_NAME = 'libgems'
   VERSION = '1.3.9.2'
-  LIBGEMS_VERSION = '0.1.2'
+  LIBGEMS_VERSION = '0.1.3'
 
   ##
   # Raised when SlimGems is unable to load or activate a gem.  Contains the
@@ -681,10 +708,8 @@ module LibGems
     # why we end up defining DefaultKey more than once.
     if !defined? YAML::Syck
       YAML.module_eval do
-          const_set 'Syck', Module.new {
-            const_set 'DefaultKey', Class.new
-          }
-        end
+        const_set 'Syck', Syck
+      end
     end
   end
 

data/lib/libgems/requirement.rb

@@ -1,24 +1,5 @@
 require "libgems/version"
 
-# Hack to handle syck's DefaultKey bug with psych
-#
-# Quick note! If/when psych loads in 1.9, it will redefine
-# YAML to point to Psych by removing the YAML constant.
-# Thusly, over in LibGems.load_yaml, we define DefaultKey again
-# after proper yaml library has been loaded.
-#
-# All this is so that there is always a YAML::Syck::DefaultKey
-# class no matter if the full yaml library has loaded or not.
-#
-module YAML
-  if !defined? Syck
-    module Syck
-      class DefaultKey
-      end
-    end
-  end
-end
-
 ##
 # A Requirement is a set of one or more version restrictions. It supports a
 # few (<tt>=, !=, >, <, >=, <=, ~></tt>) different restriction operators.
@@ -94,6 +75,12 @@ class LibGems::Requirement
     [$1 || "=", LibGems::Version.new($2)]
   end
 
+  ##
+  # An array of requirement pairs. The first element of the pair is
+  # the op, and the second is the LibGems::Version.
+
+  attr_reader :requirements #:nodoc:
+
   ##
   # Constructs a requirement from +requirements+. Requirements can be
   # Strings, LibGems::Versions, or Arrays of those. +nil+ and duplicate
@@ -114,22 +101,6 @@ class LibGems::Requirement
   # An array of requirement pairs. The first element of the pair is
   # the op, and the second is the LibGems::Version.
 
-  def requirements
-    # This is an ugly hack to work around issues with Syck.
-    # There are fixes in other places but since we sometimes
-    # load from YAML, which bypasses any initialization and
-    # other callbacks, this seems the most reliable place to
-    # fix things.
-    if !defined?(YAML::ENGINE) || YAML::ENGINE.syck?
-      @requirements.each do |r|
-        if r[0].kind_of?(Syck::DefaultKey)
-          r[0] = '='
-        end
-      end
-    end
-    @requirements
-  end
-
   def none?
     @none ||= (to_s == ">= 0")
   end
@@ -151,7 +122,7 @@ class LibGems::Requirement
 
     # Fixup the Syck DefaultKey bug
     @requirements.each do |r|
-      if r[0].kind_of? YAML::Syck::DefaultKey
+      if r[0].kind_of?(Syck::DefaultKey) || r[0].kind_of?(YAML::Syck::DefaultKey)
         r[0] = "="
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libgems
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-15 00:00:00.000000000Z
+date: 2011-09-05 00:00:00.000000000Z
 dependencies: []
 description: LibGems is essentially a clone of RubyGems but with a unique namespace
   to run side-by-side with it.
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: LibGems is a package management framework for Ruby