pik 0.2.7 → 0.2.8

data/History.txt

@@ -1,3 +1,12 @@
+=== 0.2.8 / 2010-06-22
+** BACKWARD COMPATIBILITY CHANGE 
+  pik will now install new rubies to %USERPROFILE%\rubies\, instead of %PIK_BIN%\pik\  this was necessary to all for installation into %PROGRAMFILES% dir.  If you'd like to keep the old path, run:
+    >pik config install_dir=C:\path\to\pik
+**
+* fixed bug in 'devkit update' - gcc.bat file was writing to/overwriting sh.bat
+* added support for powershell
+* added support for Git Bash
+* it is now possible to install pik to %PROGRAMFILES%
 
 === 0.2.7 / 2010-06-15
 * cleaner list output

data/Manifest.txt

@@ -18,15 +18,13 @@ features/run_command.feature
 features/step_definitions/pik_commands.rb
 features/support/env.rb
 features/support/proxy.ru
-features/switch_command.feature
 features/tag_command.feature
 features/uninstall_command.feature
+features/use_command.feature
 features/version.feature
 lib/pik.rb
-lib/pik/batch_file.rb
 lib/pik/commands.rb
 lib/pik/commands/add_command.rb
-lib/pik/commands/batch_file_editor.rb
 lib/pik/commands/command.rb
 lib/pik/commands/config_command.rb
 lib/pik/commands/config_file_editor.rb
@@ -40,10 +38,11 @@ lib/pik/commands/install_command.rb
 lib/pik/commands/list_command.rb
 lib/pik/commands/remove_command.rb
 lib/pik/commands/run_command.rb
-lib/pik/commands/switch_command.rb
+lib/pik/commands/script_file_editor.rb
 lib/pik/commands/tag_command.rb
 lib/pik/commands/uninstall_command.rb
 lib/pik/commands/update_command.rb
+lib/pik/commands/use_command.rb
 lib/pik/config_file.rb
 lib/pik/contrib/progressbar.rb
 lib/pik/contrib/unzip.rb
@@ -57,7 +56,10 @@ lib/pik/contrib/zip/ziprequire.rb
 lib/pik/core_ext/pathname.rb
 lib/pik/implementations.rb
 lib/pik/options.rb
-lib/pik/pik.rb
+lib/pik/scripts/bash_file.rb
+lib/pik/scripts/batch_file.rb
+lib/pik/scripts/ps_file.rb
+lib/pik/scripts/script_file.rb
 lib/pik/search_path.rb
 lib/pik/version_parser.rb
 lib/pik/which.rb
@@ -83,6 +85,5 @@ spec/switch_command_spec.rb
 spec/version_parser_spec.rb
 spec/which_spec.rb
 tools/pik.bat
-tools/pik/pik_runner
-tools/pik/pik_runner.exe
-tools/pik/pik_runner.exy
+tools/pik.ps1
+tools/pik_runner.exe

data/README.rdoc

@@ -12,7 +12,7 @@ Gordon Thiesfeld
 
 == DESCRIPTION:
 
-Pik is a tool to manage multiple versions of ruby on Windows.  
+Pik is a tool to manage multiple versions of ruby on Windows.  It can be used from the Windows command line (cmd.exe), Windows PowerShell, or Git Bash.  I have yet to test on cygwin.  
 
     >pik help commands
     
@@ -42,15 +42,17 @@ Pik is a tool to manage multiple versions of ruby on Windows.
   
 == REQUIREMENTS:
 
