pik 0.2.2 → 0.2.3

data/History.txt

@@ -1,7 +1,20 @@
+=== 0.2.3 / 2009-10-25
+
+* install command improvements - better error message on unrecognized implementation, better version picking, better directory naming, renamed some variables to be more concise (not everything is a version - implementations have versions, and versions have packages)
+* added remote option to list command
+* better error message when a version was deleted, but not removed from the config.  Thanks Roger Pack
+* bugfix: run/gem/ruby command hangs when waiting for input. Thanks Roger Pack
+* renamed tools/pik.exe to pik_runner.exe to minimize confusion/conflicts. Thanks Luis Lavena
+* Upgraded to exerb 0.4.4.  Thanks Alexey Borzenkov
+* Added documentation for tags commands. Thanks Luis Lavena
+* 'pik tags' with no options will display the help docs, instead of throwing a cryptic error.  
+* Added docs for ruby and gem command. Improved docs for run command
+
 === 0.2.2 / 2009-10-20
 
 * Pik::Command#get_version now handles paths with spaces.  Thanks to Dominic Sisneros and Vassilis Rizopoulos 
 * All Cucumber scenarios are run against 'C:\temp\path with spaces' instead of 'C:\temp'
+* Added :rebuild task as a dependency to :package task, so that the executable gets rebuilt on packaging.  Thanks, skim.
 
 === 0.2.1 / 2009-10-19
 
@@ -10,7 +23,7 @@
 
 === 0.2.0 / 2009-10-18
 
-* pik is now an exerb compile executable, and must be installed to a location that is in the system path, but is
+* pik is now an exerb compiled executable, and must be installed to a location that is in the system path, but is
   seperate from ruby
 * added pik_install command
 * added support for IronRuby and Jruby

data/Manifest.txt

@@ -50,8 +50,9 @@ lib/pik/contrib/zip/zip.rb
 lib/pik/contrib/zip/zipfilesystem.rb
 lib/pik/contrib/zip/ziprequire.rb
 lib/pik/core_ext/pathname.rb
+lib/pik/implementations.rb
 lib/pik/options.rb
-lib/pik/runner.rb
+lib/pik/pik.rb
 lib/pik/search_path.rb
 lib/pik/which.rb
 lib/pik/windows_env.rb
@@ -62,6 +63,10 @@ spec/commands_spec.rb
 spec/default_command_spec.rb
 spec/gemsync_command_spec.rb
 spec/help_command_spec.rb
+spec/html/ironruby.htm
+spec/html/jruby.htm
+spec/html/ruby.htm
+spec/implementations_spec.rb
 spec/list_command_spec.rb
 spec/pathname_spec.rb
 spec/remove_command_spec.rb
@@ -71,6 +76,6 @@ spec/spec.opts
 spec/switch_command_spec.rb
 spec/which_spec.rb
 tools/pik.bat
-tools/pik/pik
-tools/pik/pik.exe
-tools/pik/pik.exy
+tools/pik/pik_runner
+tools/pik/pik_runner.exe
+tools/pik/pik_runner.exy

data/README.rdoc

@@ -2,9 +2,11 @@
 
 http://github.com/vertiginous/pik
 
-Bugs/Feature: http://github.com/vertiginous/pik/issues
+Mailing List:  http://groups.google.com/group/discuss_pik
 
-Rubyforge:    http://rubyforge.org/projects/pik/
+Rubyforge:  http://rubyforge.org/projects/pik/
+
+Bugs/Feature requests:  http://github.com/vertiginous/pik/issues
 
 Gordon Thiesfeld
 
