summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/dl/win32/lib/win32/registry.rb2
-rw-r--r--lib/rubygems.rb8
-rw-r--r--lib/rubygems/commands/help_command.rb2
-rw-r--r--lib/rubygems/commands/install_command.rb4
-rw-r--r--lib/rubygems/commands/pristine_command.rb2
-rw-r--r--lib/rubygems/installer.rb14
-rw-r--r--lib/rubygems/package.rb2
-rw-r--r--test/rubygems/test_gem.rb16
-rw-r--r--test/rubygems/test_gem_dependency_resolver_dependency_conflict.rb4
-rw-r--r--test/rubygems/test_gem_remote_fetcher.rb4
10 files changed, 29 insertions, 29 deletions
diff --git a/ext/dl/win32/lib/win32/registry.rb b/ext/dl/win32/lib/win32/registry.rb
index 865f1fd..8a5d559 100644
--- a/ext/dl/win32/lib/win32/registry.rb
+++ b/ext/dl/win32/lib/win32/registry.rb
@@ -278,7 +278,7 @@ For detail, see the MSDN[http://msdn.microsoft.com/library/en-us/sysinfo/base/pr
def CreateKey(hkey, name, opt, desired)
result = packhandle(0)
- disp = packdw(0)
+ disp = packdw(0)
check RegCreateKeyExW.call(hkey, make_wstr(name), 0, 0, opt, desired,
0, result, disp)
[ unpackhandle(result), unpackdw(disp) ]
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index dfc1006..ad23a42 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -1013,20 +1013,20 @@ module Gem
def register_default_spec(spec)
new_format, prefix_pattern = nil
-
+
spec.files.each do |file|
if new_format == nil
new_format = spec.require_paths.any? {|path| file.start_with? path}
-
+
prefix_group = spec.require_paths.map {|f| f + "/"}.join("|")
prefix_pattern = /^(#{prefix_group})/
end
-
+
if new_format
file = file.sub(prefix_pattern, "")
next unless $~
end
-
+
@path_to_default_spec_map[file] = spec
end
end
diff --git a/lib/rubygems/commands/help_command.rb b/lib/rubygems/commands/help_command.rb
index 9f0ebc0..4cbb8da 100644
--- a/lib/rubygems/commands/help_command.rb
+++ b/lib/rubygems/commands/help_command.rb
@@ -46,7 +46,7 @@ Some examples of 'gem' usage.
* Update all gems on your system:
gem update
-
+
* Update your local version of RubyGems
gem update --system
diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb
index ac78764..5e2ffcd 100644
--- a/lib/rubygems/commands/install_command.rb
+++ b/lib/rubygems/commands/install_command.rb
@@ -37,7 +37,7 @@ class Gem::Commands::InstallCommand < Gem::Command
'install the listed gems') do |v,o|
o[:gemdeps] = v
end
-
+
add_option(:"Install/Update", '--default',
'Add the gem\'s full specification to',
'specifications/default and extract only its bin') do |v,o|
@@ -157,7 +157,7 @@ to write the specification by hand. For example:
alert_error "Can't use --version w/ multiple gems. Use name:ver instead."
terminate_interaction 1
end
-
+
# load post-install hooks appropriate to options
if options[:install_as_default]
require 'rubygems/install_default_message'
diff --git a/lib/rubygems/commands/pristine_command.rb b/lib/rubygems/commands/pristine_command.rb
index 0a7f315..257e6df 100644
--- a/lib/rubygems/commands/pristine_command.rb
+++ b/lib/rubygems/commands/pristine_command.rb
@@ -110,7 +110,7 @@ with extensions.
Gem::RemoteFetcher.fetcher.download_to_cache dep
end
- env_shebang =
+ env_shebang =
if options.include? :env_shebang then
options[:env_shebang]
else
diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb
index c6fad3c..47995f4 100644
--- a/lib/rubygems/installer.rb
+++ b/lib/rubygems/installer.rb
@@ -212,17 +212,17 @@ class Gem::Installer
FileUtils.rm_rf gem_dir
FileUtils.mkdir_p gem_dir
-
+
if @options[:install_as_default]
extract_bin
write_default_spec
else
extract_files
-
+
build_extensions
write_build_info_file
run_post_build_hooks
-
+
generate_bin
write_spec
write_cache_file
@@ -349,11 +349,11 @@ class Gem::Installer
file.fsync rescue nil # for filesystems without fsync(2)
end
end
-
+
##
# Writes the full .gemspec specification (in Ruby) to the gem home's
# specifications/default directory.
-
+
def write_default_spec
File.open(default_spec_file, "w") do |file|
file.puts spec.to_ruby
@@ -738,12 +738,12 @@ EOF
def extract_files
@package.extract_files gem_dir
end
-
+
##
# Extracts only the bin/ files from the gem into the gem directory.
# This is used by default gems to allow a gem-aware stub to function
# without the full gem installed.
-
+
def extract_bin
@package.extract_files gem_dir, "bin/*"
end
diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb
index 76f45a9..511062e 100644
--- a/lib/rubygems/package.rb
+++ b/lib/rubygems/package.rb
@@ -340,7 +340,7 @@ EOM
open_tar_gz io do |tar|
tar.each do |entry|
next unless File.fnmatch pattern, entry.full_name
-
+
destination = install_location entry.full_name, destination_dir
FileUtils.rm_rf destination
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
index a4e5313..6cce66c 100644
--- a/test/rubygems/test_gem.rb
+++ b/test/rubygems/test_gem.rb
@@ -1112,29 +1112,29 @@ class TestGem < Gem::TestCase
assert_equal '["a-1", "b-1", "c-1"]', out.strip
end
-
+
def test_register_default_spec
Gem.clear_default_specs
-
+
old_style = Gem::Specification.new do |spec|
spec.files = ["foo.rb", "bar.rb"]
end
-
+
Gem.register_default_spec old_style
-
+
assert_equal old_style, Gem.find_unresolved_default_spec("foo.rb")
assert_equal old_style, Gem.find_unresolved_default_spec("bar.rb")
assert_equal nil, Gem.find_unresolved_default_spec("baz.rb")
-
+
Gem.clear_default_specs
-
+
new_style = Gem::Specification.new do |spec|
spec.files = ["lib/foo.rb", "ext/bar.rb", "bin/exec", "README"]
spec.require_paths = ["lib", "ext"]
end
-
+
Gem.register_default_spec new_style
-
+
assert_equal new_style, Gem.find_unresolved_default_spec("foo.rb")
assert_equal new_style, Gem.find_unresolved_default_spec("bar.rb")
assert_equal nil, Gem.find_unresolved_default_spec("exec")
diff --git a/test/rubygems/test_gem_dependency_resolver_dependency_conflict.rb b/test/rubygems/test_gem_dependency_resolver_dependency_conflict.rb
index 56a34d3..5043865 100644
--- a/test/rubygems/test_gem_dependency_resolver_dependency_conflict.rb
+++ b/test/rubygems/test_gem_dependency_resolver_dependency_conflict.rb
@@ -6,7 +6,7 @@ class TestGemDependencyResolverDependencyConflict < Gem::TestCase
def test_explanation
root =
dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
- child =
+ child =
dependency_request dep('net-ssh', '>= 2.6.5'), 'net-ssh', '2.2.2', root
conflict =
@@ -23,7 +23,7 @@ class TestGemDependencyResolverDependencyConflict < Gem::TestCase
def test_request_path
root =
dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
- child =
+ child =
dependency_request dep('net-ssh', '>= 2.6.5'), 'net-ssh', '2.2.2', root
conflict =
diff --git a/test/rubygems/test_gem_remote_fetcher.rb b/test/rubygems/test_gem_remote_fetcher.rb
index 7ffb638..572148f 100644
--- a/test/rubygems/test_gem_remote_fetcher.rb
+++ b/test/rubygems/test_gem_remote_fetcher.rb
@@ -600,7 +600,7 @@ gems:
skip 'openssl is missing' unless defined?(OpenSSL::SSL)
ssl_server = self.class.start_ssl_server({
- :SSLVerifyClient =>
+ :SSLVerifyClient =>
OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT})
temp_ca_cert = File.join(DIR, 'ca_cert.pem')
@@ -617,7 +617,7 @@ gems:
skip 'openssl is missing' unless defined?(OpenSSL::SSL)
ssl_server = self.class.start_ssl_server({
- :SSLVerifyClient =>
+ :SSLVerifyClient =>
OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT})
temp_ca_cert = File.join(DIR, 'ca_cert.pem')