geminstaller 0.3.0 → 0.4.0

data/History.txt

@@ -1,4 +1,14 @@
-== 0.x.y / yyyy-mm-dd
+== 0.4.0 / 2008-04-10
+* Fix multiplatform bug on windows where ruby platform requiring compile was selected over native mswin platform.
+* deprecate support of rubygems 0.9.5, 1.0.0, and 1.1.0.
+* Change handling of platforms on rubygems on Rubygems > 0.9.5, let RubyGems handle default.
+* rename GemInstaller.run method to GemInstaller.install, keep run as an alias for install
+* add‍warning‍if‍a‍gem‍version‍error‍is‍detected,‍with instructions‍to‍run‍geminstaller‍to‍install‍the‍missing‍version
+* Rubygems‍1.x‍compatibility
+* better internal support for uninstall options
+* use‍new,‍correct‍x86-mswin32‍format‍for‍mswin32‍platform‍gems
+* update‍warning‍message‍for‍older‍rubygems‍versions
+* made tests run on Mac OS X Leopard w/RubyGems 1.0.1
 
 == 0.3.0 / 2008-01-01
 * Changes to work with RubyGems >= 0.9.5 and take advantage of new platform and auto-install features.  See notes at http://geminstaller.rubyforge.org/code/index.html#rubygems_compatibility

data/Manifest.txt

@@ -20,7 +20,6 @@ lib/geminstaller/autogem.rb
 lib/geminstaller/backward_compatibility.rb
 lib/geminstaller/config.rb
 lib/geminstaller/config_builder.rb
-lib/geminstaller/dependency_injector.rb
 lib/geminstaller/enhanced_stream_ui.rb
 lib/geminstaller/exact_match_list_command.rb
 lib/geminstaller/file_reader.rb
@@ -42,6 +41,7 @@ lib/geminstaller/output_filter.rb
 lib/geminstaller/output_listener.rb
 lib/geminstaller/output_observer.rb
 lib/geminstaller/output_proxy.rb
+lib/geminstaller/registry.rb
 lib/geminstaller/requires.rb
 lib/geminstaller/rogue_gem_finder.rb
 lib/geminstaller/ruby_gem.rb
@@ -54,8 +54,10 @@ lib/geminstaller/unexpected_prompt_error.rb
 lib/geminstaller/valid_platform_selector.rb
 lib/geminstaller/version_specifier.rb
 lib/geminstaller/yaml_loader.rb
+lib/geminstaller_rails_preinitializer.rb
 start_local_gem_server.sh
 test/test_all.rb
+test/test_all_smoketests.rb
 website/config.yaml
 website/metainfo.yaml
 website/src/analytics.page

data/Rakefile

@@ -16,6 +16,7 @@ require './lib/geminstaller/hoe_extensions.rb'
 
 IndependentHoe.new('geminstaller', GemInstaller.version) do |p|
   p.author = 'Chad Woolley'
+  p.email = 'thewoolleyman@gmail.com'
   p.rubyforge_name = 'geminstaller'
   p.summary = p.paragraphs_of('README.txt', 1).first.split(/\n/)[2]
   p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
@@ -26,6 +27,12 @@ IndependentHoe.new('geminstaller', GemInstaller.version) do |p|
   p.extra_deps = []
 end
 
+def run_smoketest(path_to_smoketest)
+  cmd = "#{Hoe::RUBY_FLAGS} #{path_to_smoketest} #{Hoe::FILTER}"
+  result = send :ruby, cmd
+  raise "#{path_to_smoketest} Smoketest failed" unless result == 0 || result == true
+end
+
 desc "Run all metrics"
 task :metrics do
   Rake::Task[:coverage].invoke
@@ -48,6 +55,7 @@ task :diff_manifest => :clean do
     next unless File.file? path
     next if path =~ /\.svn|tmp$|CVS/
     next if path =~ /\.iml|\.ipr|\.iws|\.kpf|\.tmproj|\.project/
+    next if path =~ /\.\/nbproject/
     next if path =~ /\.\/spec/
     next if path =~ /\.\/pkg/
     next if path =~ /\.\/output/
@@ -89,4 +97,30 @@ task :publish_website => [:clean, :website] do
   local_dir = 'website/output'
   sh %{rsync -av --delete --exclude=statsvn #{local_dir}/ #{host}:#{remote_dir}}
 end
+
+desc 'Run All Smoketests'
+task :smoketest => [:clean] do
+  run_smoketest 'test/test_all_smoketests.rb'
+end
+
+desc 'Run Install Smoketest'
+task :install_smoketest => [:clean] do
+  run_smoketest 'spec/smoketest/install_smoketest.rb'
+end
+
+desc 'Run AutoGem Smoketest'
+task :autogem_smoketest => [:clean] do
+  run_smoketest 'spec/smoketest/autogem_smoketest.rb'
+end
+
+desc 'Run Rails Smoketest'
+task :rails_smoketest => [:clean] do
+  run_smoketest 'spec/smoketest/rails_smoketest.rb'
+end
+
+desc 'Run Debug Smoketest'
+task :debug_smoketest => [:clean] do
+  run_smoketest 'spec/smoketest/debug_smoketest.rb'
+end
+
 # vim: syntax=Ruby

data/TODO.txt

@@ -1,12 +1,30 @@
-
 =============== Unfiled =============
-* release with support for rubygems >= 0.9.5
-================ 0.3.0 release ===================
+================ 0.4.0 release ===================
+* fix smoke tests on CI
+* Investigate error when installing and loading gem in same session (like rails preinitializer) - Not reproducible - fixed in >1.1.0???
+================ 0.5.0 release ===================
+* If permission error, auto-install under writable_gem_home ~/gems/1.8 (configurable), Gem.clear_paths, set ENV['GEM_HOME'] to ENV['HOME']pathsepGem::ConfigMap[:ruby_version], and issue warning (saying in order to prevent warning, a) set gem_home: in ~/.gemrc, b) invoke via sudo (only if command line), c) make (and keep) current Gem.dir writeable, or d) add geminstaller (and ruby?) to sudoers file (security hole).  Properties: "[no_]use_writable_gem_home" and "writable_gem_home".
+* For RubyGems >=1.0.1, look at using Gem::SourceInfoCache instead of SourceIndex or --list command
+* Move classes which are unused against current RubyGems into Legacy module.
+* Speed! What can be done to speed things up?
+* performance improvement: first try cache hit without all option, then with if not found.
+* add command line tool to automatically generate files - default file, rake task (geminstaller:run, geminstaller:install, geminstaller:autogem), and preinit hook.  Auto-detect rails vs. non-rails project and generate stuff accordingly.  --setup, --setup-rails.  Check for new-style boot.rb, fail if missing, check for RAILS_GEM_VERSION in environment.rb, warn if present.
+* Merb support.  Does merb have preinitializer.rb equivalent?
+* Change 'run' to automatically automatically calls both 'install' and 'autogem', add 'no-install' and 'no-autogem' option (only applicable when invoked programatically) to suppress if desired
+* auto-install on app startup should not be the default unless use_writable_gem_home is implemented, because of sudo/rake doublerun/speed issues.  Update autogem missing gem error message accordingly.
+* also look for config file under RAILS_ROOT/config, if RAILS_ROOT is defined (somehow fails under textmate, if working dir is wrong)
+================ 0.x.0 release ===================
+* Change option handling to accept hashes in addition to strings when invoked programatically
+* rails_smoketest.rb is not working, always reinstalls existing gems
+* add option to use frozen edge rails before rails gem, understand the implications
+* add auto-install option if gem version error is detected, update error message saying to set option
+* cryptic message if "name:" is left off in yaml
+* Add option to auto-update rubygems to specified version.  See rubygems mailing list thread for details
+* set up sample rails project with geminstaller hook and sample test under CI.  Have cruise_config uninstall a dummy gem before rails tests, then have rails test ensure it was installed and loaded.
+================ 0.x.x release ===================
 * turn smoketest into rake task, with correct return code handling, and hook up to cruise
 * look into and explain mongrel/webrick installation errors
 * add top-level method for uninstall of gems, and document (requested by Alex Chaffee and others)