@@ -58,23 +60,18 @@ Windows, more than one version of Ruby (otherwise, what's the point?) and Rubyge
 
 == INSTALL:
 
-1. If you've used a version previous to this one, you'll need to uninstall them.
-   Don't worry, this will leave your pik config intact.
-    
-    pik run "gem uninstall pik"
-    
-2. Install the pik gem
-
-    gem install pik
+*  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.
     
-3. You need to install pik to a location that's in your path, but someplace other than your ruby\bin dir
-
+*  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.
+   
     >path
       PATH=C:\tools\;C:\ruby\186-p368-mingw32\bin;C:\WINDOWS\system32;C:\WINDOWS
 
     >pik_install C:\tools
   
-4. Add all the versions of ruby that you want to use with pik
+*  If this is a first-time install, add all the versions of ruby that you want to use with pik
 
     >pik add
     Adding:  186: ruby 1.8.6 (2009-03-31 patchlevel 368) [i386-mingw32]
@@ -94,6 +91,11 @@ Note:
   inside of the IronRuby lib:
     
     pik config gem_home=C:\ruby\ironruby-091\lib\ironruby\gems\1.8
+    
+  Also, if you're using a version of JRuby older than 1.4.0RC2, you'll probably need to set the JAVA_HOME env
+  variable.
+  
+   set JAVA_HOME=C:\Program Files\Java\jre6
 
 == EXAMPLES:
 

data/Rakefile

@@ -1,16 +1,17 @@
 # -*- ruby -*-
 
 require 'rubygems'
+require 'win32/process'
 
 file 'tools/pik/pik.exy' do
   Dir.chdir 'tools/pik' do
-    sh('ruby -rexerb/mkexy pik')
+    sh('ruby -rexerb/mkexy pik_runner')
   end
 end
 
 file 'tools/pik/pik.exe', :needs => 'tools/pik/pik.exy' do
   Dir.chdir 'tools/pik' do
-    sh('ruby -S exerb pik.exy')
+    sh('ruby -S exerb pik_runner.exy')
   end
 end
 
@@ -50,20 +51,31 @@ Hoe.spec('pik') do
 
 ----------------------------------------------------------------------------
 
-1. If you've used a version previous to this one, you'll need to uninstall them.
-   Don't worry, this will leave your pik config intact.
+*  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.
     
-    pik run "gem uninstall pik"
-    
-2. Install the pik gem
-
-    gem install pik
-    
-3. You need to install pik to a location that's in your path, but someplace other than your ruby\\bin dir
+*  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.
+   
+    >path
+      PATH=C:\\tools\\;C:\\ruby\\186-p368-mingw32\\bin;C:\\WINDOWS\\system32;C:\\WINDOWS
 
-    pik_install C:\\some\\other\\path
+    >pik_install C:\\tools
   
-4. Add all the versions of ruby that you want to use with pik
+*  If this is a first-time install, add all the versions of ruby that you want to use with pik
+
+    >pik add
+    Adding:  186: ruby 1.8.6 (2009-03-31 patchlevel 368) [i386-mingw32]
+     Located at:  c:/ruby/186-p368-mingw32/bin
+    
+    >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
+     
 
 ----------------------------------------------------------------------------  
 
@@ -74,8 +86,60 @@ end
 require 'cucumber'
 require 'cucumber/rake/task'
 
+namespace :cucumber do
+
+  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"
+  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']
+
 # vim: syntax=Ruby

data/bin/pik_install

@@ -12,12 +12,16 @@ 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
+    :verbose => true
   mkdir_p File.join(install_dir, 'pik'), :verbose => true
-  cp File.join(tools_dir, 'pik', 'pik.exe'), 
-     File.join(install_dir, 'pik') ,
-      :verbose => true
-   puts "\npik is installed"
+  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 "\npik is installed"
 else
   puts "#{install_dir} is not a directory.  pik was not installed."
 end

data/features/add_command.feature

@@ -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_140RC1\bin""
-    Then I should see "Adding:  140: jruby 1.4.0RC1 (ruby 1.8.7 patchlevel 174)"
-    And I should see "Located at:  C:\temp\more spaces in path\ruby\jruby_140RC1\bin"
+    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"
     
     

data/features/env.rb

@@ -2,19 +2,19 @@ config=<<CONFIG
 --- 
 "091: IronRuby 0.9.1.0 on .NET 2.0.0.0": 
   :path: !ruby/object:Pathname 
-    path: c:/temp/more spaces in path/ruby/ironruby_091/bin
-"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]": 
+    path: c:/temp/more spaces in path/ruby/ironruby-091/bin
+"140: jruby 1.4.0RC2 (ruby 1.8.7 patchlevel 174) (2009-10-21 7e77f32) (Java HotSpot(TM) Client VM 1.6.0_14) [x86-java]": 
   :path: !ruby/object:Pathname 
-    path: C:/temp/more spaces in path/ruby/jruby_140RC1/bin
+    path: C:/temp/more spaces in path/ruby/jruby-140RC2/bin
 "186: ruby 1.8.6 (2009-03-31 patchlevel 368) [i386-mingw32]": 
   :path: !ruby/object:Pathname 
     path: c:/ruby/186-p368-mingw32/bin
 "186: ruby 1.8.6 (2009-08-04 patchlevel 383) [i386-mingw32]": 
   :path: !ruby/object:Pathname 
-    path: c:/temp/more spaces in path/ruby/ruby_186-p383/bin
+    path: c:/temp/more spaces in path/ruby/ruby-186-p383/bin
 "191: ruby 1.9.1p243 (2009-07-16 revision 24175) [i386-mingw32]": 
   :path: !ruby/object:Pathname 
-    path: c:/temp/more spaces in path/ruby/ruby_191-p243/bin
+    path: c:/temp/more spaces in path/ruby/ruby-191-p243/bin
 --- 
 :download_dir: !ruby/object:Pathname 
   path: C:\\temp\\path with spaces\\downloads

data/features/install_command.feature

@@ -10,3 +10,20 @@ Feature: install command
     And I should see "   to:  C:\temp\path with spaces\downloads"
     And I should see "** Extracting:  C:\temp\path with spaces\downloads"
     And I should see "** Adding:  191: ruby 1.9.1p243 (2009-07-16 revision 24175) [i386-mingw32]"
+
+
+  Scenario: install IronRuby
+    When I run "pik in ironruby"
+    Then I should see "** Downloading:  http://rubyforge.org/frs/download.php/64504/ironruby-0.9.1.zip"
+    And I should see "   to:  C:\temp\path with spaces\downloads\ironruby-0.9.1.zip"
+    And I should see "** Extracting:  C:\temp\path with spaces\downloads\ironruby-0.9.1.zip"
+    And I should see "** Adding:  091: IronRuby 0.9.1.0 on .NET 2.0.0.0"
+    And I should see " Located at:  C:\temp\path with spaces\IronRuby-091\bin"
+
+  Scenario: install Ruby 1.8.6
+    When I run "pik in ruby 1.8"
+    Then I should see "** Downloading:  http://rubyforge.org/frs/download.php/62267/ruby-1.8.6-p383-i386-mingw32.7z"
+    And I should see "   to:  C:\temp\path with spaces\downloads\ruby-1.8.6-p383-i386-mingw32.7z"
+    And I should see "** Extracting:  C:\temp\path with spaces\downloads\ruby-1.8.6-p383-i386-mingw32.7z"
+    And I should see "** Adding:  186: ruby 1.8.6 (2009-08-04 patchlevel 383) [i386-mingw32]"
+    And I should see " Located at:  C:\temp\path with spaces\Ruby-186-p383\bin"

data/features/list_command.feature

@@ -15,4 +15,13 @@ Feature: list command
   Scenario: list verbose output
     When I run "pik list -v"
     Then I should find "^\d+\: .+\*$"
-    And I should find "path\: C\:[\\\/].+"
+    And I should find "path\: C\:[\\\/].+"
+    
+  Scenario: list remote packages
+    When I run "pik list -r"
+    And I should see "IronRuby:"
+    And I should see "0.9.1:"
+    And I should see "JRuby:"
+    And I should see "1.4.0RC2:"
+    Then I should see "Ruby:"
+    And I should see " 1.8.6-p383"

data/features/switch_command.feature

@@ -14,7 +14,7 @@ Feature: switch command
     Examples:
       | version                                                   | patterns  |
       | IronRuby 0.9.1.0 on .NET 2.0.0.0                          | Ir 91     |
-      | jruby 1.4.0RC1 (ruby 1.8.7 patchlevel 174)                | jruby 1.4 |
+      | jruby 1.4.0RC2 (ruby 1.8.7 patchlevel 174)                | jruby 1.4 |
       | ruby 1.8.6 (2009-08-04 patchlevel 383) [i386-mingw32]     | 186 383   |
       | ruby 1.9.1p243 (2009-07-16 revision 24175) [i386-mingw32] | 191 p2    |
       
@@ -27,7 +27,7 @@ Feature: switch command
     Examples:
       | version                                                   | patterns  |
       | IronRuby 0.9.1.0 on .NET 2.0.0.0                          | Ir 91     |
-      | jruby 1.4.0RC1 (ruby 1.8.7 patchlevel 174)                | jruby 1.4 |
+      | jruby 1.4.0RC2 (ruby 1.8.7 patchlevel 174)                | jruby 1.4 |
       | ruby 1.8.6 (2009-08-04 patchlevel 383) [i386-mingw32]     | 186 383   |
       | ruby 1.9.1p243 (2009-07-16 revision 24175) [i386-mingw32] | 191 p2    |
       

data/features/tag_command.feature

@@ -16,3 +16,8 @@ Feature: tag command
     And I run "pik tags mingw run echo."
     Then I should see "ruby 1.8.6 (2009-08-04 patchlevel 383) [i386-mingw32]"
     And I should see "ruby 1.9.1p243 (2009-07-16 revision 24175) [i386-mingw32]"
+
+  Scenario: run tags with no options
+    When I run "pik tags"
+    Then I should see "The tags command allows you to run a subset of versions."
+    And I should see "C:\>pik tags mingw,jruby gem install my_gem"

data/lib/pik.rb

@@ -1,5 +1,5 @@
 module Pik
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -8,6 +8,8 @@ require 'pathname'
 require 'fileutils'
 require 'rbconfig'
 
+require 'pik/pik'
+require 'pik/batch_file'
 require 'pik/core_ext/pathname'
 require 'pik/commands'
 require 'pik/commands/config_file_editor'
@@ -27,9 +29,10 @@ require 'pik/commands/default_command'
 require 'pik/commands/implode_command'
 require 'pik/commands/tag_command'
 require 'pik/config_file'
+require 'pik/implementations'
 require 'pik/windows_env'
 require 'pik/which'
-require 'pik/batch_file'
+
 require 'pik/search_path'
 
 require 'highline'

data/lib/pik/commands/command.rb

@@ -83,7 +83,7 @@ module Pik
       @config  = config_ || ConfigFile.new
       @hl      = HighLine.new
       add_sigint_handler
-      options.program_name = "#{File.basename($0)} #{self.class.names.join('|')}"
+      options.program_name = "#{PIK_BATCH.basename('.*')} #{self.class.names.join('|')}"
       command_options
       parse_options
       create(PIK_HOME) unless PIK_HOME.exist?

data/lib/pik/commands/config_command.rb

@@ -63,6 +63,9 @@ module Pik
     def command_options
       super
       sep =<<SEP
+If no options are given, the current and global configuration
+is displayed.
+
   Configuration options are:
     
     rubyopt      on = -rubygems, off = blank         

data/lib/pik/commands/help_command.rb

@@ -24,7 +24,7 @@ module Pik
     end
    
     def command_options
-      options.program_name = "#{File.basename($0)} command"
+      options.program_name = "#{PIK_BATCH.basename('.*')} command"
       sep = <<SEP
 
 To get help with a command

data/lib/pik/commands/install_command.rb

@@ -5,56 +5,24 @@ require 'pik/contrib/progressbar'
 module Pik
 
   class  Install < Command
-  
+   
     aka :in
     it "Downloads and installs different ruby versions."
     
-    def versions
-       {
-        'ruby' => {
-          '1.8.6-p383' =>
-          'http://rubyforge.org/frs/download.php/62267/ruby-1.8.6-p383-i386-mingw32.7z',
-          '1.9.1-p243' =>
-          'http://rubyforge.org/frs/download.php/62269/ruby-1.9.1-p243-i386-mingw32.7z'
-          },
-        'ironruby' => {
-          '0.9.1' =>
-          'http://rubyforge.org/frs/download.php/64504/ironruby-0.9.1.zip',
-          '0.9.0' =>
-          'http://rubyforge.org/frs/download.php/61382/ironruby-0.9.0.zip'
-        },
-        'jruby' => {
-          '1.4.0RC1' =>
-          'http://dist.codehaus.org/jruby/1.4.0RC1/jruby-bin-1.4.0RC1.zip'
-        }
-      }
+    def initialize(args=ARGV, config_=nil)
+      super
+      @download_dir = config.global[:download_dir] || PIK_HOME + 'downloads'
+      @install_root = config.global[:install_dir]  || PIK_BATCH.dirname + 'pik'
+      FileUtils.mkdir_p @download_dir.to_s
     end
     
     def execute
-      target = ''
-      @download_dir = config.global[:download_dir] || PIK_HOME + 'downloads'
-      FileUtils.mkdir_p @download_dir.to_s
-      version = @args.shift
-      if versions[version]
-        target += version
-        version = versions[version]
-        @args.each{ |i| version = version.select{|k,v| k =~ Regexp.new(Regexp.escape(i)) } }
-        t, version = most_recent(version)
-        target += "_#{t}"
-      elsif URI.parse(version.to_s) === URI::HTTP
-        version = URI.parse(version.to_s)
-        target  = @args.shift
-      else
-        raise VersionUnknown
-      end
-      install_root = config.global[:install_dir] || PIK_BATCH.dirname + 'pik'
-      target =  install_root + target.gsub('.','')
-      FileUtils.mkdir_p target
-      file = download(version)
+      implementation  = Implementations[@args.shift]
+      target, package = implementation.find(*@args)
+      target          =  @install_root + "#{implementation.subclass}-#{target.gsub('.','')}"
+      file            = download(package)
       extract(target, file)
       add( Pathname(target) + 'bin' )
-    rescue VersionUnknown
-      puts 'unknown'   
     end
     
     def command_options
@@ -77,20 +45,17 @@ SEP
       options.separator sep  
     end
     
-    def most_recent(version)
-      version.sort.last
-    end
-    
-    def download(version, download_dir=@download_dir)   
-      target = download_dir + version.split('/').last
-      puts "** Downloading:  #{version}\n   to:  #{target.windows}\n\n"
-      URI.download(version,target.to_s, {:progress => true})
+    def download(package, download_dir=@download_dir)   
+      target = download_dir + package. split('/').last
+      puts "** Downloading:  #{package} \n   to:  #{target.windows}\n\n"
+      URI.download(package, target.to_s, {:progress => true})
       puts
       return target
     end
     
     def extract(target, file)
       if Which::SevenZip.exe
+        FileUtils.mkdir_p target
         extract_(file, target)
       else
         file = download_seven_zip