pik 0.2.5 → 0.2.6

data/History.txt

@@ -1,3 +1,13 @@
+=== 0.2.6 / 2009-11-08
+
+* deprecated checkup command in favor of info command
+* added info command
+* added benchmark command
+* fixes to gemsync command
+* don't need to be admin to run pik default
+* added update command
+* gemsync command - platform aware - remote option - quiet option
+
 
 === 0.2.5 / 2009-10-29
 

data/Manifest.txt

@@ -22,11 +22,9 @@ features/uninstall_command.feature
 features/version.feature
 lib/pik.rb
 lib/pik/batch_file.rb
-lib/pik/checkup.rb
 lib/pik/commands.rb
 lib/pik/commands/add_command.rb
 lib/pik/commands/batch_file_editor.rb
-lib/pik/commands/checkup_command.rb
 lib/pik/commands/command.rb
 lib/pik/commands/config_command.rb
 lib/pik/commands/config_file_editor.rb
@@ -34,6 +32,7 @@ lib/pik/commands/default_command.rb
 lib/pik/commands/gemsync_command.rb
 lib/pik/commands/help_command.rb
 lib/pik/commands/implode_command.rb
+lib/pik/commands/info_command.rb
 lib/pik/commands/install_command.rb
 lib/pik/commands/list_command.rb
 lib/pik/commands/remove_command.rb
@@ -41,6 +40,7 @@ lib/pik/commands/run_command.rb
 lib/pik/commands/switch_command.rb
 lib/pik/commands/tag_command.rb
 lib/pik/commands/uninstall_command.rb
+lib/pik/commands/update_command.rb
 lib/pik/config_file.rb
 lib/pik/contrib/progressbar.rb
 lib/pik/contrib/unzip.rb
@@ -56,6 +56,7 @@ lib/pik/implementations.rb
 lib/pik/options.rb
 lib/pik/pik.rb
 lib/pik/search_path.rb
+lib/pik/version_parser.rb
 lib/pik/which.rb
 lib/pik/windows_env.rb
 spec/add_command_spec.rb
@@ -76,6 +77,7 @@ spec/run_command_spec.rb
 spec/search_path_spec.rb
 spec/spec.opts
 spec/switch_command_spec.rb
+spec/version_parser_spec.rb
 spec/which_spec.rb
 tools/pik.bat
 tools/pik/pik_runner

data/README.rdoc

@@ -12,49 +12,33 @@ Gordon Thiesfeld
 
 == DESCRIPTION:
 
-Pik is a tool to switch between multiple versions of ruby on Windows.  
+Pik is a tool to manage multiple versions of ruby on Windows.  
 
-Or to put it another way
-
-  doskey rvm=pik $*  # (sort of)
-  
-You have to tell it where your different ruby versions live using 
-'pik add'.  Then you can change to one by using 'pik switch'.
-
-It also supports running commands/code with all versions configured.
-
-  pik run  #  Runs commands on the command line
-  pik ruby #  Runs using the ruby interpreter for each version (ruby.exe, jruby.bat, ir.exe)
-  pik gem  #  Runs using the gem command for each version  (gem.bat, igem.bat)
-  pik rake #  Runs using the rake command for each version  (rake.bat, irake.bat)
-   
-
-== FEATURES/PROBLEMS:
-
-
-== SYNOPSIS:
-
-  >pik help commands
-
-    add             Adds another ruby location to pik.
-    checkup|cu      Checks your environment for current Ruby best practices.
-    config          Adds/modifies configuration options.
-    default         Switches back to the default settings.
-    gem             Runs the gem command with all versions that pik is aware of.
-    gemsync         Duplicates gems from the current version to the one specified.
-    help            Displays help information.
-    implode         Removes your pik configuration.
-    install|in      Downloads and installs different ruby versions.
-    list|ls         Lists ruby versions that pik is aware of.
-    rake            Runs the rake command with all versions that pik is aware of.
-    remove|rm       Removes a ruby location from pik.
-    ruby|rb         Runs ruby with all versions that pik is aware of.
-    run             Runs command with all versions of ruby that pik is aware of.
-    switch|sw|use   Switches ruby versions based on patterns.
-    tag             Adds the given tag to the current version.
-    tags            Runs the pik command against the given tags.
-  
-  For help on a particular command, use 'pik help COMMAND'.
+    >pik help commands
+    
+      add             Adds another ruby location to pik.
+      benchmark|bench Runs bencmarks with all versions that pik is aware of.
+      checkup|cu      Checks your environment for current Ruby best practices.
+      config          Adds/modifies configuration options.
+      default         Switches back to the default settings.
+      gem             Runs the gem command with all versions that pik is aware of.
+      gemsync         Synchronizes gems from the version specified to the current version.
+      help            Displays help information.
+      implode         Removes your pik configuration.
+      info            Displays information about the current ruby version.
+      install|in      Downloads and installs different ruby versions.
+      list|ls         Lists ruby versions that pik is aware of.
+      rake            Runs the rake command with all versions that pik is aware of.
+      remove|rm       Removes a ruby location from pik.
+      ruby|rb         Runs ruby with all versions that pik is aware of.
+      run             Runs command with all versions of ruby that pik is aware of.
+      switch|sw|use   Switches ruby versions based on patterns.
+      tag             Adds the given tag to the current version.
+      tags            Runs the pik command against the given tags.
+      uninstall|unin  Deletes a ruby version from the filesystem and removes it from Pik.
+      update|up       updates pik.
+    
+    For help on a particular command, use 'pik help COMMAND'.
   
 == REQUIREMENTS:
 

