libgems 0.0.1 → 0.0.2

data/lib/libgems.rb

@@ -98,7 +98,7 @@ require 'thread'
 module LibGems
   NAME = 'LibGems'
   GEM_NAME = 'libgems'
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
   GEM_VERSION = '1.3.8'
 
   ##
@@ -417,7 +417,7 @@ module LibGems
   # The standard configuration object for gems.
 
   def self.configuration
-    @configuration ||= LibGems::ConfigFile.new []
+    @configuration || load_configuration
   end
 
   ##
@@ -425,7 +425,15 @@ module LibGems
   # protocol) as the standard configuration object.
 
   def self.configuration=(config)
-    @configuration = config
+    load_configuration(config)
+  end
+
+  def self.load_configuration(config=nil)
+    @configuration = config || LibGems::ConfigFile.new([])
+    LibGems.use_paths(@configuration[:gemhome], @configuration[:gempath])
+    LibGems::Command.extra_args = @configuration[:gem]
+    LibGems::DocManager.configured_args = @configuration[:rdoc]
+    @configuration
   end
 
   ##
@@ -450,7 +458,6 @@ module LibGems
   # The path where gems are to be installed.
 
   def self.dir
-    @gem_home ||= nil
     set_home(ENV['LIBGEMS_HOME'] || ENV['GEM_HOME'] || LibGems.configuration.home || default_dir) unless @gem_home
     @gem_home
   end
@@ -1149,6 +1156,8 @@ module LibGems
   autoload :Platform, 'libgems/platform'
   autoload :Builder, 'libgems/builder'
   autoload :ConfigFile, 'libgems/config_file'
+  autoload :Command, 'libgems/command'
+  autoload :DocManager, 'libgems/doc_manager'
 end
 
 module ::Kernel
@@ -1243,4 +1252,4 @@ class << LibGems
 end
 
 LibGems.clear_paths
-
+LibGems.load_configuration

data/lib/libgems/installer.rb

@@ -178,16 +178,7 @@ class LibGems::Installer
       FileUtils.cp @gem, File.join(@gem_home, "cache")
     end
 
-    unless @spec.post_install_message.nil?
-      # Only for SlimGems
-      if @spec.name == LibGems::GEM_NAME
-        lines = @spec.post_install_message.split("\n")
-        lines.shift if lines.first.include?("Upgraded from #{LibGems::NAME}")
-        say lines.join("\n")
-      else
-        say @spec.post_install_message
-      end
-    end
+    say @spec.post_install_message unless @spec.post_install_message.nil?
 
     @spec.loaded_from = File.join(@gem_home, 'specifications', @spec.spec_name)
 

data/lib/libgems/specification.rb

@@ -703,11 +703,12 @@ class LibGems::Specification
     if YAML.const_defined?(:ENGINE) && !YAML::ENGINE.syck? then
       super.gsub(/ !!null \n/, " \n")
     else
-      YAML.quick_emit object_id, opts do |out|
+      ret = YAML.quick_emit object_id, opts do |out|
         out.map taguri, to_yaml_style do |map|
           encode_with map
         end
       end
+      ret.gsub("!ruby/object:LibGems", "!ruby/object:Gem")
     end
   end
 
@@ -734,7 +735,7 @@ class LibGems::Specification
     result = []
     result << "# -*- encoding: utf-8 -*-"
     result << nil
-    result << "LibGems::Specification.new do |s|"
+    result << "Gem::Specification.new do |s|"
 
     result << "  s.name = #{ruby_code name}"
     result << "  s.version = #{ruby_code version}"
@@ -769,7 +770,7 @@ class LibGems::Specification
     result << "    s.specification_version = #{specification_version}"
     result << nil
 
-    result << "    if LibGems::Version.new(LibGems::GEM_VERSION) >= LibGems::Version.new('1.2.0') then"
+    result << "    if Gem::Version.new(Gem::GEM_VERSION) >= Gem::Version.new('1.2.0') then"
 
     unless dependencies.empty? then
       dependencies.each do |dep|
