pik 0.2.4 → 0.2.5

data/History.txt

@@ -1,3 +1,15 @@
+
+=== 0.2.5 / 2009-10-29
+
+* use upx (http://upx.sf.net/) to compress pik_runner.exe
+* fixes uninstall story so it doesn't conflict with other stories
+* bugfix in uninstall command
+* made all prompts default to 'yes'.  bugfix:interactive add would prompt for jruby\bin dirs twice because of the existence of jruby.exe and jruby.bat
+* fixed downloading of seven_zip error
+* uninstall command
+* fixes bug in BatchFileEditor#switch_path_to
+* switched to HPricot for package searches, requires rubygems and exerb-mingw - closes gh-30
+
 === 0.2.4 / 2009-10-28
 
 * added rake command

data/Manifest.txt

@@ -18,6 +18,7 @@ features/run_command.feature
 features/step_definitions/pik_commands.rb
 features/switch_command.feature
 features/tag_command.feature
+features/uninstall_command.feature
 features/version.feature
 lib/pik.rb
 lib/pik/batch_file.rb
@@ -39,6 +40,7 @@ lib/pik/commands/remove_command.rb
 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/config_file.rb
 lib/pik/contrib/progressbar.rb
 lib/pik/contrib/unzip.rb

data/Rakefile

@@ -1,17 +1,18 @@
 # -*- ruby -*-
 
 require 'rubygems'
+require 'rbconfig'
 require 'win32/process'
 
 ENV['SPEC_OPTS']= '-O spec/spec.opts'
 
 file 'tools/pik/pik_runner.exy' do
   Dir.chdir 'tools/pik' do
-    sh('ruby -rexerb/mkexy pik_runner')
+    sh('ruby -rexerb/mkexy pik_runner -v')
   end
   exy = YAML.load(File.read('tools/pik/pik_runner.exy'))
   zlib1 = {
-    'file' => 'c:/ruby/186-p368-mingw32/bin/zlib1.dll',
+    'file' =>  File.join(RbConfig::CONFIG['bindir'], 'zlib1.dll'),
     'type' => 'extension-library'
   }
   exy['file']['zlib1.dll']  = zlib1
@@ -21,6 +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')
   end
 end
 

data/features/add_command.feature

@@ -18,8 +18,8 @@ Feature: add command
     And I should see "Located at:  C:\ruby\186-p368-mingw32\bin"
 
   Scenario: add a version that has already been added
-    Given I have already added "ruby 1.8.6 (2009-03-31 patchlevel 368) [i386-mingw32]"
-    When I run "pik add C:\ruby\186-p368-mingw32\bin"
+    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""
     Then I should see "This version has already been added."    
     And nothing should be added to the config file.
         

data/features/config_command.feature

@@ -5,7 +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-03-31 patchlevel 368) [i386-mingw32]"
+    Given I have already added "ruby 1.8.6 (2009-08-04 patchlevel 383) [i386-mingw32]"
     And I am currently using it.
     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,8 +5,7 @@ Feature: default command
   That allows her to switch back to the system defined version.
 
   Scenario: switching to the default version
-    # Given my default system version is "ruby 1.8.6 (2009-03-31 patchlevel 368) [i386-mingw32]"
-    And I am currently using "ruby 1.9.1p243 (2009-07-16 revision 24175) [i386-mingw32]"
+    Given I am currently using "ruby 1.9.1p243 (2009-07-16 revision 24175) [i386-mingw32]"
     When I run "pik default -v" and check the path
-    Then I should see "ruby 1.8.6 (2009-03-31 patchlevel 368) [i386-mingw32]"
-    And the path should point to "c:\ruby\186-p368-mingw32\bin"
+    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"

data/features/env.rb

@@ -8,9 +8,6 @@ config=<<CONFIG
 "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-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
@@ -28,8 +25,9 @@ require 'yaml'
 require 'pathname'
 require 'fileutils'
 require 'lib/pik'
+require 'rbconfig'
 
-REAL_PATH  = ENV['PATH']
+REAL_PATH  = SearchPath.new(ENV['PATH']).replace(RbConfig::CONFIG['bindir'], 'c:/temp/more spaces in path/ruby/ruby-186-p383/bin').join
 
 ENV['HOME'] = "C:\\temp\\path with spaces"
 ENV['JAVA_HOME'] = "C:\\Program Files\\Java\\jre6"

data/features/list_command.feature

@@ -22,6 +22,6 @@ Feature: list command
     And I should see "IronRuby:"
     And I should see "0.9.1:"
     And I should see "JRuby:"