-* Rename API: deprecate 'autogem' and rename to 'load'; change current 'run' to 'install'; add new 'run' which automatically calls both 'install' and 'load', add 'no-load' option (only applicable when invoked programatically) to supress automatic 'load'
-
 * docs - add example of using environment variable to control gem version without changing code (Rails)
 * docs - document and add sample file for preinitializer boot hook.  Explain why it can't be in environment.rb vs boot.rb or prinitializer (bottom line: env is not processed before Initializer, so can't be used to load rails gems)
 * tutorial: using common or shared config files, with different configs for different environments - test (rspec) vs. dev (capistrano) vs. demo/staging/prod, mention include_config option and pros/cons of different approaches
@@ -17,7 +35,7 @@
 * put mongrel/rails startup bug in tracker, add link in "known bugs" section on home page.
 * tutorial: running via capistrano
 * crossreference front page, tutorials, and docs
-================ 0.3.1 release ===================
+================ 0.x.x release ===================
 * Namespace remaining un-namespaced constants
 * Allow array or eval'able string of gems to be passed as --gems arg or instead of args
 * Add @options[:gems], should be parsed from command line* root-owned gems: add -S | --sudo-only-if-allowed option, will only invoke sudo if GEMINSTALLER_ALLOW(S)_SUDO env var is set
@@ -25,16 +43,16 @@
 * root-owned gems: Dynamically detect posix platform and check if gem repo is completely writeable.  Ignorable prompt?
 * docs - clean up sudo section.  Should be clearer about sudoers entry, and make sure that NOPASSWD is the last entry.  Rename from #dealing_with_sudo to #dealing_with_root_owned_gems, rewrite to reflect new best practices (different GEM_PATH or auto-sudo via capistrano)
 * tutorial: update running via capistrano to reference new sudo docs
-================ 0.3.2 release ===================
+================ 0.x.x release ===================
 * handle installation of gem from file (requested by Alex Chaffee)
 * Investigate gem_plugin.  Plugin for mongrel???
 * Investigate making a Rails plugin
-================ 0.3.3 release ===================
+================ 0.x.x release ===================
 * Why does RubyGems reinstall BlueCloth even though it is already installed?!?!? (remove from FAQ after solved)
 * Figure out how to suppress webrick messages from embedded gem server
 * add option to warn if any rogue gems are found
-================ 0.3.4 release =====================
-================ 0.3.5 finishing website ===================
+================ 0.x.x release =====================
+================ 0.x.x finishing website ===================
 * autogem and run args can be passed as string or array
 * better test coverage for --sudo and --exception options
 * use rspec context_setup
@@ -71,7 +89,7 @@
 * clean up registry - third-party first, no dependency next, alphabetized
 * review/clean up ri/rdoc
 * Better errors for invalid yaml (unsupported keys)
-========= 0.3.0 release ==============
+========= 0.x.0 release ==============
 * patch hoe to install_gem without sudo on windows
 * understand why '> 1' must be quoted to be a valid yaml value - see yaml_loader_spec.rb
 * tests failed when "partially" connected to network? (wireless at office)

data/bin/geminstaller

@@ -27,4 +27,4 @@ if ARGV.include?('--geminstaller-exec-path')
   exit 0
 end
 
-exit GemInstaller.run(ARGV, geminstaller_executable)
+exit GemInstaller.install(ARGV, geminstaller_executable)

data/ci/cruise

@@ -40,6 +40,7 @@ when 'stop'
   system "mongrel_rails stop -P #{cruise_path}/tmp/pids/mongrel.pid"
   Dir["#{cruise_path}/tmp/pids/builders/*.pid"].each do |pid_file|
     pid = File.open(pid_file){|f| f.read }
+    puts "Killing builder at file #{pid_file}, pid=#{pid}"
     system "kill -9 #{pid}"
     rm pid_file
   end

data/cruise_config.rb

@@ -8,4 +8,9 @@ Project.configure do |project|
     rubygems_version.gsub!('-','.')
     ENV['RUBYGEMS_VERSION'] = rubygems_version
   end
