rubygems-update 1.3.4 → 1.3.5

data/lib/rubygems.rb

@@ -5,13 +5,14 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'rubygems/rubygems_version'
 require 'rubygems/defaults'
 require 'thread'
 require 'etc'
 
 module Gem
 
+  RubyGemsVersion = VERSION = '1.3.5'
+
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
   # name and version requirements of the gem that either conflicts with
@@ -383,7 +384,7 @@ module Gem
       raise Gem::Exception, msg
     end
 
-    File.join(spec.full_gem_path, spec.bindir, exec_name).sub(/.*\s.*/m, '"\&"')
+    File.join(spec.full_gem_path, spec.bindir, exec_name)
   end
 
   ##

data/lib/rubygems/commands/setup_command.rb

@@ -88,6 +88,8 @@ By default, this RubyGems will install gem as:
   end
 
   def execute
+    @verbose = Gem.configuration.really_verbose
+
     install_destdir = options[:destdir]
 
     unless install_destdir.empty? then
@@ -113,21 +115,29 @@ By default, this RubyGems will install gem as:
 
     remove_source_caches install_destdir
 
+    say "RubyGems #{Gem::VERSION} installed"
+
     install_rdoc
 
     say
-    say "-" * 78
-    say
+    if @verbose then
+      say "-" * 78
+      say
+    end
 
-    release_notes = File.join Dir.pwd, 'doc', 'release_notes',
-                              "rel_#{Gem::RubyGemsVersion.gsub '.', '_'}.rdoc"
+    release_notes = File.join Dir.pwd, 'History.txt'
 
-    if File.exist? release_notes then
-      say File.read(release_notes)
-    else
-      say "Oh-no! Unable to find release notes!"
-      say "Looked in: #{release_notes}" if Gem.configuration.really_verbose
-    end
+    release_notes = if File.exist? release_notes then
+                      open release_notes do |io|
+                        text = io.gets '==='
+                        text << io.gets('===')
+                        text[0...-3]
+                      end
+                    else
+                      "Oh-no! Unable to find release notes!"
+                    end
+
+    say release_notes
 
     say
     say "-" * 78
@@ -145,7 +155,7 @@ By default, this RubyGems will install gem as:
   end
 
   def install_executables(bin_dir)
-    say "Installing gem executable"
+    say "Installing gem executable" if @verbose
 
     @bin_file_names = []
 
@@ -203,7 +213,7 @@ TEXT
   end
 
   def install_lib(lib_dir)
-    say "Installing RubyGems"
+    say "Installing RubyGems" if @verbose
 
     Dir.chdir 'lib' do
       lib_files = Dir[File.join('**', '*rb')]
@@ -226,23 +236,23 @@ TEXT
     if File.writable? gem_doc_dir and
        (not File.exist? rubygems_doc_dir or
         File.writable? rubygems_doc_dir) then
-      say "Removing old RubyGems RDoc and ri"
+      say "Removing old RubyGems RDoc and ri" if @verbose
       Dir[File.join(Gem.dir, 'doc', 'rubygems-[0-9]*')].each do |dir|
         rm_rf dir
       end
 
       if options[:ri] then
         ri_dir = File.join rubygems_doc_dir, 'ri'
-        say "Installing #{rubygems_name} ri into #{ri_dir}"
+        say "Installing #{rubygems_name} ri into #{ri_dir}" if @verbose
         run_rdoc '--ri', '--op', ri_dir
       end
 
       if options[:rdoc] then
         rdoc_dir = File.join rubygems_doc_dir, 'rdoc'
-        say "Installing #{rubygems_name} rdoc into #{rdoc_dir}"
+        say "Installing #{rubygems_name} rdoc into #{rdoc_dir}" if @verbose
         run_rdoc '--op', rdoc_dir
       end
-    else
+    elsif @verbose then
       say "Skipping RDoc generation, #{gem_doc_dir} not writable"
       say "Set the GEM_HOME environment variable if you want RDoc generated"
     end
