fdietz-ruby-config 0.2.0 → 0.3.0

data/lib/ruby_config/file_helper.rb

@@ -5,7 +5,15 @@ module RubyConfig
       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

data/lib/ruby_config/options_parser.rb

@@ -17,7 +17,9 @@ module RubyConfig
       @options.use = false
       @options.runtime = nil
       @options.install = false
+      @options.uninstall = false
       @options.help = false
+      @options.setup = false
       
       @optparse = OptionParser.new do |opts|
         opts.banner = "Usage: ruby-config [options]"
@@ -47,9 +49,13 @@ module RubyConfig
           @options.runtime = runtime
           abort("No Runtime specified") unless runtime
         end
+        
+        opts.on('--setup', 'Setup your bash script') do
+          @options.setup = true
+        end
 
         opts.on('-v', '--version', 'Display version' ) do
-          puts "ruby-config version: #{RubyConfig.VERSION}"
+          puts "ruby-config version: #{RubyConfig.version}"
           exit
         end
 

data/lib/ruby_config/profile_config.rb

@@ -0,0 +1,65 @@
+# Not used currently
+module RubyConfig
+  class ProfileConfig 
+        
+    def initialize(bash_profile_path)
+      @bash_profile_path = bash_profile_path
+    end
+    
+    def change
+      RubyConfig::FileHelper.append_content_to_file(content_with_header, @bash_profile_path)
+    end
+    
+    def exists?
+      RubyConfig::FileHelper.read_content_from_file(@bash_profile_path).include?(content)
+    end
+
+    def content_with_header
+      str = header
+      str << content
+      str
+    end
+    
+    def content
+      str = ""
+      [ruby_home, gem_home, gem_path, path].each do |line|
+        str << export_line(line)
+      end
+      str
+    end
+    
+    private 
+    
+    def header
+      "# ruby-config v#{RubyConfig.version}"
+    end
+    
+    def ruby_home
+      "RUBY_HOME=#{home}/#{ruby_config}/ruby"
+    end
+    
+    def gem_home
+      "GEM_HOME=#{home}/#{ruby_config}/gem"
+    end
+    
+    def gem_path
+      "GEM_PATH=#{home}/#{ruby_config}/gem"
+    end
+    
+    def path
+      "PATH=$RUBY_HOME/bin:$GEM_HOME/bin:$PATH"
+    end
+    
+    def home
+      "$HOME"
+    end
+    
+    def ruby_config
+      ".ruby-config"
+    end
+    
+    def export_line(str)
+      "export #{str}\n"
+    end
+  end
+end

data/lib/ruby_config/registry.rb

@@ -1,3 +1,6 @@
+require 'ruby_config/config'
+require 'ruby_config/file_helper'
+
 module RubyConfig
   
   class Registry
@@ -10,7 +13,6 @@ module RubyConfig
       @tmp_path = File.join(ruby_config_path, "tmp")
       
       @config = RubyConfig::Config.new(@ruby_config_path)
-      @environment_config = RubyConfig::EnvironmentConfig.new(@ruby_config_path)
       
       @list = []
       ensure_config_directory_exists
@@ -93,17 +95,6 @@ module RubyConfig
       FileUtils.mkdir_p(@runtime_install_path)
     end
 
-    # bash_alias required by jruby nailgun
-    # def update_current_environment_config(ruby_home, gem_home, bash_alias = {})
-    #   set_bash_var = {'GEM_HOME' => gem_home, 'RUBY_HOME' => ruby_home}
-    #   prepend_bash_var = {'PATH' => "#{ruby_home}/bin" }
-    #   
-    #   @environment_config.set_bash_var = set_bash_var
-    #   @environment_config.prepend_bash_var = prepend_bash_var
-    #   @environment_config.bash_alias = bash_alias
-    #   @environment_config.save
-    # end
-
   end
   
 end

data/lib/ruby_config/runner.rb

@@ -1,3 +1,9 @@
+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 }
+
 module RubyConfig
 
   class Runner
@@ -22,11 +28,13 @@ module RubyConfig
         elsif options.install
           install_runtime(options.runtime)
         elsif options.uninstall
-          # TODO
+          uninstall(options.runtime)
         elsif options.use
           use_runtime(options.runtime)
         elsif options.help
           help(options_parser)
+        elsif options.setup
+          setup
         end
       rescue OptionParser::ParseError => e
         puts e
@@ -36,6 +44,49 @@ module RubyConfig
 
     private 
     
+    def setup
+      config = RubyConfig::ProfileConfig.new(bash_profile_path)
+      
+      if config.exists?
+        puts "Found existing profile configuration. You are all set!"
+      else
+        puts "Ruby-Config will add the following lines to your environment:"
+        puts "#{bash_profile_path}:"
+        puts config.content
+        puts
+        
+        if agree("Append configuration to your profile? [y/n]  ", true)
+          config.change
+          puts 
+          puts "Done! To apply changes execute the following command:"
+          puts " source #{bash_profile_path}"
+        end
+      end
+    end
+    
+    def bash_profile_path
+      File.join(ENV['HOME'], '.bash_profile')
+    end
+    
+    def uninstall(handle)
+      unless @registry.exist?(handle)
+        puts "Unknown ruby runtime: #{handle}."
+        return
+      end
+      
+      if @registry.default?(handle)
+        puts "Can't delete currently selected runtime."
+        return
+      end
+      
+      runtime = @registry.get(handle)
+      
+      if agree("Really want to delete: #{runtime.description}? [y/n]  ", true)
+        runtime.delete
+        puts "Done!"
+      end
+    end
+    
     def load_available_runtimes
       list = []
       list << RubyConfig::Runtimes::LeopardRuntime
