libgems 0.0.5 → 0.1.0

data/History.txt

@@ -1,4 +1,17 @@
-=== 1.3.8 / 2011-05-16
+=== 1.3.9.1 / 2011-06-03
+
+SlimGems is a drop-in replacement for RubyGems. See README.md for more.
+
+* Fixes slimgems getting uninstalled when `gem uninstall GEM` is called.
+
+=== 1.3.9 / 2011-06-02
+
+SlimGems is reborn! SlimGems is a fork of RubyGems, see README.md for more.
+
+This release fixes some minor issues in installing SlimGems in certain 
+environments.
+
+=== 1.3.8 / 2011-06-01
 
 SlimGems is born! SlimGems is a fork of RubyGems, see README.md for more.
 

data/lib/libgems.rb

@@ -98,8 +98,8 @@ require 'thread'
 module LibGems
   NAME = 'LibGems'
   GEM_NAME = 'libgems'
-  VERSION = '1.3.8'
-  LIBGEMS_VERSION = '0.0.5'
+  VERSION = '1.3.9.2'
+  LIBGEMS_VERSION = '0.1.0'
 
   ##
   # Raised when SlimGems is unable to load or activate a gem.  Contains the
@@ -662,10 +662,23 @@ module LibGems
   # Loads YAML, preferring Psych
 
   def self.load_yaml
-    require 'psych'
-  rescue ::LoadError
-  ensure
-    require 'yaml'
+    begin
+      require 'psych' unless ENV['TEST_SYCK']
+    rescue ::LoadError
+    ensure
+      require 'yaml'
+    end
+
+    # Hack to handle syck's DefaultKey bug with psych.
+    # See the note at the top of lib/rubygems/requirement.rb for
+    # why we end up defining DefaultKey more than once.
+    if !defined? YAML::Syck
+      YAML.module_eval do
+          const_set 'Syck', Module.new {
+            const_set 'DefaultKey', Class.new
+          }
+        end
+    end
   end
 
   ##

data/lib/libgems/commands/fetch_command.rb

@@ -36,18 +36,32 @@ class LibGems::Commands::FetchCommand < LibGems::Command
     version = options[:version] || LibGems::Requirement.default
     all = LibGems::Requirement.default != version
 
+    platform  = LibGems.platforms.last
     gem_names = get_all_gem_names
 
     gem_names.each do |gem_name|
       dep = LibGems::Dependency.new gem_name, version
       dep.prerelease = options[:prerelease]
 
-      specs_and_sources = LibGems::SpecFetcher.fetcher.fetch(dep, all, true,
-                                                         dep.prerelease?)
+      # Because of the madness that is SpecFetcher, you can't
+      # set both all and prerelease to true. If you do, prerelease
+      # is ignored.
+
+      if dep.prerelease? and all
+        specs_and_sources, errors =
+          LibGems::SpecFetcher.fetcher.fetch_with_errors(dep, false, true,
+                                                     dep.prerelease?)
+      else
+        specs_and_sources, errors =
+          LibGems::SpecFetcher.fetcher.fetch_with_errors(dep, all, true,
+                                                     dep.prerelease?)
+      end
+
 
-      specs_and_sources, errors =
-        LibGems::SpecFetcher.fetcher.fetch_with_errors(dep, all, true,
-                                                   dep.prerelease?)
+      if platform then
+        filtered = specs_and_sources.select { |s,| s.platform == platform }
+        specs_and_sources = filtered unless filtered.empty?
+      end
 
       spec, source_uri = specs_and_sources.sort_by { |s,| s.version }.last
 

data/lib/libgems/commands/update_command.rb

