pik 0.2.1 → 0.2.2

data/History.txt

@@ -1,6 +1,11 @@
+=== 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'
+
 === 0.2.1 / 2009-10-19
 
-* bugfix - path to pik could have spaces.
+* bugfix - path to pik could have spaces - thanks, Dominic Sisneros
 * update install instructions
 
 === 0.2.0 / 2009-10-18

data/Manifest.txt

@@ -4,7 +4,6 @@ README.rdoc
 Rakefile
 bin/pik_install
 features/add_command.feature
-features/checkup_command.feature
 features/config_command.feature
 features/default_command.feature
 features/env.rb

data/README.rdoc

@@ -1,7 +1,10 @@
 = pik
 
 http://github.com/vertiginous/pik
-http://rubyforge.org/projects/pik/
+
+Bugs/Feature: http://github.com/vertiginous/pik/issues
+
+Rubyforge:    http://rubyforge.org/projects/pik/
 
 Gordon Thiesfeld
 

data/Rakefile

@@ -1,6 +1,38 @@
 # -*- ruby -*-
 
 require 'rubygems'
+
+file 'tools/pik/pik.exy' do
+  Dir.chdir 'tools/pik' do
+    sh('ruby -rexerb/mkexy pik')
+  end
+end
+
+file 'tools/pik/pik.exe', :needs => 'tools/pik/pik.exy' do
+  Dir.chdir 'tools/pik' do
+    sh('ruby -S exerb pik.exy')
+  end
+end
+
+task :build, :needs => 'tools/pik/pik.exe'
+
+task :install, :needs => :build do
+  sh('ruby bin/pik_install C:\\bin')
+end
+
+task :clobber_exe do
+  rm_rf 'tools/pik/pik.exe'
+end
+
+task :clobber_exy, :needs => :clobber_exe do
+  rm_rf 'tools/pik/pik.exy'
+end
+
+task :rebuild, :needs => [:clobber_exy, :build]
+task :reinstall, :needs => [:clobber_exy, :install]
+
+task :package => :rebuild
+
 require 'hoe'
 
 $LOAD_PATH.unshift('lib')
@@ -27,7 +59,7 @@ Hoe.spec('pik') do
 
     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
+3. You need to install pik to a location that's in your path, but someplace other than your ruby\\bin dir
 
     pik_install C:\\some\\other\\path
   
@@ -39,40 +71,11 @@ PIM
 
 end
 
-file 'tools/pik/pik.exy' do
-  Dir.chdir 'tools/pik' do
-    sh('ruby -rexerb/mkexy pik')
-  end
-end
-
-file 'tools/pik/pik.exe', :needs => 'tools/pik/pik.exy' do
-  Dir.chdir 'tools/pik' do
-    sh('ruby -S exerb pik.exy')
-  end
-end
-
-task :build, :needs => 'tools/pik/pik.exe'
-
-task :install, :needs => :build do
-  sh('ruby bin/pik_install C:\\bin')
-end
-
-task :clobber_exe do
-  rm_rf 'tools/pik/pik.exe'
-end
-
-task :clobber_exy, :needs => :clobber_exe do
-  rm_rf 'tools/pik/pik.exy'
-end
-
-task :rebuild, :needs => [:clobber_exy, :build]
-task :reinstall, :needs => [:clobber_exy, :install]
-
 require 'cucumber'
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = "features --format pretty"
+  t.cucumber_opts = "features  -f html -o ../pik_cucumber.html -f progress"
 end
 
 # vim: syntax=Ruby

data/features/add_command.feature

@@ -26,3 +26,11 @@ Feature: add command
   Scenario: add a nonexistent version
     When I run "pik add C:\ruby\nonexistent_ruby\bin"
     Then I should see "Couldn't find a Ruby version at C:\ruby\nonexistent_ruby\bin"
+    
+  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"
+    
+    

data/features/env.rb

@@ -1,48 +1,41 @@
 config=<<CONFIG
 --- 
-"090: IronRuby 0.9.0.0 on .NET 2.0.0.0": 
-  :gem_home: !ruby/object:Pathname 
-    path: c:\\ruby\\ironruby-0.9.0\\lib\\ironruby\\gems\\1.8
-  :path: !ruby/object:Pathname 
-    path: C:/ruby/IronRuby-0.9.0/bin
 "091: IronRuby 0.9.1.0 on .NET 2.0.0.0": 