@@ -1041,13 +1042,13 @@ class LibGems::Specification
     case obj
     when String            then '%q{' + obj + '}'
     when Array             then obj.inspect
-    when LibGems::Version      then obj.to_s.inspect
+    when LibGems::Version  then obj.to_s.inspect.gsub("LibGems", "Gem")
     when Date              then '%q{' + obj.strftime('%Y-%m-%d') + '}'
     when Time              then '%q{' + obj.strftime('%Y-%m-%d') + '}'
     when Numeric           then obj.inspect
     when true, false, nil  then obj.inspect
-    when LibGems::Platform     then "LibGems::Platform.new(#{obj.to_a.inspect})"
-    when LibGems::Requirement  then "LibGems::Requirement.new(#{obj.to_s.inspect})"
+    when LibGems::Platform     then "Gem::Platform.new(#{obj.to_a.inspect})"
+    when LibGems::Requirement  then "Gem::Requirement.new(#{obj.to_s.inspect})"
     else raise LibGems::Exception, "ruby_code case not handled: #{obj.class}"
     end
   end

data/test/test_gem.rb

@@ -135,6 +135,32 @@ class TestGem < RubyGemTestCase
     assert_equal expected, LibGems.configuration
   end
 
+    def test_do_configuration
+    LibGems.clear_paths
+
+    temp_conf = File.join @tempdir, '.gemrc'
+
+    other_gem_path = File.join @tempdir, 'other_gem_path'
+    other_gem_home = File.join @tempdir, 'other_gem_home'
+
+    LibGems.ensure_gem_subdirectories other_gem_path
+    LibGems.ensure_gem_subdirectories other_gem_home
+
+    File.open temp_conf, 'w' do |fp|
+      fp.puts "gem: --commands"
+      fp.puts "gemhome: #{other_gem_home}"
+      fp.puts "gempath:"
+      fp.puts "  - #{other_gem_path}"
+      fp.puts "rdoc: --all"
+    end
+
+    LibGems.configuration = LibGems::ConfigFile.new %W[--config-file #{temp_conf}]
+
+    assert_equal [other_gem_path, other_gem_home], LibGems.path
+    assert_equal %w[--commands], LibGems::Command.extra_args
+    assert_equal %w[--all], LibGems::DocManager.configured_args
+  end
+
   def test_self_datadir
     foo = nil
 

metadata

@@ -2,7 +2,7 @@
 name: libgems
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Jim Weirich
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 Z
+date: 2011-06-11 00:00:00 Z
 dependencies: []
 
 description: |
@@ -163,7 +163,6 @@ files:
 - lib/libgems/format.rb
 - lib/libgems/gem_openssl.rb
 - lib/libgems/gem_path_searcher.rb
-- lib/libgems/gem_runner.rb
 - lib/libgems/gemcutter_utilities.rb
 - lib/libgems/indexer.rb
 - lib/libgems/install_update_options.rb
@@ -256,7 +255,6 @@ files:
 - test/test_gem_ext_rake_builder.rb
 - test/test_gem_format.rb
 - test/test_gem_gem_path_searcher.rb
-- test/test_gem_gem_runner.rb
 - test/test_gem_gemcutter_utilities.rb
 - test/test_gem_indexer.rb
 - test/test_gem_install_update_options.rb
@@ -292,7 +290,7 @@ files:
 homepage: http://rubygems.org
 licenses: []
 
-post_install_message: "Upgraded from LibGems to LibGems 0.0.1\n\
+post_install_message: "Upgraded from LibGems to LibGems 0.0.2\n\
   \xEF\xBB\xBF=== 1.3.8 / 2011-05-16\n\n\
   SlimGems is born! SlimGems is a fork of RubyGems, see README.md for more.\n\n"
 rdoc_options: []
@@ -372,7 +370,6 @@ test_files:
 - test/test_gem_ext_rake_builder.rb
 - test/test_gem_format.rb
 - test/test_gem_gem_path_searcher.rb
-- test/test_gem_gem_runner.rb
 - test/test_gem_gemcutter_utilities.rb
 - test/test_gem_indexer.rb
 - test/test_gem_install_update_options.rb

data/lib/libgems/gem_runner.rb

@@ -1,79 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require 'libgems/command_manager'
-require 'libgems/config_file'
-require 'libgems/doc_manager'
-
-##
-# Run an instance of the gem program.
-#
-# LibGems::GemRunner is only intended for internal use by SlimGems itself.  It
-# does not form any public API and may change at any time for any reason.
-#
-# If you would like to duplicate functionality of `gem` commands, use the
-# classes they call directly.
-
-class LibGems::GemRunner
-
-  def initialize(options={})
-    @command_manager_class = options[:command_manager] || LibGems::CommandManager
-    @config_file_class = options[:config_file] || LibGems::ConfigFile
-    @doc_manager_class = options[:doc_manager] || LibGems::DocManager
-  end
-
-  ##
-  # Run the gem command with the following arguments.
-
-  def run(args)
-    start_time = Time.now
-
-    if args.include?('--')
-      # We need to preserve the original ARGV to use for passing gem options
-      # to source gems.  If there is a -- in the line, strip all options after
-      # it...its for the source building process.
-      build_args = args[args.index("--") + 1...args.length]
-      args = args[0...args.index("--")]
-    end
-
-    LibGems::Command.build_args = build_args if build_args
-
-    do_configuration args
-    cmd = @command_manager_class.instance
-
-    cmd.command_names.each do |command_name|
-      config_args = LibGems.configuration[command_name]
-      config_args = case config_args
-                    when String
-                      config_args.split ' '
-                    else
-                      Array(config_args)
-                    end
-      LibGems::Command.add_specific_extra_args command_name, config_args
-    end
-
-    cmd.run LibGems.configuration.args
-    end_time = Time.now
-
-    if LibGems.configuration.benchmark then
-      printf "\nExecution time: %0.2f seconds.\n", end_time - start_time
-      puts "Press Enter to finish"
-      STDIN.gets
-    end
-  end
-
-  private
-
-  def do_configuration(args)
-    LibGems.configuration = @config_file_class.new(args)
-    LibGems.use_paths(LibGems.configuration[:gemhome], LibGems.configuration[:gempath])
-    LibGems::Command.extra_args = LibGems.configuration[:gem]
-    @doc_manager_class.configured_args = LibGems.configuration[:rdoc]
-  end
-
-end
-
-LibGems.load_plugins

data/test/test_gem_gem_runner.rb

@@ -1,45 +0,0 @@
-require File.expand_path('../gemutilities', __FILE__)
-require 'libgems/gem_runner'
-
-class TestGemGemRunner < RubyGemTestCase
-
-  def test_do_configuration
-    LibGems.clear_paths
-
-    temp_conf = File.join @tempdir, '.gemrc'
-
-    other_gem_path = File.join @tempdir, 'other_gem_path'
-    other_gem_home = File.join @tempdir, 'other_gem_home'
-
-    LibGems.ensure_gem_subdirectories other_gem_path
-    LibGems.ensure_gem_subdirectories other_gem_home
-
-    File.open temp_conf, 'w' do |fp|
-      fp.puts "gem: --commands"
-      fp.puts "gemhome: #{other_gem_home}"
-      fp.puts "gempath:"
-      fp.puts "  - #{other_gem_path}"
-      fp.puts "rdoc: --all"
-    end
-
-    gr = LibGems::GemRunner.new
-    gr.send :do_configuration, %W[--config-file #{temp_conf}]
-
-    assert_equal [other_gem_path, other_gem_home], LibGems.path
-    assert_equal %w[--commands], LibGems::Command.extra_args
-    assert_equal %w[--all], LibGems::DocManager.configured_args
-  end
-
-  def test_build_args__are_handled
-    LibGems.clear_paths
-
-    gr = LibGems::GemRunner.new
-    assert_raises(LibGems::SystemExitException) do
-      gr.run(%W[--help -- --build_arg1 --build_arg2])
-    end
-
-    assert_equal %w[--build_arg1 --build_arg2], LibGems::Command.build_args
-  end
-
-end
-