pik 0.2.6 → 0.2.7

data/History.txt

@@ -1,3 +1,23 @@
+
+=== 0.2.7 / 2010-06-15
+* cleaner list output
+* pik switch/use is no longer case sensitive
+    '>pik iron' vice '>pik Iron'
+* created devkit implmentation (pik install devkit)
+* created devkit update command (pik devkit update) creates batch files if you install
+    a newer version of ruby after devkit.
+* added devkit config option, if you already have it installed:
+    >pik config devkit=c:\ruby\devkit
+    >pik devkit update
+* fixed Implementations::IronRuby to catch newer versions, and ignore ipy packages
+* improved pik_install instructions
+* pik_install displays usage message when no argument is given
+* fixed some bugs in info command
+* fixed pik.bat to run in tcc/le
+* removed RubyGems dependency ( the executable was causing weird errors with plugins)
+* fixed Implementations::Ruby to catch RC1 7z files
+* fixed regression in version option
+
 === 0.2.6 / 2009-11-08
 
 * deprecated checkup command in favor of info command

data/Manifest.txt

@@ -6,16 +6,18 @@ bin/pik_install
 features/add_command.feature
 features/config_command.feature
 features/default_command.feature
-features/env.rb
 features/gemsync_command.feature
 features/help_command.feature
 features/implode_command.feature
+features/info_command.feature
 features/install_command.feature
 features/list_command.feature
 features/pik_install.feature
 features/remove_command.feature
 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
@@ -29,6 +31,7 @@ lib/pik/commands/command.rb
 lib/pik/commands/config_command.rb
 lib/pik/commands/config_file_editor.rb
 lib/pik/commands/default_command.rb
+lib/pik/commands/devkit_command.rb
 lib/pik/commands/gemsync_command.rb
 lib/pik/commands/help_command.rb
 lib/pik/commands/implode_command.rb

data/README.rdoc

@@ -44,32 +44,55 @@ Pik is a tool to manage multiple versions of ruby on Windows.
 
 Windows, more than one version of Ruby (otherwise, what's the point?) and Rubygems
 
+*  Build dependencies: exerb-mingw, highline, hpricot, crown, upx, wix
+
+*  Development dependencies: rake, cucumber, rspec, hoe, hoe-git, rack, rack-cache
+
 == INSTALL:
 
-*  If you're upgrading from a version <= 0.1.1, you'll want to delete the pik.bat file
-   from all of your ruby versions. Gem uninstall should do the trick.
-    
-*  Install pik to a location that's in your path, but someplace other than your ruby\bin dir
-   If you're upgrading from a more recent version, pik_install will overwrite the older files as needed.
+*  install pik using rubygems.
+
+    >gem install pik
+    ...
    
-    >path
-      PATH=C:\tools\;C:\ruby\186-p368-mingw32\bin;C:\WINDOWS\system32;C:\WINDOWS
+    Successfully installed pik-0.2.6
+    1 gem installed
 
-    >pik_install C:\tools
-  
-*  If this is a first-time install, add all the versions of ruby that you want to use with pik
+After the gem is installed, you can use the 'pik_install' script to install the pik executable.  Install pik to a location that's in your path, but someplace other than your ruby\bin dir.  For instance, the directory C:\bin is in my path:
+
+    >path
+    PATH=c:\bin;C:\Program Files\Windows Resource Kits\Tools\;c:\ruby\Ruby-186-p383\bin;
+   
+So I run:
 
-    >pik add
-    Adding:  186: ruby 1.8.6 (2009-03-31 patchlevel 368) [i386-mingw32]
-     Located at:  c:/ruby/186-p368-mingw32/bin
+    >pik_install C:\bin
+    Thank you for using pik.
+   
+    Installing to C:\bin
+     
+    ...
+     
+    pik is installed
     
+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.
+ 
     >pik add C:\ruby\IronRuby-091\bin
     Adding:  091: IronRuby 0.9.1.0 on .NET 2.0.0.0
      Located at:  C:/ruby/IronRuby-091/bin
     
-    >pik add C:\ruby\jruby-1.4.0RC1\bin
-    Adding:  140: jruby 1.4.0RC1 (ruby 1.8.7 patchlevel 174) (2009-09-30 80c263b) (Java HotSpot(TM) Client VM 1.6.0_14) [x86-java]
-     Located at:  C:/ruby/jruby-1.4.0RC1/bin
+    >pik install ruby
+    ** Downloading:  http://rubyforge.org/frs/download.php/66874/ruby-1.9.1-p243-i386-mingw32-rc1.7z
+       to:  c:\installs\ruby-1.9.1-p243-i386-mingw32-rc1.7z
+    
+    ...
+
+*  If you're upgrading from version 0.2.6, you should be able to upgrade with 'pik update'
+
+*  If you're upgrading from a version <= 0.1.1, you'll want to delete the pik.bat file
+   from all of your ruby versions. Gem uninstall should do the trick.
+
      
 Note:
   
@@ -207,7 +230,7 @@ pik run # there
 
 (The MIT License)
 
-Copyright (c) 2009 Gordon Thiesfeld
+Copyright (c) 2010 Gordon Thiesfeld
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -2,11 +2,29 @@
 
 require 'rubygems'
 require 'rbconfig'
-require 'win32/process'
+require 'uuid'
+require 'hoe'
+
+$LOAD_PATH.unshift('lib')
+require 'pik'
+
+
+EXE_VERSION = {
+  'version' => {
+    'file_version_number' => "#{Pik::VERSION}.0",
+    'comments' => 'The Ruby version manager for Windows',
+    'product_name' => 'Pik',
+    'file_description' => 'Pik Runner',
+    'original_filename' => 'pik_runner.exe'
+  }
+}
+
 
 ENV['SPEC_OPTS']= '-O spec/spec.opts'
 
-file 'tools/pik/pik_runner.exy' do
+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')
   end
@@ -16,24 +34,26 @@ file 'tools/pik/pik_runner.exy' do
     'type' => 'extension-library'
   }
   exy['file']['zlib1.dll']  = zlib1