+  if project.name =~ /debug_smoketest/i # debug smoketest project
+    project.rake_task = 'debug_smoketest'
+  elsif project.name =~ /smoketest/i # smoketest project
+    project.rake_task = 'smoketest'
+  end
 end

data/focused_spec_debug.sh

@@ -1,2 +1,2 @@
 # warning - experimental
-rdebug -I spec/fixture/rubygems_dist/rubygems-1.0.0/lib/ /usr/local/bin/spec -- $1 --line=$2
+ruby -I spec/lib/ruby-debug-0.10.0/cli:spec/lib/ruby-debug-0.10.0/bin:spec/lib/ruby-debug-base-0.10.0/lib:spec/lib/ruby-debug-0.10.0/bin/rdebug:spec/lib/rspec-1.1.1/lib spec/lib/ruby-debug-0.10.0/bin/rdebug spec/lib/rspec-1.1.1/bin/spec -- $1 --line=$2

data/lib/geminstaller/application.rb

@@ -8,7 +8,7 @@ module GemInstaller
       @args = nil
     end
     
-    def run
+    def install
       begin
         exit_flag_and_return_code = handle_args
         if exit_flag_and_return_code[0]

data/lib/geminstaller/autogem.rb

@@ -12,9 +12,18 @@ module GemInstaller
     end
     
     def process_gem(gem)
-      unless @completed_names.index(gem.name) or gem.no_autogem
-        invoke_require_gem_command(gem.name, gem.version)
-        @completed_names << gem.name
+      name = gem.name
+      version = gem.version
+      unless @completed_names.index(name) or gem.no_autogem
+        begin
+          invoke_require_gem_command(name, version)
+        rescue Gem::LoadError => load_error
+          load_error_message = load_error.message
+          load_error_message.strip!
+          error_message = "Error: GemInstaller attempted to load gem '#{name}', version '#{version}', but that version is not installed.  Use GemInstaller to install the gem.  Original Gem::LoadError was: '#{load_error_message}'"
+          raise GemInstaller::GemInstallerError.new(error_message)
+        end
+        @completed_names << name
         @completed_gems << gem
       end
     end
@@ -23,8 +32,8 @@ module GemInstaller
       if GemInstaller::RubyGemsVersionChecker.matches?('< 0.9')
         require_gem(name, version)
       else
-        # TODO: should we check true/false result of gem method?
-        gem(name, version)
+        # TODO: check true/false result of gem method, print debug message if false (already loaded)
+        result = gem(name, version)
       end
     end
   end

data/lib/geminstaller/enhanced_stream_ui.rb

@@ -1,6 +1,7 @@
 module GemInstaller
   class EnhancedStreamUI < Gem::StreamUI
-    attr_writer :gem_interaction_handler, :outs, :errs
+    attr_writer :outs, :errs
+    attr_writer :gem_interaction_handler if GemInstaller::RubyGemsVersionChecker.matches?('<=0.9.4')
     
     def initialize()
       # override default constructor to have no args
@@ -35,6 +36,8 @@ module GemInstaller
       end
     end
 
+    if GemInstaller::RubyGemsVersionChecker.matches?('<=1.0.1')
+    # explicit exit in terminate_interation was removed after 1.0.1
     def terminate_interaction!(status=-1)
       raise_error(status)
     end
@@ -43,6 +46,7 @@ module GemInstaller
       raise_error(status) unless status == 0
       raise GemInstaller::RubyGemsExit.new(status)
     end
+    end
     
     def alert_error(statement, question=nil)
       # if alert_error got called due to a GemInstaller::UnexpectedPromptError, re-throw it

data/lib/geminstaller/gem_command_manager.rb

@@ -1,25 +1,31 @@
 module GemInstaller
   class GemCommandManager
-    attr_writer :gem_spec_manager, :gem_runner_proxy, :gem_interaction_handler
+    attr_writer :gem_spec_manager, :gem_runner_proxy
+    attr_writer :gem_interaction_handler if GemInstaller::RubyGemsVersionChecker.matches?('<=0.9.4')
     
     def list_remote_gem(gem, additional_options)
       run_args = ["list",gem.name,"--remote","--details"]
+      run_args << "--all" if GemInstaller::RubyGemsVersionChecker.matches?('>1.0.1')
       run_args += additional_options
       @gem_runner_proxy.run(run_args)
     end
 
     def uninstall_gem(gem)
       return if !@gem_spec_manager.is_gem_installed?(gem)
-      @gem_interaction_handler.dependent_gem = gem
+      init_gem_interaction_handler(gem)
       run_gem_command('uninstall', gem, gem.uninstall_options)
     end
 
     def install_gem(gem, force_reinstall = false)
       return [] if @gem_spec_manager.is_gem_installed?(gem) && !force_reinstall
-      @gem_interaction_handler.dependent_gem = gem
+      init_gem_interaction_handler(gem)
       run_gem_command('install', gem, gem.install_options)
     end
     
+    def init_gem_interaction_handler(gem)
+      @gem_interaction_handler.dependent_gem = gem if GemInstaller::RubyGemsVersionChecker.matches?('<=0.9.4')
+    end
+    
     def dependency(name, version, additional_options = [])
       # rubygems has bug up to 0.9.4 where the pipe options uses 'puts', instead of 'say', so we can't capture it
       # with enhanced_stream_ui.  Patched: http://rubyforge.org/tracker/index.php?func=detail&aid=9020&group_id=126&atid=577
@@ -51,7 +57,7 @@ module GemInstaller
     def run_gem_command(gem_command, gem, options)
       run_args = [gem_command,gem.name,"--version", "#{gem.version}"]
       if GemInstaller::RubyGemsVersionChecker.matches?('>=0.9.5')
-        run_args += ['--platform', "#{gem.platform}"]
+        run_args += ['--platform', "#{gem.platform}"] if gem.platform && !gem.platform.empty?
       end
       run_args += options
       @gem_runner_proxy.run(run_args)

data/lib/geminstaller/gem_interaction_handler.rb

@@ -3,11 +3,11 @@ module GemInstaller
     attr_writer :dependent_gem, :noninteractive_chooser_class, :valid_platform_selector
     DEPENDENCY_PROMPT = 'Install required dependency'
     