@@ -327,7 +337,7 @@ abort "#{deprecation_message}"
       system_cache_file = File.join(install_destdir,
                                     Gem::SourceInfoCache.system_cache_file)
 
-      say "Removing old source_cache files"
+      say "Removing old source_cache files" if Gem.configuration.really_verbose
       rm_f user_cache_file if File.writable? File.dirname(user_cache_file)
       rm_f system_cache_file if File.writable? File.dirname(system_cache_file)
     end

data/lib/rubygems/commands/which_command.rb

@@ -46,7 +46,7 @@ class Gem::Commands::WhichCommand < Gem::Command
         end
 
         say "(checking gem #{spec.full_name} for #{arg})" if
-          Gem.configuration.verbose
+          Gem.configuration.verbose and $stdout.tty?
       end
 
       paths = find_paths arg, dirs

data/lib/rubygems/config_file.rb

@@ -29,14 +29,21 @@ class Gem::ConfigFile
 
   PLATFORM_DEFAULTS = {}
 
-  system_config_path = 
+  system_config_path =
     begin
       require 'Win32API'
 
       CSIDL_COMMON_APPDATA = 0x0023
       path = 0.chr * 260
-      SHGetFolderPath = Win32API.new 'shell32', 'SHGetFolderPath', 'LLLLP', 'L'
-      SHGetFolderPath.call 0, CSIDL_COMMON_APPDATA, 0, 1, path
+      if RUBY_VERSION > '1.9' then
+        SHGetFolderPath = Win32API.new 'shell32', 'SHGetFolderPath', 'PLPLP',
+                                       'L', :stdcall
+        SHGetFolderPath.call nil, CSIDL_COMMON_APPDATA, nil, 1, path
+      else
+        SHGetFolderPath = Win32API.new 'shell32', 'SHGetFolderPath', 'LLLLP',
+                                       'L'
+        SHGetFolderPath.call 0, CSIDL_COMMON_APPDATA, 0, 1, path
+      end
 
       path.strip
     rescue LoadError
@@ -44,7 +51,7 @@ class Gem::ConfigFile
     end
 
   SYSTEM_WIDE_CONFIG_FILE = File.join system_config_path, 'gemrc'
-  
+
   # List of arguments supplied to the config file object.
   attr_reader :args
 

data/lib/rubygems/indexer.rb

@@ -141,7 +141,7 @@ class Gem::Indexer
                                     "Complete"
 
     Gem.time 'Generated YAML quick index gemspecs' do
-      index.each do |original_name, spec|
+      index.released_gems.each do |original_name, spec|
         spec_file_name = "#{original_name}.gemspec.rz"
         yaml_name = File.join @quick_dir, spec_file_name
 
@@ -221,7 +221,7 @@ class Gem::Indexer
     files = []
 
     Gem.time 'Generated Marshal quick index gemspecs' do
-      (index.gems.merge(index.prerelease_gems)).each do |original_name, spec|
+      index.gems.each do |original_name, spec|
         spec_file_name = "#{original_name}.gemspec.rz"
         marshal_name = File.join @quick_marshal_dir, spec_file_name
 
@@ -275,7 +275,7 @@ class Gem::Indexer
   # Builds indicies for RubyGems 1.2 and newer. Handles full, latest, prerelease
 
   def build_modern_indicies(index)
-    build_modern_index(index.sort, @specs_index, 'specs')
+    build_modern_index(index.released_specs.sort, @specs_index, 'specs')
     build_modern_index(index.latest_specs.sort,
                        @latest_specs_index,
                        'latest specs')
@@ -534,7 +534,7 @@ class Gem::Indexer
     FileUtils.rm_rf @directory
   end
 
-   ##
+  ##
   # Zlib::GzipWriter wrapper that gzips +filename+ on disk.
 
   def gzip(filename)