-  :gem_home: !ruby/object:Pathname 
-    path: c:\\temp\\ruby\\ironruby_091\\lib\\ironruby\\gems\\1.8
-  :path: !ruby/object:Pathname 
-    path: c:/temp/ruby/ironruby_091/bin
-"131: jruby 1.3.1 (ruby 1.8.6p287) (2009-06-15 2fd6c3d) (Java HotSpot(TM) Client VM 1.6.0_14) [x86-java]": 
   :path: !ruby/object:Pathname 
-    path: C:/ruby/jruby-131/bin
+    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: !ruby/object:Pathname 
-    path: c:/temp/ruby/jruby_140RC1/bin
-"185: ruby 1.8.5 (2006-12-25 patchlevel 12) [i386-mswin32]": 
-  :path: !ruby/object:Pathname 
-    path: C:/ruby/185-p012-mswin32/bin
-"186: ruby 1.8.6 (2008-08-11 patchlevel 287) [i386-mswin32]": 
-  :path: !ruby/object:Pathname 
-    path: C:/ruby/186-p287-mswin32/bin
+    path: C:/temp/more spaces in path/ruby/jruby_140RC1/bin
 "186: ruby 1.8.6 (2009-03-31 patchlevel 368) [i386-mingw32]": 
   :path: !ruby/object:Pathname 
     path: c:/ruby/186-p368-mingw32/bin
-"191: ruby 1.9.1p129 (2009-05-12 revision 23412) [i386-mingw32]": 
+"186: ruby 1.8.6 (2009-08-04 patchlevel 383) [i386-mingw32]": 
   :path: !ruby/object:Pathname 
-    path: C:/ruby/191-p129-mingw32/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:/ruby/191-p243-mingw32/bin
+    path: c:/temp/more spaces in path/ruby/ruby_191-p243/bin
 --- 
 :download_dir: !ruby/object:Pathname 
-  path: c:\\temp\\.pik\\downloads
+  path: C:\\temp\\path with spaces\\downloads
 :install_dir: !ruby/object:Pathname 
-  path: c:\\temp\\ruby
+  path: C:\\temp\\path with spaces
 CONFIG
 
+require 'yaml'
+require 'pathname'
+require 'fileutils'
+require 'lib/pik'
+
 REAL_PATH  = ENV['PATH']
-FAKE_PIK_HOME = 'c:/temp/.pik'
-ENV['HOME'] = "C:\\temp"
+
+ENV['HOME'] = "C:\\temp\\path with spaces"
 ENV['JAVA_HOME'] = "C:\\Program Files\\Java\\jre6"
 
+PIK_LOG = 'log\\output.log'
+TEST_PIK_HOME  = Pathname.new( ENV['HOME'] || ENV['USERPROFILE'] ) + '.pik'
+FAKE_PIK_HOME = 'c:/temp/path with spaces/.pik'
+
 Before do
   ENV['PATH'] = REAL_PATH
   FileUtils.rm_rf FAKE_PIK_HOME

data/features/implode_command.feature

@@ -6,7 +6,7 @@ Feature: implode command
   
   
   Scenario: pik implode
-    Given I have a directory "C:/temp/.pik"
+    Given I have a directory "C:/temp/path with spaces/.pik"
     And it contains a config.yml
     When I run "pik implode -f"
     Then the directory should be deleted

data/features/install_command.feature

@@ -7,7 +7,6 @@ Feature: install command
   Scenario: install from the intarwebs
     When I run "pik install ruby"
     Then I should see "** Downloading:  http://rubyforge.org/frs/download.php/62269/ruby-1.9.1-p243-i386-mingw32.7z"
-    And I should see "   to:  c:\temp\.pik"
-    And I should see "** Extracting:  c:\temp\.pik\downloads"
-    And I should see "** Adding:  "
-
+    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]"

data/features/remove_command.feature

@@ -6,13 +6,13 @@ Feature: remove command
 
   Scenario: remove a version from the config
     Given I have already added "ruby 1.8.6 (2009-03-31 patchlevel 368) [i386-mingw32]"
-    When I run "pik remove 186 min -f"
+    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.
+  #  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.
         

data/features/run_command.feature

@@ -6,17 +6,17 @@ Feature: run command
 
   Scenario: run code
     When I run "pik run "path""
