fdietz-ruby-config 0.7.0 → 0.8.0

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.8.0

data/lib/ruby_config/installer.rb

@@ -18,7 +18,7 @@ module RubyConfig
     def install(runtime)       
       runtime.do_install 
 
-      # TOOD: only cleanup runtime-specific files
+      # TODO: only cleanup runtime-specific files
       cleanup_tmp_dir
     end
     
@@ -27,10 +27,19 @@ module RubyConfig
     
       runtime.post_install
     
-      # install thyself
-      @rubygems.gem_install(RUBY_CONFIG_GEM_NAME)
+      # TODO: check gem installation 
+      begin
+        # install thyself
+        @rubygems.gem_install(RUBY_CONFIG_GEM_NAME, runtime)
+      rescue Exception => e
+        puts "Error when trying to install fdietz-ruby-config gem: #{e.message}"
+      end
       
-      runtime.runtime_specific_gems.each { |gem| @rubygems.gem_install(gem)  }
+      begin
+        runtime.runtime_specific_gems.each { |gem| @rubygems.gem_install(gem, runtime)  }
+      rescue Exception => e
+        puts "Error when trying to install #{runtime.runtime_specific_gems.join(',')} gems: #{e.message}"
+      end
     end
 
     def runtime_install_path

data/lib/ruby_config/main.rb

@@ -186,33 +186,21 @@ module RubyConfig
     end
     
     def print_use_results(runtime)
-      puts "env:"
-      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
+      puts "gem env:"
+      display_gem_env(runtime)
       
       puts "\nruby -v:"
-      display_system_ruby_version
+      display_ruby_version(runtime)
     end
-    
-    # def print_alias(hash)
-    #   hash.each do |key, value|
-    #     puts " alias #{key}=\"#{value}\""
-    #   end
-    # end
-    
-    def display_ruby_version(runtime)
-      puts "Running: #{runtime}"
+        
+    def display_gem_env(runtime)
+      system("#{runtime.gem_executable_path} env")
     end
     
-    def display_system_ruby_version
-      system "ruby -v"
+    def display_ruby_version(runtime)
+      system("#{runtime.ruby_executable_path} -v")    
     end
-    
+        
     def abort(message)
       puts message
       exit

data/lib/ruby_config/profile_config.rb

@@ -29,7 +29,7 @@ module RubyConfig
       end
       str
     end
-
+    
     private 
     
     def content_for_new_script

data/lib/ruby_config/rubygems.rb

@@ -19,9 +19,8 @@ module RubyConfig
       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}"
+    def gem_install(gem_technical_name, runtime)
+      system "#{runtime.gem_executable_path} install -q --no-ri --no-rdoc #{gem_technical_name}"
     end 
 
     private 
@@ -29,8 +28,10 @@ module RubyConfig
       # 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}")
+        # puts "ruby executable path: #{ruby_executable_path}"
+        # system("#{ruby_executable_path} setup.rb  --prefix=#{additional_library_path}")
+        # system("#{ruby_executable_path} setup.rb")
+        system("setup.rb")
       end
       
       def extract_tar_gz(tgz_archive_path, destination_path)

data/lib/ruby_config/runtime_base.rb

@@ -78,14 +78,23 @@ module RubyConfig
       File.join(@install_path, 'gem')
     end
     
+    def gem_bin_path
+      File.join(gem_home_path, 'bin')
+    end
+    
     def ruby_executable_path
       File.join(ruby_bin_path, 'ruby')
     end
 
     def gem_executable_path
+      puts "entering RuntimeBase::gem_executable_path.."
       File.join(ruby_bin_path, 'gem')
     end
     
+    def irb_executable_path
+      File.join(ruby_bin_path, 'irb')
+    end
+    
     # aka site_ruby
     def additional_library_path
       File.join(ruby_home_path, 'lib', 'ruby', 'site_ruby', major_version)

data/lib/ruby_config/runtimes/jruby_runtime.rb

@@ -25,7 +25,11 @@ module RubyConfig
       def archive_download_url
         JRUBY_DOWNLOAD_URL
       end
-          
+      
+      def gem_home_path
+        File.join(ruby_home_path, 'lib', 'ruby', 'site_ruby', major_version)
+      end
+                
       # only required for nailgun support
       # def bash_alias
       #   {'ruby_ng', 'jruby --ng', 

data/lib/ruby_config/runtimes/ruby186_runtime.rb

@@ -37,6 +37,11 @@ module RubyConfig
         RubyConfig::Runtimes::RubyFromSourceHelper.compile(File.join(@tmp_path, ARCHIVE_PATH), ruby_home_path)
       end
         
+      # def gem_executable_path
+      #   puts "entering Ruby186Runtime::gem_executable_path.."
+      #   File.join(additional_library_path, 'bin', 'gem')
+      # end
+      
     end
   
   end

data/lib/ruby_config/runtimes/ruby19_runtime.rb

@@ -33,6 +33,10 @@ module RubyConfig
       def archive_download_url
         RubyConfig::Runtimes::RubyFromSourceHelper.download_url(MAJOR_VERSION, MINOR_VERSION, PATCH_LEVEL)
       end
+
+      def gem_executable_path
+        File.join(ruby_bin_path, 'gem')
+      end
       
       def install
         extract_tar_gz(File.join(@tmp_path, archive_file_name), @tmp_path)

data/lib/ruby_config/runtimes/ruby_enterprise_edition_runtime.rb

@@ -28,16 +28,19 @@ module RubyConfig
         RUBY_ENTERPRISE_EDITION_DOWNLOAD_URL
       end
       
+      # def gem_home_path
+      #   File.join(ruby_home_path, 'lib', 'ruby', 'site_ruby', major_version)
+      # end
+            
       def install
         extract_tar_gz(File.join(@tmp_path, archive_file_name), @tmp_path)
         
         ree_installer
       end
+
       
       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

@@ -17,9 +17,20 @@ module RubyConfig
     def set_symlinks_to_runtime(runtime)
       delete_existing_symlinks
       create_symlinks(runtime)
+      set_environment(runtime)
     end
     
     private
+    
+      # will only apply for current ruby-config process
+      # after ruby-config exits bash profile will take over again
+      def set_environment(runtime)
+        ENV['RUBY_HOME'] = runtime.ruby_home_path
+        ENV['GEM_HOME'] = runtime.gem_home_path
+        #ENV['GEM_PATH'] = runtime.gem_home_path
+        ENV['PATH'] = "#{runtime.ruby_bin_path}:#{runtime.gem_bin_path}:#{ENV['PATH']}"
+      end
+      
       def ruby_path
         File.join(@ruby_config_path, "ruby")
       end
@@ -35,7 +46,7 @@ module RubyConfig
       
       def delete_existing_symlinks
         [ruby_path, gem_path].each do |path|
-          File.delete(path) if File.exist?(path)
+          FileUtils.remove_entry_secure(path) if File.exist?(path)
         end
       end
                  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fdietz-ruby-config
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Frederik Dietz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-05 00:00:00 -07:00
+date: 2009-09-27 00:00:00 -07:00
 default_executable: ruby-config
 dependencies: []
 
@@ -45,6 +45,7 @@ files:
 - lib/ruby_config/switcher.rb
 has_rdoc: true
 homepage: http://github.com/fdietz/ruby-config
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -65,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Install and Switch between various Ruby Runtimes easily