+  exy['resource']  = EXE_VERSION
+   
   File.open('tools/pik/pik_runner.exy', 'w+'){ |f| f.puts YAML.dump(exy) }
 end
 
-file 'tools/pik/pik.exe', :needs => ['tools/pik/pik_runner.exy'] do
+file 'tools/pik/pik_runner.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') unless ENV['QUICK']
   end
 end
 
-task :build, :needs => 'tools/pik/pik.exe'
+task :build, :needs => 'tools/pik/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.exe'
+  rm_rf 'tools/pik/pik_runner.exe'
 end
 
 task :clobber_exy, :needs => :clobber_exe do
@@ -45,10 +65,6 @@ task :reinstall, :needs => [:clobber_exy, :install]
 
 task :package => :rebuild
 
-require 'hoe'
-
-$LOAD_PATH.unshift('lib')
-require 'pik'
 
 Hoe.plugin :git
 
@@ -98,61 +114,54 @@ end
 require 'cucumber'
 require 'cucumber/rake/task'
 
-namespace :cucumber do
+@dir = Pathname(File.dirname(__FILE__)) 
+@test_versions = {
+  'JRuby'     => ['1.5.1'],
+  'IronRuby'  => ['0.9.2'],
+  'Ruby'      => [
+    '1.9.1-p378-1',
+    '1.8.6-p398-2',
+    '1.8.7-p249-1'
+  ]
+}
 
-  directory "C:/temp"
-  
-  desc "sets up C:\\temp for pik's cuke tests"
-  task :setup => "C:/temp" do
-    ENV['HOME'] = "C:\\temp"
-    sh "pik config installs=\"C:\\temp\\more spaces in path\\ruby\""
-    sh "pik install jruby"
-    sh "pik install ironruby"
-    sh "pik install ruby"
-    sh "pik install ruby 1.8"
-    sh "pik gem in rake"
-  end
-  
-  namespace :phonyweb do
-    
-    task :start => 'hosts:add' do
-      @web = Process.create(:app_name => "ruby C:\\scripts\\repo\\pik\\phony_web\\server.rb")
-    end
-    
-    task :kill => 'hosts:remove' do
-      Process.kill(3, @web.process_id)
-    end
-  end
-  
-  # this is used with the phony web server for 
-  # testing the install and list command
-  # without sucking up bandwidth.  It also makes the
-  # tests run faster
-  namespace :hosts do
-   
-    HOSTS = File.join(ENV['SystemRoot'], 'System32','drivers','etc','hosts')
-    desc "adds fake hosts to system's hosts file"
-    task :add do
-      File.open(HOSTS,'a+'){|f|
-       f.puts "127.0.0.1   www.jruby.org rubyforge.org www.rubyforge.org jruby.kenai.com dist.codehaus.org"
-      }
-    end
-    
-    desc "remove fake hosts from system's hosts file"
-    task :remove do
-      new_hosts = File.open(HOSTS, 'r').readlines.reject{ |i| i =~ /^127\.0\.0\.1   www\.jruby\.org/ }
-      File.open(HOSTS, 'w+'){|f| f.puts new_hosts }
-    end
-   
-    task :rm => :remove
-   
-  end
-end
 
 Cucumber::Rake::Task.new(:features) do |t|
   t.cucumber_opts = "features  -f html -o ../pik_cucumber.html -f progress"
 end
 