-    Then I should find "PATH=" 9 times
+    Then I should find "PATH=" 5 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!" 9 times
+    Then I should find "hello world!" 5 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" 9 times
+    Then I should find "\n\d\.\d\.\d\n" 5 times
     And I should see each version listed.
     

data/features/step_definitions/pik_commands.rb

@@ -1,14 +1,7 @@
-require 'yaml'
-require 'pathname'
-require 'fileutils'
-
-PIK_LOG = 'log\\output.log'
-PIK_HOME  = Pathname.new( ENV['HOME'] || ENV['USERPROFILE'] ) + '.pik'
-
 Given /^I have.+added "(.+)"/ do |version|
   @version = version
   @version_reg = Regexp.new(Regexp.escape(version), Regexp::IGNORECASE)
-  @config_file = PIK_HOME + 'config.yml'
+  @config_file = TEST_PIK_HOME + 'config.yml'
   @original_config = YAML.load(File.read(@config_file))
   @ver = @original_config.keys.grep(@version_reg){|k| @original_config[k] }
   @ver.size.should eql(1)
@@ -38,12 +31,12 @@ Given /^it contains a config\.yml/ do
 end
 
 Given /^I have no \.pik directory/ do
-  FileUtils.rm_rf PIK_HOME
-  PIK_HOME.should_not exist
+  FileUtils.rm_rf TEST_PIK_HOME
+  TEST_PIK_HOME.should_not exist
 end
 
 Given /^I have an empty config\.yml/ do
-  File.open(PIK_HOME + 'config.yml','w'){|f| }
+  File.open(TEST_PIK_HOME + 'config.yml','w'){|f| }
 end
 
 Given /^I have not installed pik to (.+)$/ do |path|
@@ -61,7 +54,7 @@ When /^I run "pik_install (.+)"$/ do |args|
 end
 
 When /^I run "pik (.+?)" and "pik (.+)",$/ do |args1, args2|