+    def initialize
+      check_rubygems_version
+    end
+    
     def handle_ask_yes_no(question)
-      if GemInstaller::RubyGemsVersionChecker.matches?('>=0.9.5')
-        # gem_interaction_handler is not used for RubyGems >= 0.9.5
-        raise RuntimeError.new("Internal GemInstaller Error: GemInteractionHandler should not be used for RubyGems >= 0.9.5")
-      end
       return unless question.index(DEPENDENCY_PROMPT)
       message = "Error: RubyGems is prompting to install a required dependency, and you have not " +
                 "specified the '--install-dependencies' option for the current gem.  You must modify your " +
@@ -17,10 +17,6 @@ module GemInstaller
     end
     
     def handle_choose_from_list(question, list, noninteractive_chooser = nil)
-      if GemInstaller::RubyGemsVersionChecker.matches?('>=0.9.5')
-        # gem_interaction_handler is not used for RubyGems >= 0.9.5
-        raise RuntimeError.new("Internal GemInstaller Error: GemInteractionHandler should not be used for RubyGems >= 0.9.5")
-      end
       noninteractive_chooser ||= @noninteractive_chooser_class.new
       valid_platforms = nil
       if dependent_gem_with_platform_specified?(list, noninteractive_chooser) or noninteractive_chooser.uninstall_list_type?(question)
@@ -34,5 +30,12 @@ module GemInstaller
     def dependent_gem_with_platform_specified?(list, noninteractive_chooser)
       noninteractive_chooser.dependent_gem?(@dependent_gem.name, list) and @dependent_gem.platform
     end
+  
+    def check_rubygems_version
+      if GemInstaller::RubyGemsVersionChecker.matches?('>=0.9.5')
+        # gem_interaction_handler is not used for RubyGems >= 0.9.5
+        raise RuntimeError.new("Internal GemInstaller Error: GemInteractionHandler should not be used for RubyGems >= 0.9.5")
+      end
+    end
   end
 end

data/lib/geminstaller/gem_runner_proxy.rb

@@ -16,6 +16,13 @@ module GemInstaller
       exit_status = nil
       begin
         gem_runner.run(args)
+      rescue SystemExit => system_exit
+        if GemInstaller::RubyGemsVersionChecker.matches?('>1.0.1')
+          raise system_exit unless system_exit.is_a? Gem::SystemExitException
+          exit_status = system_exit.message
+        else
+          raise system_exit
+        end
       rescue GemInstaller::RubyGemsExit => normal_exit
         exit_status = normal_exit.message
       rescue GemInstaller::GemInstallerError => exit_error

data/lib/geminstaller/gem_spec_manager.rb

@@ -27,8 +27,8 @@ module GemInstaller
       else
         # TODO: this is a hack because source_index#search doesn't allow specification of platform
         if exact_platform_match
-          found_gem_specs = found_gem_specs.delete_if do |spec|
-            !spec_platform_matches?(spec, gem.platform)
+          found_gem_specs = found_gem_specs.select do |spec|
+            spec_platform_matches?(spec, gem.platform)
           end
         end
       end
@@ -39,11 +39,10 @@ module GemInstaller
     end
 
     def spec_platform_matches?(spec, platform)
-      spec_platform = Gem::Platform.new(spec.platform)
-      if spec_platform.is_a?(String)
-        return spec_platform == platform
+      if GemInstaller::RubyGemsVersionChecker.matches?('>0.9.5')
+        return Gem::Platform.new(spec.platform) == Gem::Platform.new(platform)
       end
-      return spec_platform =~ platform
+      return spec.platform == platform
     end
   end
 end

data/lib/geminstaller/noninteractive_chooser.rb

@@ -3,6 +3,7 @@ module GemInstaller
   # Format for "uninstall" prompt list: "#{spec.name}-#{spec.version}" for ruby,  "#{spec.name}-#{spec.version}-#{spec.platform}" (gem.full_name) for binary
   class NoninteractiveChooser
     def initialize
+      check_rubygems_version
       @question = nil
     end
     
@@ -102,6 +103,12 @@ module GemInstaller
       install_format_exact_name_match_regexp = /^#{dependent_gem_name}\s.*/
       install_list_type? and list[0] =~ install_format_exact_name_match_regexp
     end
-  
+
+    def check_rubygems_version
+      if GemInstaller::RubyGemsVersionChecker.matches?('>=0.9.5')
+        # noninteractive_chooser is not used for RubyGems >= 0.9.5
+        raise RuntimeError.new("Internal GemInstaller Error: NoninteractiveChooser should not be used for RubyGems >= 0.9.5")
+      end
+    end
   end
 end

data/lib/geminstaller/{dependency_injector.rb → registry.rb}

@@ -1,21 +1,14 @@
 module GemInstaller
-  class DependencyInjector
-    def registry
-      @registry ||= create_registry
-    end
-    
-    def create_registry
-      # define the service registry
-      @registry = GemInstaller::Registry.new
-    end
-  end
-  
   class Registry
     attr_accessor :file_reader, :yaml_loader, :output_proxy, :config_builder, :gem_source_index, :gem_runner_proxy
-    attr_accessor :gem_runner, :gem_command_manager, :gem_list_checker, :app, :arg_parser, :options, :noninteractive_chooser
-    attr_accessor :gem_interaction_handler, :install_processor, :missing_dependency_finder, :valid_platform_selector
+    attr_accessor :gem_runner, :gem_command_manager, :gem_list_checker, :app, :arg_parser, :options
+    attr_accessor :install_processor, :missing_dependency_finder, :valid_platform_selector
     attr_accessor :output_listener, :outs_output_observer, :errs_output_observer, :output_filter, :autogem, :rogue_gem_finder
     attr_accessor :gem_spec_manager, :source_index_search_adapter
+    
+    if GemInstaller::RubyGemsVersionChecker.matches?('<=0.9.4')
+      attr_accessor :gem_interaction_handler, :noninteractive_chooser
+    end
 
     def initialize
       @options = {}