-task :cuke => ['cucumber:phonyweb:start', :features, 'cucumber:phonyweb:kill']
+task :guid do
+  puts
+  puts UUID.new.generate.upcase
+end
+
+directory 'pkg'
+
+@package = 'pik'
+
+msi_file = "pkg/#{@package}-#{Pik::VERSION}.msi"
+file msi_file, :needs => 'tools/pik/pik_runner.exe'
+
+task :installer, :needs => [msi_file, :light]
+
+task :build_env do
+ ENV['PATH'] = "#{ENV['ProgramFiles(x86)']}\\Windows Installer XML v3.5\\bin;#{ENV['PATH']}"
+end
+
+task :candle, :needs => [:build_env] do
+  chdir 'lib/installer/' do
+    wxs_files = ["MyInstallDirDialog.wxs",'WixUI_MyInstallDir.wxs' , "#{@package}.wxs"].join(' ')
+    # wxs_files = ["#{@package}.wxs"].join(' ')
+    sh("candle -nologo #{wxs_files}")
+  end
+end
 
+task :light, :needs => :candle do
+  chdir 'lib/installer/' do
+    wixobj_files = ["MyInstallDirDialog.wixobj", 'WixUI_MyInstallDir.wixobj', "#{@package}.wixobj"].join(' ')
+    # wixobj_files = ["#{@package}.wixobj"].join(' ')
+    sh("light -nologo -ext WixUtilExtension -ext WixUIExtension #{wixobj_files} -o ../../#{msi_file}")
+  end
+end
 # vim: syntax=Ruby
+

data/bin/pik_install

@@ -4,24 +4,52 @@ require 'fileutils'
 
 include FileUtils
 
+usage =<<USAGE
+Usage:  pik_install path\\to\\install
+
+You should install to a directory that is in your system path,
+or add the directory to your system path.  Do not install to 
+your ruby's bin directory because pik will remove it from the
+path when switching versions.
+
+Example: 
+
+  C:\\>path
+  
+  PATH=C:\\tools;C:\\ruby\\Ruby-186-p383\\bin;C:\\WINDOWS\\system32;...
+    
+  C:\\>pik_install C:\\tools
+
+USAGE
+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')
 
-if File.directory?(install_dir)
-  puts "Installing to #{install_dir}\n\n"
-  cp File.join(tools_dir, 'pik.bat'), install_dir , 
-    :verbose => true
-  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
-    
-  old_exe = File.join(install_dir, 'pik', 'pik.exe')
-  rm(old_exe, :verbose => true) if File.exist?(old_exe)
+puts "Installing to #{install_dir}\n\n"
+cp File.join(tools_dir, 'pik.bat'), install_dir , 
+  :verbose => true
+
+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('/',"\\") )
+  
+  system_path_msg =<<SYSTEM_PATH_MSG
+  
+The directory you installed to is not in the sytem path.
+#{install_dir}
+
+You will need to add it.
 
-  puts "\npik is installed"
-else
-  puts "#{install_dir} is not a directory.  pik was not installed."
+SYSTEM_PATH_MSG
+  
+  puts system_path_msg
+  
 end

data/features/add_command.feature

@@ -13,13 +13,13 @@ Feature: add command
 
   Scenario: add a version
     Given I have an empty config.yml
-    When I run "pik add C:\ruby\186-p368-mingw32\bin"
-    Then I should see "Adding:  186: ruby 1.8.6 (2009-03-31 patchlevel 368) [i386-mingw32]"
-    And I should see "Located at:  C:\ruby\186-p368-mingw32\bin"
+    When I run "pik add c:\bin\Pik\Ruby-186-p398\bin"
+    Then I should see "Adding:  186: ruby 1.8.6 (2010-02-04 patchlevel 398) [i386-mingw32]"
+    And I should see "Located at:  C:\bin\Pik\Ruby-186-p398\bin"
 
   Scenario: add a version that has already been added
-    Given I have already added "ruby 1.8.6 (2009-08-04 patchlevel 383) [i386-mingw32]"
-    When I run "pik add "C:\temp\more spaces in path\ruby\Ruby-186-p383\bin""
+    Given I have already added "ruby 1.8.6 (2010-02-04 patchlevel 398) [i386-mingw32]"
+    When I run "pik add "C:\temp\more spaces in path\ruby\Ruby-186-p398-2\bin""
     Then I should see "This version has already been added."    
     And nothing should be added to the config file.
         
@@ -29,8 +29,8 @@ Feature: add command
     
   Scenario: add a version with spaces in the path.
     Given I have an empty config.yml
