fdietz-ruby-config 0.5.0 → 0.6.0

data/README.md

@@ -102,8 +102,7 @@ OS X comes with an already installed Java version.
 Use apt-get to install the essential packages:
 
  	sudo apt-get install sun-java6-jre sun-java6-jdk
-
-
+	
 ## Kudos
 
 Thanks to Relevance for their work on [Ruby Switcher](http://github.com/relevance/etc/blob/3d607c8ac2f76077f27c3cbc0140b04a89f546be/bash/ruby_switcher.sh) which I used as the basis for the installation of various Ruby Runtimes.

data/ReleaseNotes.md

@@ -0,0 +1,10 @@
+# Ruby-Config Release Notes
+
+## ruby-config 0.6
+* Set GEM_HOME correctly when installing new gems 
+* Ensure that ruby-config gem is installed on each runtime gem path
+
+## ruby-config 0.5
+* Added support for Ruby 1.8.6
+* Added support for Ruby 1.8.7
+* Added support for Ruby 1.9.1

data/VERSION

@@ -0,0 +1 @@
+0.6.0

data/lib/ruby_config/config.rb

@@ -3,15 +3,21 @@ module RubyConfig
     
     attr_accessor :hash
     
-    DEFAULTS = {'default' => 'ruby-leopard-1.8.6'}
+    #DEFAULTS = { 'default' => 'ruby-leopard-1.8.6' }
     
     def initialize(path)
       @config_file = File.join(path, "config.yml")
-      File.exist?(@config_file) ? load : @hash = {}.merge(DEFAULTS)      
-
-      #puts "config: #{@hash.inspect}"
+      File.exist?(@config_file) ? load : @hash = {}#.merge(DEFAULTS)      
     end
 
+    def default_handle
+      get('default')
+    end
+    
+    def default_handle=(handle)
+      set('default', handle)
+    end
+    
     def get(key)
       @hash[key] 
     end
@@ -21,11 +27,11 @@ module RubyConfig
     end
         
     def save
-      RubyConfig::FileHelper.store_yml(@config_file, @hash)
+      File.open(@config_file, 'w') { |out| YAML.dump( @hash, out ) }
     end
     
     def load
-      @hash = RubyConfig::FileHelper.load_yml(@config_file)
+      @hash = File.open(@config_file) { |yf| YAML::load( yf ) }
     end
         
     def to_hash

data/lib/ruby_config/installer.rb

@@ -0,0 +1,63 @@
+require 'ruby_config/rubygems'
+
+module RubyConfig
+
+  class Installer
+    
+    RUBY_CONFIG_GEM_NAME = 'fdietz-ruby-config'
+    
+    attr_reader :rubygems
+    
+    def initialize(ruby_config_path)
+      @ruby_config_path = ruby_config_path
+      @rubygems = RubyConfig::Rubygems.new(ruby_config_path)
+      
+      ensure_config_directory_exists
+    end
+
+    def install(runtime)       
+      runtime.do_install 
+
+      # TOOD: only cleanup runtime-specific files
+      cleanup_tmp_dir
+    end
+    
+    def post_install(runtime)
+      @rubygems.install(runtime) unless runtime.rubygems_installed?
+    
+      runtime.post_install
+    
+      # install thyself
+      @rubygems.gem_install(RUBY_CONFIG_GEM_NAME)
+      
+      runtime.runtime_specific_gems.each { |gem| @rubygems.gem_install(gem)  }
+    end
+
+    def runtime_install_path
+      File.join(@ruby_config_path, 'runtimes')
+    end
+
+    def tmp_path
+      File.join(@ruby_config_path, 'tmp')
+    end
+    
+    private
+      
+      def cleanup_tmp_dir
+        empty_dir(tmp_path)
+      end
+      
+      def empty_dir(path)
+        Dir[File.join(path, '*')].each do |file|
+          FileUtils.remove_entry_secure(file) if Pathname.new(file).directory?
+        end
+      end      
+            
+      def ensure_config_directory_exists
+        FileUtils.mkdir_p(@ruby_config_path)
+        FileUtils.mkdir_p(tmp_path)      
+        FileUtils.mkdir_p(runtime_install_path)
+      end
+   
+  end
+end

data/lib/ruby_config/registry.rb

@@ -1,5 +1,7 @@
 require 'ruby_config/config'
-require 'ruby_config/file_helper'
+require 'ruby_config/runtime_base'
+
+Dir.glob(File.join(File.dirname(__FILE__), 'runtimes/*.rb')).each {|f| require f }
 
 module RubyConfig
   
@@ -9,92 +11,54 @@ module RubyConfig
     
     def initialize(ruby_config_path)
       @ruby_config_path = ruby_config_path
-      @runtime_install_path = File.join(ruby_config_path, "runtimes")
-      @tmp_path = File.join(ruby_config_path, "tmp")
-      
-      @config = RubyConfig::Config.new(@ruby_config_path)
-      
-      @list = []
-      ensure_config_directory_exists
-    end
-
-    def add(runtime_const)
-      @list << runtime_const.new(@runtime_install_path, @tmp_path)
+      load_available_runtimes.each { |runtime| add(runtime) }
     end
     
-    def default?(handle)
-      handle == default_handle
-    end
-        
-    def first
-      @list.first
+    def list
+      @list ||= []
     end
     
-    def exist?(handle)
+    def add(runtime_const)
+      list << runtime_const.new(runtime_install_path, tmp_path)
+    end
+                
+    def exists?(handle)
       !!get(handle)
     end
     
     def get(handle)
       handle_int = handle.to_i # returns 0 if no fixnum
-      if handle_int > 0 && handle_int << @list.size
-        @list.values_at(handle_int-1).first
+      if handle_int > 0 && handle_int << list.size
+        list.values_at(handle_int-1).first
       else
-        @list.find { |item| item.handle == handle  }
+        list.find { |item| item.handle == handle  }
       end
     end 
     
     def list_available
-      @list
+      list
     end
 
     def list_installed
-      @list.find_all { |item| item.already_installed?}
-    end
-        
-    def install(runtime)      
-      runtime.do_install unless runtime.already_installed?
-      
-      use(runtime)
-      
-      runtime.do_post_install
-      
-      runtime      
+      list.find_all { |item| item.already_installed?}
     end
-        
-    def use(runtime)    
-      set_default_handle(runtime.handle)
-      @config.save
-      
-      set_symlinks_to_runtime(runtime)
-      
-      runtime      
-    end
-
+                
     private
-    
-    def set_symlinks_to_runtime(runtime)
-      ruby_path = File.join(@ruby_config_path, "ruby")
-      gem_path = File.join(@ruby_config_path, "gem")
-      RubyConfig::FileHelper.delete_file(ruby_path)
-      RubyConfig::FileHelper.delete_file(gem_path)
-      RubyConfig::FileHelper.set_symlink(runtime.ruby_home_path, ruby_path)
-      RubyConfig::FileHelper.set_symlink(runtime.gem_home_path, gem_path)
-    end
+
+      def load_available_runtimes
+        [ RubyConfig::Runtimes::LeopardRuntime, RubyConfig::Runtimes::RubyEnterpriseEditionRuntime,
+          RubyConfig::Runtimes::JRubyRuntime, RubyConfig::Runtimes::Ruby19Runtime,
+          RubyConfig::Runtimes::Ruby186Runtime, RubyConfig::Runtimes::Ruby187Runtime 
+        ]
+      end
         
-    def default_handle
-      @config.get("default")
-    end
-    
-    def set_default_handle(default_handle)
-      @config.set("default", default_handle)
-    end
+      def runtime_install_path
+        File.join(@ruby_config_path, 'runtimes')
+      end
     
-    def ensure_config_directory_exists
-      FileUtils.mkdir_p(@ruby_config_path)
-      FileUtils.mkdir_p(@tmp_path)      
-      FileUtils.mkdir_p(@runtime_install_path)
-    end
-
+      def tmp_path
+        File.join(@ruby_config_path, 'tmp')
+      end
+      
   end
-  
 end

data/lib/ruby_config/rubygems.rb

@@ -0,0 +1,61 @@
+module RubyConfig
+
+  class Rubygems
+
+    VERSION = "1.3.5"
+    ARCHIVE_NAME = "rubygems-#{VERSION}"
+    ARCHIVE_FILE_NAME = "#{ARCHIVE_NAME}.tgz"
+    DOWNLOAD_URL = "http://rubyforge.org/frs/download.php/60718/#{ARCHIVE_FILE_NAME}"
+        
+    def initialize(ruby_config_path)
+      @ruby_config_path = ruby_config_path
+    end
+    
+    def install(runtime)
+      download_file(DOWNLOAD_URL, archive_file_name) unless archive_exists?
+
+      extract_tar_gz(archive_file_name, tmp_path)
+      
+      ruby_gems_setup(archive_path, runtime.ruby_executable_path, runtime.additional_library_path)
+    end
+    
+    def gem_install(gem_technical_name)
+      gem_executable_path = File.join(@ruby_config_path, 'gem')
+      system "GEM_HOME=#{gem_executable_path} gem install -q --no-ri --no-rdoc #{gem_technical_name}"
+    end 
+
+    private 
+      
+      # system("ruby setup.rb --prefix=#{additional_library_path}")
+      def ruby_gems_setup(path, ruby_executable_path, additional_library_path)
+        FileUtils.cd(path)
+        puts "ruby executable path: #{ruby_executable_path}"
+        system("#{ruby_executable_path} setup.rb  --prefix=#{additional_library_path}")
+      end
+      
+      def extract_tar_gz(tgz_archive_path, destination_path)
+        system("tar xfvz #{tgz_archive_path} -C #{destination_path}")
+      end    
+    
+      def tmp_path
+        File.join(@ruby_config_path, 'tmp')
+      end
+    
+      def archive_file_name
+        File.join(tmp_path, ARCHIVE_FILE_NAME)
+      end
+      
+      def archive_path
+        File.join(tmp_path, ARCHIVE_NAME)
+      end
+    
+      def archive_exists?
+        File.exist?(archive_path)
+      end
+     
+      def download_file(url, destination_path)
+        system("wget #{url} --output-document=#{destination_path}")
+      end
+    
+  end
+end

data/lib/ruby_config/runner.rb

@@ -1,8 +1,9 @@
+require 'ruby_config/registry'
 require 'ruby_config/runtime_base'
 require 'ruby_config/options_parser'
 require 'ruby_config/profile_config'
-
-Dir.glob(File.join(File.dirname(__FILE__), 'runtimes/*.rb')).each {|f| require f }
+require 'ruby_config/installer'
+require 'ruby_config/switcher'
 
 module RubyConfig
 
@@ -11,8 +12,11 @@ module RubyConfig
     RUBY_CONFIG_PATH = File.join(ENV['HOME'], ".ruby-config")
     
     def initialize
-      @registry = RubyConfig::Registry.new(RUBY_CONFIG_PATH)
-      load_available_runtimes.each { |runtime| @registry.add(runtime) }
+      @rubygems = RubyConfig::Rubygems.new(RUBY_CONFIG_PATH)
+      @registry = RubyConfig::Registry.new(RUBY_CONFIG_PATH)      
+      @installer = RubyConfig::Installer.new(RUBY_CONFIG_PATH)
+      @switcher = RubyConfig::Switcher.new(RUBY_CONFIG_PATH)
+      @config = RubyConfig::Config.new(RUBY_CONFIG_PATH)
     end
     
     def run
@@ -75,12 +79,12 @@ module RubyConfig
     end
     
     def uninstall(handle)
-      unless @registry.exist?(handle)
+      unless @registry.exists?(handle)
         puts "Unknown ruby runtime: #{handle}."
         return
       end
-      
-      if @registry.default?(handle)
+            
+      if default?(handle)
         puts "Can't delete currently selected runtime."
         return
       end
@@ -92,46 +96,41 @@ module RubyConfig
         puts "Done!"
       end
     end
-    
-    def load_available_runtimes
-      list = []
-      list << RubyConfig::Runtimes::LeopardRuntime
-      list << RubyConfig::Runtimes::RubyEnterpriseEditionRuntime
-      list << RubyConfig::Runtimes::JRubyRuntime
-      list << RubyConfig::Runtimes::Ruby19Runtime
-      list << RubyConfig::Runtimes::Ruby186Runtime
-      list << RubyConfig::Runtimes::Ruby187Runtime
-      list
-    end
-    
+        
     def help(options_parser)
       print_info_header
       options_parser.print_help
     end
     
     def install_runtime(handle)
-      unless @registry.exist?(handle)
+      unless @registry.exists?(handle)
         puts "Unknown ruby runtime: #{handle}"
         return
       end
       
       runtime = @registry.get(handle)
             
-      puts "#{runtime} already installed" if runtime.already_installed?
+      if runtime.already_installed?
+        puts "#{runtime} already installed" 
+      else
+        @installer.install(runtime)
+        @switcher.switch(runtime)
+        @installer.post_install(runtime)
+        
+        print_use_results(runtime)
+      end
       
-      @registry.install(runtime)
-      print_use_results(runtime)
     end
     
     def use_runtime(handle)
-      unless @registry.exist?(handle)
+      unless @registry.exists?(handle)
         puts "Unknown ruby runtime: #{handle}"
         return
       end
       
       runtime = @registry.get(handle)
       
-      if @registry.use(runtime)
+      if @switcher.switch(runtime)
         #display_ruby_version
         #print_use_results(runtime)
         display_ruby_version(runtime)
@@ -171,7 +170,7 @@ module RubyConfig
     
     def print_runtime(index, item)
       print "#{index+1}) "
-      print @registry.default?(item.handle) ? "*" : " "
+      print default?(item.handle) ? "*" : " "
       puts " #{item}"
     end
     
@@ -180,20 +179,20 @@ module RubyConfig
       puts " RUBY_HOME=#{runtime.ruby_home_path}"
       puts " GEM_HOME=#{runtime.gem_home_path}"
       
-      unless runtime.bash_alias.empty?
-        puts "\nalias:"
-        print_alias(runtime.bash_alias)
-      end
+      # unless runtime.bash_alias.empty?
+      #   puts "\nalias:"
+      #   print_alias(runtime.bash_alias)
+      # end
       
       puts "\nruby -v:"
       display_system_ruby_version
     end
     
-    def print_alias(hash)
-      hash.each do |key, value|
-        puts " alias #{key}=\"#{value}\""
-      end
-    end
+    # def print_alias(hash)
+    #   hash.each do |key, value|
+    #     puts " alias #{key}=\"#{value}\""
+    #   end
+    # end
     
     def display_ruby_version(runtime)
       puts "Running: #{runtime}"
@@ -208,5 +207,9 @@ module RubyConfig
       exit
     end
 
+    def default?(handle)
+      handle == @config.default_handle
+    end
+    
   end
 end

data/lib/ruby_config/runtime_base.rb

@@ -8,32 +8,28 @@ module RubyConfig
       @install_path = File.join(install_path, handle)
       @tmp_path = tmp_path
     end
-    
+  
     def do_install
-      create_directory_structure
-      
-      download_file_unless_exists(archive_file_name, archive_download_url)
-      
-      # runtime specific installation part
+      prepare_install
       install
-          
-      cleanup_tmp_dir
     end
-        
+
+    # called after the archive was successfully downloaded to tmp/archive_file_name directory
+    # you might want to:
+    # * extract archive
+    # * configure && make && make install
     def install
       raise "Not implemented yet!"
     end
-
-    def do_post_install
-      post_install
-      
-      install_rubygems unless File.exists?(gem_executable_path)
-      
-      # install thyselve
-      #install_gem('ruby-config')
-    end
     
-    # called after install and runtime is enabled
+    # called after:
+    # * runtime.install
+    # * switch to newly installed runtime
+    # * rubygems installation
+    #
+    # you might want to:
+    # * install additional rubygems
+    # * set symlinks
     def post_install
     end
     
@@ -56,13 +52,19 @@ module RubyConfig
       raise "Not implemented yet!"
     end
 
+    # optional 
+    # Array of gem names of type string
+    def runtime_specific_gems
+      []
+    end
+    
     # example: 1.8 or 1.9
     def major_version
       '1.8'
     end
 
     # hash (key: alias name, value: alias bash script)
-    def bash_alias;{};end
+    # def bash_alias;{};end
     
     def ruby_home_path
       File.join(@install_path, 'ruby')
@@ -104,60 +106,44 @@ module RubyConfig
     def delete
       FileUtils.remove_entry_secure(@install_path)
     end
-    
-    protected
 
-      def install_rubygems
-        version = "1.3.5"
-        archive_name = "rubygems-#{version}"
-        archive_file_name = "#{archive_name}.tgz"
-        download_url = "http://rubyforge.org/frs/download.php/60718/#{archive_file_name}"
-        
-        download_file_unless_exists(archive_file_name, download_url)
-        
-        extract_tar_gz(File.join(@tmp_path, archive_file_name), @tmp_path)
-        FileUtils.cd(File.join(@tmp_path, archive_name))
-        #system("ruby setup.rb --prefix=#{additional_library_path}")
-        system("ruby setup.rb")
-      end
-      
-      def cleanup_tmp_dir
-        empty_dir(@tmp_path)
+    def create_directory_structure
+      [@install_path, @tmp_path, ruby_home_path, ruby_bin_path, gem_home_path].each do |path|
+        FileUtils.mkdir_p(path)
       end
-      
-      def create_directory_structure
-        FileUtils.mkdir_p(@install_path)
-        FileUtils.mkdir_p(@tmp_path)
-        FileUtils.mkdir_p(ruby_home_path)
-        FileUtils.mkdir_p(ruby_bin_path)
-        FileUtils.mkdir_p(gem_home_path)
-      end      
-      
-      def download_file_unless_exists(archive, url)
-        archive_path = File.join(@tmp_path, archive)
-        unless File.exist?(archive_path)
-          path = download_file_wget(url, archive_path)
-          puts "#{archive} downloaded successfully to #{archive_path}"
-        end
+    end      
+    
+    def archive_path
+      File.join(@tmp_path, archive_file_name)
+    end
+    
+    def prepare_install
+      create_directory_structure                  
+      download_archive unless archive_exists?  
+    end
+    
+    def rubygems_installed?
+      File.exists?(gem_executable_path)      
+    end
+        
+    private 
+    
+      def archive_exists?
+        File.exist?(archive_path)
       end
-       
-     def download_file_wget(url, destination_path)
-       system("wget #{url} --output-document=#{destination_path}")
-     end
 
-     def extract_tar_gz(archive_path, destination_path)
-       system("tar xfvz #{archive_path} -C #{destination_path}")
-     end
-      
-     def empty_dir(path)
-       Dir[File.join(path, '*')].each do |file|
-         FileUtils.remove_entry_secure(file) if Pathname.new(file).directory?
-       end
-     end
+      def download_archive
+        download_file(archive_download_url, archive_path)
+      end
+        
+      def download_file(url, destination_path)
+        system("wget #{url} --output-document=#{destination_path}")
+      end  
+     
+      def extract_tar_gz(archive_path, destination_path)
+        system("tar xfvz #{archive_path} -C #{destination_path}")
+      end    
      
-     def gem_install(gem_technical_name)
-       system "gem install -q --no-ri --no-rdoc #{gem_technical_name}"
-     end
   end
 
-  end
+end

data/lib/ruby_config/runtimes/jruby_runtime.rb

@@ -43,9 +43,12 @@ module RubyConfig
 
       def post_install
         # install_nailgun
-        install_jruby_specific_gem
       end
-  
+
+      def runtime_specific_gems
+        ['rake', 'jruby-openssl']
+      end
+      
       private
       
       def copy_archive_content_to_ruby_directory
@@ -55,16 +58,11 @@ module RubyConfig
             
       # there is already a jgem and gem, therefore no symlink required for gem!
       def set_symlinks_for_jruby_commands
-        jruby_commands_requiring_symlinks.each do |item|
-          RubyConfig::FileHelper.set_symlink(item.first, bin_path(item.last))
+        %w(ruby irb).each do |item|
+          FileUtils.ln_s(bin_path("j#{item}"), bin_path(item))
         end
       end
-      
-      def jruby_commands_requiring_symlinks
-        [[bin_path('jruby'), 'ruby' ], 
-         [bin_path('jirb') , 'irb'  ]]
-      end
-      
+            
       # CHECK: can we download an archive which preserves permissions instead?
       def chmod_executables
         %w(jruby jgem gem jirb).each { |command| chmod_executable_for_others(bin_path(command)) }  
@@ -85,12 +83,7 @@ module RubyConfig
         FileUtils.cd(nailgun_path)
         system "#{nailgun_path}/make"
       end
-      
-      def install_jruby_specific_gem
-        gem_install("rake")
-        gem_install("jruby-openssl")
-      end
-      
+         
     end
   
   end

data/lib/ruby_config/runtimes/ruby_enterprise_edition_runtime.rb

@@ -36,6 +36,8 @@ module RubyConfig
       
       private
         def ree_installer
+          puts "path= #{File.join(@tmp_path, RUBY_ENTERPRISE_EDITION_DIR)}"
+          puts File.exists?(File.join(@tmp_path, RUBY_ENTERPRISE_EDITION_DIR))
           FileUtils.cd(File.join(@tmp_path, RUBY_ENTERPRISE_EDITION_DIR))
           system("./installer -a #{@install_path}/ruby --dont-install-useful-gems")
         end

data/lib/ruby_config/switcher.rb

@@ -0,0 +1,47 @@
+module RubyConfig
+
+  class Switcher
+    
+    attr_reader :config
+    
+    def initialize(ruby_config_path)
+      @ruby_config_path = ruby_config_path
+      @config = RubyConfig::Config.new(@ruby_config_path)
+    end
+    
+    def switch(runtime)    
+      set_default_handle(runtime.handle)
+      set_symlinks_to_runtime(runtime)
+    end
+    
+    def set_symlinks_to_runtime(runtime)
+      delete_existing_symlinks
+      create_symlinks(runtime)
+    end
+    
+    private
+      def ruby_path
+        File.join(@ruby_config_path, "ruby")
+      end
+      
+      def gem_path
+        File.join(@ruby_config_path, "gem")
+      end
+
+      def create_symlinks(runtime)
+        FileUtils.ln_s(runtime.ruby_home_path, ruby_path)
+        FileUtils.ln_s(runtime.gem_home_path, gem_path)
+      end
+      
+      def delete_existing_symlinks
+        [ruby_path, gem_path].each do |path|
+          File.delete(path) if File.exist?(path)
+        end
+      end
+                 
+      def set_default_handle(handle)
+        @config.default_handle = handle
+        @config.save
+      end
+  end
+end

data/lib/ruby_config.rb

@@ -9,12 +9,12 @@ require 'yaml'
 require 'highline/import'
 
 require 'ruby_config/runner'
-require 'ruby_config/registry'
-require 'ruby_config/file_helper'
+#require 'ruby_config/registry'
 
 module RubyConfig  
   def self.version
-    RubyConfig::FileHelper.read_content_from_file(File.join(File.dirname(__FILE__), '..', 'VERSION'))
+    version_path = File.join(File.dirname(__FILE__), '..', 'VERSION')
+    File.open(version_path, "r")  { |file| file.read  }
   end
 end
 

data/test/unit/installer_test.rb

@@ -0,0 +1,33 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
+
+class InstallerTest < Test::Unit::TestCase
+  
+  def setup
+    @root = "/tmp/ruby-config"
+    FileUtils.mkdir(@root)
+    
+    @runtime = RuntimeBaseTestHelper::RuntimeBaseStub.new(File.join(@root, "install"), File.join(@root, "tmp"))
+    @installer = RubyConfig::Installer.new(@root)
+  end
+  
+  def teardown
+    FileUtils.rm_rf(@root)
+  end
+
+  test "should create config directories" do
+    @installer = RubyConfig::Installer.new(@root)
+    File.exists?(@installer.runtime_install_path)
+    File.exists?(@installer.tmp_path)
+  end  
+    
+end
+
+module RuntimeBaseTestHelper
+  class RuntimeBaseStub < RubyConfig::RuntimeBase
+    def install;end
+    def archive_file_name;"filename";end
+    def archive_download_url;"http://download.com";end
+    def handle;"handle";end
+    def description;"description";end
+  end
+end

data/test/unit/registry_test.rb

@@ -1,103 +1,37 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
   
-class RegistryInitializeTest < Test::Unit::TestCase
+class RegistryTest < Test::Unit::TestCase
   def setup
-    @root = File.join("/tmp", "test")
-    @registry = RubyConfig::Registry.new(@root)
+    @registry = RubyConfig::Registry.new("/tmp/ruby-config")
   end
-  
-  def teardown
-    FileUtils.rm_rf(@root)
-  end
-  
-  test "should ensure config directories exist" do
-    assert File.exist?(@root)
-    assert File.exist?(File.join(@root,"runtimes"))
-    assert File.exist?(File.join(@root,"tmp"))
+    
+  test "should list all available runtimes" do
+    assert_equal 6, @registry.list_available.size
   end
-      
-end
-
-
-class RegistryInstallTest < Test::Unit::TestCase
   
-  def setup
-    @root = File.join("/tmp", "test")
-    @registry = RubyConfig::Registry.new(@root)
-    @registry.add(RegistryTestHelper::RuntimeBaseStub)
-    @runtime = @registry.get("handle")
+  test "should list all installed runtimes" do    
+    @registry.list.first.expects(:already_installed?).returns(true)
+    assert_equal 1, @registry.list_installed.size
   end
 
-  def teardown
-    FileUtils.rm_rf(@root)
+  test "should return runtime based on handle" do
+    @registry.add(RubyConfig::Runtimes::LeopardRuntime)
+    
+    assert_equal @registry.list.first, @registry.get('ruby-leopard-1.8.6')
   end
-  
-  test "should install using specific runtime implementation" do
-    @registry.install(@runtime)
 
-    assert File.exist?(@runtime.ruby_home_path)
-    assert File.exist?(@runtime.gem_home_path)
-    assert File.exist?(File.join(@runtime.ruby_bin_path, "ruby"))
-    assert File.exist?(File.join(@runtime.ruby_bin_path, "gem"))
-    assert File.exist?(File.join(@runtime.ruby_bin_path, "irb"))
-  end
-  
-  test "should make use of installed runtime" do
-    @registry.expects(:use).with(@runtime)
-    @registry.install(@runtime)
-  end
-  
-  test "should call post install methods" do
-    @runtime.expects(:post_install)
-    @registry.install(@runtime)
+  test "should return runtime based on index" do
+    @registry.add(RubyConfig::Runtimes::LeopardRuntime)
+    
+    assert_equal @registry.list.first, @registry.get(1)
   end
-end
-
 
-class RegistryUseTest < Test::Unit::TestCase
-  
-  def setup
-    @root = File.join("/tmp", "test")
-    @registry = RubyConfig::Registry.new(@root)
-    @registry.add(RegistryTestHelper::RuntimeBaseStub)
-    @runtime = @registry.get("handle")
-    @registry.install(@runtime)
-  end
-  
-  def teardown
-    FileUtils.rm_rf(@root)
-  end
-  
-  test "should set default handle in config file" do
-    @registry.use(@runtime)
+  test "should return return true if runtime exists" do
+    @registry.add(RubyConfig::Runtimes::LeopardRuntime)
     
-    config = File.open(File.join(@registry.ruby_config_path, "config.yml")) { |yf| YAML::load( yf ) }
-    assert_equal @runtime.handle, config["default"]
+    assert @registry.exists?('ruby-leopard-1.8.6')
   end
   
-  test "should create symlinks to installed runtime" do
-    @registry.use(@runtime)
-    assert Pathname.new(File.join(@registry.ruby_config_path, "ruby")).symlink?
-    assert Pathname.new(File.join(@registry.ruby_config_path, "gem")).symlink?
-  end
 end
 
-module RegistryTestHelper
-  
-  class RuntimeBaseStub < RubyConfig::RuntimeBase
-    # create fake ruby and gem executables
-    def install
-      FileUtils.touch(File.join(ruby_bin_path, "ruby"))
-      FileUtils.touch(File.join(ruby_bin_path, "gem"))
-      FileUtils.touch(File.join(ruby_bin_path, "irb"))
-    end
-  
-    def archive_file_name;"archive.zip";end
-    def archive_download_url;"http://download.com/archive.zip";end
-    def handle;"handle";end
-    def description;"description";end
-    # no download for tests
-    def download_file_unless_exists(archive, url);end;
-  end
-  
-end
+

data/test/unit/runtime_base_test.rb

@@ -1,102 +1,75 @@
 require File.join(File.dirname(__FILE__), '..', 'test_helper')
 
-class RuntimeBaseInitializeTest < Test::Unit::TestCase
-  
-  test "should set install path" do
-    r = RuntimeBaseTestHelper::RuntimeBaseStub.new("/install", "/tmp_path")
-    assert_equal "/install/handle", r.install_path
-  end  
-end
+class RuntimeBaseTest < Test::Unit::TestCase
 
-class RuntimeBaseDoInstallTest < Test::Unit::TestCase
-  
   def setup
-    @root = "/tmp/test"
+    @root = "/tmp/ruby-config"
     FileUtils.mkdir(@root)
+    FileUtils.mkdir(File.join(@root, 'tmp'))
+    @runtime = RuntimeBaseTestHelper::RuntimeBaseStub.new(File.join(@root, "runtimes"), File.join(@root, "tmp"))
   end
-  
-  def teardown
-    FileUtils.rm_rf(@root)
-  end
-  
-  test "should create directory structure" do
-    r = RuntimeBaseTestHelper::RuntimeBaseStub.new(File.join(@root, "install"), File.join(@root, "tmp"))
-    r.stubs(:download_file_unless_exists)
-    r.do_install
-    
-    assert File.exist?(r.install_path)
-    assert File.exist?(r.tmp_path)
-    assert File.exist?(File.join(r.install_path,"gem"))
-  end  
-  
-  test "should install runtime and cleanup tmp unless installed already" do
-    r = RuntimeBaseTestHelper::RuntimeBaseStub.new(File.join(@root, "install"), File.join(@root, "tmp"))
-    r.stubs(:download_file_unless_exists)
-    
-    r.expects(:install).once
-    r.expects(:cleanup_tmp_dir).once  
-    r.do_install
-  end
-  
-end
 
-class RuntimeBaseDownloadFileUnlessExists < Test::Unit::TestCase
-  
-  def setup
-    @root = "/tmp/test"
-    FileUtils.mkdir(@root)
-    
-    @runtime = RuntimeBaseTestHelper::RuntimeBaseStub.new(File.join(@root, "install"), File.join(@root, "tmp"))
-    @runtime.send(:create_directory_structure)
-  end
-  
   def teardown
     FileUtils.rm_rf(@root)
   end
-  
-  test "should download file unless it exist already" do
-    @runtime.expects(:download_file_wget).once    
-    @runtime.send(:download_file_unless_exists, "archive.zip", "url")    
-  end
-  
-  test "should NOT download file if it exists already" do
-    archive_path = File.join(@runtime.tmp_path, "archive.zip")
-    FileUtils.touch(archive_path)
-    @runtime.expects(:download_file_wget).never
-    
-    @runtime.send(:download_file_unless_exists, "archive.zip", "url")
-  end
 
-end
+  test "should set install path" do
+    r = RuntimeBaseTestHelper::RuntimeBaseStub.new("/install", "/tmp_path")
+    assert_equal "/install/handle", r.install_path
+  end  
 
-class RuntimeBaseIfAlreadyInstalledTest < Test::Unit::TestCase
-  
-  def setup
-    @root = "/tmp/test"
-    FileUtils.mkdir(@root)
-    
-    @runtime = RuntimeBaseTestHelper::RuntimeBaseStub.new(File.join(@root, "install"), File.join(@root, "tmp"))
-    @runtime.send(:create_directory_structure)
-    FileUtils.mkdir_p(@runtime.ruby_bin_path)
-  end
-  
-  def teardown
-    FileUtils.rm_rf(@root)
-  end
-  
   test "should return true if ruby bin found" do
+    FileUtils.mkdir_p(File.join(@runtime.ruby_bin_path))
     bin_path = File.join(@runtime.ruby_bin_path, "ruby")
     FileUtils.touch(bin_path)
-    
+
     assert_equal true, @runtime.already_installed?
   end
-    
+
   test "should return false if ruby bin NOT found" do
     assert_equal false, @runtime.already_installed?
   end
-  
+
+  test "should download archive unless it exist already" do 
+    @runtime.stubs(:create_directory_structure)
+
+    @runtime.expects(:download_archive)
+    @runtime.prepare_install
+  end
+
+  test "should NOT download archive if it exists already" do
+    @runtime.stubs(:create_directory_structure)
+
+    FileUtils.touch(@runtime.archive_path)
+
+    @runtime.expects(:download_archive).never
+    @runtime.prepare_install
+  end
+
+  test "should create initial directory structure" do
+    @runtime.create_directory_structure
+
+    assert File.exists?(@runtime.ruby_bin_path)
+    assert File.exists?(@runtime.gem_home_path)
+  end
+
+  test "should delete runtime directories" do
+    create_fake_runtime_directories
+    @runtime.delete
+
+    assert !File.exists?(@runtime.ruby_home_path)
+    assert !File.exists?(@runtime.gem_home_path)
+  end
+
+  private
+  def create_fake_runtime_directories
+    FileUtils.mkdir_p(@runtime.ruby_home_path)
+    FileUtils.mkdir_p(@runtime.gem_home_path)
+  end
+
 end
 
+
 module RuntimeBaseTestHelper
   class RuntimeBaseStub < RubyConfig::RuntimeBase
     def install;end

data/test/unit/switcher_test.rb

@@ -0,0 +1,78 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
+
+class SwitcherTest < Test::Unit::TestCase
+  
+  def setup
+    @root = "/tmp/ruby-config"
+    FileUtils.mkdir(@root)
+    
+    @runtime = RuntimeBaseTestHelper::RuntimeBaseStub.new(File.join(@root, "runtimes"), File.join(@root, "tmp"))
+    @switcher = RubyConfig::Switcher.new(@root)
+  end
+  
+  def teardown
+    FileUtils.rm_rf(@root)
+  end
+
+  test "should set default handle to selected runtime handle" do
+    @switcher.config.stubs(:save)
+    @switcher.stubs(:set_symlinks_to_runtime)
+    
+    @switcher.switch(@runtime)
+    
+    assert_equal 'handle', @switcher.config.default_handle
+  end  
+  
+  test "should set symlinks to ruby and gem" do
+    @switcher.stubs(:set_default_handle)
+    @switcher.stubs(:delete_existing_symlinks)
+    
+    create_fake_ruby_and_gem_directories
+    @switcher.switch(@runtime)
+    
+    assert File.exists?(ruby_path)
+    assert File.exists?(gem_path)
+  end  
+  
+  test "should delete obsolete existing symlinks" do
+    @switcher.stubs(:set_default_handle)
+    
+    create_fake_ruby_and_gem_directories
+    create_fake_ruby_and_gem_symlinks
+    
+    @switcher.switch(@runtime)
+    assert File.exists?(ruby_path)
+    assert File.exists?(gem_path)
+  end
+  
+  private
+    def create_fake_ruby_and_gem_directories
+      FileUtils.mkdir_p(@runtime.ruby_home_path)
+      FileUtils.mkdir_p(@runtime.gem_home_path)
+    end
+    
+    def create_fake_ruby_and_gem_symlinks
+      FileUtils.ln_s(@runtime.ruby_home_path, ruby_path)
+      FileUtils.ln_s(@runtime.gem_home_path, gem_path)
+    end
+    
+    def ruby_path
+      File.join(@root, 'ruby')
+    end
+    
+    def gem_path
+      File.join(@root, 'gem')
+    end
+
+end
+
+
+module RuntimeBaseTestHelper
+  class RuntimeBaseStub < RubyConfig::RuntimeBase
+    def install;end
+    def archive_file_name;"filename";end
+    def archive_download_url;"http://download.com";end
+    def handle;"handle";end
+    def description;"description";end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fdietz-ruby-config
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Frederik Dietz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-29 00:00:00 -07:00
+date: 2009-09-05 00:00:00 -07:00
 default_executable: ruby-config
 dependencies: []
 
@@ -22,13 +22,17 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
+- README.md
+- ReleaseNotes.md
+- VERSION
 - bin/ruby-config
 - lib/ruby_config.rb
 - lib/ruby_config/config.rb
-- lib/ruby_config/file_helper.rb
+- lib/ruby_config/installer.rb
 - lib/ruby_config/options_parser.rb
 - lib/ruby_config/profile_config.rb
 - lib/ruby_config/registry.rb
+- lib/ruby_config/rubygems.rb
 - lib/ruby_config/runner.rb
 - lib/ruby_config/runtime_base.rb
 - lib/ruby_config/runtimes/jruby_runtime.rb
@@ -38,8 +42,8 @@ files:
 - lib/ruby_config/runtimes/ruby19_runtime.rb
 - lib/ruby_config/runtimes/ruby_enterprise_edition_runtime.rb
 - lib/ruby_config/runtimes/ruby_from_source_helper.rb
-- README.md
-has_rdoc: false
+- lib/ruby_config/switcher.rb
+has_rdoc: true
 homepage: http://github.com/fdietz/ruby-config
 licenses: 
 post_install_message: 
@@ -64,9 +68,11 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Install and Switch between various Ruby Runtimes easily
 test_files: 
+- test/unit/installer_test.rb
 - test/unit/profile_config_test.rb
 - test/unit/registry_test.rb
 - test/unit/runtime_base_test.rb
+- test/unit/switcher_test.rb

data/lib/ruby_config/file_helper.rb

@@ -1,36 +0,0 @@
-module RubyConfig
-  class FileHelper
-        
-    class << self
-      def write_content_to_file(content, path)
-        File.open(path, 'w') { |file| file.write content }
-      end
-      
-      def append_content_to_file(content, path)
-        File.open(path, 'a') { |file| file.write content }
-      end
-    
-      def read_content_from_file(path)
-        File.open(path, "r")  { |file| file.read  }
-      end
-      
-      def store_yml(path, data)
-        File.open(path, 'w') { |out| YAML.dump( data, out ) }
-      end
-    
-      def load_yml(path)
-        File.open(path) { |yf| YAML::load( yf ) }
-      end
-    
-      def delete_file(path)
-        File.delete(path) if File.exist?(path)
-      end
-            
-      def set_symlink(target_path, symlink_path)
-        FileUtils.ln_s(target_path, symlink_path)
-      end
-      
-    end
-    
-  end
-end