-    And I should see "1.4.0RC2:"
+    And I should see "1.4.0RC3:"
     Then I should see "Ruby:"
     And I should see " 1.8.6-p383"

data/features/remove_command.feature

@@ -5,14 +5,7 @@ Feature: remove command
   So that she can remove versions.
 
   Scenario: remove a version from the config
-    Given I have already added "ruby 1.8.6 (2009-03-31 patchlevel 368) [i386-mingw32]"
+    Given I have already added "ruby 1.8.6 (2009-08-04 patchlevel 383) [i386-mingw32]"
     When I run "pik remove 186 383 -f"
     Then I should see "removed"    
-    And the version should be removed.
-    
-  Scenario: remove a version from the config and the filesystem
-  #  Given I have already added "ruby 1.8.6 (2009-03-31 patchlevel 368) [i386-mingw32]"
-  #  When I run "pik remove 186 min -f "
-  #  Then I should see "removed"    
-  #  And the version should be removed.
-        
+    And the version should be removed.

data/features/run_command.feature

@@ -6,22 +6,22 @@ Feature: run command
 
   Scenario: run code
     When I run "pik run "path""
-    Then I should find "PATH=" 5 times
+    Then I should find "PATH=" 4 times
     And I should see each version's path listed
     And I should see each version listed.  
   
   Scenario: ruby command
     When I run "pik ruby -e "puts 'hello world!'" "
-    Then I should find "hello world!" 5 times
+    Then I should find "hello world!" 4 times
     And I should see each version listed.
   
   Scenario: gem command
     When I run "pik gem -v"
-    Then I should find "\n\d\.\d\.\d\n" 5 times
+    Then I should find "\n\d\.\d\.\d\n" 4 times
     And I should see each version listed.
     
   Scenario: rake command
     When I run "pik rake -V"
-    Then I should find "rake, version \d\.\d\.\d\n" 5 times
+    Then I should find "rake, version \d\.\d\.\d\n" 4 times
     And I should see each version listed.
     

data/features/step_definitions/pik_commands.rb

@@ -39,6 +39,10 @@ Given /^I have an empty config\.yml/ do
   File.open(TEST_PIK_HOME + 'config.yml','w'){|f| }
 end
 
+Given /^there is no ruby version in the path$/ do
+  ENV['PATH'] = SearchPath.new(REAL_PATH).remove(Which::Ruby.find).join
+end
+
 Given /^I have not installed pik to (.+)$/ do |path|
   FileUtils.rm_rf path if File.exist? path
   FileUtils.mkdir_p path

data/features/switch_command.feature

@@ -30,4 +30,17 @@ Feature: switch command
       | 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    |
-      
+ 
+   Scenario Outline: Switching versions with no ruby in the path
+    Given I have added "<version>" to pik
+    And there is no ruby version in the path
+    When I run "pik <patterns>" and check the path
+    Then the path should point to it.
+    And the GEM_HOME might get set.
+
+    Examples:
+      | version                                                   | patterns  |
+      | IronRuby 0.9.1.0 on .NET 2.0.0.0                          | Ir 91     |
+      | 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/uninstall_command.feature

@@ -0,0 +1,13 @@
+Feature: uninstall command
+  In order to keep the filesystem clean
+  A developer
+  Wants a command line tool 
+  So that he can download and uninstall older ruby versions
+
+  Scenario: uninstall IronRuby
+    When I run "pik rm Ir 91 -f -q" 
+    And I run "pik add "C:\temp\path with spaces\IronRuby-091\bin""
+    And I run "pik unin Ir 91 -f"
+    Then I should see "** Deleting C:\temp\path with spaces\IronRuby-091"
+    And I should see "091: IronRuby 0.9.1.0 on .NET 2.0.0.0 has been uninstalled."
+    

data/lib/pik.rb

@@ -1,12 +1,20 @@
 module Pik
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
+
+ENV['GEM_HOME'] = nil
+ENV['GEM_PATH'] = nil
+
 require 'yaml'
 require 'pathname'
 require 'fileutils'
+require 'open-uri'
 require 'rbconfig'
+require 'rubygems'
+require 'hpricot'
+require 'highline'
 
 require 'pik/pik'
 require 'pik/batch_file'
@@ -28,14 +36,13 @@ 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/config_file'
 require 'pik/implementations'
+require 'pik/search_path'
 require 'pik/windows_env'
 require 'pik/which'
 