-Windows, more than one version of Ruby (otherwise, what's the point?) and Rubygems
+Windows
 
 *  Build dependencies: exerb-mingw, highline, hpricot, crown, upx, wix
 
 *  Development dependencies: rake, cucumber, rspec, hoe, hoe-git, rack, rack-cache
 
 == INSTALL:
+  
+You can install pik via rubygems, or the Windows installer, or you can update pik with pik
 
-*  install pik using rubygems.
+=== Install pik using rubygems
 
     >gem install pik
     ...
@@ -73,7 +75,15 @@ So I run:
     ...
      
     pik is installed
+
+=== Install pik using the installer
+
+If you want to install to a machine that doesn't have Ruby installed yet, you can download the latest msi file from github[http://github.com/vertiginous/pik/downloads].  Or, just run:
     
+    >msiexec /i http://github.com/downloads/vertiginous/pik/pik-n.n.n.msi    
+
+The MSI installer currently doesn't install the needed files to use Pik from Git Bash. Also, there was a bug in the upgrade code in 0.2.7, so you should uninstall the current version before installing the new one.
+
 If you install to a directory that's not in your path, you'll need to add it to the path yourself.  Microsoft has good instructions[http://support.microsoft.com/kb/310519] on that.  After that, you should be ready to run pik. 
 
 *  If this is a first-time install, look at pik add, and pik install to set up your environment.

data/Rakefile

@@ -24,11 +24,11 @@ ENV['SPEC_OPTS']= '-O spec/spec.opts'
 
 lib = FileList["lib/**/*.rb"]
 
-file 'tools/pik/pik_runner.exy', :needs => ['tools/pik/pik_runner'] + lib do
-  Dir.chdir 'tools/pik' do
-    sh('ruby -rexerb/mkexy pik_runner -v')
+file 'tools/pik_runner.exy', :needs => ['tools/pik_runner'] + lib do
+  Dir.chdir 'tools' do
+    sh('ruby -rexerb/mkexy pik_runner pik.bat -v')
   end
-  exy = YAML.load(File.read('tools/pik/pik_runner.exy'))
+  exy = YAML.load(File.read('tools/pik_runner.exy'))
   zlib1 = {
     'file' =>  File.join(RbConfig::CONFIG['bindir'], 'zlib1.dll'),
     'type' => 'extension-library'
@@ -36,28 +36,28 @@ file 'tools/pik/pik_runner.exy', :needs => ['tools/pik/pik_runner'] + lib do
   exy['file']['zlib1.dll']  = zlib1
   exy['resource']  = EXE_VERSION
    
-  File.open('tools/pik/pik_runner.exy', 'w+'){ |f| f.puts YAML.dump(exy) }
+  File.open('tools/pik_runner.exy', 'w+'){ |f| f.puts YAML.dump(exy) }
 end
 
-file 'tools/pik/pik_runner.exe', :needs => ['tools/pik/pik_runner.exy'] do
-  Dir.chdir 'tools/pik' do
+file 'tools/pik_runner.exe', :needs => ['tools/pik_runner.exy'] do
+  Dir.chdir 'tools' do
     sh('ruby -S exerb pik_runner.exy')
     sh('upx -9 pik_runner.exe') unless ENV['QUICK']
   end
 end
 
-task :build, :needs => 'tools/pik/pik_runner.exe'
+task :build, :needs => 'tools/pik_runner.exe'
 
 task :install, :needs => :build do
   sh('ruby bin/pik_install C:\\bin')
 end
 
 task :clobber_exe do
-  rm_rf 'tools/pik/pik_runner.exe'
+  rm_rf 'tools/pik_runner.exe'
 end
 
 task :clobber_exy, :needs => :clobber_exe do
-  rm_rf 'tools/pik/pik_runner.exy'
+  rm_rf 'tools/pik_runner.exy'
 end
 
 task :rebuild, :needs => [:clobber_exy, :build]
@@ -73,7 +73,6 @@ Hoe.spec('pik') do
   developer('Gordon Thiesfeld', 'gthiesfeld@gmail.com')
   
   self.need_tar = false
-  self.extra_deps = {'highline' =>  '>= 0.0.0'}
   self.readme_file = 'README.rdoc'
   self.post_install_message =<<-PIM
 
@@ -130,17 +129,22 @@ Cucumber::Rake::Task.new(:features) do |t|
   t.cucumber_opts = "features  -f html -o ../pik_cucumber.html -f progress"
 end
 
+desc "generate a guid"
 task :guid do
   puts
   puts UUID.new.generate.upcase
 end
 
+require 'nokogiri'
 directory 'pkg'
+@package  = 'pik'
+@wix_file = "lib/installer/#{@package}.wxs"
+@wxs      = Nokogiri::XML(File.open(@wix_file))
+@product  = @wxs.at_css("Product")
 
-@package = 'pik'
+msi_file  = "pkg/#{@package}-#{Pik::VERSION}.msi"
 
-msi_file = "pkg/#{@package}-#{Pik::VERSION}.msi"
-file msi_file, :needs => 'tools/pik/pik_runner.exe'
+file msi_file, :needs => 'tools/pik_runner.exe'
 
 task :installer, :needs => [msi_file, :light]
 
@@ -163,5 +167,22 @@ task :light, :needs => :candle do
     sh("light -nologo -ext WixUtilExtension -ext WixUIExtension #{wixobj_files} -o ../../#{msi_file}")
   end
 end
+
+def version_string
+  @version.gsub(".","")
+end
+
+task :upgrade do
+  @product["Version"] = Pik::VERSION
+  
+  upgrade_max = @product.at_css("UpgradeVersion[Property = 'OLDAPPFOUND']")
+  upgrade_max["Maximum"] = Pik::VERSION
+
+  upgrade_min = @product.at_css("UpgradeVersion[Property = 'NEWAPPFOUND']")
+  upgrade_min["Minimum"] = Pik::VERSION
+
+  @product["Id"] = UUID.new.generate
+  File.open(@wix_file, 'w+'){|f| f.puts @wxs }
+end
 # vim: syntax=Ruby
 

data/bin/pik_install

@@ -25,18 +25,50 @@ abort usage unless ARGV.first
 
 puts "Thank you for using pik.\n\n"
 
-install_dir = ARGV.first
-tools_dir   = File.join(File.dirname(__FILE__), '..', 'tools')
+install_dir      = ARGV.first
+     
+pik_home         = File.join(ENV['USERPROFILE'], '.pik')
+
+src_dir          = File.join(File.dirname(File.dirname(__FILE__)), 'tools')
+
+bash_install_dir = install_dir.tr('\\','/').sub(/^(.):/){|s| "/#{s[0,1].downcase}"}
+
+mkdir_p install_dir, :verbose => true
+mkdir_p pik_home,    :verbose => true
+
+old_dir = File.join(install_dir, 'pik')
+old_pik = File.join(old_dir, 'pik_runner.exe')
+if File.exist? old_pik
+  puts "cleaning up old files"
+  rm old_pik,    :verbose => true
+end
+
+begin
+  rmdir(old_dir, :verbose=> true) if File.exist? old_dir
+rescue Errno::ENOTEMPTY
+  puts "warning: can't delete #{old_dir}, directory not empty"
+  puts "continuing intall..."
+end
 
 puts "Installing to #{install_dir}\n\n"
-cp File.join(tools_dir, 'pik.bat'), install_dir , 
-  :verbose => true
+cp File.join(src_dir, 'pik_runner.exe'), install_dir, :verbose => true
+cp File.join(src_dir, 'pik.bat'),        install_dir, :verbose => true
+cp File.join(src_dir, 'pik.ps1'),        install_dir, :verbose => true
+
+pikrc_file = File.join(pik_home, '.pikrc')
+pikrc_contents =<<PIKRC
+#!/bin/sh
+pik_path=#{bash_install_dir}
+
+function pik  {
+  $pik_path/pik_runner.exe pik.sh $@
+  [[ -s $USERPROFILE/.pik/pik.sh ]] && source $USERPROFILE/.pik/pik.sh
+} 
+PIKRC
+puts
+puts "creating #{pikrc_file}"
+File.open(pikrc_file, 'w+'){|f| f.puts pikrc_contents }
 
-mkdir_p File.join(install_dir, 'pik'), :verbose => true
-cp File.join(tools_dir, 'pik', 'pik_runner.exe'), 
-  File.join(install_dir, 'pik') , 
-  :verbose => true
-  
 puts "\npik is installed"
 
 unless ENV['PATH'].downcase.include?( install_dir.downcase.gsub('/',"\\") )
@@ -52,4 +84,12 @@ SYSTEM_PATH_MSG
   
   puts system_path_msg
   
-end
+end
+
+puts
+puts bash_msg =<<BASH_MSG
+if you want to use pik with git bash, add the following line to your ~/.bashrc:
+
+  [[ -s $USERPROFILE/.pik/.pikrc ]] && source $USERPROFILE/.pik/.pikrc
+
+BASH_MSG

data/features/support/env.rb

@@ -35,11 +35,11 @@ require 'win32/process'
 REAL_PATH  = SearchPath.new(ENV['PATH']).replace(RbConfig::CONFIG['bindir'], 'C:\temp\more spaces in path\ruby\Ruby-186-p398-2\bin').join
 OTHER_RUBY  = 'c:\\temp\\more spaces in path\\ruby\\Ruby-191-p378-1\\bin'
 
-ENV['HOME'] = "C:\\temp\\path with spaces"
+ENV['USERPROFILE'] = "C:\\temp\\path with spaces"
 ENV['http_proxy'] = "http://localhost:9292"
 
 PIK_LOG = 'log\\output.log'
-TEST_PIK_HOME  = Pathname.new( ENV['HOME'] || ENV['USERPROFILE'] ) + '.pik'
+TEST_PIK_HOME  = Pathname.new( ENV['USERPROFILE'] ) + '.pik'
 FAKE_PIK_HOME = 'c:/temp/path with spaces/.pik'
 PID_FILE = 'c:/temp/proxy/proxy.pid'
 

data/features/{switch_command.feature → use_command.feature}

@@ -1,12 +1,12 @@
-Feature: switch command
+Feature: use command
   In order to switch from one ruby version to another
   A developer
   Wants an interface to the program
   So that she can easily update the path and other environment variables.
 
-  Scenario Outline: Switching versions with switch command
+  Scenario Outline: Switching versions with use command
     Given I have added "<version>" to pik
-    When I run "pik switch <patterns> -v" and check the path
+    When I run "pik use <patterns> -v" and check the path
     Then I should see "<version>"
     And the path should point to it.
     And the GEM_HOME might get set.

data/lib/pik.rb

@@ -1,7 +1,3 @@
-module Pik
-  VERSION = '0.2.7'
-end
-
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'vendor/lib'))
 
@@ -12,24 +8,17 @@ require 'find'
 require 'open-uri'
 require 'rbconfig'
 
-ENV['GEM_HOME'] = nil
-ENV['GEM_PATH'] = nil
-# real_home       = ENV['HOME']
-# ENV['HOME']     = "nul"
-
-# require 'rubygems'
-
-# ENV['HOME']    = real_home
-
 require 'hpricot'
 require 'highline'
 
-require 'pik/pik'
-require 'pik/batch_file'
 require 'pik/core_ext/pathname'
+require 'pik/scripts/script_file'
+require 'pik/scripts/batch_file'
+require 'pik/scripts/ps_file'
+require 'pik/scripts/bash_file'
 require 'pik/commands'
 require 'pik/commands/config_file_editor'
-require 'pik/commands/batch_file_editor'
+require 'pik/commands/script_file_editor'
 require 'pik/commands/command'
 require 'pik/commands/devkit_command'
 require 'pik/commands/install_command'
@@ -37,7 +26,7 @@ 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/use_command'
 require 'pik/commands/run_command'
 require 'pik/commands/remove_command'
 require 'pik/commands/config_command'
@@ -54,14 +43,34 @@ require 'pik/version_parser'
 require 'pik/windows_env'
 require 'pik/which'
 
-PIK_HOME  = Pathname.new( ENV['HOME'] || ENV['USERPROFILE'] ) + '.pik'
+module Pik
+  VERSION = '0.2.8'
+  Scripts = {
+    '.cmd' => BatchFile, 
+    '.bat' => BatchFile, 
+    '.ps1' => PsFile, 
+    '.sh'  => BashFile 
+  }
 
-if defined? ExerbRuntime
-  PIK_BATCH = Pathname.new(ARGV.shift).ruby
-else
-  pik_exe = Pathname.new($0).expand_path + '..' 
-  PIK_BATCH = pik_exe.dirname + "#{pik_exe.basename}.bat"
+  def self.print_error(error)
+    puts "\nThere was an error."
+    puts " Error: #{error.message}\n\n"
+    puts error.backtrace.map{|m| "  in: #{m}" }
+    puts
+  end
+  
 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.")
+
+PIK_HOME    = Pathname.new( ENV['USERPROFILE'] ) + '.pik'
+
+if defined?(ExerbRuntime) || $0 =~ /pik_runner/
+  PIK_SCRIPT  = Pathname.new(ARGV.shift).ruby
+  SCRIPT_LANG = Pik::Scripts[PIK_SCRIPT.extname]
+  SCRIPT_FILE = SCRIPT_LANG.new(PIK_HOME + 'pik')
+else
+  SCRIPT_FILE = Pik::BatchFile.new(PIK_HOME + 'pik')
+end

data/lib/pik/commands/command.rb

@@ -9,7 +9,7 @@ module Pik
   end
   
   class  Command
-    
+
     attr_reader :config
     
     attr_reader :options
@@ -47,14 +47,6 @@ module Pik
     def self.names
       @names ||= [cmd_name]
     end
-  
-    def self.clean_gem_batch
-      BatchFile.open(PIK_BATCH) do |gem_bat|
-        # remove old calls to .pik/pik batches
-        gem_bat.remove_line( /call.+pik.+bat/i )
-        gem_bat.write  
-      end
-    end
 
     def self.choose_from(patterns, config)
       if patterns.empty?
@@ -85,11 +77,11 @@ module Pik
       @config  = config_ || ConfigFile.new
       @hl      = HighLine.new
       add_sigint_handler
-      options.program_name = "#{PIK_BATCH.basename('.*')} #{self.class.names.join('|')}"
+      options.program_name = "pik #{self.class.names.join('|')}"
       command_options
       parse_options
       create(PIK_HOME) unless PIK_HOME.exist?
-      delete_old_pik_batches
+      delete_old_pik_script
     end
 
     def close
@@ -162,10 +154,8 @@ module Pik
       home.mkpath
     end
    
-    def delete_old_pik_batches( cutoff=(Time.now - (2 * 60 * 60)) )
-      Dir[(PIK_HOME + "*.bat").to_ruby.to_s].each do |f|
-        File.delete(f) if File.ctime(f) < cutoff 
-      end
+    def delete_old_pik_script
+      SCRIPT_FILE.path.delete if SCRIPT_FILE.path.exist?
     end
     
     def sh(cmd)