Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

DirectedGraph Specs : Removing a vertex doesn't remove edges from the graph #303

Closed
wants to merge 32 commits into
from
Commits
Jump to file or symbol
Failed to load files and symbols.
+887 −1,073
Split
View
@@ -23,6 +23,7 @@ src_gen
docs/api
test/rails
test/prawn
+gem/Manifest.txt
gem/lib/*.jar
gem/lib/jruby-jars/version.rb
gem/pkg
View
25 bin/gem
@@ -1,25 +1,4 @@
#!/usr/bin/env jruby
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'rubygems'
-require 'rubygems/gem_runner'
-require 'rubygems/exceptions'
-
-required_version = Gem::Requirement.new ">= 1.8.7"
-
-unless required_version.satisfied_by? Gem.ruby_version then
- abort "Expected Ruby Version #{required_version}, is #{Gem.ruby_version}"
-end
-
-args = ARGV.clone
-
-begin
- Gem::GemRunner.new.run args
-rescue Gem::SystemExitException => e
- exit e.exit_code
-end
+# We just load jgem, since that's what RubyGems updates
+load File.join(File.dirname(__FILE__), "jgem")
View
@@ -5,6 +5,15 @@
# See LICENSE.txt for permissions.
#++
+# The prelude in 1.9.1 injects rubygems.rb into $LOADED_FEATURES
+# which prevents the `require 'rubygems'` from actually loading
+# the site's version of rubygems. So we have to use it's API
+# to get it's prelude out of the way.
+#
+if RUBY_VERSION =~ /^1\.9\.1/ && defined?(Gem::QuickLoader)
+ Gem::QuickLoader.load_full_rubygems_library
+end
+
require 'rubygems'
require 'rubygems/gem_runner'
require 'rubygems/exceptions'
View
@@ -248,16 +248,13 @@ if [[ -z "$JAVA_ENCODING" ]]; then
java_args="${java_args} -Dfile.encoding=UTF-8"
fi
-# Add a property to report memory max
-JAVA_OPTS="$JAVA_OPTS $JAVA_VM -Djruby.memory.max=${JAVA_MEM} -Djruby.stack.max=${JAVA_STACK}"
-
# Append the rest of the arguments
ruby_args="${ruby_args} $@"
# Put the ruby_args back into the position arguments $1, $2 etc
set -- "${ruby_args}"
-JAVA_OPTS="$JAVA_OPTS $JAVA_MEM $JAVA_STACK"
+JAVA_OPTS="$JAVA_OPTS $JAVA_VM $JAVA_MEM $JAVA_STACK"
JFFI_BOOT=""
if [ -d "$JRUBY_HOME/lib/native/" ]; then
Binary file not shown.
View
@@ -92,7 +92,7 @@ tzdata.ftpserver=ftp.iana.org
tzdata.ftp.dir=/tz/releases
tzdata.ftp.anonymous.userid=jruby@jruby.org
tzdata.distributed.version=2011n
-tzdata.latest.version=2012e
+tzdata.latest.version=2012f
jline.version=2.7
asm.version=4.0
shared.lib.dir=lib/ruby/shared
View
@@ -1,7 +0,0 @@
-History.txt
-Manifest.txt
-README.txt
-lib/jruby-jars.rb
-lib/jruby-jars/version.rb
-lib/jruby-core-1.7.0.dev.jar
-lib/jruby-stdlib-1.7.0.dev.jar
View
@@ -704,7 +704,7 @@
</exclude>
<variables />
</win32>
- <win32 name="Windows w/ JRE" id="21" mediaFileName="${compiler:sys.shortName}_${compiler:sys.platform}jre_${compiler:sys.version}" installDir="jruby-${compiler:sys.version}" overridePrincipalLanguage="false" requires64bit="false" jreBitType="32" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" includedJRE="windows-x86-1.7.0_05" manualJREEntry="false" bundleType="1" jreURL="" jreFtpURL="" jreShared="false" directDownload="false" customInstallBaseDir="c:" createUninstallIcon="true" contentFilesType="1" downloadURL="" runAsAdmin="false">
+ <win32 name="Windows w/ JRE" id="21" mediaFileName="${compiler:sys.shortName}_${compiler:sys.platform}jre_${compiler:sys.version}" installDir="jruby-${compiler:sys.version}" overridePrincipalLanguage="false" requires64bit="false" jreBitType="32" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" includedJRE="windows-x86-1.7.0_07" manualJREEntry="false" bundleType="1" jreURL="" jreFtpURL="" jreShared="false" directDownload="false" customInstallBaseDir="c:" createUninstallIcon="true" contentFilesType="1" downloadURL="" runAsAdmin="false">
<excludedLaunchers />
<excludedComponents />
<excludedBeans>
@@ -716,7 +716,7 @@
</exclude>
<variables />
</win32>
- <win32 name="Windows 64-bit w/ JRE" id="198" mediaFileName="${compiler:sys.shortName}_${compiler:sys.platform}_x64_jre_${compiler:sys.version}" installDir="jruby-${compiler:sys.version}" overridePrincipalLanguage="false" requires64bit="true" jreBitType="64" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" includedJRE="windows-amd64-1.7.0_05" manualJREEntry="false" bundleType="1" jreURL="" jreFtpURL="" jreShared="false" directDownload="false" customInstallBaseDir="c:" createUninstallIcon="true" contentFilesType="1" downloadURL="" runAsAdmin="false">
+ <win32 name="Windows 64-bit w/ JRE" id="198" mediaFileName="${compiler:sys.shortName}_${compiler:sys.platform}_x64_jre_${compiler:sys.version}" installDir="jruby-${compiler:sys.version}" overridePrincipalLanguage="false" requires64bit="true" jreBitType="64" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" includedJRE="windows-amd64-1.7.0_07" manualJREEntry="false" bundleType="1" jreURL="" jreFtpURL="" jreShared="false" directDownload="false" customInstallBaseDir="c:" createUninstallIcon="true" contentFilesType="1" downloadURL="" runAsAdmin="false">
<excludedLaunchers />
<excludedComponents />
<excludedBeans>
@@ -15,15 +15,15 @@ module Gem::LocalRemoteOptions
##
# Allows OptionParser to handle HTTP URIs.
- def accept_uri http = nil
- OptionParser.accept(http ? URI::HTTP : URI::Generic) do |value|
+ def accept_uri_http
+ OptionParser.accept URI::HTTP do |value|
begin
uri = URI.parse value
rescue URI::InvalidURIError
raise OptionParser::InvalidArgument, value
end
- if http && !['http', 'https', 'file'].include?(uri.scheme)
+ unless ['http', 'https', 'file'].include?(uri.scheme)
raise OptionParser::InvalidArgument, value
end
@@ -85,7 +85,7 @@ def add_clear_sources_option
# Add the --http-proxy option
def add_proxy_option
- accept_uri :http
+ accept_uri_http
add_option(:"Local/Remote", '-p', '--[no-]http-proxy [URL]', URI::HTTP,
'Use HTTP proxy for remote operations') do |value, options|
@@ -98,9 +98,9 @@ def add_proxy_option
# Add the --source option
def add_source_option
- accept_uri
+ accept_uri_http
- add_option(:"Local/Remote", '--source URL', URI::Generic,
+ add_option(:"Local/Remote", '--source URL', URI::HTTP,
'Add URL as a remote source for gems') do |source, options|
source << '/' if source !~ /\/\z/
Oops, something went wrong.