-require 'pik/search_path'
-
-require 'highline'
 
 PIK_HOME  = Pathname.new( ENV['HOME'] || ENV['USERPROFILE'] ) + '.pik'
 

data/lib/pik/commands/add_command.rb

@@ -43,20 +43,20 @@ module Pik
     def add_interactive
       @hl.choose do |menu|  
         menu.prompt = ""
-        menu.choice('e]nter a path'){
+        menu.choice('e]nter a path') do
           dir = @hl.ask("Enter a path to a ruby/bin dir (enter to quit)")
-          execute(dir) unless dir.empty? || !@hl.agree("Add '#{dir}'? [Yn] ")
+          execute(dir) unless dir.empty? || !@hl.agree("Add '#{dir}'?"){|answer| answer.default = 'yes' }
           add_interactive
-        }
-        menu.choice('s]earch'){
+        end
+        menu.choice('s]earch') do
           search_dir = @hl.ask("Enter a search path")
           files = Which::Ruby.glob(search_dir + '**')
-          files.each{|file| 
+          files.uniq.each do |file| 
             dir = File.dirname(file)
-            add(dir) if @hl.agree("Add '#{dir}'? [Yn] ")
-          }
+            add(dir) if @hl.agree("Add '#{dir}'?"){|answer| answer.default = 'yes' }
+          end
           add_interactive
-        }
+        end
         menu.choice('q]uit'){raise QuitError}
       end        
     

data/lib/pik/commands/batch_file_editor.rb

@@ -23,35 +23,25 @@ module Pik
       end
     end  
       
-    def switch_path_to(new_ver)
-      dir = Which::Ruby.find
-      current_config = config[ find_config_from_path(dir) ]
+    def switch_path_to(other)
+      current = Which::Ruby.find
+      
+      new_path = SearchPath.new(ENV['PATH'])
+      new_path.replace_or_add(current, other[:path])
+      
+      # if there is currently a GEM_HOME, remove it's bin dir from the path
+      new_path.remove(Pathname.new(ENV['GEM_HOME']) + 'bin') if ENV['GEM_HOME']
+      
+      # if the new version has a GEM_HOME, add it's bin dir to the path
+      new_path.add(Pathname.new(other[:gem_home]) + 'bin') if other[:gem_home]
       
-      new_path = SearchPath.new(ENV['PATH']).replace_or_add(dir, new_ver[:path])
-      if new_gem_home = new_ver[:gem_home]
-        
-        new_gem_bin = Pathname.new(new_gem_home) + 'bin'
-        
-        if current_gem_home = current_config[:gem_home]
-          current_gem_bin = Pathname.new(current_gem_home) + 'bin'
-          new_path.replace(current_gem_bin, new_gem_bin)
-        else
-          new_path.add(new_gem_bin)
-        end
-      else
-        if current_gem_home = current_config[:gem_home]
-          current_gem_bin = Pathname.new(current_gem_home) + 'bin'
-          new_path.remove(current_gem_bin)
-        end
-      end
       @batch.set('PATH' => new_path.join )
     end
-
-    def switch_gem_home_to(gem_home_dir)
-      gem_home_dir ||= ''
-      gem_path = Pathname.new(gem_home_dir).to_windows 
-      @batch.set('GEM_PATH' => gem_path )
-      @batch.set('GEM_HOME' => gem_path )
+    
+    def switch_gem_home_to(gem_home)
+      gem_home = Pathname(gem_home).to_windows rescue nil
+      @batch.set('GEM_PATH' => gem_home )
+      @batch.set('GEM_HOME' => gem_home )
     end
   
     def echo_ruby_version(path, verb='')

data/lib/pik/commands/implode_command.rb

@@ -9,8 +9,8 @@ module Pik
   
     def execute
       msg =  "Are you sure you want pik to implode? "
-      msg << "This will remove '#{PIK_HOME.to_ruby}'. [Yn] "
-      if @force || @hl.agree(msg)
+      msg << "This will remove '#{PIK_HOME.to_ruby}'."
+      if @force || @hl.agree(msg){|answer| answer.default = 'yes' }
         PIK_HOME.rmtree
       end
     end

data/lib/pik/commands/install_command.rb

@@ -58,7 +58,7 @@ SEP
         FileUtils.mkdir_p target
         extract_(file, target)
       else
-        file = download_seven_zip
+        download_seven_zip
         extract(target, file)
       end  
     end
@@ -80,9 +80,9 @@ SEP
     
     def download_seven_zip
       question = "You need the 7zip utility to extract this file.\n"