@@ -52,11 +45,6 @@ module GemInstaller
       @source_index_search_adapter = GemInstaller::SourceIndexSearchAdapter.new
       @source_index_search_adapter.gem_source_index_proxy = @gem_source_index_proxy
 
-      @gem_interaction_handler = GemInstaller::GemInteractionHandler.new
-      @noninteractive_chooser_class = GemInstaller::NoninteractiveChooser
-      @gem_interaction_handler.noninteractive_chooser_class = @noninteractive_chooser_class
-      @gem_interaction_handler.valid_platform_selector = @valid_platform_selector
-      
       @outs_output_observer = GemInstaller::OutputObserver.new
       @outs_output_observer.stream = :stdout
       @outs_output_observer.register(@output_listener)
@@ -67,7 +55,6 @@ module GemInstaller
       @enhanced_stream_ui = GemInstaller::EnhancedStreamUI.new
       @enhanced_stream_ui.outs = @outs_output_observer
       @enhanced_stream_ui.errs = @errs_output_observer
-      @enhanced_stream_ui.gem_interaction_handler = @gem_interaction_handler
 
       @gem_runner_class = Gem::GemRunner
       @gem_cmd_manager_class = Gem::CommandManager
@@ -89,7 +76,6 @@ module GemInstaller
       @gem_command_manager = GemInstaller::GemCommandManager.new
       @gem_command_manager.gem_spec_manager = @gem_spec_manager
       @gem_command_manager.gem_runner_proxy = @gem_runner_proxy
-      @gem_command_manager.gem_interaction_handler = @gem_interaction_handler
         
       @rogue_gem_finder = GemInstaller::RogueGemFinder.new
       @rogue_gem_finder.gem_command_manager = @gem_command_manager
@@ -118,6 +104,15 @@ module GemInstaller
       @install_processor.gem_spec_manager = @gem_spec_manager
       @install_processor.missing_dependency_finder = @missing_dependency_finder
       @install_processor.output_filter = @output_filter
+      
+      if GemInstaller::RubyGemsVersionChecker.matches?('<=0.9.4')
+        @gem_interaction_handler = GemInstaller::GemInteractionHandler.new
+        @noninteractive_chooser_class = GemInstaller::NoninteractiveChooser
+        @gem_interaction_handler.noninteractive_chooser_class = @noninteractive_chooser_class
+        @gem_interaction_handler.valid_platform_selector = @valid_platform_selector
+        @gem_command_manager.gem_interaction_handler = @gem_interaction_handler
+        @enhanced_stream_ui.gem_interaction_handler = @gem_interaction_handler
+      end
 
       @app = GemInstaller::Application.new
       @app.autogem = @autogem

data/lib/geminstaller/requires.rb

@@ -16,6 +16,18 @@ unless defined? ALLOW_UNSUPPORTED_RUBYGEMS_VERSION or GemInstaller::RubyGemsVers
             "----------------------------------------------------------------\n\n"
 end
 
+
+if !(defined? ALLOW_UNSUPPORTED_RUBYGEMS_VERSION) or 
+  GemInstaller::RubyGemsVersionChecker.matches?('=0.9.5') or
+  GemInstaller::RubyGemsVersionChecker.matches?('=1.1.0')
+  print "\n\n----------------------------------------------------------------\n" + 
+            "WARNING: You are using RubyGems version #{Gem::RubyGemsVersion}.\n" +
+            "This version is known to have bugs and/or compatibility issues\n" +
+            "with GemInstaller.  Update RubyGems, or continue at your risk.\n" +
+            "To update rubygems (recommended), use 'gem update --system'.\n" +
+            "----------------------------------------------------------------\n\n"
+end
+
 # requires for rubygems internal classes
 require 'rubygems/doc_manager'
 require 'rubygems/config_file'
@@ -45,7 +57,6 @@ require 'erb'
 require 'optparse'
 require 'yaml'
 require 'fileutils'
-require 'tempfile'
 
 # third party lib extensions
 require File.expand_path("#{dir}/rubygems_extensions")
@@ -57,7 +68,7 @@ require File.expand_path("#{dir}/arg_parser")
 require File.expand_path("#{dir}/autogem")
 require File.expand_path("#{dir}/config")
 require File.expand_path("#{dir}/config_builder")
-require File.expand_path("#{dir}/dependency_injector")
+require File.expand_path("#{dir}/registry")
 require File.expand_path("#{dir}/enhanced_stream_ui")
 require File.expand_path("#{dir}/exact_match_list_command")
 require File.expand_path("#{dir}/file_reader")

data/lib/geminstaller/ruby_gem.rb

@@ -10,7 +10,9 @@ module GemInstaller
       if opts[:version] != "" && opts[:version] != nil 
         @version = opts[:version] 
       end
-      @platform = 'ruby'
+      if GemInstaller::RubyGemsVersionChecker.matches?('<=0.9.5')
+        @platform = 'ruby'
+      end
       if opts[:platform] != "" && opts[:platform] != nil 
         @platform = opts[:platform]
       end
@@ -31,14 +33,21 @@ module GemInstaller
     end
     
     def self.default_platform
-      Gem::Platform::RUBY
-    end    
+      if GemInstaller::RubyGemsVersionChecker.matches?('>0.9.5')
+        Gem::Platform::CURRENT
+      else
+        # Not sure if this is actually required for RubyGems <=0.9.5, but it 
+        # was the original value in GemInstaller <=0.3.0, and makes the tests pass
+        'ruby'
+      end
+    end
 
     def <=>(other)
       compare = @name <=> other.name
       return compare if compare != 0
       compare = @version <=> other.version
       return compare if compare != 0
+      return 0 if (@platform == nil && other.platform == nil)
       return @platform <=> other.platform
     end
     

data/lib/geminstaller.rb

@@ -2,7 +2,7 @@ dir = File.dirname(__FILE__)
 require File.expand_path("#{dir}/geminstaller/requires.rb")
 
 module GemInstaller
-  def self.run(args = [], geminstaller_executable = nil)
+  def self.install(args = [], geminstaller_executable = nil)
     args_copy = args.dup
     args_copy = args_copy.split(' ') unless args.respond_to? :join
     # recursively call script with sudo, if --sudo option is specified