@@ -654,8 +654,8 @@ class Gem::Indexer
     files = build_marshal_gemspecs index
 
     Gem.time 'Updated indexes' do
-      update_specs_index index, @dest_specs_index, @specs_index
-      update_specs_index index, @dest_latest_specs_index, @latest_specs_index
+      update_specs_index index.released_gems, @dest_specs_index, @specs_index
+      update_specs_index index.released_gems, @dest_latest_specs_index, @latest_specs_index
       update_specs_index(index.prerelease_gems, @dest_prerelease_specs_index,
                          @prerelease_specs_index)
     end

data/lib/rubygems/source_index.rb

@@ -30,7 +30,7 @@ class Gem::SourceIndex
 
   include Gem::UserInteraction
 
-  attr_reader :gems, :prerelease_gems # :nodoc:
+  attr_reader :gems # :nodoc:
 
   ##
   # Directories to use to refresh this SourceIndex when calling refresh!
@@ -122,16 +122,22 @@ class Gem::SourceIndex
   # #prerelease_gems
 
   def initialize(specifications={})
-    @gems, @prerelease_gems = [{}, {}]
+    @gems = {}
     specifications.each{ |full_name, spec| add_spec spec }
     @spec_dirs = nil
   end
 
-  ##
-  # Both regular and prerelease gems
-
+  # TODO: remove method
   def all_gems
-    @gems.merge @prerelease_gems
+    @gems
+  end
+
+  def prerelease_gems
+    @gems.reject{ |name, gem| !gem.version.prerelease? }
+  end
+
+  def released_gems
+    @gems.reject{ |name, gem| gem.version.prerelease? }
   end
 
   ##
@@ -153,8 +159,8 @@ class Gem::SourceIndex
   end
 
   ##
-  # Returns an Array specifications for the latest versions of each gem in
-  # this index.
+  # Returns an Array specifications for the latest released versions
+  # of each gem in this index.
 
   def latest_specs
     result = Hash.new { |h,k| h[k] = [] }
@@ -165,6 +171,7 @@ class Gem::SourceIndex
       curr_ver = spec.version
       prev_ver = latest.key?(name) ? latest[name].version : nil
 
+      next if curr_ver.prerelease?
       next unless prev_ver.nil? or curr_ver >= prev_ver or
                   latest[name].platform != Gem::Platform::RUBY
 
@@ -192,7 +199,14 @@ class Gem::SourceIndex
   # An array including only the prerelease gemspecs
 
   def prerelease_specs
-    @prerelease_gems.values
+    prerelease_gems.values
+  end
+
+  ##
+  # An array including only the released gemspecs
+
+  def released_specs
+    released_gems.values
   end
 
   ##
@@ -201,11 +215,7 @@ class Gem::SourceIndex
   def add_spec(gem_spec, name = gem_spec.full_name)
     # No idea why, but the Indexer wants to insert them using original_name
     # instead of full_name. So we make it an optional arg.
-    if gem_spec.version.prerelease?
-      @prerelease_gems[name] = gem_spec
-    else
-      @gems[name] = gem_spec
-    end
+    @gems[name] = gem_spec
   end
 
   ##
@@ -221,11 +231,7 @@ class Gem::SourceIndex
   # Remove a gem specification named +full_name+.
 
   def remove_spec(full_name)
-    if @gems.key? full_name then
-      @gems.delete full_name
-    else
-      @prerelease_gems.delete full_name
-    end
+    @gems.delete full_name
   end
 
   ##

data/lib/rubygems/spec_fetcher.rb

@@ -22,7 +22,7 @@ class Gem::SpecFetcher
   attr_reader :latest_specs # :nodoc:
 
   ##
-  # Cache of all spces
+  # Cache of all released specs
 
   attr_reader :specs # :nodoc:
 
@@ -61,8 +61,9 @@ class Gem::SpecFetcher
 
   ##
   # Fetch specs matching +dependency+.  If +all+ is true, all matching
