rubygems-update 0.8.10 → 0.8.11

data/ChangeLog

@@ -1,5 +1,71 @@
+2005-07-08  Jim Weirich  <jim@weirichhouse.org>
+
+	* Preparing for release 0.8.11.
+
+2005-06-12  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/installer.rb
+	(Gem::Installer::installation_satisfies_dependency): Refactored
+	dependency check into ensure_dependency! and
+	installation_satisfies_dependency?.
+
+2005-06-12  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems.rb,lib/rubygems/installer.rb: Applied Mark Hubbart's
+	* lib/rubygems/remote_installer.rb: Applied David Glasser's install-
+	* Applied Paul Duncan's incredibly complete gem signing patch.
+	Thanks, Paul!
+	* lib/rubygems/installer.rb: Fixed bug in installer that caused
+	dependency installation not to work.
+
+2005-06-06  Chad Fowler  <chad@chadfowler.com>
+	* lib/rubygems/specification.rb: Fixed Erik hatcher's reported bug
+	of gem directories having "-" at the end of their names (e.g.
+	"BlueCloth-1.0.0-".
+
+2005-06-01  Jim Weirich  <jim@weirichhouse.org>
+
+	* scripts/specdoc.rb (_resolve_links): Updated to generate hieraki
+	format so it can be included in the docs.rubygems.org site.
+
+	* test/test_specification.rb (TestSpecification::test_to_ruby):
+	Fixed test on date that hard-coded a specific date.
+
+2005-05-29  Jim Weirich  <jim@weirichhouse.org>
+
+	* Changes from the Seattle Code fest: (1) Package list command
+	(e.g. gem inspect GEM).  (2) .gemrc settings now allow cvsrc like
+	options to set defaults per subcommand.  (3) The autorequire spec
+	attribute will now accept a list.  (4) Binwrappers vs symlinks
+	(more info to follow).  (5) Substituted Time for Date in specs,
+	increasing performance dramatically in an important area.
+
+2005-05-04  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems.rb (Gem::Exception::find_home): Changed rescue
+	clause from Exception to StandardError.  Exception doesn't seem to
+	catch everything ... I'm not sure I understand why.
+
+2005-04-29  Chad Fowler <chad@chadfowler.com>
+	* lib/rubygems/specifiation.rb: Marcel Molina's patch to discover
+	which attributes in the spec are Array attributes.
+
+2005-04-27  Chad Fowler <chad@chadfowler.com>
+	* lib/rubygems/gem_commands.rb: -y is now a synonym for 
+	--include-dependencies
+
+2005-04-21  Chad Fowler <chad@chadfowler.com>
+	* lib/rubygems/installer.rb: Added non-require_gem dependency check
+	for installation.
+
+2005-04-03  Chad Fowler <chad@chadfowler.com>
+
+	* pre-install.rb: Added version check to RubyGems installation.
+
 2005-03-25  Jim Weirich  <jim@weirichhouse.org>
 
+	* lib/rubygems/rubygems_version.rb (Gem): Created release for
+	0.8.10.
+
 	* lib/rubygems/gem_commands.rb
 	(Gem::UpdateCommand::do_rubygems_update): Update --system now runs
 	the ruby command directly rather than trying to load teh

data/README

@@ -2,10 +2,19 @@
 
 (See Releases for release-specific information)
 
-== For user documentation (and installation instructions) see
+== Installation
 
-* {Quick Introduction}[http://rubygems.rubyforge.org/wiki/wiki.pl?Quick_Introduction]
-* {User Guide}[http://rubygems.rubyforge.org/wiki/wiki.pl?UserGuide]
+Get it from RubyForge (http://rubygems.rubyforge.org) and run (as root, if appropriate and necessary)
+
+  ruby setup.rb
+
+For more details and other options, see:
+
+* {User Guide/Installation}[http://docs.rubygems.org/read/chapter/3]
+
+== For User Documentation, see
+
+* {RubyGems User Guide}[http://docs.rubygems.org/read/book/1]
 
 == For developer docs see
 
@@ -43,8 +52,13 @@ RubyGems was originally developed at RubyConf 2003 by:
 * Dick Davies -- rasputnik(at)hellooperator.net
 * Mauricio Fernandez -- batsman.geo(at)yahoo.com
 * Simon Strandgaard -- neoneye(at)adslhome.dk
+* Dave Glasser -- glasser(at)mit.edu
+* Paul Duncan -- pabs(at)pablotron.org
 * Ville Aine -- vaine(at)cs.helsinki.fi
 
+
+(If your name is missing, PLEASE let us know!)
+
 == Feedback
 
 Please provide us feedback at http://rubyforge.org/projects/rubygems

data/Rakefile

@@ -30,12 +30,13 @@ CLOBBER.include(
   "test/temp",
   'test/data/gemhome',
   'test/data/*.gem',
-  'scripts/*.wiki',
+  'scripts/*.hieraki',
   'data__',
   'html',
   'pkgs/sources/sources*.gem',
   '.config',
-  '**/debug.log'
+  '**/debug.log',
+  'logs'
   )
 
 task :default => [:test]
@@ -71,9 +72,9 @@ task :build_tests do
 end
 
 # Shortcuts for test targets
-task :ft => [:functional]
-task :ut => [:test]
-task :at => [:alltests]
+task :tf => [:functional]
+task :tu => [:test]
+task :ta => [:alltests]
 
 task :gemtest do
   ruby %{-Ilib -rscripts/runtest -e 'run_tests("test/test_gempaths.rb", true)'}
@@ -190,19 +191,26 @@ end
 
 # Wiki Doc Targets
 
-desc "Build the Wiki documentation"
-task :wiki => ['scripts/gemdoc.wiki', 'scripts/specdoc.wiki']
+desc "Upload the Hieraki Data"
+task :upload => [:upload_gemdoc]
 
-file 'scripts/gemdoc.wiki' => ['scripts/gemdoc.rb', 'scripts/gemdoc.data'] do
+task :upload_gemdoc => ['scripts/gemdoc.hieraki'] do
+  ruby %{scripts/upload_gemdoc.rb}
+end
+
+desc "Build the Hieraki documentation"
+task :hieraki => ['scripts/gemdoc.hieraki', 'scripts/specdoc.hieraki']
+
+file 'scripts/gemdoc.hieraki' => ['scripts/gemdoc.rb', 'scripts/gemdoc.data'] do
   chdir('scripts') do
-    ruby %{-I../lib gemdoc.rb <gemdoc.data >gemdoc.wiki}
+    ruby %{-I../lib gemdoc.rb <gemdoc.data >gemdoc.hieraki}
   end
 end
 
-file 'scripts/specdoc.wiki' =>
+file 'scripts/specdoc.hieraki' =>
   ['scripts/specdoc.rb', 'scripts/specdoc.data', 'scripts/specdoc.yaml'] do
   chdir('scripts') do
-    ruby %{-I../lib specdoc.rb >specdoc.wiki}
+    ruby %{-I../lib specdoc.rb >specdoc.hieraki}
   end
 end
 
@@ -248,6 +256,16 @@ installation of RubyGems before this update can be applied.
   s.rubyforge_project = "rubygems"
   s.bindir = "bin"                               # Use these for applications.
   s.executables = ["update_rubygems"]
+  certdir = ENV['CERT_DIR']
+  if certdir
+    s.signing_key = File.join(certdir, 'gem-private_key.pem')
+    s.cert_chain  = [File.join(certdir, 'gem-public_cert.pem')]
+  end
+end
+
+# Add console output about signing the Gem
+file "pkg/#{Spec.full_name}.gem" do
+  puts "Signed with certificates in '#{ENV['CERT_DIR']}'" if ENV['CERT_DIR']
 end
 
 Rake::GemPackageTask.new(Spec) do |p| end

data/bin/gem_mirror

@@ -0,0 +1,67 @@
+#! /usr/bin/ruby
+
+# sample ~/.gemmirrorc:
+#--- 
+#- 
+#  from: http://gems.rubyforge.org/
+#  to: /Users/glasser/MyGEMS/gems.rubyforge.org
+
+require 'yaml'
+require 'rubygems'
+require 'open-uri'
+
+config_file = File.join(Gem.user_home, '.gemmirrorrc')
+
+raise "Config file #{config_file} not found" unless File.exist?(config_file)
+
+mirrors = YAML.load_file(config_file)
+
+mirrors.each do |mir|
+  raise "mirror missing 'from' field" unless mir.has_key?('from')
+  raise "mirror missing 'to' field" unless mir.has_key?('to')
+  
+  get_from = mir['from']
+  save_to = mir['to']
+
+  raise "Directory not found: #{save_to}" unless File.exist?(save_to)
+  raise "Not a directory: #{save_to}" unless File.directory?(save_to)
+
+  gems_dir = save_to + "/gems"
+  if File.exist?(gems_dir)
+    raise "Not a directory: #{gems_dir}" unless File.directory?(gems_dir)
+  else
+    Dir.mkdir(gems_dir)
+  end
+
+  sourceindex_text = ''
+
+  open(get_from + "/yaml", "r") do |y|
+    sourceindex_text = y.read
+    open(save_to + "/yaml", "wb") do |out|
+      out.write(sourceindex_text)
+    end
+  end
+
+  sourceindex = YAML.load(sourceindex_text)
+
+  sourceindex.each do |fullname, gem|
+    gem_file = fullname + '.gem'
+    unless File.exists?(gems_dir + "/" + gem_file) 
+      puts "fetching: " + gem_file
+    
+      begin
+        open(get_from + "/gems/" + gem_file, "r") do |g|
+          contents = g.read
+          open(gems_dir + "/" + gem_file, "wb") do |out|
+            out.write(contents)
+          end
+        end
+      rescue
+        old_gf = gem_file
+        gem_file = gem_file.downcase
+        retry if old_gf != gem_file
+        puts $!
+      end
+    end
+  end
+end

data/examples/application/an-app.gemspec

@@ -17,6 +17,8 @@ spec = Gem::Specification.new do |s|
   #s.extra_rdoc_files = ["README", "Changes.rdoc"]
   #s.default_executable = "myapp"
   s.bindir = "bin"
+  s.signing_key = '/Users/chadfowler/cvs/rubygems/gem-private_key.pem'
+  s.cert_chain  = ['/Users/chadfowler/cvs/rubygems/gem-public_cert.pem']
 end
 
 if $0==__FILE__

data/lib/rubygems.rb

@@ -114,6 +114,11 @@ module Gem
       File.join(Gem.user_home, '.gemrc')
     end
 
+    # Return the Ruby command to use to execute the Ruby interpreter.
+    def ruby
+      "ruby"
+    end
+
     ##
     # Activate a gem (i.e. add it to the Ruby load path).  The gem
     # must satisfy all the specified version constraints.  If
@@ -172,7 +177,12 @@ module Gem
 	$:.unshift File.join(spec.full_gem_path, path)
       end
       
-      require spec.autorequire if autorequire && spec.autorequire
+      if autorequire && spec.autorequire then
+        Array(spec.autorequire).each do |a_lib|
+          require a_lib
+        end
+      end
+
       return true
     end
     
@@ -327,7 +337,7 @@ module Gem
       end
       begin
         File.expand_path("~")
-      rescue Exception => ex
+      rescue StandardError => ex
         if File::ALT_SEPARATOR
           "C:/"
         else
@@ -357,7 +367,11 @@ module Gem
       # fundamental RubyGems dependency, so it might as well be up the
       # top.  -- Gavin Sinclair, 2004-12-12
       #
-      File.join(Config::CONFIG['libdir'], 'ruby', 'gems', Config::CONFIG['ruby_version'])
+      if defined? RUBY_FRAMEWORK_VERSION
+        return File.join(File.dirname(Config::CONFIG["sitedir"]), "Gems")
+      else
+        File.join(Config::CONFIG['libdir'], 'ruby', 'gems', Config::CONFIG['ruby_version'])
+      end
     end
 
     private 
@@ -380,6 +394,7 @@ end
 
 require 'rubygems/source_index'
 require 'rubygems/specification'
+require 'rubygems/security'
 require 'rubygems/version'
 #require 'rubygems/loadpath_manager'    # custom_require replaces this
 require 'rubygems/custom_require'

data/lib/rubygems/builder.rb

@@ -1,5 +1,7 @@
 require "rubygems/package"
+require "rubygems/security"
 require "yaml"
+require 'rubygems/gem_openssl'
 
 module Gem
 
@@ -26,9 +28,20 @@ module Gem
       @spec.mark_version
       @spec.validate
       
+      # if the signing key was specified, then load the file, and swap
+      # to the public key (TODO: we should probably just omit the
+      # signing key in favor of the signing certificate, but that's for
+      # the future, also the signature algorihtm should be configurable)
+      signer = nil
+      if @spec.respond_to?(:signing_key) && @spec.signing_key
+        signer = Gem::Security::Signer.new(@spec.signing_key, @spec.cert_chain)
+        @spec.signing_key = nil
+        @spec.cert_chain = signer.cert_chain.map { |cert| cert.to_s }
+      end
+
       file_name = @spec.full_name+".gem"
 
-      Package.open(file_name, "w") do |pkg|
+      Package.open(file_name, "w", signer) do |pkg|
           pkg.metadata = @spec.to_yaml
           @spec.files.each do |file|
               next if File.directory? file

data/lib/rubygems/cmd_manager.rb

@@ -47,6 +47,8 @@ module Gem
       register_command EnvironmentCommand.new
       register_command SpecificationCommand.new
       register_command UnpackCommand.new
+      register_command CertCommand.new
+      register_command ContentsCommand.new
     end
     
     def register_command(command)

data/lib/rubygems/command.rb

@@ -76,7 +76,7 @@ module Gem
       end
     end
 
-    private
+    private 
 
     def command_manager
       Gem::CommandManager.instance
@@ -91,7 +91,8 @@ module Gem
     
     def add_extra_args(args)
       result = []
-      extra = Command.extra_args.dup
+      s_extra = Command.specific_extra_args(@command)
+      extra = Command.extra_args + s_extra
       while ! extra.empty?
         ex = []
         ex << extra.shift
@@ -172,6 +173,29 @@ module Gem
           @extra_args = value.split
         end
       end
+
+      def specific_extra_args(cmd)
+          @specific_extra_args ||= Hash.new do |h,k|
+              h[k] = Array.new
+          end
+
+          r = @specific_extra_args[cmd]
+          return r
+      end
+
+      def add_specific_extra_args(cmd,args)
+          # Access @specific_extra_args so that the hash is
+          # created for sure.
+          #
+          specific_extra_args(cmd)
+
+          if args.kind_of? String
+              args = args.split(/\s+/)
+          end
+
+          @specific_extra_args[cmd] = args
+      end
+
     end
 
     add_common_option('--source URL', 'Use URL as the remote source for gems') do |value, options|

data/lib/rubygems/custom_require.rb

@@ -4,15 +4,18 @@ module Kernel
   alias require__ require
 
   #
-  # We replace Ruby's require with our own, which is capable of loading gems on demand.
+  # We replace Ruby's require with our own, which is capable of
+  # loading gems on demand.
   #
   # When you call <tt>require 'x'</tt>, this is what happens:
-  # * If the file can be loaded from the existing Ruby loadpath, it is.
-  # * Otherwise, installed gems are searched for a file that matches.  If it's found in gem
-  #   'y', that gem is activated (added to the loadpath).
+  # * If the file can be loaded from the existing Ruby loadpath, it
+  #   is.
+  # * Otherwise, installed gems are searched for a file that matches.
+  #   If it's found in gem 'y', that gem is activated (added to the
+  #   loadpath).
   #
-  # The normal <tt>require</tt> functionality of returning false if that file has already been
-  # loaded is preserved.
+  # The normal <tt>require</tt> functionality of returning false if
+  # that file has already been loaded is preserved.
   #
   def require(path)
     require__ path
@@ -33,8 +36,8 @@ end  # module Kernel
 module Gem
 
   #
-  # GemPathSearcher has the capability to find loadable files inside gems.  It generates data
-  # up front to speed up searches later.
+  # GemPathSearcher has the capability to find loadable files inside
+  # gems.  It generates data up front to speed up searches later.
   #
   class GemPathSearcher
     
@@ -42,10 +45,11 @@ module Gem
     # Initialise the data we need to make searches later.
     #
     def initialize
-      # We want a record of all the installed gemspecs, in the order we wish to examine them.
+      # We want a record of all the installed gemspecs, in the order
+      # we wish to examine them.
       @gemspecs = init_gemspecs
-      # Map gem spec to glob of full require_path directories.  Preparing this information may
-      # speed up searches later.
+      # Map gem spec to glob of full require_path directories.
+      # Preparing this information may speed up searches later.
       @lib_dirs = {}
       @gemspecs.each do |spec|
         @lib_dirs[spec.object_id] = lib_dirs(spec)
@@ -53,10 +57,12 @@ module Gem
     end
 
     # 
-    # Look in all the installed gems until a matching _path_ is found.  Return the _gemspec_
-    # of the gem where it was found.  If no match is found, return nil.
+    # Look in all the installed gems until a matching _path_ is found.
+    # Return the _gemspec_ of the gem where it was found.  If no match
+    # is found, return nil.
     #
-    # The gems are searched in alphabetical order, and in reverse version order.
+    # The gems are searched in alphabetical order, and in reverse
+    # version order.
     #
     # For example:
     #
@@ -65,9 +71,10 @@ module Gem
     #   find('rake/rdoctask')      # -> (rake-0.4.12 spec)
     #   find('foobarbaz')          # -> nil
     #
-    # Matching paths can have various suffixes ('.rb', '.so', and others), which may or may
-    # not already be attached to _file_.  This method doesn't care about the full filename
-    # that matches; only that there is a match.
+    # Matching paths can have various suffixes ('.rb', '.so', and
+    # others), which may or may not already be attached to _file_.
+    # This method doesn't care about the full filename that matches;
+    # only that there is a match.
     # 
     def find(path)
       @gemspecs.each do |spec|
@@ -81,17 +88,19 @@ module Gem
     SUFFIX_PATTERN = "{,.rb,.so,.bundle,.dll,.sl}"
 
     #
-    # Attempts to find a matching path using the require_paths of the given _spec_.
+    # Attempts to find a matching path using the require_paths of the
+    # given _spec_.
     #
-    # Some of the intermediate results are cached in @lib_dirs for speed.
+    # Some of the intermediate results are cached in @lib_dirs for
+    # speed.
     #
     def matching_file(spec, path)  # :doc:
       glob = "#{@lib_dirs[spec.object_id]}/#{path}#{SUFFIX_PATTERN}"
       return true unless Dir[glob].select { |f| File.file?(f) }.empty?
     end
 
-    # Return a list of all installed gemspecs, sorted by alphabetical order and in reverse
-    # version order.
+    # Return a list of all installed gemspecs, sorted by alphabetical
+    # order and in reverse version order.
     def init_gemspecs
       Gem.source_index.map { |_, spec| spec }.sort { |a,b|
 	(a.name <=> b.name).nonzero? || (b.version <=> a.version)