@@ -15,9 +15,14 @@ module GemInstaller
       return result
     else
       app = create_application(args_copy)
-      app.run
+      app.install
     end
-  end 
+  end
+  
+  def self.run(args = [], geminstaller_executable = nil)
+    # run is now an alias for install
+    install(args, geminstaller_executable)
+  end
   
   def self.autogem(args = [])
     args_copy = args.dup
@@ -29,7 +34,7 @@ module GemInstaller
   end
 
   def self.version
-    "0.3.0"
+    "0.4.0"
   end
 
   def self.create_application(args = [], registry = nil)
@@ -40,8 +45,7 @@ module GemInstaller
   end
   
   def self.create_registry
-    dependency_injector = GemInstaller::DependencyInjector.new
-    dependency_injector.registry
+    GemInstaller::Registry.new
   end
   
   def self.parse_config_paths(config_paths)
@@ -56,18 +60,14 @@ module GemInstaller
   end
   
   def self.reinvoke_with_sudo(args, geminstaller_executable)
-    # TODO: this sudo support seems like a hack, but I don't have a better idea right now.  Ideally, we would
-    # invoke rubygems from the command line inside geminstaller.  However, we can't do that because rubygems
-    # currently doesn't provide a way to specify platform from the command line - it always pops up the list
-    # for multi-platform gems, and we have to extend/hack rubygems to manage that.
-    # Feel free to comment or improve it, this seems to work for now...
+    # Sudo support is a hack, better to use other alternatives.
     geminstaller_executable ||= find_geminstaller_executable
     args_without_sudo = strip_sudo(args)
     args_without_sudo << '--redirect-stderr-to-stdout'
     cmd = "sudo ruby #{geminstaller_executable} #{args_without_sudo.join(' ')}"
     # TODO: this eats any output.  There currently is no standard way to get a return code AND stdin AND stdout.
     # Some non-standard packages like Open4 handle this, but not synchronously.  The Simplest Thing That Could
-    # Possibly Work s to have a command line option which will cause all stderr output to be redirected to stdout.
+    # Possibly Work is to have a command line option which will cause all stderr output to be redirected to stdout.
     result = system(cmd)
     return 1 unless result
     return $?.exitstatus

data/lib/geminstaller_rails_preinitializer.rb

@@ -0,0 +1,45 @@
+############# GemInstaller Rails Preinitializer - see http://geminstaller.rubyforge.org
+
+# This file should be required in your Rails config/preinitializer.rb for Rails >= 2.0,
+# or required in config/boot.rb before initialization for Rails < 2.0.  For example:
+#   require 'geminstaller_rails_preinitializer'
+#
+# If you require a different geminstaller configuration, copy this file into your Rails app,
+# modify it, and require your customized version.  For example:
+#   require "#{File.expand_path(RAILS_ROOT)}/config/custom_geminstaller_rails_preinitializer.rb"
+
+require "rubygems" 
+require "geminstaller" 
+
+module GemInstallerRailsPreinitializer
+  class << self
+    def preinitialize
+      args = ''
+
+      # Specify --geminstaller-output=all and --rubygems-output=all for maximum debug logging
+      args += ' --geminstaller-output=all --rubygems-output=all'
+
+      # The 'exceptions' flag determines whether errors encountered while running GemInstaller
+      # should raise exceptions (and abort Rails), or just return a nonzero return code
+      args += " --exceptions" 
+
+      # This will use sudo by default on all non-windows platforms, but requires an entry in your
+      # sudoers file to avoid having to type a password.  It can be omitted if you don't want to use sudo.
+      # See http://geminstaller.rubyforge.org/documentation/documentation.html#dealing_with_sudo
+      # Note that environment variables will NOT be passed via sudo!
+      #args += " --sudo" unless RUBY_PLATFORM =~ /mswin/
+
+      # The 'install' method will auto-install gems as specified by the args and config
+      GemInstaller.install(args)
+
+      # The 'autogem' method will automatically add all gems in the GemInstaller config to your load path,
+      # using the rubygems 'gem' method.  Note that only the *first* version of any given gem will be loaded.
+      GemInstaller.autogem(args)
+    end
+  end
+end
+
+# Attempt to prevent GemInstaller from running twice, but won't work if it is executed
+# in a separate interpreter (like rake tests)
+GemInstallerRailsPreinitializer.preinitialize unless $geminstaller_initialized
+$geminstaller_initialized = true

data/test/test_all_smoketests.rb

@@ -0,0 +1,21 @@
+print "\nRunning all GemInstaller SmokeTests, ENV['RUBYGEMS_VERSION'] == '#{ENV['RUBYGEMS_VERSION']}'\n\n"
+
+dir = File.dirname(__FILE__)
+smoketest_dir = File.expand_path("#{dir}/../spec/smoketest")
+
+test_files = Dir.glob("#{smoketest_dir}/**/*_smoketest.rb")
+
+test_files.each do |test_file|
+  raise "#{test_file} failed" unless system("ruby #{test_file}")
+end
+# 
+# class SmokeTestSuite
+#   def self.suite
+#     suite = Test::Unit::TestSuite.new
+#     suite << GemInstaller::AutoGemSmokeTest.suite
+# #    suite << GemInstaller::InstallSmokeTest.suite
+# #    suite << GemInstaller::RailsSmokeTest.suite
+#     return suite
+#   end
+# end
+# Test::Unit::UI::Console::TestRunner.run(SmokeTestSuite)

data/website/src/code/index.page

@@ -20,10 +20,10 @@ These are some notes on the underlying design of GemInstaller, and the current s
 ** Unit vs. Functional: Many classes have two identically-named spec files associated with them, under unit and functional.  
 *** Unit Specs:  The Unit specs for the most part test only a single class in isolation, usually using mock objects, so they run very fast.  Many of them are vestiges of my initial BDD approach when I started from nothing.  I incur a little bit of overhead cost to maintain them as the app evolves, but I don't mind that as much as some people :).  They also come in very handy when I want to BDD some new behavior and don't want to have the high "Test Gem Home" fixture creation overhead that the functional specs have.
 *** Functional Specs:  These also have a one-to-one relationship with classes for the most part - geminstaller_spec is an exception.  Most of these test how groups of classes interact together at various levels.  Most of them use the "Test Gem Home" fixture approach.  This is effective, but adds several seconds to the startup of each run.  There is also overlap between some of them, especially at high levels of the API, which adds some maintenance overhead, but is worth it to me since it helps catch integration bugs.