@@ -121,10 +121,12 @@ class LibGems::Commands::UpdateCommand < LibGems::Command
               gem_names.all? { |name| /#{name}/ !~ l_spec.name }
 
       dependency = LibGems::Dependency.new l_spec.name, "> #{l_spec.version}"
+      dependency.prerelease = options[:prerelease]
 
       begin
         fetcher = LibGems::SpecFetcher.fetcher
-        spec_tuples = fetcher.find_matching dependency
+        spec_tuples = fetcher.find_matching dependency, false, true,
+                                            options[:prerelease]
       rescue LibGems::RemoteFetcher::FetchError => e
         raise unless fetcher.warn_legacy e do
           require 'libgems/source_info_cache'

data/lib/libgems/dependency_list.rb

@@ -201,7 +201,7 @@ class LibGems::DependencyList
   # +ignored+.
 
   def active_count(specs, ignored)
-    specs.count { |spec| ignored[spec.full_name].nil? }
+    specs.inject(0) {|c, spec| ignored[spec.full_name].nil? ? c + 1 : c }
   end
 
 end

data/lib/libgems/installer.rb

@@ -338,6 +338,17 @@ class LibGems::Installer
   ##
   # Generates a #! line for +bin_file_name+'s wrapper copying arguments if
   # necessary.
+  #
+  # If the :custom_shebang config is set, then it is used as a template
+  # for how to create the shebang used for to run a gem's executables.
+  #
+  # The template supports 4 expansions:
+  #
+  #  $env    the path to the unix env utility
+  #  $ruby   the path to the currently running ruby interpreter
+  #  $exec   the path to the gem's executable
+  #  $name   the name of the gem the executable is for
+  #
 
   def shebang(bin_file_name)
     ruby_name = LibGems::ConfigMap[:ruby_install_name] if @env_shebang
@@ -351,6 +362,25 @@ class LibGems::Installer
       shebang.strip! # Avoid nasty ^M issues.
     end
 
+    if which = LibGems.configuration[:custom_shebang]
+      which = which.gsub(/\$(\w+)/) do
+        case $1
+        when "env"
+          @env_path ||= ENV_PATHS.find do |env_path|
+                          File.executable? env_path
+                        end
+        when "ruby"
+          "#{LibGems.ruby}#{opts}"
+        when "exec"
+          bin_file_name
+        when "name"
+          spec.name
+        end
+      end
+
+      return "#!#{which}"
+    end
+
     if not ruby_name then
       "#!#{LibGems.ruby}#{opts}"
     elsif opts then

data/lib/libgems/requirement.rb

@@ -1,5 +1,24 @@
 require "libgems/version"
 
+# Hack to handle syck's DefaultKey bug with psych
+#
+# Quick note! If/when psych loads in 1.9, it will redefine
+# YAML to point to Psych by removing the YAML constant.
+# Thusly, over in LibGems.load_yaml, we define DefaultKey again
+# after proper yaml library has been loaded.
+#
+# All this is so that there is always a YAML::Syck::DefaultKey
+# class no matter if the full yaml library has loaded or not.
+#
+module YAML
+  if !defined? Syck
+    module Syck
+      class DefaultKey
+      end
+    end
+  end
+end
+
 ##
 # A Requirement is a set of one or more version restrictions. It supports a
 # few (<tt>=, !=, >, <, >=, <=, ~></tt>) different restriction operators.
@@ -115,6 +134,13 @@ class LibGems::Requirement
 
   def marshal_load array # :nodoc:
     @requirements = array[0]
+
+    # Fixup the Syck DefaultKey bug
+    @requirements.each do |r|
+      if r[0].kind_of? YAML::Syck::DefaultKey
+        r[0] = "="
+      end
+    end
   end
 
   def prerelease?

data/test/simple_gem.rb

@@ -6,19 +6,19 @@ SIMPLE_GEM = <<-GEMDATA
           options = {}
           ARGV.options do |opts|
             opts.on_tail("--help", "show this message") {puts opts; exit}
-            opts.on('--dir=DIRNAME', "Installation directory for the LibGems") {|options[:directory]|}
-            opts.on('--force', "Force LibGems to intall, bypassing dependency checks") {|options[:force]|}
-            opts.on('--gen-rdoc', "Generate RDoc documentation for the LibGems") {|options[:gen_rdoc]|}
+            opts.on('--dir=DIRNAME', "Installation directory for the Gem") {|options[:directory]|}
+            opts.on('--force', "Force Gem to intall, bypassing dependency checks") {|options[:force]|}
+            opts.on('--gen-rdoc', "Generate RDoc documentation for the Gem") {|options[:gen_rdoc]|}
             opts.parse!
           end
 
-          require 'libgems'
-          @directory = options[:directory] || LibGems.dir
+          require 'rubygems'
+          @directory = options[:directory] || Gem.dir
           @force = options[:force]
 
-          gem = LibGems::Installer.new(__FILE__).install(@force, @directory)
+          gem = Gem::Installer.new(__FILE__).install(@force, @directory)
           if options[:gen_rdoc]
-            LibGems::DocManager.new(gem).generate_rdoc
+            Gem::DocManager.new(gem).generate_rdoc
           end
 end
 

data/test/test_gem_commands_fetch_command.rb

@@ -52,6 +52,30 @@ class TestGemCommandsFetchCommand < RubyGemTestCase
            "#{@a2_pre.full_name} not fetched"
   end
 
+  def test_execute_specific_prerelease
+    util_setup_fake_fetcher true
+    util_clear_gems
+    util_setup_spec_fetcher @a2, @a2_pre
+
+    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
+      File.read(File.join(@gemhome, 'cache', @a2.file_name))
+    @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
+      File.read(File.join(@gemhome, 'cache', @a2_pre.file_name))
+
+    @cmd.options[:args] = [@a2.name]
+    @cmd.options[:prerelease] = true
+    @cmd.options[:version] = "2.a"
+
+    use_ui @ui do
+      Dir.chdir @tempdir do
+        @cmd.execute
+      end
+    end
+
+    assert File.exist?(File.join(@tempdir, @a2_pre.file_name)),
+           "#{@a2_pre.full_name} not fetched"
+  end
+
   def test_execute_version
     util_setup_fake_fetcher
     util_setup_spec_fetcher @a1, @a2

data/test/test_gem_commands_update_command.rb

@@ -15,16 +15,18 @@ class TestGemCommandsUpdateCommand < RubyGemTestCase
     @cmd.options[:generate_ri]   = false
 
     util_setup_fake_fetcher
+    util_setup_spec_fetcher @a1, @a2, @a3a
 
     @a1_path = File.join @gemhome, 'cache', @a1.file_name
     @a2_path = File.join @gemhome, 'cache', @a2.file_name
-
-    util_setup_spec_fetcher @a1, @a2
+    @a3a_path = File.join @gemhome, 'cache', @a3a.file_name
 
     @fetcher.data["#{@gem_repo}gems/#{@a1.file_name}"] =
       read_binary @a1_path
     @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
       read_binary @a2_path
+    @fetcher.data["#{@gem_repo}gems/#{@a3a.file_name}"] =
+      read_binary @a3a_path
   end
   
   def teardown
@@ -186,6 +188,27 @@ class TestGemCommandsUpdateCommand < RubyGemTestCase
     assert_empty out
   end
 
+  def test_execute_named_up_to_date_prerelease
+    util_clear_gems
+
+    LibGems::Installer.new(@a2_path).install
+
+    @cmd.options[:args] = [@a2.name]
+    @cmd.options[:prerelease] = true
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+    assert_equal "Updating installed gems", out.shift
+    assert_equal "Updating #{@a3a.name}", out.shift
+    assert_equal "Successfully installed #{@a3a.full_name}", out.shift
+    assert_equal "Gems updated: #{@a3a.name}", out.shift
+
+    assert_empty out
+  end
+
   def test_execute_up_to_date
     util_clear_gems
 

data/test/test_gem_installer.rb

@@ -1,6 +1,31 @@
 require File.expand_path('../gem_installer_test_case', __FILE__)
 
 class TestGemInstaller < LibGemsInstallerTestCase
+  
+  class StubbedConfigFile < LibGems::ConfigFile
+    def load_file(filename) {} end
+  end
+  
+  def setup
+    super
+    if !defined?(@@test_num)
+      @@test_num = 0
+      @@total_tests = self.class.test_methods.size
+      @@config = LibGems.configuration
+    end
+    LibGems.configuration = StubbedConfigFile.new([])
+    LibGems.send(:set_home, @gemhome) # Config clears this
+  end
+  
+  def run(runner)
+    result = super
+  ensure
+    @@test_num += 1
+    if @@test_num == @@total_tests
+      LibGems.configuration = @@config
+    end
+    result
+  end
 
   def test_app_script_text
     util_make_exec '2', ''
@@ -527,7 +552,7 @@ load LibGems.bin_path('a', 'my_exec', version)
     end
 
     LibGems.post_install do |installer|
-      assert File.exist?(cache_file), 'cache file should exist'
+      assert File.exist?(cache_file), "cache file should exist: #{cache_file}"
     end
 
     build_rake_in do
@@ -640,7 +665,7 @@ load LibGems.bin_path('a', 'my_exec', version)
     assert File.exist?(gemdir)
 
     exe = File.join(gemdir, 'bin', 'executable')
-    assert File.exist?(exe)
+    assert File.exist?(exe), "#{exe} should exist"
     exe_mode = File.stat(exe).mode & 0111
     assert_equal 0111, exe_mode, "0%o" % exe_mode unless win_platform?
     assert File.exist?(File.join(gemdir, 'lib', 'code.rb'))
@@ -817,6 +842,36 @@ load LibGems.bin_path('a', 'my_exec', version)
     assert_equal "#!#{LibGems.ruby} -ws", shebang
   end
 
+  def test_shebang_custom
+    LibGems.configuration[:custom_shebang] = 'test'
+
+    util_make_exec '2', "#!/usr/bin/ruby"
+
+    shebang = @installer.shebang 'my_exec'
+
+    assert_equal "#!test", shebang
+  end
+
+  def test_shebang_custom_with_expands
+    LibGems.configuration[:custom_shebang] = '1 $env 2 $ruby 3 $exec 4 $name'
+
+    util_make_exec '2', "#!/usr/bin/ruby"
+
+    shebang = @installer.shebang 'my_exec'
+
+    assert_equal "#!1 /usr/bin/env 2 #{LibGems.ruby} 3 my_exec 4 a", shebang
+  end
+
+  def test_shebang_custom_with_expands_and_arguments
+    LibGems.configuration[:custom_shebang] = '1 $env 2 $ruby 3 $exec'
+
+    util_make_exec '2', "#!/usr/bin/ruby -ws"
+
+    shebang = @installer.shebang 'my_exec'
+
+    assert_equal "#!1 /usr/bin/env 2 #{LibGems.ruby} -ws 3 my_exec", shebang
+  end
+
   def test_unpack
     util_setup_gem
 

data/test/test_gem_silent_ui.rb

@@ -1,8 +1,7 @@
-require 'rubygems/test_case' # Looks like it's defined somewhere else
 require 'libgems/user_interaction'
 require 'timeout'
 
-class TestGemSilentUI < Gem::TestCase
+class TestGemSilentUI < RubyGemTestCase
 
   def setup
     super
@@ -49,7 +48,7 @@ class TestGemSilentUI < Gem::TestCase
 
     assert_empty out, 'No output'
     assert_empty err, 'No output'
-    
+
     out, err = capture_io do
       use_ui @sui do
         value = @sui.ask_yes_no 'Problem?', true
@@ -60,7 +59,7 @@ class TestGemSilentUI < Gem::TestCase
     assert_empty err, 'No output'
 
     assert value, 'Value is true'
-    
+
     out, err = capture_io do
       use_ui @sui do
         value = @sui.ask_yes_no 'Problem?', false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libgems
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-06 00:00:00.000000000Z
+date: 2011-08-10 00:00:00.000000000Z
 dependencies: []
 description: ! "# SlimGems\n\n* Website: http://slimgems.github.com/\n* Github: http://github.com/slimgems/slimgems\n*
   Get gems from: http://rubygems.org\n\n## Description\n\nSlimGems is a drop-in replacement
@@ -229,7 +229,6 @@ files:
 - test/test_kernel.rb
 - History.txt
 - LICENSE.txt
-- blah.rb
 - README.md
 - Rakefile
 - ChangeLog

data/blah.rb

@@ -1,5 +0,0 @@
-module Blah
-  def self.hi
-    puts "hi"
-  end
-end