-  # versions are returned.  If +matching_platform+ is false, all platforms are
-  # returned. If +prerelease+ is true, prerelease versions are included.
+  # (released) versions are returned.  If +matching_platform+ is
+  # false, all platforms are returned. If +prerelease+ is true,
+  # prerelease versions are included.
 
   def fetch(dependency, all = false, matching_platform = true, prerelease = false)
     specs_and_sources = find_matching dependency, all, matching_platform, prerelease
@@ -112,9 +113,9 @@ class Gem::SpecFetcher
   end
 
   ##
-  # Find spec names that match +dependency+.  If +all+ is true, all matching
-  # versions are returned.  If +matching_platform+ is false, gems for all
-  # platforms are returned.
+  # Find spec names that match +dependency+.  If +all+ is true, all
+  # matching released versions are returned.  If +matching_platform+
+  # is false, gems for all platforms are returned.
 
   def find_matching(dependency, all = false, matching_platform = true, prerelease = false)
     found = {}
@@ -161,7 +162,7 @@ class Gem::SpecFetcher
 
   ##
   # Returns a list of gems available for each source in Gem::sources.  If
-  # +all+ is true, all versions are returned instead of only latest
+  # +all+ is true, all released versions are returned instead of only latest
   # versions. If +prerelease+ is true, include prerelease versions.
 
   def list(all = false, prerelease = false)
@@ -194,6 +195,12 @@ class Gem::SpecFetcher
       list[source_uri] = cache[source_uri]
     end
 
+    if type == :all
+      list.values.map do |gems|
+        gems.reject! { |g| g[1].prerelease? }
+      end
+    end
+
     list
   end
 

data/lib/rubygems/specification.rb

@@ -847,7 +847,7 @@ class Gem::Specification
             'authors must be Array of Strings'
     end
 