@@ -94,7 +145,7 @@ module RubyConfig
     def print_info_header
       puts "ruby-config (http://github/fdietz/ruby-config)"
       puts "Author: Frederik Dietz <fdietz@gmail.com>"
-      puts "Version: #{RubyConfig::VERSION}"
+      puts "Version: #{RubyConfig.version}"
       puts
     end
     
@@ -152,14 +203,4 @@ module RubyConfig
     end
 
   end
-end
-
-#RubyConfig::Runner.new.run
-
-
-# require 'fileutils'
-# if ARGV.include?('--dry-run')
-#   include FileUtils::DryRun
-# else
-#   include FileUtils::Verbose
-# end
+end

data/lib/ruby_config/runtime_base.rb

@@ -101,6 +101,10 @@ module RubyConfig
        Pathname.new(File.join(ruby_bin_path, 'ruby')).exist?
     end
     
+    def delete
+      FileUtils.remove_entry_secure(@install_path)
+    end
+    
     protected
 
       def install_rubygems

data/lib/ruby_config.rb

@@ -1,15 +1,20 @@
-#puts Dir.glob(File.join(File.dirname(__FILE__), 'ruby_config/**/*.rb'))
-Dir.glob(File.join(File.dirname(__FILE__), 'ruby_config/**/*.rb')).each {|f| require f }
-
-module RubyConfig
-  VERSION = '1.0.0'
-end
-
+require 'rubygems'
 require 'fileutils'
 require 'open-uri'
 require 'tempfile'
 require 'pathname'
 require 'ostruct'
 require 'optparse'
-require "yaml"
+require 'yaml'
+require 'highline/import'
+
+require 'ruby_config/runner'
+require 'ruby_config/registry'
+require 'ruby_config/file_helper'
+
+module RubyConfig  
+  def self.version
+    RubyConfig::FileHelper.read_content_from_file(File.join(File.dirname(__FILE__), '..', 'VERSION'))
+  end
+end
 

data/test/unit/runtime_base_test.rb

@@ -22,7 +22,6 @@ class RuntimeBaseDoInstallTest < Test::Unit::TestCase
   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.stubs(:already_installed?).returns(true)
     r.do_install
     
     assert File.exist?(r.install_path)
@@ -33,23 +32,12 @@ class RuntimeBaseDoInstallTest < Test::Unit::TestCase
   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.stubs(:already_installed?).returns(false)
     
     r.expects(:install).once
     r.expects(:cleanup_tmp_dir).once  
     r.do_install
   end
   
-  test "should NOT install runtime if installed already" do
-    r = RuntimeBaseTestHelper::RuntimeBaseStub.new(File.join(@root, "install"), File.join(@root, "tmp"))
-    r.stubs(:download_file_unless_exists)
-    r.stubs(:already_installed?).returns(true)
-    
-    r.expects(:install).never
-    r.expects(:cleanup_tmp_dir).never
-    r.do_install
-  end
-  
 end
 
 class RuntimeBaseDownloadFileUnlessExists < Test::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fdietz-ruby-config
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Frederik Dietz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-24 00:00:00 -07:00
+date: 2009-08-29 00:00:00 -07:00
 default_executable: ruby-config
 dependencies: []
 
@@ -25,9 +25,9 @@ files:
 - bin/ruby-config
 - lib/ruby_config.rb
 - lib/ruby_config/config.rb
-- lib/ruby_config/environment_config.rb
 - lib/ruby_config/file_helper.rb
 - lib/ruby_config/options_parser.rb
+- lib/ruby_config/profile_config.rb
 - lib/ruby_config/registry.rb
 - lib/ruby_config/runner.rb
 - lib/ruby_config/runtime_base.rb
@@ -41,7 +41,6 @@ files:
 - README.md
 has_rdoc: false
 homepage: http://github.com/fdietz/ruby-config
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -62,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Install and Switch between various Ruby Runtimes easily

data/lib/ruby_config/environment_config.rb

@@ -1,43 +0,0 @@
-# Not used currently
-module RubyConfig
-  class EnvironmentConfig 
-    
-    attr_writer :set_bash_var, :prepend_bash_var, :append_bash_var, :bash_alias
-    
-    def initialize(path)
-      @config_file = File.join(path, "current_env_config")
-    end
-        
-    def save
-      configuration = create_configuration(@set_bash_var, @prepend_bash_var, @append_bash_var, @bash_alias)
-      RubyConfig::FileHelper.write_content_to_file(configuration, @config_file)  
-    end
-
-    private
-
-      def create_configuration(set_bash_var = {}, prepend_bash_var = {}, append_bash_var = {}, bash_alias = {})
-        configuration = ""
-        prepend_bash_var.each { |key,value| configuration << prepend_to_bash_environment_var(key, value) + "\n" }
-        set_bash_var.each { |key,value| configuration << set_bash_environment_var(key, value) + "\n" }
-        bash_alias.each { |key, value| configuration << set_bash_alias(key, value) + "\n"  }
-        configuration
-      end
-      
-      def prepend_to_bash_environment_var(var, path)
-        "export #{var}=#{path}:$#{var}"
-      end
-    
-      def append_to_bash_environment_var(var, path)
-        "export #{var}=$#{var}:#{path}"
-      end
-    
-      def set_bash_environment_var(var, path)
-        "export #{var}=#{path}"
-      end
-    
-      def set_bash_alias(var, script)
-        "alias #{var}=\"#{script}\""
-      end
-    
-  end
-end