fdietz-ruby-config 0.6.0 → 0.7.0

data/README.md

@@ -22,19 +22,19 @@ Install the gem:
 	
 Ensure that your bash profile script is configured correctly:
 
-	#bash: ruby-config --setup
+	#bash: ruby-config setup
 	
 Note, that the setup routine will show the changes it will make beforehand and will prompt you
 before actually applying the changes. You can manually apply the changes if you decide.
 
 List all available runtimes:
 
-	#bash: ruby-config -a
+	#bash: ruby-config available
 	
 
 List all currently installed runtimes:
 
-	#bash: ruby-config -l
+	#bash: ruby-config list
 
 	Installed Ruby Versions:
 	1)   Default Leopard Ruby 1.8.6 [ruby-leopard-1.8.6]
@@ -48,15 +48,15 @@ The wildcard for the 5. item indicates that this is the currently used runtime.
 	
 Install new Runtime by handle name:
 
-	#bash: ruby-config -i jruby-1.3.1
+	#bash: ruby-config install jruby-1.3.1
 	
 Alternatively, you can use the index of the available runtimes listing:
 
-	#bash: ruby-config -i 3
+	#bash: ruby-config install 3
 
 Switch to an already installed runtime:
 
-	#bash: ruby-config -u jruby-1.3.1
+	#bash: ruby-config switch jruby-1.3.1
 	
 Alternatively, you can use the index again.. Now check the ruby-version:
 

data/ReleaseNotes.md

@@ -1,8 +1,12 @@
 # Ruby-Config Release Notes
 
+## ruby-config 0.7
+* Use command-style interface instead of options
+
 ## ruby-config 0.6
 * Set GEM_HOME correctly when installing new gems 
 * Ensure that ruby-config gem is installed on each runtime gem path
+* Added tests for Ruby compile from source runtimes
 
 ## ruby-config 0.5
 * Added support for Ruby 1.8.6

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/bin/ruby-config

@@ -3,4 +3,4 @@
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__) , '..', 'lib')
 require 'ruby_config'
 
-RubyConfig::Runner.new.run
+RubyConfig::Main.new.main(ARGV)

data/lib/ruby_config/{runner.rb → main.rb}

@@ -7,7 +7,7 @@ require 'ruby_config/switcher'
 
 module RubyConfig
 
-  class Runner
+  class Main
 
     RUBY_CONFIG_PATH = File.join(ENV['HOME'], ".ruby-config")
     
@@ -19,31 +19,42 @@ module RubyConfig
       @config = RubyConfig::Config.new(RUBY_CONFIG_PATH)
     end
     
-    def run
+    def main(argv)
+      arguments = argv
       options_parser = RubyConfig::OptionsParser.new
-      
+            
       begin
-        options = options_parser.parse
-
-        if options.list_available
-          list_available  
-        elsif options.list_installed
-          list_installed
-        elsif options.install
-          install_runtime(options.runtime)
-        elsif options.uninstall
-          uninstall(options.runtime)
-        elsif options.use
-          use_runtime(options.runtime)
-        elsif options.help
+        options = options_parser.parse_options!(arguments)
+        
+        if options.help
           help(options_parser)
-        elsif options.setup
-          setup
+          exit
         end
       rescue OptionParser::ParseError => e
         puts e
         options_parser.print_help
+        exit
       end
+      
+      commands = options_parser.parse_commands!(arguments)
+      
+      if commands.list
+        list_installed
+      elsif commands.available
+        list_available
+      elsif commands.install
+        install(commands.handle)
+      elsif commands.uninstall
+        uninstall(commands.handle)
+      elsif commands.switch
+        switch(commands.handle)
+      elsif commands.setup
+        setup
+      else
+        puts "Unknown Command: #{arguments}"
+        options_parser.print_help
+      end
+      
     end
 
     private 
@@ -102,7 +113,7 @@ module RubyConfig
       options_parser.print_help
     end
     
-    def install_runtime(handle)
+    def install(handle)
       unless @registry.exists?(handle)
         puts "Unknown ruby runtime: #{handle}"
         return
@@ -122,7 +133,7 @@ module RubyConfig
       
     end
     
-    def use_runtime(handle)
+    def switch(handle)
       unless @registry.exists?(handle)
         puts "Unknown ruby runtime: #{handle}"
         return
@@ -150,7 +161,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
     

data/lib/ruby_config/options_parser.rb

@@ -1,76 +1,120 @@
 module RubyConfig
   class OptionsParser
+
+    COMMANDS = { 
+      'list' => 'List installed Ruby runtimes',
+      'available' => 'List available Ruby runtimes',
+      'switch' => 'Switch to specific Ruby runtime',
+      'install' => 'Install specific Ruby runtime',
+      'uninstall' => 'Uninstall specific Ruby runtime',
+      'setup' => 'Setup your bash environment'
+    }
+    
+    OPTIONS = {
+      '-v, --version' => "Display version",
+      '-h, --help' => "Display this screen"
+    }
     