-    licenses.each{ |license|
+    licenses.each { |license|
       if license.length > 64
         raise Gem::InvalidSpecificationException,
           "each license must be 64 characters or less"

data/test/test_gem.rb

@@ -78,14 +78,6 @@ class TestGem < RubyGemTestCase
     end
   end
 
-  def test_self_bin_path_with_spaces
-    quick_gem 'sp ace', '3' do |s|
-      s.executables = ['exec']
-    end
-    path = Gem.bin_path('sp ace', 'exec')
-    assert_equal %w(" "), [path[0,1], path[-1,1]], "Path should be escaped"
-  end
-
   def test_self_bin_path_not_found
     assert_raises(Gem::GemNotFoundException) do
       Gem.bin_path('non-existent')

data/test/test_gem_commands_dependency_command.rb

@@ -43,6 +43,8 @@ Gem a-1
 
 Gem a-2
 
+Gem a-3.a
+
 Gem a_evil-9
 
 Gem b-2
@@ -100,6 +102,8 @@ Gem a-1
 
 Gem a-2
 
+Gem a-3.a
+
 Gem a_evil-9
 
 Gem b-2

data/test/test_gem_commands_uninstall_command.rb

@@ -58,5 +58,25 @@ class TestGemCommandsUninstallCommand < GemInstallerTestCase
     assert_empty output, "UI output should be empty after an uninstall error"
   end
 
+  def test_execute_prerelease
+    @spec = quick_gem "pre", "2.b"
+    @gem = File.join @tempdir, "#{@spec.full_name}.gem"
+    FileUtils.touch @gem
+
+    util_setup_gem
+
+    use_ui @ui do
+      @installer.install
+    end
+
+    @cmd.options[:args] = ["pre"]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    output = @ui.output
+    assert_match(/Successfully uninstalled/, output)
+  end
 end
 

data/test/test_gem_indexer.rb

@@ -118,10 +118,13 @@ class TestGemIndexer < RubyGemTestCase
     expected = <<-EOF
 a-1
 a-2
+a-3.a
 a_evil-9
 b-2
 c-1.2
 d-2.0
+d-2.0.a
+d-2.0.b
 pl-1-i386-linux
     EOF
 
@@ -163,13 +166,13 @@ pl-1-i386-linux
     assert_indexed @tempdir, "latest_specs.#{@marshal_version}.gz"
 
     expected = <<-EOF
-<?xml version="1.0"?>
-<rss version="2.0">
+<?xml version=\"1.0\"?>
+<rss version=\"2.0\">
   <channel>
     <title>ExampleForge gems</title>
     <link>http://example.com</link>
     <description>Recently released gems from http://example.com</description>
-    <generator>RubyGems v#{Gem::RubyGemsVersion}</generator>
+    <generator>RubyGems v1.3.4</generator>
     <docs>http://cyber.law.harvard.edu/rss/rss.html</docs>
     <item>
       <title>a-2</title>
@@ -178,9 +181,21 @@ pl-1-i386-linux
       </description>
       <author>example@example.com (A User)</author>
       <guid>a-2</guid>
-      <enclosure url="http://gems.example.com/gems/a-2.gem"
-                 length="3072" type="application/octet-stream" />
-      <pubDate>#{Gem::Specification::TODAY.rfc2822}</pubDate>
+      <enclosure url=\"http://gems.example.com/gems/a-2.gem\"
+                 length=\"3072\" type=\"application/octet-stream\" />
+      <pubDate>#{@a2.date.rfc2822}</pubDate>
+      <link>http://example.com</link>
+    </item>
+    <item>
+      <title>a-3.a</title>
+      <description>
+&lt;pre&gt;This is a test description&lt;/pre&gt;
+      </description>
+      <author>example@example.com (A User)</author>
+      <guid>a-3.a</guid>
+      <enclosure url=\"http://gems.example.com/gems/a-3.a.gem\"
+                 length=\"3072\" type=\"application/octet-stream\" />
+      <pubDate>#{@a3a.date.rfc2822}</pubDate>
       <link>http://example.com</link>
     </item>
     <item>
@@ -190,9 +205,9 @@ pl-1-i386-linux
       </description>
       <author>example@example.com (A User)</author>
       <guid>a_evil-9</guid>
-      <enclosure url="http://gems.example.com/gems/a_evil-9.gem"
-                 length="3072" type="application/octet-stream" />
-      <pubDate>#{Gem::Specification::TODAY.rfc2822}</pubDate>
+      <enclosure url=\"http://gems.example.com/gems/a_evil-9.gem\"
+                 length=\"3072\" type=\"application/octet-stream\" />
+      <pubDate>#{@a_evil9.date.rfc2822}</pubDate>
       <link>http://example.com</link>
     </item>
     <item>
@@ -202,9 +217,9 @@ pl-1-i386-linux
       </description>
       <author>example@example.com (A User)</author>
       <guid>b-2</guid>
-      <enclosure url="http://gems.example.com/gems/b-2.gem"
-                 length="3072" type="application/octet-stream" />
-      <pubDate>#{Gem::Specification::TODAY.rfc2822}</pubDate>
+      <enclosure url=\"http://gems.example.com/gems/b-2.gem\"
+                 length=\"3072\" type=\"application/octet-stream\" />
+      <pubDate>#{@b2.date.rfc2822}</pubDate>
       <link>http://example.com</link>
     </item>
     <item>
@@ -214,9 +229,33 @@ pl-1-i386-linux
       </description>
       <author>example@example.com (A User)</author>
       <guid>c-1.2</guid>
-      <enclosure url="http://gems.example.com/gems/c-1.2.gem"
-                 length="3072" type="application/octet-stream" />
-      <pubDate>#{Gem::Specification::TODAY.rfc2822}</pubDate>
+      <enclosure url=\"http://gems.example.com/gems/c-1.2.gem\"
+                 length=\"3072\" type=\"application/octet-stream\" />
+      <pubDate>#{@c1_2.date.rfc2822}</pubDate>
+      <link>http://example.com</link>
+    </item>
+    <item>
+      <title>d-2.0.a</title>
+      <description>
+&lt;pre&gt;This is a test description&lt;/pre&gt;
+      </description>
+      <author>example@example.com (A User)</author>
+      <guid>d-2.0.a</guid>
+      <enclosure url=\"http://gems.example.com/gems/d-2.0.a.gem\"
+                 length=\"3072\" type=\"application/octet-stream\" />
+      <pubDate>#{@d2_0_a.date.rfc2822}</pubDate>
+      <link>http://example.com</link>
+    </item>
+    <item>
+      <title>d-2.0.b</title>
+      <description>
+&lt;pre&gt;This is a test description&lt;/pre&gt;
+      </description>
+      <author>example@example.com (A User)</author>
+      <guid>d-2.0.b</guid>
+      <enclosure url=\"http://gems.example.com/gems/d-2.0.b.gem\"
+                 length=\"3072\" type=\"application/octet-stream\" />
+      <pubDate>#{@d2_0_b.date.rfc2822}</pubDate>
       <link>http://example.com</link>
     </item>
     <item>
@@ -226,9 +265,9 @@ pl-1-i386-linux
       </description>
       <author>example@example.com (A User)</author>
       <guid>pl-1-x86-linux</guid>
-      <enclosure url="http://gems.example.com/gems/pl-1-x86-linux.gem"
-                 length="3072" type="application/octet-stream" />
-      <pubDate>#{Gem::Specification::TODAY.rfc2822}</pubDate>
+      <enclosure url=\"http://gems.example.com/gems/pl-1-x86-linux.gem\"
+                 length=\"3072\" type=\"application/octet-stream\" />
+      <pubDate>#{@pl1.date.rfc2822}</pubDate>
       <link>http://example.com</link>
     </item>
     <item>
@@ -247,9 +286,9 @@ eighty characters.&lt;/pre&gt;
       </description>
       <author>example@example.com (Example), example2@example.com (Example2)</author>
       <guid>a-1</guid>
-      <enclosure url="http://gems.example.com/gems/a-1.gem"
-                 length="3584" type="application/octet-stream" />
-      <pubDate>#{(Gem::Specification::TODAY - 86400).rfc2822}</pubDate>
+      <enclosure url=\"http://gems.example.com/gems/a-1.gem\"
+                 length=\"3584\" type=\"application/octet-stream\" />
+      <pubDate>#{@a1.date.rfc2822}</pubDate>
       <link>http://a.example.com</link>
     </item>
   </channel>
@@ -462,9 +501,9 @@ eighty characters.&lt;/pre&gt;
                  @ui.output
     assert_match %r%^\.\.\.\.\.\.\.\.\.\.$%, @ui.output
     assert_match %r%^Loaded all gems$%, @ui.output
-    assert_match %r%^Generating Marshal quick index gemspecs for 7 gems$%,
+    assert_match %r%^Generating Marshal quick index gemspecs for 10 gems$%,
                  @ui.output
-    assert_match %r%^Generating YAML quick index gemspecs for 7 gems$%,
+    assert_match %r%^Generating YAML quick index gemspecs for 10 gems$%,
                  @ui.output
     assert_match %r%^Complete$%, @ui.output
     assert_match %r%^Generating specs index$%, @ui.output
@@ -473,7 +512,7 @@ eighty characters.&lt;/pre&gt;
     assert_match %r%^Generating latest index$%, @ui.output
     assert_match %r%^Generating prerelease specs index$%, @ui.output
     assert_match %r%^Generating Marshal master index$%, @ui.output
-    assert_match %r%^Generating YAML master index for 7 gems \(this may take a while\)$%, @ui.output
+    assert_match %r%^Generating YAML master index for 10 gems \(this may take a while\)$%, @ui.output
     assert_match %r%^Complete$%, @ui.output
     assert_match %r%^Compressing indicies$%, @ui.output