-  %x[tools\\pik.bat #{args1} > #{PIK_LOG} 2>&1 && tools\\pik.bat #{args2} > #{PIK_LOG} 2>&1]
+  %x[tools\\pik.bat #{args1} > #{PIK_LOG} 2>&1 & tools\\pik.bat #{args2} >> #{PIK_LOG} 2>&1]
 end
 
 When /^I run "pik (.+?)"$/ do |args|
@@ -80,6 +73,12 @@ Then /^I should see "(.*)"$/ do |data|
   stdout = File.read(PIK_LOG)
   stdout.should match(Regexp.new(Regexp.escape(data)))
 end
+
+
+Then /^I should see the Pik::VERSION$/ do
+  stdout = File.read(PIK_LOG)
+  stdout.should match(Regexp.new(Regexp.escape(Pik::VERSION)))
+end
  
 Then /^I should find "(.*)"$/ do |regexp|
   stdout = File.read(PIK_LOG)
@@ -107,7 +106,7 @@ end
 
 Then /^I should see each version.s path listed$/ do
   stdout = File.read(PIK_LOG)
-  config_file = PIK_HOME + 'config.yml'
+  config_file = TEST_PIK_HOME + 'config.yml'
   config = YAML.load(File.read(config_file))
   config.each{|k,v| 
     path = Regexp.new(Regexp.escape(v[:path].to_s.gsub('/','\\')))
@@ -117,7 +116,7 @@ end
 
 Then /^I should see each version listed\.$/ do
   stdout = File.read(PIK_LOG)
-  config_file = PIK_HOME + 'config.yml'
+  config_file = TEST_PIK_HOME + 'config.yml'
   config = YAML.load(File.read(config_file))
   config.each{|k,v| 
     version = Regexp.new(Regexp.escape(k.split(': ')[1..-1].join(': ')))
@@ -136,7 +135,7 @@ Then /^the GEM_HOME might get set\.$/ do
 end
 
 Then /^the directory should be deleted$/ do
-  Pathname(@dir).should_not exist
+  Pathname(TEST_PIK_HOME).should_not exist
 end
 
 Then /^nothing should be added to the config file\.$/ do
@@ -149,7 +148,6 @@ Then /^the version should be removed\.$/ do
   @current_config.size.should eql(@original_config.size - 1)
 end
 
-
 Then /^a gem_home option should be added to the config\.$/ do
   @ver[0][:gem_home].should be_nil
   @current_config = YAML.load(File.read(@config_file))

data/features/switch_command.feature

@@ -15,8 +15,7 @@ Feature: switch command
       | 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 |
-      | ruby 1.8.6 (2008-08-11 patchlevel 287) [i386-mswin32]     | 186 ms    |
-      | ruby 1.8.6 (2009-03-31 patchlevel 368) [i386-mingw32]     | 186 mi    |
+      | 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 pattern only
@@ -29,7 +28,6 @@ Feature: switch command
       | 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 |
-      | ruby 1.8.6 (2008-08-11 patchlevel 287) [i386-mswin32]     | 186 ms    |
-      | ruby 1.8.6 (2009-03-31 patchlevel 368) [i386-mingw32]     | 186 mi    |
+      | 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

@@ -11,8 +11,8 @@ Feature: tag command
     And I should see "  - 091: IronRuby 0.9.1.0 on .NET 2.0.0.0"
 
   Scenario: run tagged versions
-    When I run "pik Ir 91" and "pik tag iron",
-    And I run "pik Ir 90" and "pik tag iron",
-    And I run "pik tags iron run echo."
-    Then I should find "IronRuby 0.9.1.0 on .NET 2.0.0.0"
-    And I should find "IronRuby 0.9.0.0 on .NET 2.0.0.0"
+    When I run "pik 191" and "pik tag mingw",
+    And I run "pik 186 383" and "pik tag mingw",
+    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]"

data/features/version.feature

@@ -6,4 +6,5 @@ Feature: display pik version
   
   Scenario: Listing versions
     When I run "pik -V"
-    Then I should find "^pik \d.\d.\d"
+    Then I should see "pik "
+    And I should see the Pik::VERSION

data/lib/pik.rb

@@ -1,5 +1,5 @@
 module Pik
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/lib/pik/commands/command.rb

@@ -118,7 +118,7 @@ module Pik
         
     def get_version(path=Which::Ruby.find)
       cmd = Which::Ruby.exe(path)
-      ruby_ver = `#{cmd} -v`
+      ruby_ver = `"#{cmd}" -v`
       ruby_ver =~ /ruby (\d\.\d\.\d)/i
       major    = $1.gsub('.','')
       "#{major}: #{ruby_ver.strip}"

data/lib/pik/commands/run_command.rb

@@ -67,7 +67,7 @@ SEP
         
     def echo_ruby_version(path)
       rb = Which::Ruby.exe(path)
-      puts `#{rb} -v `
+      puts `"#{rb}" -v `
     end
 
   end

data/tools/pik/pik.exy

@@ -1,5 +1,5 @@
 # Generated by mkexy
-# on 2009-10-18 23:27
+# on 2009-10-26 13:54
 
 general:
   startup: pik

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pik
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Gordon Thiesfeld
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-19 00:00:00 -05:00
+date: 2009-10-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -63,7 +63,6 @@ files:
 - Rakefile
 - bin/pik_install
 - features/add_command.feature
-- features/checkup_command.feature
 - features/config_command.feature
 - features/default_command.feature
 - features/env.rb
@@ -138,13 +137,27 @@ has_rdoc: true
 homepage: http://github.com/vertiginous/pik
 licenses: []
 
-post_install_message: "\n\
-  ----------------------------------------------------------------------------\n\n\
-  1. If you've used a version previous to this one, you'll need to uninstall them.\n   Don't worry, this will leave your pik config intact.\n    \n    pik run \"gem uninstall pik\"\n    \n\
-  2. Install the pik gem\n\n    gem install pik\n    \n\
-  3. You need to install pik to a location that's in your path, but someplace other than your ruby\bin dir\n\n    pik_install C:\\some\\other\\path\n  \n\
-  4. Add all the versions of ruby that you want to use with pik\n\n\
-  ----------------------------------------------------------------------------  \n\n"
+post_install_message: |+
+  
+  ----------------------------------------------------------------------------
+  
+  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
+      
+  3. You need to install pik to a location that's in your path, but someplace other than your ruby\bin dir
+  
+      pik_install C:\some\other\path
+    
+  4. Add all the versions of ruby that you want to use with pik
+  
+  ----------------------------------------------------------------------------  
+  
 rdoc_options: 
 - --main
 - README.rdoc