data/Rakefile

@@ -22,7 +22,7 @@ end
 file 'tools/pik/pik.exe', :needs => ['tools/pik/pik_runner.exy'] do
   Dir.chdir 'tools/pik' do
     sh('ruby -S exerb pik_runner.exy')
-    sh('upx -9 pik_runner.exe')
+    sh('upx -9 pik_runner.exe') unless ENV['QUICK']
   end
 end
 

data/features/gemsync_command.feature

@@ -0,0 +1,19 @@
+Feature: gemsync command
+  In order to test code against specific ruby implementations
+  A developer
+  Wants an interface to the program
+  So that he can tag versions that pik is aware of
+  
+  Scenario: sync to previous version
+    Given I only have the rake gem installed to version 1.9.1.
+    When I run "pik 191 mi" and "pik gemsync 186 mi -q -d",
+    Then I should see "** Syncing"
+    And I should find "Gem rake.+ already installed"
+    And I should see "Installing hoe"
+
+  Scenario: attempt to sync to different platform
+    When I run "pik Ir 91" and "pik gemsync 186 mi -q -d",
+    Then I should see "You appear to be attempting a gemsync from a different platform."
+    
+    
+  # Scenaorio: sync remotely 

data/features/step_definitions/pik_commands.rb

@@ -7,6 +7,17 @@ Given /^I have.+added "(.+)"/ do |version|
   @ver.size.should eql(1)
 end
 
+Given /^I only have the rake gem installed to version 1\.9\.1\.$/ do
+  x = `pik 191 & gem list`.split("\n").map{|gem_| gem_.split(' ') }
+  x.map! do |name, version|
+    unless name == 'rake'
+      `pik 191 & gem unin #{name} -x -I`
+      name
+    end
+  end
+  x.should_not include('rake')
+end
+
 Given /^I am currently using it\.$/ do
   unless `ruby -v` =~ @version_reg
     k,v = `pik switch #{@version} & path`.split('=')

data/lib/pik.rb

@@ -1,5 +1,5 @@
 module Pik
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -10,6 +10,7 @@ ENV['GEM_PATH'] = nil
 require 'yaml'
 require 'pathname'
 require 'fileutils'
+require 'find'
 require 'open-uri'
 require 'rbconfig'
 require 'rubygems'
@@ -27,19 +28,21 @@ require 'pik/commands/install_command'
 require 'pik/commands/list_command'
 require 'pik/commands/add_command'
 require 'pik/commands/help_command'
+require 'pik/commands/info_command'
 require 'pik/commands/switch_command'
 require 'pik/commands/run_command'
 require 'pik/commands/remove_command'
-require 'pik/commands/checkup_command'
 require 'pik/commands/config_command'
 require 'pik/commands/gemsync_command'
 require 'pik/commands/default_command'
 require 'pik/commands/implode_command'
 require 'pik/commands/tag_command'
 require 'pik/commands/uninstall_command'
+require 'pik/commands/update_command'
 require 'pik/config_file'
 require 'pik/implementations'
 require 'pik/search_path'
+require 'pik/version_parser'
 require 'pik/windows_env'
 require 'pik/which'
 
@@ -52,3 +55,6 @@ else
   pik_exe = Pathname.new($0).expand_path + '..' 
   PIK_BATCH = pik_exe.dirname + "#{pik_exe.basename}.bat"
 end
+
+Pik::Commands.deprecate(:checkup => "The checkup command is deprecated, using the info command instead.")
+Pik::Commands.deprecate(:cu => "The cu command is deprecated, using the info command instead.")

data/lib/pik/batch_file.rb

@@ -49,7 +49,7 @@ class BatchFile
     self
   end
 
-  def echo(string)
+  def echo(string='.')
     string = ' ' + string unless string == '.'
     @file_data << "ECHO#{string}"
     self

data/lib/pik/commands.rb

@@ -11,7 +11,9 @@ module Pik
     end
     
     def self.find(command)
-      commands.find{ |cmd| cmd.names.include?(command.to_sym) }
+      command = command.to_sym
+      puts deprecated[command] if deprecated[command]
+      commands.find{ |cmd| cmd.names.include?(command) }
     end
   
     def self.list
@@ -29,7 +31,14 @@ module Pik
       @commands ||= []
     end
   
-  
+    def self.deprecate(command)
+      deprecated.update command
+    end
+
+    def self.deprecated
+      @deprecated ||= {}
+    end
+      
   end
   
 end

data/lib/pik/commands/command.rb

@@ -18,6 +18,8 @@ module Pik
     
     attr_accessor :version
     
+    attr_accessor :debug
+    
     def self.cmd_name
       name.split('::').last.downcase.to_sym
     end
