rubygems-update 0.9.2 → 0.9.3

data/ChangeLog

@@ -1,3 +1,63 @@
+2007-05-10  Jim Weirich  <jim@weirichhouse.org>
+
+	* lib/rubygems/remote_installer.rb: Uncommented the require
+	'sources' line.
+
+	* lib/rubygems/source_info_cache.rb: Uncommented the require
+	'sources' line.
+
+	* lib/rubygems/rubygems_version.rb (Gem): Bumped to version 0.9.3
+	in preparation for release.
+
+	* lib/rubygems/package.rb (Gem::TarInput::zipped_stream):
+	Zipped_stream now always uses the in memory string IO buffer.
+	There were just too many problems with ZLib (on windows)
+	otherwise.
+
+2007-03-26  Jim Weirich  <jim@weirichhouse.org>
+
+	*  (Index): new digest technique.
+
+	* lib/rubygems/validator.rb (Gem::Validator::verify_gem): Removed
+	really old MD5 and replaced with gem based digests.  
+	
+	* experimental/deployment.rb (Gem::Deployment::Manager::initialize):
+	New digest technique.
+
+	* experimental/test_deployment.rb (TestDeployment::test_deployed_file):
+          New digest technique.
+
+2007-03-26  Chad Fowler <chad@chadfowler.com>
+
+  * Extracted the big ball of mud that was gem_commands.rb into    
+    separate files.
+
+2007-03-17  Chad Fowler <chad@chadfowler.com>
+
+  * Various ruby 1.8.6 fixes for failing tests.
+  
+  * Updated setup.rb to 3.4.1
+  
+  * Renamed cmd_manager to command_manager to keep names consistent
+  
+  * lib/installer.rb: Rework path checking to use Pathname (ara howard bug #8811)
+  
+2007-03-02  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb: Add bin directory before library directory,
+	otherwise gems like rake don't work.
+
+2007-03-01  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/open-uri.rb: Fix all the infinite loop errors.
+
+	* lib/rubygems.rb: Add dirs from activate after -I and ENV['RUBYLIB']
+	dirs.  Otherwise gems won't allow -I to work when #gem is called.
+
+2007-02-11  Chad Fowler <chad@chadfowler.com>
+
+	* test/gemutilities.rb: Fix to make Windows tests pass. (Anatol Pomozov)
+
 2007-02-05  Jim Weirich  <jim@weirichhouse.org>
 
 	* lib/rubygems/rubygems_version.rb (Gem): Bumped to version 0.9.2

data/lib/rubygems.rb

@@ -113,7 +113,7 @@ module Gem
       require 'rubygems/installer'
       require 'rubygems/validator'
       require 'rubygems/doc_manager'
-      require 'rubygems/cmd_manager'
+      require 'rubygems/command_manager'
       require 'rubygems/gem_runner'
       require 'rubygems/config_file'
     end
@@ -253,28 +253,31 @@ module Gem
       if spec.loaded?
         return false unless autorequire
         result = spec.autorequire ? require(spec.autorequire) : false
-        return result || false 
+        return result || false
       end
 
       spec.loaded = true
       @loaded_specs[spec.name] = spec
-      
+
       # Load dependent gems first
       spec.dependencies.each do |dep_gem|
         activate(dep_gem, autorequire)
       end
-      
-      # add bin dir to require_path
-      if(spec.bindir) then
-        spec.require_paths << spec.bindir
-      end
-      
-      # Now add the require_paths to the LOAD_PATH
-      spec.require_paths.each do |path|
-        $:.unshift File.join(spec.full_gem_path, path)
+
+      # bin directory must come before library directories
+      spec.require_paths.unshift spec.bindir if spec.bindir
+
+      require_paths = spec.require_paths.map do |path|
+        File.join spec.full_gem_path, path
       end
-      
-      if autorequire && spec.autorequire then
+
+      sitelibdir = Config::CONFIG['sitelibdir']
+
+      # gem directories must come after -I and ENV['RUBYLIB']
+      $:.insert($:.index(sitelibdir), *require_paths)
+
+      # Now autorequire
+      if autorequire && spec.autorequire then # DEPRECATED
         Array(spec.autorequire).each do |a_lib|
           require a_lib
         end
@@ -282,7 +285,7 @@ module Gem
 
       return true
     end
-    
+
     # Report a load error during activation.  The message of load
     # error depends on whether it was a version mismatch or if there
     # are not gems of any version by the requested name.

data/lib/rubygems/builder.rb

@@ -33,7 +33,23 @@ module Gem
     def build
       @spec.mark_version
       @spec.validate
-      
+      @signer = sign
+      write_package
+      say success
+      @spec.file_name
+    end
+    
+    def success
+      <<-EOM
+  Successfully built RubyGem
+  Name: #{@spec.name}
+  Version: #{@spec.version}
+  File: #{@spec.full_name+'.gem'}
+EOM
+    end
+    
+    private
+    def sign
       # 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
@@ -44,30 +60,20 @@ module Gem
         @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", signer) do |pkg|
-          pkg.metadata = @spec.to_yaml
-          @spec.files.each do |file|
-              next if File.directory? file
-              pkg.add_file_simple(file, File.stat(file_name).mode & 0777,
-                                  File.size(file)) do |os|
-                                      os.write File.open(file, "rb"){|f|f.read}
-                                  end
-          end
-      end
-      say success
-      file_name
+      signer
     end
     
-    def success
-      <<-EOM
-  Successfully built RubyGem
-  Name: #{@spec.name}
-  Version: #{@spec.version}
-  File: #{@spec.full_name+'.gem'}
-EOM
+    def write_package
+      Package.open(@spec.file_name, "w", @signer) do |pkg|
+        pkg.metadata = @spec.to_yaml
+        @spec.files.each do |file|
+          next if File.directory? file
+          pkg.add_file_simple(file, File.stat(@spec.file_name).mode & 0777,
+                              File.size(file)) do |os|
+              os.write File.open(file, "rb"){|f|f.read}
+          end
+        end
+      end
     end
   end
 end

data/lib/rubygems/{cmd_manager.rb → command_manager.rb}

@@ -40,40 +40,40 @@ module Gem
   # sub-commands supported by the gem command.
   class CommandManager
     include UserInteraction
-
+    include Commands
+    
     # Return the authoratative instance of the command manager.
     def self.instance
-      @cmd_manager ||= CommandManager.new
+      @command_manager ||= CommandManager.new
     end
-
+    
     # Register all the subcommands supported by the gem command.
     def initialize
       @commands = {}
-      register_command BuildCommand.new
-      register_command CertCommand.new
-      register_command CheckCommand.new
-      register_command CleanupCommand.new
-      register_command ContentsCommand.new
-      register_command DependencyCommand.new
-      register_command EnvironmentCommand.new
-      register_command HelpCommand.new
-      register_command InstallCommand.new
-      register_command ListCommand.new
-      register_command OutdatedCommand.new
-      register_command PristineCommand.new
-      register_command QueryCommand.new
-      register_command RDocCommand.new
-      register_command SearchCommand.new
-      register_command SourcesCommand.new
-      register_command SpecificationCommand.new
-      register_command UninstallCommand.new
-      register_command UnpackCommand.new
-      register_command UpdateCommand.new
+      register_command :build
+      register_command :cert
+      register_command :check
+      register_command :contents
+      register_command :dependency
+      register_command :environment
+      register_command :help
+      register_command :install
+      register_command :outdated
+      register_command :pristine
+      register_command :query
+      register_command :list
+      register_command :rdoc
+      register_command :search
+      register_command :sources
+      register_command :specification
+      register_command :uninstall
+      register_command :unpack
+      register_command :update
     end
     
     # Register the command object.
     def register_command(command_obj)
-      @commands[command_obj.command.intern] = command_obj
+      @commands[command_obj] = load_and_instantiate(command_obj)
     end
     
     # Return the registered command from the command name.
@@ -136,5 +136,16 @@ module Gem
       len = cmd_name.length
       self.command_names.select { |n| cmd_name == n[0,len] }
     end
+    
+    private
+    def load_and_instantiate(command_name)
+      command_name = command_name.to_s
+      begin
+        Gem::Commands.const_get("#{command_name.capitalize}Command").new
+      rescue
+        require "rubygems/commands/#{command_name}_command"
+        retry
+      end
+    end
   end
 end 

data/lib/rubygems/commands/build_command.rb

@@ -0,0 +1,57 @@
+module Gem
+  module Commands
+    class BuildCommand < Command
+      include CommandAids
+
+      def initialize
+        super('build', 'Build a gem from a gemspec')
+      end
+
+      def usage
+        "#{program_name} GEMSPEC_FILE"
+      end
+
+      def arguments
+        "GEMSPEC_FILE      name of gemspec file used to build the gem"
+      end
+
+      def execute
+        gemspec = get_one_gem_name
+        if File.exist?(gemspec)
+          specs = load_gemspecs(gemspec)
+          specs.each do |spec|
+            Gem::Builder.new(spec).build
+          end
+          return
+        else
+          alert_error "Gemspec file not found: #{gemspec}"
+        end
+      end
+
+      def load_gemspecs(filename)
+        if yaml?(filename)
+          require 'yaml'
+          result = []
+          open(filename) do |f|
+            begin
+              while spec = Gem::Specification.from_yaml(f)
+                result << spec
+              end
+            rescue EndOfYAMLException => e
+              # OK
+            end
+          end
+        else
+          result = [Gem::Specification.load(filename)]
+        end
+        result
+      end
+
+      def yaml?(filename)
+        line = open(filename) { |f| line = f.gets }
+        result = line =~ %r{^--- *!ruby/object:Gem::Specification}
+        result
+      end
+    end
+  end
+end

data/lib/rubygems/commands/cert_command.rb

@@ -0,0 +1,83 @@
+module Gem
+  module Commands
+    
+    class CertCommand < Command
+      include CommandAids
+    
+      def initialize
+        super(
+          'cert',
+          'Adjust RubyGems certificate settings',
+          {
+          })
+
+        add_option('-a', '--add CERT', 'Add a trusted certificate.') do |value, options|
+          cert = OpenSSL::X509::Certificate.new(File.read(value))
+          Gem::Security.add_trusted_cert(cert)
+          puts "Added #{cert.subject.to_s}"
+        end
+
+        add_option('-l', '--list', 'List trusted certificates.') do |value, options|
+          glob_str = File::join(Gem::Security::OPT[:trust_dir], '*.pem')
+          Dir::glob(glob_str) do |path|
+            cert = OpenSSL::X509::Certificate.new(File.read(path))
+            # this could proably be formatted more gracefully
+            puts cert.subject.to_s
+          end
+        end
+
+        add_option('-r', '--remove STRING',
+                   'Remove trusted certificates containing',
+                   'STRING.') do |value, options|
+          trust_dir = Gem::Security::OPT[:trust_dir]
+          glob_str = File::join(trust_dir, '*.pem')
+
+          Dir::glob(glob_str) do |path|
+            cert = OpenSSL::X509::Certificate.new(File.read(path))
+            if cert.subject.to_s.downcase.index(value)
+              puts "Removing '#{cert.subject.to_s}'"
+              File.unlink(path)
+            end
+          end
+        end
+
+        add_option('-b', '--build EMAIL_ADDR',
+                   'Build private key and self-signed',
+                   'certificate for EMAIL_ADDR.') do |value, options|
+          vals = Gem::Security::build_self_signed_cert(value)
+          File::chmod(0600, vals[:key_path])
+          puts "Public Cert: #{vals[:cert_path]}",
+               "Private Key: #{vals[:key_path]}",
+               "Don't forget to move the key file to somewhere private..."
+        end
+
+        add_option('-C', '--certificate CERT',
+                   'Certificate for --sign command.') do |value, options|
+          cert = OpenSSL::X509::Certificate.new(File.read(value))
+          Gem::Security::OPT[:issuer_cert] = cert
+        end
+
+        add_option('-K', '--private-key KEY',
+                   'Private key for --sign command.') do |value, options|
+          key = OpenSSL::PKey::RSA.new(File.read(value))
+          Gem::Security::OPT[:issuer_key] = key
+        end
+
+
+        add_option('-s', '--sign NEWCERT', 
+                   'Sign a certificate with my key and',
+                   'certificate.') do |value, options|
+          cert = OpenSSL::X509::Certificate.new(File.read(value))
+          my_cert = Gem::Security::OPT[:issuer_cert]
+          my_key = Gem::Security::OPT[:issuer_key]
+          cert = Gem::Security.sign_cert(cert, my_key, my_cert)
+          File::open(value, 'wb') { |file| file.write(cert.to_pem) }
+        end
+
+      end
+
+      def execute
+      end
+    end
+  end
+end

data/lib/rubygems/commands/check_command.rb

@@ -0,0 +1,74 @@
+module Gem
+  module Commands
+    class CheckCommand < Command
+      include CommandAids
+
+      def initialize
+        super('check', 'Check installed gems',
+              {:verify => false, :alien => false})
+
+        add_option('-v', '--verify FILE',
+                   'Verify gem file against its internal',
+                   'checksum') do |value, options|
+          options[:verify] = value
+        end
+
+        add_option('-a', '--alien', "Report 'unmanaged' or rogue files in the",
+                   "gem repository") do |value, options|
+          options[:alien] = true
+        end
+
+        add_option('-t', '--test', "Run unit tests for gem") do |value, options|
+          options[:test] = true
+        end
+
+        add_option('-V', '--version',
+                   "Specify version for which to run unit tests") do |value, options|
+          options[:version] = value
+        end
+      end
+    
+      def execute
+        if options[:test]
+          version = options[:version] || "> 0.0.0"
+          gem_spec = Gem::SourceIndex.from_installed_gems.search(get_one_gem_name, version).first
+          Gem::Validator.new.unit_test(gem_spec)
+        end
+        if options[:alien]
+          say "Performing the 'alien' operation"
+          Gem::Validator.new.alien.each do |key, val|
+            if(val.size > 0)
+              say "#{key} has #{val.size} problems"
+              val.each do |error_entry|
+                say "\t#{error_entry.path}:"
+                say "\t#{error_entry.problem}"
+                say
+              end
+            else  
+              say "#{key} is error-free"
+            end
+            say
+          end
+        end
+        if options[:verify]
+          gem_name = options[:verify]
+          unless gem_name
+            alert_error "Must specify a .gem file with --verify NAME"
+            return
+          end
+          unless File.exist?(gem_name)
+            alert_error "Unknown file: #{gem_name}."
+            return
+          end
+          say "Verifying gem: '#{gem_name}'"
+          begin
+            Gem::Validator.new.verify_gem_file(gem_name)
+          rescue Exception => e
+            alert_error "#{gem_name} is invalid."
+          end
+        end
+      end
+    
+    end
+  end
+end