+    EXAMPLES = [
+      'ruby-config list ',
+      'ruby-config install jruby-1.3.1',
+      'ruby-config switch jruby-1.3.1',
+      'ruby-config -v'
+    ]
+       
     def initialize
       create_options
     end
     
     def print_help
-      puts @optparse
-    end
-    
-    def create_options
-      @options = OpenStruct.new
-      @options.verbose = false
-      @options.list_available = false
-      @options.list_installed = false
-      @options.use = false
-      @options.runtime = nil
-      @options.install = false
-      @options.uninstall = false
-      @options.help = false
-      @options.setup = false
+      puts "Usage: ruby-config [command] [options]"
+      puts
+      puts " Available Commands:"
       
-      @optparse = OptionParser.new do |opts|
-        opts.banner = "Usage: ruby-config [options]"
-
-        opts.on('-a', '--list-available', 'List available Ruby runtimes') do
-          @options.list_available = true
-        end
-
-        opts.on('-l', '--list-installed', 'List installed Ruby runtimes') do
-          @options.list_installed = true
-        end
-
-        opts.on('-u', '--use [HANDLE]', 'Use specific Ruby runtime') do |runtime|
-          @options.use = true
-          @options.runtime = runtime        
-          abort("No Runtime specified") unless runtime
-        end
-
-        opts.on('-i', '--install [HANDLE]', 'Install specific Ruby runtime') do |runtime|
-          @options.install = true
-          @options.runtime = runtime
-          abort("No Runtime specified") unless runtime
-        end
-
-        opts.on('--uninstall [HANDLE]', 'Uninstall specific Ruby runtime') do |runtime|
-          @options.uninstall = true
-          @options.runtime = runtime
-          abort("No Runtime specified") unless runtime
-        end
+      COMMANDS.each do |key, value|
+        puts "  #{key} #{indent} #{value}"
+      end
+      
+      puts
+      puts " Available Options:"
+      OPTIONS.each do |key, value|
+        puts "  #{key} #{indent} #{value}"
+      end
+      
+      puts 
+      puts " Examples:"
+      EXAMPLES.each do |value|
+        puts "  #{value}"
+      end
+      
+      puts
+    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}"
-          exit
-        end
-
-        opts.on('-h', '--help', 'Display this screen' ) do
-          @options.help = true
-        end
+    def parse_commands!(arguments)
+      args = find_commands(arguments)
+      
+      @commands = OpenStruct.new
+      @commands.list = false
+      @commands.available = false
+      @commands.switch = false
+      @commands.install = false
+      @commands.uninstall = false
+      @commands.setup = false
+     
+      case args.first
+      when 'list'
+        @commands.list = true
+      when 'available'
+        @commands.available = true
+      when 'setup'
+        @commands.setup = true
+      when 'install'
+        @commands.install = true
+        @commands.handle = args[1]
+        abort("No Runtime specified") unless @commands.handle
+      when 'uninstall'
+        @commands.uninstall = true
+        @commands.handle = args[1]
+        abort("No Runtime specified") unless @commands.handle
+      when 'switch'
+        @commands.switch = true
+        @commands.handle = args[1]
+        abort("No Runtime specified") unless @commands.handle
       end
       
+      @commands
     end
-    
-    def parse
-      @optparse.parse!
+            
+    def parse_options!(arguments)
+      @optparse.parse!(arguments)
       @options
     end
+
+    private
+    
+      def create_options
+        @options = OpenStruct.new
+        @options.help = false
+
+        @optparse = OptionParser.new do |opts|
+          opts.on('-v', '--version', 'Display version' ) do
+            puts "ruby-config version: #{RubyConfig::VERSION}"
+            exit
+          end
+          opts.on('-h', '--help', 'Display this screen' ) do
+            @options.help = true
+          end
+        end
+      end
       
+      def find_commands(args)
+        args.reject { |a| a =~ /^(-|--)/ }
+      end
+      
+      def indent
+        "\t\t\t\t"
+      end
+    
   end
   
 end

data/lib/ruby_config/profile_config.rb

@@ -51,7 +51,7 @@ module RubyConfig
     end
     
     def header
-      "# ruby-config v#{RubyConfig.version}"
+      "# ruby-config v#{RubyConfig::VERSION}"
     end
     
     def ruby_home

data/lib/ruby_config.rb

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

data/test/unit/profile_config_test.rb

@@ -68,7 +68,7 @@ class ProfileConfigTest < Test::Unit::TestCase
   
   test "should contain the ruby-config header" do
     result = @config.send(:content_for_existing_script)
-    assert result.include?("# ruby-config v#{RubyConfig.version}")
+    assert result.include?("# ruby-config v#{RubyConfig::VERSION}")
   end
   
   test "should contain bash script header" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fdietz-ruby-config
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Frederik Dietz
@@ -29,11 +29,11 @@ files:
 - lib/ruby_config.rb
 - lib/ruby_config/config.rb
 - lib/ruby_config/installer.rb
+- lib/ruby_config/main.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
 - lib/ruby_config/runtimes/leopard_runtime.rb
@@ -45,7 +45,6 @@ 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
@@ -66,7 +65,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: 2
 summary: Install and Switch between various Ruby Runtimes easily