@@ -106,11 +108,17 @@ module Pik
     
     def parse_options
       options.on("--version", "-V", "Pik version") do |value|
-        puts "pik " + Pik::VERSION
-        @version = true
+        puts pik_version
+      end
+      options.on("--debug", "-d", "Outputs debug information") do |value|
+        @debug = true
       end
       options.parse! @args 
     end
+    
+    def pik_version
+      "pik " + Pik::VERSION
+    end
    
     def current_version?(string)
       string == get_version
@@ -124,11 +132,6 @@ module Pik
       "#{major}: #{ruby_ver.strip}"
     end
     
-    # def current_path?(config_path)
-    #   @path ||= SearchPath.new(ENV['PATH'])
-    #   @path.find{|dir| Pathname(dir) == Pathname(config_path) }
-    # end
-    
     def find_config_from_path(path=Which::Ruby.find)
       config.find{|k,v| 
         Pathname(v[:path])== Pathname(path)
@@ -142,8 +145,16 @@ module Pik
     end
 
     def default_gem_home
-      path = `#{Which::Ruby.exe} -rubygems -e\"require 'rubygems' ; puts Gem.default_path.first\"`
-      Pathname.new(path.chomp).to_windows
+      get_gem_home(:first)
+    end
+    
+    def actual_gem_home
+      get_gem_home(:last)
+    end
+    
+    def get_gem_home(position)
+      path = `#{Which::Ruby.exe} -rubygems -e\"require 'rubygems' ; puts Gem.default_path.#{position}\"`
+      Pathname.new(path.chomp).to_windows    
     end
     
     def create(home)
@@ -157,6 +168,11 @@ module Pik
       end
     end
     
+    def sh(cmd)
+      puts cmd if debug
+      system(cmd)
+    end
+    
     def cmd_name
       self.class.cmd_name
     end

data/lib/pik/commands/default_command.rb

@@ -10,9 +10,6 @@ module Pik
     include BatchFileEditor
   
     def execute
-      unless User.new.admin?
-        raise "You must have admin rights for the default command"
-      end
       sys = WindowsEnv.system
       usr = WindowsEnv.user
       new_path = [sys['PATH'],usr['PATH']].compact.join(';')

data/lib/pik/commands/gemsync_command.rb

@@ -1,55 +1,91 @@
+
 module Pik
 
   class  GemSync < Command
   
-    it "Duplicates gems from the current version to the one specified."
-    include BatchFileEditor
+    it "Synchronizes gems from the version specified to the current version."
+    
+    attr_reader :remote, :quiet
     
     def execute
-      target  = self.class.choose_from(@args, config)
-      current = get_version
-      install_gems(current, target) if target
+      source  = self.class.choose_from(@args, config)
+      raise "Couldn't find a version from the pattern given: '#{@args.join(' ')}'" unless source
+      current = find_config_from_path
+      
+      if platform_consistent?(source, current)
+        puts "** Syncing: #{current}\n   with: #{source}"
+        puts "   from a remote repository." if remote
+        puts
+        install_gems(current, source)
+      end
     end
     
-    def install_gems(current, target)
-      switch_path_to(config[target])
-      switch_gem_home_to(config[target][:gem_home]) 
-      target_cache = gem_cache(target)
+    def platform_consistent?(source, current)
+      s_platform = VersionParser.parse(source).platform
+      c_platform = VersionParser.parse(current).platform
+      return true if s_platform == c_platform || remote
+      msg =<<MSG
+  You appear to be attempting a gemsync from a different platform.  
+  
+    Sync: #{current}
+    with: #{source}
+
+  If you really want to sync, I recommend you quit and run gemsync with
+  the --remote flag.
+
+MSG
+      raise msg if quiet
+      @hl.agree(msg + "Are you sure you'd like to continue?"){|answer| answer.default = 'no'}
+    end
+    
+   def install_gems(current, source)
+      target_cache = gem_cache(current)
       
-      gem_cache(current).find do |file|
+      gem_cache(source).find do |file|
         if file.file?
           if (target_cache + file.basename).exist? 
-            @batch.echo "Gem #{file.basename} already installed"
+            puts "** Gem #{file.basename('.gem')} already installed"
           else
-            gem_install(file)
+            puts "** Installing #{file.basename('.gem')}"
+            gem_opts = "install -q --no-rdoc --no-ri"
+            cmd = "#{Which::Gem.exe.basename} #{gem_opts} #{gem_file(file)}"
+            puts cmd if debug
+            system(cmd)
           end
         end
       end
-      switch_path_to(config[current])
-      switch_gem_home_to(config[target][:gem_home]) 
     end
     
-    def gem_cache(version)
-      conf = config[version]
-      path = if conf[:gem_home] 
-        Pathname.new( conf[:gem_home] )
+    def gem_file(file)
+      if remote
+        gem_re = /(.+)\-(\d+\.\d+\.\d+).+/
+        file, gem_name, version = file.basename.to_s.match(gem_re).to_a
+        "#{gem_name} --version \"=#{version}\" --remote"
       else
-        cmd = ruby_exe(conf[:path]).to_s + " -rubygems -e \"puts Gem.default_path.last\""
-        Pathname.new( `#{cmd}`.chomp ) 
+        # deal with spaces in path
+        file.sub(/.*\s.*/m, '"\&"')
       end
-      puts path + "cache"
-      path + "cache"
     end
     
-    def gem_install(file)
-      @batch.echo "Installing #{file.basename}"
-      @batch.call "gem install -q --no-rdoc --no-ri #{file}"
+    def gem_cache(version)
+      conf = config[version]
+      cmd = Which::Ruby.exe(conf[:path]).to_s + " -rubygems -e \"puts Gem.default_path.last\""
+      
+      path = conf[:gem_home] ? Pathname( conf[:gem_home] ) : Pathname( `#{cmd}`.chomp ) 
+      path + "cache"
     end
     
     def command_options
       super
       sep =<<SEP
+  Gemsync syncs the current version of ruby with the one given.    
+  
+  This tool is fairly dumb. Syncing across implementations is 
+  probably a bad idea.
+      
   Examples:
+    
+    syncs ruby 1.8.6 with the gems install for 1.9.1
 
     C:\\>ruby -v
     ruby 1.8.6 (2009-03-31 patchlevel 368) [i386-mingw32]
@@ -62,6 +98,13 @@ module Pik
     ...
 SEP
       options.separator sep
+      
+      options.on("--quiet", "-q", "Sync without prompting, fails if platforms don't match") do |value|
+        @quiet = value
+      end
+      options.on("--remote", "-r", "Pull gems from a remote repository") do |value|
+        @remote = value
+      end
     end
   
   end

data/lib/pik/commands/info_command.rb

@@ -0,0 +1,69 @@
+
+module Pik
+
+  class  Info < Command
+  
+    it "Displays information about the current ruby version."
+    aka :checkup, :cu
+    
+    def execute
+      puts info      
+    end
+    
+    def info
+      ruby = Which::Ruby.exe
+      ruby_version = find_config_from_path(ruby.dirname)
+      current = config[ruby_version]
+      gem_home = current[:gem_home] || actual_gem_home
+      ruby_version = Pik::VersionParser.parse(ruby_version)
+
+      return info =<<INFO
+#{pik_version}
+
+ruby:
+interpreter:  "#{ruby_version.interpreter}"
+version:      "#{ruby_version.version}"
+date:         "#{ruby_version.date}"
+platform:     "#{ruby_version.platform}"
+patchlevel:   "#{ruby_version.patchlevel}"
+full_version: "#{ruby_version.full_version}"
+
+homes:
+gem:          "#{gem_home}"
+ruby:         "#{ruby.dirname.dirname}"
+
+binaries:
+ruby:         "#{ruby}"
+irb:          "#{Which::Irb.exe}"
+gem:          "#{Which::Gem.exe}"
+rake:         "#{Which::Rake.exe}"
+
+environment:
+GEM_HOME:     "#{ENV['GEM_HOME']}"
+HOME:         "#{ENV['HOME']}"
+IRBRC:        "#{ENV['IRBRC']}"
+RUBYOPT:      "#{ENV['RUBYOPT']}"
+
+file associations:
+.rb:           #{file_associations('.rb')}
+.rbw:          #{file_associations('.rbw')}#{check_path} 
+INFO
+    end
+    
+    def check_path
+      dirs = Which::Ruby.find_all
+      unless dirs.size == 1
+        dirs.unshift("\n\nwarning: There is more than one version of ruby in the system path")
+        dirs.join("\n")
+      end
+    end
+    
+    def file_associations(extension)
+      @reg = Reg.new
+      assoc = @reg.hkcr(extension) rescue nil
+      ftype = @reg.hkcr("#{assoc}\\Shell\\open\\command") rescue nil
+    end
+
+  end
+  
+end

data/lib/pik/commands/install_command.rb

@@ -19,7 +19,7 @@ module Pik
     def execute
       implementation  = Implementations[@args.shift]
       target, package = implementation.find(*@args)
-      target          =  @install_root + "#{implementation.subclass}-#{target.gsub('.','')}"
+      target          = @install_root + "#{implementation.name}-#{target.gsub('.','')}"
       file            = download(package)
       extract(target, file)
       add( Pathname(target) + 'bin' )

data/lib/pik/commands/run_command.rb

@@ -71,6 +71,7 @@ SEP
       rb = Which::Ruby.exe(path)
       raise "Unable to find a Ruby executable at #{path}" unless rb
       puts `"#{rb}" -v `
+      puts
     end
     
     def check_args
@@ -150,6 +151,44 @@ SEP
     end
     
   end
+  
+  class Benchmark < Ruby
+    
+    it "Runs bencmarks with all versions that pik is aware of."
+    aka :bench
+    
+    def execute
+      file_name = @args.first
+      file_data = File.read(file_name)
+        
+      Tempfile.open('pik_bench') do |temp|
+        @args = [temp.path]
+        temp.write benchmark(file_name, file_data)
+      end
+      super
+    end   
+  
+    def benchmark(name, data)
+    bench =<<BM
+require "benchmark" 
+Benchmark.bmbm do |benchmark| 
+  benchmark.report("** benchmarking '#{File.basename(name)}'") do 
+    #{data}
+  end
+end
+BM
+    end
+    
+    def help_message
+      sep =<<SEP
+  Examples:
+
+    C:\\>pik benchmark hello.rb
+
+SEP
+    end
+    
+  end
 
 end
 

data/lib/pik/commands/update_command.rb

@@ -0,0 +1,16 @@
+module Pik
+
+  class Update < Command
+   
+    aka :up
+    it "updates pik."
+    include BatchFileEditor
+    
+    def execute
+      sh "#{Which::Gem.exe} install pik"
+      @batch.call("pik_install #{PIK_BATCH.dirname}")
+    end
+     
+  end
+
+end

data/lib/pik/implementations.rb

@@ -71,6 +71,7 @@ module Pik
       def subclass
         self.class.to_s.split('::').last
       end
+      alias :name :subclass
   
     end
     

data/lib/pik/version_parser.rb

@@ -0,0 +1,53 @@
+module Pik
+
+  class VersionParser
+  
+    def self.parse(version)
+      new(version)
+    end
+    
+    def initialize(version)
+      @version = version
+      @parts = @version.split(/ |\(|\)/).reject{|i| i.empty? }
+    end
+    
+    def interpreter
+      @interpreter ||= @parts[1]
+    end
+    
+    def version
+      md = @parts[2].match(/\d\.\d\.\d\.\d|\d\.\d\.\d/)
+      md[0] if md
+    end
+    
+    def date
+      case interpreter
+      when 'IronRuby'
+        nil
+      when 'ruby', 'jruby'
+        md = @version.match(/\d\d\d\d\-\d\d\-\d\d/)
+        md[0] if md
+      end
+    end
+    
+    def platform
+      md = @version.match(/\[(.+)\]|(\.NET.+)/) 
+      md.to_a.compact.last if md
+    end
+    
+    def patchlevel
+      md = @version.match(/patchlevel (\d+)|\dp(\d+)/) 
+      md.to_a.compact.last if md
+    end
+    
+    def full_version
+      @version[5..-1]
+    end
+    
+  end
+  
+end
+      
+        
+
+  

data/lib/pik/which.rb

@@ -9,7 +9,13 @@ module Which
         path = path.find{|dir| exist?(dir)}
         Pathname(path) rescue nil
       end
-  
+      
+      def find_all(search_path=ENV['PATH'])
+        path = SearchPath.new(search_path)
+        path = path.find_all{|dir| exist?(dir)}
+        path.map{|i| Pathname(i) }
+      end
+      
       def exist?(path)
         !!exe(path)
       end
@@ -54,5 +60,11 @@ module Which
       ['7za.exe']
     end 
   end
+  
+  class Irb < Base
+    def self.executables
+      ['irb.bat', 'ir.exe']
+    end
+  end
 
 end

data/lib/pik/windows_env.rb

@@ -5,13 +5,13 @@ require 'Win32API'
 class WindowsEnv
 
   def self.system
-    key     = :HKEY_LOCAL_MACHINE
+    key    = :HKEY_LOCAL_MACHINE
     subkey = 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment'
     new(key, subkey)
   end
 
   def self.user
-    key = :HKEY_CURRENT_USER
+    key    = :HKEY_CURRENT_USER
     subkey = 'Environment'
     new(key, subkey)
   end

data/spec/gemsync_command_spec.rb

@@ -1,15 +1,7 @@
 describe Pik::GemSync do
   it "should have a summary" do
-    summary = "Duplicates gems from the current version to the one specified."
+    summary = "Synchronizes gems from the version specified to the current version."
     Pik::GemSync.summary.should eql(summary)
   end
   
-  describe "gem_install" do
-    it "should install gems via batch file" do
-      gemsync = Pik::GemSync.new([])
-      gemsync.gem_install(Pathname.new('c:/fake/file.gem'))
-      gemsync.batch.file_data.should include( "ECHO Installing file.gem" )
-      gemsync.batch.file_data.should include( "CALL gem install -q --no-rdoc --no-ri c:\\fake\\file.gem\n" )
-    end
-  end
 end

data/spec/version_parser_spec.rb

@@ -0,0 +1,121 @@
+
+describe Pik::VersionParser do
+
+  {
+  "091: IronRuby 0.9.1.0 on .NET 2.0.0.0" => OpenStruct.new(
+     :interpreter  => "IronRuby",
+     :version      => "0.9.1.0",
+     :date         => nil,
+     :platform     => ".NET 2.0.0.0",
+     :patchlevel   => nil,
+     :full_version => "IronRuby 0.9.1.0 on .NET 2.0.0.0"
+    ), 
+  "092: IronRuby 0.9.2.0 on .NET 2.0.0.0" => OpenStruct.new(
+     :interpreter  => "IronRuby",
+     :version      => "0.9.2.0",
+     :date         => nil,
+     :platform     => ".NET 2.0.0.0",
+     :patchlevel   => nil,
+     :full_version => "IronRuby 0.9.2.0 on .NET 2.0.0.0"
+    ), 
+  "131: jruby 1.3.1 (ruby 1.8.6p287) (2009-06-15 2fd6c3d) (Java HotSpot(TM) Client VM 1.6.0_14) [x86-java]" => OpenStruct.new(
+     :interpreter  => "jruby",
+     :version      => "1.3.1",
+     :date         => "2009-06-15",
+     :platform     => "x86-java",
+     :patchlevel   => "287",
+     :full_version => "jruby 1.3.1 (ruby 1.8.6p287) (2009-06-15 2fd6c3d) (Java HotSpot(TM) Client VM 1.6.0_14) [x86-java]"
+    ), 
+  "140: jruby 1.4.0 (ruby 1.8.7 patchlevel 174) (2009-11-02 69fbfa3) (Java HotSpot(TM) Client VM 1.6.0_14) [x86-java]" => OpenStruct.new(
+     :interpreter  => "jruby",
+     :version      => "1.4.0",
+     :date         => "2009-11-02",
+     :platform     => "x86-java",
+     :patchlevel   => "174",
+     :full_version => "jruby 1.4.0 (ruby 1.8.7 patchlevel 174) (2009-11-02 69fbfa3) (Java HotSpot(TM) Client VM 1.6.0_14) [x86-java]"
+    ), 
+  "185: ruby 1.8.5 (2006-12-25 patchlevel 12) [i386-mswin32]" => OpenStruct.new(
+     :interpreter  => "ruby",
+     :version      => "1.8.5",
+     :date         => "2006-12-25",
+     :platform     => "i386-mswin32",
+     :patchlevel   => "12",
+     :full_version => "ruby 1.8.5 (2006-12-25 patchlevel 12) [i386-mswin32]"
+    ), 
+  "186: ruby 1.8.6 (2008-08-11 patchlevel 287) [i386-mswin32]" => OpenStruct.new(
+     :interpreter  => "ruby",
+     :version      => "1.8.6",
+     :date         => "2008-08-11",
+     :platform     => "i386-mswin32",
+     :patchlevel   => "287",
+     :full_version => "ruby 1.8.6 (2008-08-11 patchlevel 287) [i386-mswin32]"
+    ), 
+  "186: ruby 1.8.6 (2009-03-31 patchlevel 368) [i386-mingw32]" => OpenStruct.new(
+     :interpreter  => "ruby",
+     :version      => "1.8.6",
+     :date         => "2009-03-31",
+     :platform     => "i386-mingw32",
+     :patchlevel   => "368",
+     :full_version => "ruby 1.8.6 (2009-03-31 patchlevel 368) [i386-mingw32]"
+    ), 
+  "186: ruby 1.8.6 (2009-08-04 patchlevel 383) [i386-mingw32]" => OpenStruct.new(
+     :interpreter  => "ruby",
+     :version      => "1.8.6",
+     :date         => "2009-08-04",
+     :platform     => "i386-mingw32",
+     :patchlevel   => "383",
+     :full_version => "ruby 1.8.6 (2009-08-04 patchlevel 383) [i386-mingw32]"
+    ), 
+  "191: ruby 1.9.1p129 (2009-05-12 revision 23412) [i386-mingw32]" => OpenStruct.new(
+     :interpreter  => "ruby",
+     :version      => "1.9.1",
+     :date         => "2009-05-12",
+     :platform     => "i386-mingw32",
+     :patchlevel   => "129",
+     :full_version => "ruby 1.9.1p129 (2009-05-12 revision 23412) [i386-mingw32]"
+    ), 
+  "191: ruby 1.9.1p243 (2009-07-16 revision 24175) [i386-mingw32]" => OpenStruct.new(
+     :interpreter  => "ruby",
+     :version      => "1.9.1",
+     :date         => "2009-07-16",
+     :platform     => "i386-mingw32",
+     :patchlevel   => "243",
+     :full_version => "ruby 1.9.1p243 (2009-07-16 revision 24175) [i386-mingw32]"
+    )
+  }.each do |string, data| 
+
+    ruby_version = Pik::VersionParser.parse(string)
+  
+    describe '#parse' do
+      it 'should return a VersionParser object' do
+        ruby_version.should be_a(Pik::VersionParser)
+      end
+    end
+
+    it "should have an interpreter for #{string}" do
+      ruby_version.interpreter.should eql(data.interpreter)
+    end
+    
+    it "should have a version for #{string}" do
+      ruby_version.version.should eql(data.version)
+    end
+    
+    it "should have a date for #{string}" do
+      ruby_version.date.should eql(data.date)
+    end    
+
+    it "should have a platform for #{string}" do
+      ruby_version.platform.should eql(data.platform)
+    end
+ 
+     it "should have a patchlevel for #{string}" do
+      ruby_version.patchlevel.should eql(data.patchlevel)
+    end
+
+    it "should have a full_version for #{string}" do
+      ruby_version.full_version.should eql(data.full_version)
+    end
+ 
+  end
+  
+end

data/tools/pik/pik_runner

@@ -40,4 +40,3 @@ rescue => e
 ensure
   cmd.close if cmd
 end 
-

data/tools/pik/pik_runner.exy

@@ -8,6 +8,10 @@ file:
     type: extension-library
   abbrev.rb: 
     file: c:/ruby/Ruby-186-p383/lib/ruby/1.8/abbrev.rb
+  bundler/commands/bundle_command.rb: 
+    file: c:/ruby/Ruby-186-p383/lib/ruby/gems/1.8/gems/bundler-0.7.0/lib/bundler/commands/bundle_command.rb
+  bundler/commands/exec_command.rb: 
+    file: c:/ruby/Ruby-186-p383/lib/ruby/gems/1.8/gems/bundler-0.7.0/lib/bundler/commands/exec_command.rb
   cgi.rb: 
     file: c:/ruby/Ruby-186-p383/lib/ruby/1.8/cgi.rb
   date.rb: 
@@ -29,6 +33,8 @@ file:
     type: extension-library
   fileutils.rb: 
     file: c:/ruby/Ruby-186-p383/lib/ruby/1.8/fileutils.rb
+  find.rb: 
+    file: c:/ruby/Ruby-186-p383/lib/ruby/1.8/find.rb
   highline.rb: 
     file: c:/ruby/Ruby-186-p383/lib/ruby/gems/1.8/gems/highline-1.5.1/lib/highline.rb
   highline/color_scheme.rb: 
@@ -105,8 +111,6 @@ file:
     file: ./../../lib/pik/commands/add_command.rb
   pik/commands/batch_file_editor.rb: 
     file: ./../../lib/pik/commands/batch_file_editor.rb
-  pik/commands/checkup_command.rb: 
-    file: ./../../lib/pik/commands/checkup_command.rb
   pik/commands/command.rb: 
     file: ./../../lib/pik/commands/command.rb
   pik/commands/config_command.rb: 
@@ -121,6 +125,8 @@ file:
     file: ./../../lib/pik/commands/help_command.rb
   pik/commands/implode_command.rb: 
     file: ./../../lib/pik/commands/implode_command.rb
+  pik/commands/info_command.rb: 
+    file: ./../../lib/pik/commands/info_command.rb
   pik/commands/install_command.rb: 
     file: ./../../lib/pik/commands/install_command.rb
   pik/commands/list_command.rb: 
@@ -135,6 +141,8 @@ file:
     file: ./../../lib/pik/commands/tag_command.rb
   pik/commands/uninstall_command.rb: 
     file: ./../../lib/pik/commands/uninstall_command.rb
+  pik/commands/update_command.rb: 
+    file: ./../../lib/pik/commands/update_command.rb
   pik/config_file.rb: 
     file: ./../../lib/pik/config_file.rb
   pik/contrib/progressbar.rb: 
@@ -151,6 +159,8 @@ file:
     file: ./../../lib/pik/pik.rb
   pik/search_path.rb: 
     file: ./../../lib/pik/search_path.rb
+  pik/version_parser.rb: 
+    file: ./../../lib/pik/version_parser.rb
   pik/which.rb: 
     file: ./../../lib/pik/which.rb
   pik/windows_env.rb: 
@@ -168,6 +178,10 @@ file:
     file: c:/ruby/Ruby-186-p383/lib/ruby/site_ruby/1.8/rubygems.rb
   rubygems/builder.rb: 
     file: c:/ruby/Ruby-186-p383/lib/ruby/site_ruby/1.8/rubygems/builder.rb
+  rubygems/command.rb: 
+    file: c:/ruby/Ruby-186-p383/lib/ruby/site_ruby/1.8/rubygems/command.rb
+  rubygems/command_manager.rb: 
+    file: c:/ruby/Ruby-186-p383/lib/ruby/site_ruby/1.8/rubygems/command_manager.rb
   rubygems/config_file.rb: 
     file: c:/ruby/Ruby-186-p383/lib/ruby/site_ruby/1.8/rubygems/config_file.rb
   rubygems/custom_require.rb: 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pik
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Gordon Thiesfeld
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 -06:00
+date: 2009-11-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,21 +33,33 @@ dependencies:
         version: 2.3.3
     version: 
 description: |-
-  Pik is a tool to switch between multiple versions of ruby on Windows.  
+  Pik is a tool to manage multiple versions of ruby on Windows.  
   
-  Or to put it another way
-  
-    doskey rvm=pik $*  # (sort of)
-    
-  You have to tell it where your different ruby versions live using 
-  'pik add'.  Then you can change to one by using 'pik switch'.
-  
-  It also supports running commands/code with all versions configured.
-  
-    pik run  #  Runs commands on the command line
-    pik ruby #  Runs using the ruby interpreter for each version (ruby.exe, jruby.bat, ir.exe)
-    pik gem  #  Runs using the gem command for each version  (gem.bat, igem.bat)
-    pik rake #  Runs using the rake command for each version  (rake.bat, irake.bat)
+      >pik help commands
+      
+        add             Adds another ruby location to pik.
+        benchmark|bench Runs bencmarks with all versions that pik is aware of.
+        checkup|cu      Checks your environment for current Ruby best practices.
+        config          Adds/modifies configuration options.
+        default         Switches back to the default settings.
+        gem             Runs the gem command with all versions that pik is aware of.
+        gemsync         Synchronizes gems from the version specified to the current version.
+        help            Displays help information.
+        implode         Removes your pik configuration.
+        info            Displays information about the current ruby version.
+        install|in      Downloads and installs different ruby versions.
+        list|ls         Lists ruby versions that pik is aware of.
+        rake            Runs the rake command with all versions that pik is aware of.
+        remove|rm       Removes a ruby location from pik.
+        ruby|rb         Runs ruby with all versions that pik is aware of.
+        run             Runs command with all versions of ruby that pik is aware of.
+        switch|sw|use   Switches ruby versions based on patterns.
+        tag             Adds the given tag to the current version.
+        tags            Runs the pik command against the given tags.
+        uninstall|unin  Deletes a ruby version from the filesystem and removes it from Pik.
+        update|up       updates pik.
+      
+      For help on a particular command, use 'pik help COMMAND'.
 email: 
 - gthiesfeld@gmail.com
 executables: 
@@ -82,11 +94,9 @@ files:
 - features/version.feature
 - lib/pik.rb
 - lib/pik/batch_file.rb
-- lib/pik/checkup.rb
 - lib/pik/commands.rb
 - lib/pik/commands/add_command.rb
 - lib/pik/commands/batch_file_editor.rb
-- lib/pik/commands/checkup_command.rb
 - lib/pik/commands/command.rb
 - lib/pik/commands/config_command.rb
 - lib/pik/commands/config_file_editor.rb
@@ -94,6 +104,7 @@ files:
 - lib/pik/commands/gemsync_command.rb
 - lib/pik/commands/help_command.rb
 - lib/pik/commands/implode_command.rb
+- lib/pik/commands/info_command.rb
 - lib/pik/commands/install_command.rb
 - lib/pik/commands/list_command.rb
 - lib/pik/commands/remove_command.rb
@@ -101,6 +112,7 @@ files:
 - lib/pik/commands/switch_command.rb
 - lib/pik/commands/tag_command.rb
 - lib/pik/commands/uninstall_command.rb
+- lib/pik/commands/update_command.rb
 - lib/pik/config_file.rb
 - lib/pik/contrib/progressbar.rb
 - lib/pik/contrib/unzip.rb
@@ -116,6 +128,7 @@ files:
 - lib/pik/options.rb
 - lib/pik/pik.rb
 - lib/pik/search_path.rb
+- lib/pik/version_parser.rb
 - lib/pik/which.rb
 - lib/pik/windows_env.rb
 - spec/add_command_spec.rb
@@ -136,6 +149,7 @@ files:
 - spec/search_path_spec.rb
 - spec/spec.opts
 - spec/switch_command_spec.rb
+- spec/version_parser_spec.rb
 - spec/which_spec.rb
 - tools/pik.bat
 - tools/pik/pik_runner
@@ -200,6 +214,6 @@ rubyforge_project: pik
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Pik is a tool to switch between multiple versions of ruby on Windows
+summary: Pik is a tool to manage multiple versions of ruby on Windows
 test_files: []
 

data/lib/pik/checkup.rb

@@ -1,11 +0,0 @@
-# class Pik
-
-#   class Checkup
-  
-#     def initialize(text)
-#       @text   = text
-#       @output = ["Checkup results:"]
-#     end
-
-
-# end

data/lib/pik/commands/checkup_command.rb

@@ -1,70 +0,0 @@
-module Pik
-
-  class  Checkup < Command  
-    
-    aka :cu
-    it "Checks your environment for current Ruby best practices."
-    
-    def execute
-      home
-      rubyopt
-      path
-      pathext
-    end
-
-    def to_s
-      ERB.new(@output.join("\n\n")).result
-    end
-
-    def rubyopt
-      unless WindowsEnv.user['rubyopt'].nil? && WindowsEnv.system['rubyopt'].nil?
-        fail('rubyopt')        
-      else
-        pass('rubyopt')
-      end
-    end
-
-    def home
-      if WindowsEnv.user['home'].empty?
-        fail('home')        
-      else
-        pass('home')
-      end
-    end
-
-    def path
-      user_path = WindowsEnv.user['path']    || ''
-      syst_path = WindowsEnv.system['path']  || ''
-      dirs = (user_path + syst_path).split(';')
-      dirs = dirs.select{|dir| File.exist?( File.join(dir,'ruby.exe') ) }
-      unless dirs.size == 1
-        fail('path')        
-      else
-        pass('path')
-      end
-    end
-
-    def pathext
-      p_ext = WindowsEnv.system['pathext'].downcase
-      unless p_ext.include?('.rb') && p_ext.include?('.rbw')
-        fail('pathext')        
-      else
-        pass('pathext')
-      end
-    end
-
-    def pass(test)
-      print '.'
-      $stdout.flush
-      # @output << @text[test][:pass]
-    end
-
-    def fail(test)
-      print 'F'
-      $stdout.flush
-      # @output << @text[test][:fail]
-    end
-
-  end
-  
-end