-*** Smoke Tests: There are some tests under /spec/smoketests which I run manually.  These are really coarse grained scripts, and don't use Rspec or Test::Unit.  They hit the live rubygems.org gem repository, and install/uninstall actual gems.  They are used as a periodic check to ensure that my "Test Gem Home" fixture approach is not masking any real-life bugs.
+*** Smoke Tests: There are some tests under /spec/smoketests which are not part of the main spec suite.  These are really coarse grained scripts.  They hit the live rubygems.org gem repository, and install/uninstall actual gems, and exercise my sample rails app which uses GemInstaller.  They are used as a check to ensure that my "Test Gem Home" fixture approach is not masking any real-life bugs.
 * I'm a proponent of high code coverage.  I check periodically to ensure I maintain close to 100% code coverage, not counting platform- and version-specific code blocks (and I'll get around to those some day).  Also, the sudo recursive invocation stuff still needs some tests, but that's a bit tricky to automate.
 * The tests are "harder" on Windows (but run fine on mac/linux).  The app should work fine, but testing is pretty tricky.  I have all tests working against the latest rubygems (1.0.1).  Here's what does and doesn't work with tests against latest rubygems on windows:
-  * smoketest.rb and autogem_test.rb work
+  * install_smoketest.rb and autogem_smoketest.rb work
   * ruby test/test_all.rb works
   * rake default test task does not work (this seems to be a problem with hoe on windows)
   * Sometimes test suite still hangs after a while, this is probably some orphaned EmbeddedGemServer process somewhere.  A reboot should fix it - this is windows, after all!
@@ -56,9 +56,9 @@ Yeah, it's too manual.  Notes for improvement below.
 * Update version in geminstaller.rb
 * rake update_manifest
 * Run tests:
-  * CI should be green for all versions
-  * smoketest.rb and autogem_test.rb should pass for all RubyGems versions on mac/linux
-  * test_all, smoketest.rb and autogem_test.rb should pass for latest RubyGems version on windows
+** CI should be green for all versions
+** install_smoketest.rb and autogem_smoketest.rb should pass for all RubyGems versions on mac/linux
+** test_all, install_smoketest.rb and autogem_smoketest.rb should pass for latest RubyGems version on windows
 * Make sure everything is checked in
 * Make a tag in svn
 * rake clean package

data/website/src/default.template

@@ -36,7 +36,7 @@
       </div>
     </div>
 
-    <div id="footer">&copy; 2007 Chad Woolley | Generated by <a href="http://webgen.rubyforge.org">webgen</a></div>
+    <div id="footer">&copy; 2008 Chad Woolley | Generated by <a href="http://webgen.rubyforge.org">webgen</a></div>
     {includeFile: {filename: analytics.page, escapeHTML: false, processOutput: false}}
 
   </body>

data/website/src/documentation/documentation.page