-      question << "Would you like me to download it? [Yn]"
-      if @hl.agree question
-        uri    = 'http://downloads.sourceforge.net/sevenzip/7za465.zip'
+      question << "Would you like me to download it? (yes/no)"
+      if @hl.agree(question){|answer| answer.default = 'yes' }
+        uri  = 'http://downloads.sourceforge.net/sevenzip/7za465.zip'
         file = download(uri)
         Zip.fake_unzip(file.to_s, /\.exe|\.dll$/, PIK_BATCH.dirname.to_s)
       else

data/lib/pik/commands/remove_command.rb

@@ -6,14 +6,14 @@ module Pik
     it "Removes a ruby location from pik."
     include ConfigFileEditor
     
-    attr_reader :force
+    attr_reader :force, :quiet
     
     def execute
       to_remove = self.class.choose_from(@args, @config)
       raise QuitError unless to_remove
-      if force || @hl.agree("Are you sure you'd like to remove '#{to_remove}'? [Yn] ")  
+      if force || @hl.agree("Are you sure you'd like to remove '#{to_remove}'?"){|answer| answer.default = 'yes' }
         @config.delete(to_remove)
-        @hl.say("#{to_remove} removed")
+        @hl.say("#{to_remove} removed.") unless quiet
       end
     end
     
@@ -22,6 +22,9 @@ module Pik
       options.on("--force", "-f", "Remove without prompting") do |value|
         @force = value
       end
+      options.on("--quiet", "-q", "Remove without a response") do |value|
+        @quiet = value
+      end
     end
     
   end

data/lib/pik/commands/uninstall_command.rb

@@ -0,0 +1,39 @@
+
+module Pik
+
+  class  UnInstall < Command
+   
+    aka :unin
+    it "Deletes a ruby version from the filesystem and removes it from Pik."
+    
+    attr_reader :force
+    
+    def execute
+      to_remove = self.class.choose_from(@args, @config)
+      raise QuitError unless to_remove
+      if force || @hl.agree("Are you sure you'd like to uninstall '#{to_remove}'?"){|answer| answer.default = 'yes' }
+        puts "** Deleting #{config[to_remove][:path].dirname}"
+        path = config[to_remove][:path].dirname
+        FileUtils.rm_rf(path) if path.exist?
+        remove
+        puts
+        @hl.say("#{to_remove} has been uninstalled.")
+      end
+    end
+    
+    def remove
+      rm = Pik::Remove.new(@args + ['--force', '--quiet'], config)
+      rm.execute
+      rm.close
+    end
+    
+    def command_options
+      super
+      options.on("--force", "-f", "Remove without prompting") do |value|
+        @force = value
+      end
+    end
+  
+  end
+    
+end

data/lib/pik/implementations.rb

@@ -1,4 +1,3 @@
-require 'open-uri'
 
 module Pik
   
@@ -54,14 +53,19 @@ module Pik
       end
       
       def versions
-        vers = read.scan(@re).map{|v| v.reverse}
-        vers.map!{ |name, path| [name, @url + path] }.flatten!
-        Hash[*vers]
+        h = {}
+        Hpricot(read).search("a") do |a|
+          if a_href = a.attributes['href']
+            href, link, version = *a_href.match(@re)
+            h[version] =  @url + link  if version
+          end
+        end
+        h
       end
   
       def read
         uri = URI.parse(@url+@path)
-        uri.read
+        uri.read rescue ''
       end    
   
       def subclass
@@ -75,7 +79,7 @@ module Pik
       def initialize
         super
         @path = "/frs/?group_id=167"
-        @re  = /\"(.+ruby\-(.+)\-i386\-mingw32\.7z)\"/
+        @re  = /(.+ruby\-(.+)\-i386\-mingw32\.7z)/
       end
     
     end
@@ -85,17 +89,18 @@ module Pik
       def initialize
         super
         @path = "/frs/?group_id=4359"
-        @re  = /\"(.+ironruby\-(\d\.\d\.\d)\.zip)\"/
+        @re  = /(.+ironruby\-(\d\.\d\.\d)\.zip)/
       end
     
     end
     
     class JRuby < Base
     
+      # <a href='http://jruby.kenai.com/downloads/1.4.0RC3/jruby-bin-1.4.0RC3.zip'>
       def initialize
         @url  = ''
         @path = "http://www.jruby.org/download"
-        @re   = /\<p.*\>\<a .*href\=\"(.+ruby-bin\-(.+)\.zip)\"/
+        @re   = /(.+\-bin\-(.+)\.zip)/
       end
     end