-    When I run "pik add "C:\temp\more spaces in path\ruby\jruby-140RC2\bin""
-    Then I should see "Adding:  140: jruby 1.4.0RC2 (ruby 1.8.7 patchlevel 174)"
-    And I should see "Located at:  C:\temp\more spaces in path\ruby\jruby-140RC2\bin"
+    When I run "pik add "C:\temp\more spaces in path\ruby\JRuby-151\bin""
+    Then I should see "Adding:  151: jruby 1.5.1 (ruby 1.8.7 patchlevel 249)"
+    And I should see "Located at:  C:\temp\more spaces in path\ruby\JRuby-151\bin"
     
     

data/features/config_command.feature

@@ -5,8 +5,7 @@ Feature: config command
   That allows her to configure pik's behavior.
   
   Scenario: config gem_home
-    Given I have already added "ruby 1.8.6 (2009-08-04 patchlevel 383) [i386-mingw32]"
-    And I am currently using it.
+    Given I am currently using "ruby 1.8.6 (2010-02-04 patchlevel 398) [i386-mingw32]"
     When I run "pik config gem_home default" 
     Then a gem_home option should be added to the config.
         

data/features/default_command.feature

@@ -5,7 +5,7 @@ Feature: default command
   That allows her to switch back to the system defined version.
 
   Scenario: switching to the default version
-    Given I am currently using "ruby 1.9.1p243 (2009-07-16 revision 24175) [i386-mingw32]"
+    Given I am currently using "ruby 1.9.1p378 (2010-01-10 revision 26273) [i386-mingw32]"
     When I run "pik default -v" and check the path
-    Then I should see "ruby 1.8.6 (2009-08-04 patchlevel 383) [i386-mingw32]"
-    And the path should point to "c:\ruby\Ruby-186-p383\bin"
+    Then I should see "ruby 1.8.7 (2010-01-10 patchlevel 249) [i386-mingw32]"
+    And the path should point to "C:\Ruby\ruby-187-p249\bin"

data/features/gemsync_command.feature

@@ -12,7 +12,7 @@ Feature: gemsync command
     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",
+    When I run "pik iron" and "pik gemsync 186 mi -q -d",
     Then I should see "You appear to be attempting a gemsync from a different platform."
     
     

data/features/info_command.feature

@@ -0,0 +1,62 @@
+Feature: info command
+  In order to add ruby versions to pik
+  A developer
+  Wants a command line interface
+  So that she can add versions.
+
+Scenario: Info command 
+    When I run "pik info"
+    Then I should see 
+      """    
+      ruby:
+      interpreter:  "ruby"
+      version:      "1.8.6"
+      date:         "2010-02-04"
+      platform:     "i386-mingw32"
+      patchlevel:   "398"
+      full_version: "ruby 1.8.6 (2010-02-04 patchlevel 398) [i386-mingw32]"
+      
+      homes:
+      gem:          "C:\temp\more spaces in path\ruby\Ruby-186-p398-2\lib\ruby\gems\1.8"
+      ruby:         "C:\temp\more spaces in path\ruby\Ruby-186-p398-2"
+      
+      binaries:
+      ruby:         "C:\temp\more spaces in path\ruby\Ruby-186-p398-2\bin"
+      irb:          "C:\temp\more spaces in path\ruby\Ruby-186-p398-2\bin\irb.bat"
+      gem:          "C:\temp\more spaces in path\ruby\Ruby-186-p398-2\bin\gem.bat"
+      rake:         "C:\temp\more spaces in path\ruby\Ruby-186-p398-2\bin\rake.bat"
+      
+      environment:
+      GEM_HOME:     ""
+      HOME:         "C:\temp\path with spaces"
+      IRBRC:        ""
+      RUBYOPT:      "-rubygems"
+      
+      file associations:
+      .rb:           "C:\Ruby\ruby-187-p249\bin\ruby.exe" "%1" %*
+      .rbw:          "C:\Ruby\ruby-187-p249\bin\rubyw.exe" "%1" %*
+      """
+
+  
+  Scenario: No ruby in path
+    Given there is no ruby version in the path
+    When I run "pik info"
+    Then I should see 
+      """    
+
+      Pik info will not work unless there is a version of ruby in the path.
+      
+      You can use pik switch to add one.
+      
+      """
+   
+  Scenario: Multiple rubies in path
+    Given there is more than one ruby version in the path
+    When I run "pik info"
+    Then I should see     
+      """    
+      
+      warning: There is more than one version of ruby in the system path
+      C:\temp\more spaces in path\ruby\Ruby-191-p378-1\bin
+      C:\temp\more spaces in path\ruby\Ruby-186-p398-2\bin
+      """