@@ -113,7 +113,7 @@ geminstaller --config=../common-config/geminstaller-common-across-projects.yml,g
 
 h3(#exceptions_option). <code>--exceptions</code> option
 
-By default, GemInstaller will not throw exceptions for errors when invoked via <code>GemInstaller.run</code> or <code>GemInstaller.autogem</code>.  This is so that any GemInstaller errors will not abort startup of Rails or any other app other apps.  However, if you do want errors to abort startup of Rails or your app, you can set this option.
+By default, GemInstaller will not throw exceptions for errors when invoked via <code>GemInstaller.install</code> or <code>GemInstaller.autogem</code>.  This is so that any GemInstaller errors will not abort startup of Rails or any other app other apps.  However, if you do want errors to abort startup of Rails or your app, you can set this option.
 
 h3(#redirect_stderr_to_stdout_option). <code>--redirect-stderr-to-stdout</code> option
 
@@ -322,7 +322,7 @@ args += " --exceptions"
 args += " --sudo" unless RUBY_PLATFORM =~ /mswin/ 
 
 # The 'install' method will auto-install gems as specified by the args and config
-GemInstaller.run(args)
+GemInstaller.install(args)
 
 # The 'autogem' method will automatically add all gems in the GemInstaller config to your load path, using the 'gem'
 # or 'require_gem' command.  Note that only the *first* version of any given gem will be loaded.

data/website/src/documentation/index.page

@@ -67,7 +67,7 @@ args += " --exceptions"
 args += " --sudo" unless RUBY_PLATFORM =~ /mswin/
 
 # The 'install' method will auto-install gems as specified by the args and config
-GemInstaller.run(args)
+GemInstaller.install(args)
 
 # The 'autogem' method will automatically add all gems in the GemInstaller config to your load path, using the 'gem'
 # or 'require_gem' command.  Note that only the *first* version of any given gem will be loaded.

data/website/src/documentation/tutorials.page

@@ -97,7 +97,7 @@ gems:
   platform: <%= RUBY_PLATFORM =~ /mswin/ ? 'mswin32' : 'ruby'%>
 </pre>
 
-Once you have your *<code>geminstaller.yml</code>* created, the last step is to add calls to <code>GemInstaller.run</code> and <code>GemInstaller.autogem</code> in your boot.rb.  They should be placed right after the block which defines the RAILS_ROOT constant, as shown below ("..." indicates omitted lines):
+Once you have your *<code>geminstaller.yml</code>* created, the last step is to add calls to <code>GemInstaller.install</code> and <code>GemInstaller.autogem</code> in your boot.rb.  They should be placed right after the block which defines the RAILS_ROOT constant, as shown below ("..." indicates omitted lines):
 
 
 *RAILS_ROOT/config/boot.rb*:
@@ -127,7 +127,7 @@ args += " --exceptions"
 args += " --sudo" unless RUBY_PLATFORM =~ /mswin/ 
 
 # The 'install' method will auto-install gems as specified by the args and config
-GemInstaller.run(args)
+GemInstaller.install(args)
 
 # The 'autogem' method will automatically add all gems in the GemInstaller config to your load path, using the 'gem'
 # or 'require_gem' command.  Note that only the *first* version of any given gem will be loaded.
@@ -225,7 +225,7 @@ config_paths = "#{File.expand_path(RAILS_ROOT)}/config/geminstaller.yml"
 args = "--config #{config_paths}" 
 args += " --exceptions"
 args += " --sudo" unless RUBY_PLATFORM =~ /mswin/ 
-GemInstaller.run(args)
+GemInstaller.install(args)
 GemInstaller.autogem(args)
 ############# End GemInstaller config
 

data/website/src/faq.page

@@ -15,7 +15,7 @@ Q: What about gems like RMagick that have platform-specific binary dependencies?
 A: You are on your own, this is outside of the scope of GemInstaller.  The geminstaller.yml file is parsed with ERB, so you can put whatever hooks you want to perform necessary system setup and/or prereq validation.  You can also google or check the RMagick home page: "http://rmagick.rubyforge.org/":http://rmagick.rubyforge.org/
 
 Q: Why don't the tests/specs run on Windows?<br/>
-A: Dunno, something with the process handling on windows for TestGemHome and EmbeddedGemServer.  The manual application tests under spec/smoketest/ work on windows, though.
+A: This has been improved with GemInstaller 0.3.0.  Using RubyGems 1.0.1 on Windows, install_smoketest.rb, autogem_smoketest.rb, and ruby test/test_all.rb all work.  See references to 'windows' on the "Code Page":code/index.html for more details.
 
 
 <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>This space intentionally left blank.<br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>

data/website/src/index.page

@@ -35,7 +35,7 @@ GemInstaller was created by "Chad Woolley":http://www.thewoolleyweb.com.
 
 h2(#news). News
 
-Version 0.3.0 of GemInstaller is released.  This is tested and working against latest RubyGems 1.0.1.
+Version 0.4.0 of GemInstaller is released.  This is tested and working against RubyGems 1.1.1.
 
 h2(#known_issues). Known Issues
 
@@ -47,6 +47,17 @@ I bet there's another bug or twoo, so please "report them if you find them":http
 
 h2(#history). History
 
+* 0.4.0
+** Fix multiplatform bug on windows where ruby platform requiring compile was selected over native mswin platform.
+** deprecate support of rubygems 0.9.5, 1.0.0, and 1.1.0.
+** Change handling of platforms on rubygems on Rubygems > 0.9.5, let RubyGems handle default.
+** rename GemInstaller.run method to GemInstaller.install, keep run as an alias for install
+** add‍warning‍if‍a‍gem‍version‍error‍is‍detected,‍with instructions‍to‍run‍geminstaller‍to‍install‍the‍missing‍version
+** Rubygems‍1.x‍compatibility
+** better internal support for uninstall options
+** use‍new,‍correct‍x86-mswin32‍format‍for‍mswin32‍platform‍gems
+** update‍warning‍message‍for‍older‍rubygems‍versions
+** made tests run on Mac OS X Leopard w/RubyGems 1.0.1
 * 0.3.0
 ** Changes to work with RubyGems >= 0.9.5 and take advantage of new platform and auto-install features.  See "notes on RubyGems version compatibility":code/index.html#rubygems_compatibility
 ** On Linux/Mac, you can now specify a RUBYGEMS_VERSION environment var to test against a specific version of RubyGems.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: geminstaller
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Chad Woolley
@@ -9,12 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-01 00:00:00 -07:00
+date: 2008-04-10 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
 description: "== FEATURES:  GemInstaller provides automated management of RubyGems.  It uses a simple YAML config file to:  * Automatically install the correct versions of all required gems wherever your app runs. * Automatically ensure installed gems and versions are consistent across multiple applications, machines, platforms, and environments  * Automatically add correct versions of gems to the ruby load path when your app runs ('require_gem'/'gem') * Automatically reinstall missing dependency gems (built in to RubyGems > 1.0) * Automatically detect correct platform to install for multi-platform gems (built in to RubyGems > 1.0) * Print YAML for \"rogue gems\" which are not specified in the current config, to easily bootstrap your config file, or find gems that were manually installed without GemInstaller. * Allow for common configs to be reused across projects or environments by supporting multiple config files, including common config file snippets, and defaults with overrides. * Allow for dynamic selection of gems, versions, and platforms to be used based on environment vars or any other logic. * Avoid the \"works on demo, breaks on production\" syndrome  == SYNOPSYS:  GemInstaller provides automated management of RubyGems."
-email: ryand-ruby@zenspider.com
+email: thewoolleyman@gmail.com
 executables: 
 - geminstaller
 extensions: []
@@ -48,7 +48,6 @@ files:
 - lib/geminstaller/backward_compatibility.rb
 - lib/geminstaller/config.rb
 - lib/geminstaller/config_builder.rb
-- lib/geminstaller/dependency_injector.rb
 - lib/geminstaller/enhanced_stream_ui.rb
 - lib/geminstaller/exact_match_list_command.rb
 - lib/geminstaller/file_reader.rb
@@ -70,6 +69,7 @@ files:
 - lib/geminstaller/output_listener.rb
 - lib/geminstaller/output_observer.rb
 - lib/geminstaller/output_proxy.rb
+- lib/geminstaller/registry.rb
 - lib/geminstaller/requires.rb
 - lib/geminstaller/rogue_gem_finder.rb
 - lib/geminstaller/ruby_gem.rb
@@ -82,8 +82,10 @@ files:
 - lib/geminstaller/valid_platform_selector.rb
 - lib/geminstaller/version_specifier.rb
 - lib/geminstaller/yaml_loader.rb
+- lib/geminstaller_rails_preinitializer.rb
 - start_local_gem_server.sh
 - test/test_all.rb
+- test/test_all_smoketests.rb
 - website/config.yaml
 - website/metainfo.yaml
 - website/src/analytics.page
@@ -121,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: geminstaller
-rubygems_version: 1.0.1
+rubygems_version: 1.1.0
 signing_key: 
 specification_version: 2
 summary: GemInstaller provides automated management of RubyGems.