pik 0.2.6 → 0.2.7

data/features/install_command.feature

@@ -5,25 +5,30 @@ Feature: install command
   So that he can download and install them
 
   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\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]"
+     When I run "pik rm 191 -f -q" 
+    When I run "pik install ruby 1.9.1"
+    Then I should see "** Downloading:  http://rubyforge.org/frs/download.php/71082/ruby-1.9.1-p378-i386-mingw32-1.7z"
+    And I should see "  to:  C:\temp\path with spaces\downloads\ruby-1.9.1-p378-i386-mingw32-1.7z"
+    And I should see "** Extracting:  C:\temp\path with spaces\downloads\ruby-1.9.1-p378-i386-mingw32-1.7z"
+    And I should see "** Adding:  191: ruby 1.9.1p378 (2010-01-10 revision 26273) [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"
+    When I run "pik rm iron 92 -f -q" 
+    When I run "pik in ironruby 0.9.2"
+    Then I should see "** Downloading:  http://rubyforge.org/frs/download.php/66606/ironruby-0.9.2.zip"
+    And I should see "   to:  C:\temp\path with spaces\downloads\ironruby-0.9.2.zip"
+    And I should see "** Extracting:  C:\temp\path with spaces\downloads\ironruby-0.9.2.zip"
+    And I should see "** Adding:  092: IronRuby 0.9.2.0 on .NET 2.0.0.0"
+    And I should see " Located at:  C:\temp\path with spaces\IronRuby-092\bin"
 
-  Scenario: install Ruby 1.8.6
+  Scenario: install Ruby 1.8.7
+    When I run "pik rm 187-test -f -q"
+    When I run "pik rm 187 249  -f -q"
     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"
+    Then I should see "** Downloading:  http://rubyforge.org/frs/download.php/71081/ruby-1.8.7-p249-i386-mingw32-1.7z"
+    And I should see "   to:  C:\temp\path with spaces\downloads\ruby-1.8.7-p249-i386-mingw32-1.7z"
+    And I should see "** Extracting:  C:\temp\path with spaces\downloads\ruby-1.8.7-p249-i386-mingw32-1.7z"
+    And I should see "** Adding:  187: ruby 1.8.7 (2010-01-10 patchlevel 249) [i386-mingw32]"
+    And I should see " Located at:  C:\temp\path with spaces\Ruby-187-p249-1\bin"
+    

data/features/list_command.feature

@@ -6,15 +6,15 @@ Feature: list command
 
   Scenario: list versions
     When I run "pik list"
-    Then I should find "^\d+\: .+ruby"
+    Then I should find "^  \d+\: .+ruby"
 
   Scenario: Determining the current ruby version from the list
     When I run "pik list"
-    Then I should find "^\d+\: .+\*$"
+    Then I should find "^\* \d+\: .+$"
     
   Scenario: list verbose output
     When I run "pik list -v"
-    Then I should find "^\d+\: .+\*$"
+    Then I should find "^\* \d+\: .+$"
     And I should find "path\: C\:[\\\/].+"
     
   Scenario: list remote packages
@@ -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.0RC3:"
+    And I should see "1.4.1:"
     Then I should see "Ruby:"
-    And I should see " 1.8.6-p383"
+    And I should see " 1.9.1-p378"

data/features/pik_install.feature

@@ -13,7 +13,6 @@ Feature: pik_install binary script
     And I should see "pik is installed"
     And I should see "To get help with a command"
     
-    
   Scenario: pik_install to path with spaces
     Given I have not installed pik to C:\temp\path with spaces\bin
     And "C:\temp\path with spaces\bin" is in the system path
@@ -21,4 +20,37 @@ Feature: pik_install binary script
     And then I run "pik help"
     Then I should see "Installing to C:\temp\path with spaces\bin"
     And I should see "pik is installed"
-    And I should see "To get help with a command"
+    And I should see "To get help with a command"
+    
+  Scenario: pik_install with no arguments
+    Given I have not installed pik to C:\temp\path with spaces\bin
+    When I run "pik_install"
+    Then I should see
+    """
+    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
+    
+    """
+    
+  Scenario: pik_install to dir not in system path
+    Given I have not installed pik to C:\temp\path with spaces\bin
+    When I run "pik_install "C:\temp\path with spaces\bin""
+    Then I should see
+    """
+    The directory you installed to is not in the sytem path.
+    C:\temp\path with spaces\bin
+    
+    You will need to add it.
+    """

data/features/remove_command.feature

@@ -5,7 +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-08-04 patchlevel 383) [i386-mingw32]"
-    When I run "pik remove 186 383 -f"
+    Given I have already added "ruby 1.8.6 (2010-02-04 patchlevel 398) [i386-mingw32]"
+    When I run "pik remove 186 398 -f"
     Then I should see "removed"    
     And the version should be removed.

data/features/run_command.feature

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

data/features/step_definitions/pik_commands.rb

@@ -54,18 +54,22 @@ 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
-  Dir[path + "\\pik.bat"].should be_empty
+Given /^there is more than one ruby version in the path$/ do
+  Given "\"#{OTHER_RUBY}\" is in the system path"
 end
 
 Given /^"(.*)" is in the system path$/ do |arg1|
   ENV['PATH'] = [arg1, ENV['PATH']].join(';')
 end
 
-When /^I run "pik_install (.+)"$/ do |args|
-  %x[ruby bin/pik_install #{args} > #{PIK_LOG} 2>&1 ]
+Given /^I have not installed pik to (.+)$/ do |path|
+  FileUtils.rm_rf path if File.exist? path
+  FileUtils.mkdir_p path
+  Dir[path + "\\pik.bat"].should be_empty
+end
+
+When /^I run "pik_install(.*)"$/ do |args|
+  %x[ruby bin/pik_install#{args} > #{PIK_LOG} 2>&1 ]
 end
 
 When /^I run "pik (.+?)" and "pik (.+)",$/ do |args1, args2|
@@ -94,7 +98,12 @@ 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 not see "([^\"]*)"$/ do |arg1|
+  stdout = File.read(PIK_LOG)
+  stdout.should_not match(Regexp.new(Regexp.escape(arg1)))
+end
+
 Then /^I should find "(.*)"$/ do |regexp|
   stdout = File.read(PIK_LOG)
   stdout.should match(Regexp.new(regexp))
@@ -168,4 +177,9 @@ Then /^a gem_home option should be added to the config\.$/ do
   @current_config = YAML.load(File.read(@config_file))
   @ver = @current_config.keys.grep(@version_reg){|k| @current_config[k] }
   @ver[0][:gem_home].should_not be_nil
+end
+
+Then /^I should see$/ do |string|
+  stdout = File.read(PIK_LOG)
+  stdout.should include(string)
 end

data/features/support/env.rb

@@ -0,0 +1,75 @@
+config=<<CONFIG
+--- 
+"092: IronRuby 0.9.2.0 on .NET 2.0.0.0": 
+  :path: !ruby/object:Pathname 
+    path: C:/temp/more spaces in path/ruby/IronRuby-092/bin
+"151: jruby 1.5.1 (ruby 1.8.7 patchlevel 249) (2010-06-06 f3a3480) (Java HotSpot(TM) Client VM 1.6.0_18) [x86-java]": 
+  :path: !ruby/object:Pathname 
+    path: C:/temp/more spaces in path/ruby/JRuby-151/bin
+"186: ruby 1.8.6 (2010-02-04 patchlevel 398) [i386-mingw32]": 
+  :path: !ruby/object:Pathname 
+    path: C:/temp/more spaces in path/ruby/Ruby-186-p398-2/bin
+"187-test: ruby 1.8.7 (2010-01-10 patchlevel 249) [i386-mingw32]": 
+  :path: !ruby/object:Pathname 
+    path: C:/temp/more spaces in path/ruby/Ruby-187-p249-1/bin
+"187: ruby 1.8.7 (2010-01-10 patchlevel 249) [i386-mingw32]": 
+  :path: !ruby/object:Pathname 
+    path: C:/Ruby/ruby-187-p249/bin
+"191: ruby 1.9.1p378 (2010-01-10 revision 26273) [i386-mingw32]": 
+  :path: !ruby/object:Pathname 
+    path: C:/temp/more spaces in path/ruby/Ruby-191-p378-1/bin
+--- 
+:download_dir: !ruby/object:Pathname 
+  path: C:\\temp\\path with spaces\\downloads
+:install_dir: !ruby/object:Pathname 
+  path: C:\\temp\\path with spaces
+CONFIG
+
+require 'yaml'
+require 'pathname'
+require 'fileutils'
+require 'lib/pik'
+require 'rbconfig'
+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['http_proxy'] = "http://localhost:9292"
+
+PIK_LOG = 'log\\output.log'
+TEST_PIK_HOME  = Pathname.new( ENV['HOME'] || ENV['USERPROFILE'] ) + '.pik'
+FAKE_PIK_HOME = 'c:/temp/path with spaces/.pik'
+PID_FILE = 'c:/temp/proxy/proxy.pid'
+
+
+def start_proxy
+  proxy    = Pathname.new( File.dirname(__FILE__)) + 'proxy.ru'
+  log = File.new("c:/temp/proxy/proxy.log", 'w+')
+  Process.create(:app_name => "rackup.bat #{proxy} -s webrick --pid \"#{PID_FILE}\"", :startup_info => {:stdout =>  log.fileno, :stderr => log.fileno})
+end
+
+
+def stop_proxy
+  if File.exist?(PID_FILE)
+    pid = File.read(PID_FILE).to_i
+    Process.kill(3,pid)
+    FileUtils.rm(PID_FILE)
+  end
+end
+
+start_proxy
+
+at_exit do
+  stop_proxy
+end
+
+
+Before do
+  ENV['PATH'] = REAL_PATH
+  FileUtils.rm_rf FAKE_PIK_HOME
+  FileUtils.mkdir_p FAKE_PIK_HOME
+  File.open(File.join(FAKE_PIK_HOME, 'config.yml'), 'w'){|f| f.puts config }
+end
+

data/features/support/proxy.ru

@@ -0,0 +1,81 @@
+# require "net/http"
+
+# Example Usage:
+
+# use Rack::Proxy do |req|
+# if req.path =~ %r{^/remote/service.php$}
+# URI.parse("http://remote-service-provider.com/service-end-point.php?#{req.query}")
+# end
+# end
+#
+# run proc{|env| [200, {"Content-Type" => "text/plain"}, ["Ha ha ha"]] }
+#
+
+require 'rack/cache'
+require 'logger'
+
+module Rack::Cache
+  class Request < Rack::Request
+    # True when the Cache-Control/no-cache directive is present or the
+    # Pragma header is set to no-cache.
+    def no_cache?
+      false
+    end
+  end
+  
+  class Response
+    # Determine if the response is "fresh". Fresh responses may be served from
+    # cache without any interaction with the origin. A response is considered
+    # fresh when it includes a Cache-Control/max-age indicator or Expiration
+    # header and the calculated age is less than the freshness lifetime.
+    def fresh?
+      true
+    end
+  end
+end
+
+use Rack::Cache,
+  :verbose => false,
+  :metastore => 'file:C:/temp/proxy/meta',
+  :entitystore => 'file:C:/temp/proxy/entity'
+
+class Rack::Proxy
+  def initialize(app, &block)
+    self.class.send(:define_method, :uri_for, &block)
+    @app = app
+  end
+
+  def call(env)
+    req = Rack::Request.new(env)
+    method = req.request_method.downcase
+    method[0..0] = method[0..0].upcase
+    return @app.call(env) unless uri = uri_for(req)
+    # env['rack.errors'].write(uri.query)
+    sub_request = Net::HTTP.const_get(method).new("#{uri.path}#{"?" if uri.query}#{uri.query}")
+
+    if sub_request.request_body_permitted? and req.body
+      sub_request.body_stream = req.body
+      sub_request.content_length = req.content_length
+      sub_request.content_type = req.content_type
+    end
+
+    sub_request["X-Forwarded-For"] = (req.env["X-Forwarded-For"].to_s.split(/, +/) + [req.env['REMOTE_ADDR']]).join(", ")
+    sub_request["Accept-Encoding"] = req.accept_encoding
+    sub_request["Referer"] = req.referer
+
+    sub_response = Net::HTTP.start(uri.host, uri.port) do |http|
+      http.request(sub_request)
+    end
+
+    headers = {}
+    sub_response.each_header do |k,v|
+      headers[k] = v unless k.to_s =~ /status|cookie|content-length|transfer-encoding/i
+    end
+
+    [sub_response.code.to_i, headers, [sub_response.read_body]]
+  end
+end
+
+proxy = use(Rack::Proxy){ |req| URI.parse(req.url) }
+
+run proxy

data/features/switch_command.feature

@@ -13,10 +13,10 @@ Feature: switch command
 
     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    |
+      | IronRuby 0.9.2.0 on .NET 2.0.0.0                          | iron 92   |
+      | jruby 1.5.1 (ruby 1.8.7 patchlevel 249)                   | jruby 1.5 |
+      | ruby 1.8.6 (2010-02-04 patchlevel 398) [i386-mingw32]     | 186 398   |
+      | ruby 1.9.1p378 (2010-01-10 revision 26273) [i386-mingw32] | 191 p3    |
       
   Scenario Outline: Switching versions with pattern only
     Given I have added "<version>" to pik
@@ -26,11 +26,11 @@ Feature: switch command
 
     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    |
- 
+      | IronRuby 0.9.2.0 on .NET 2.0.0.0                          | iron 92   |
+      | jruby 1.5.1 (ruby 1.8.7 patchlevel 249)                   | jruby 1.5 |
+      | ruby 1.8.6 (2010-02-04 patchlevel 398) [i386-mingw32]     | 186 398   |
+      | ruby 1.9.1p378 (2010-01-10 revision 26273) [i386-mingw32] | 191 p3    |
+  
    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
@@ -40,7 +40,8 @@ Feature: switch command
 
     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    |     
+      | IronRuby 0.9.2.0 on .NET 2.0.0.0                          | iron 92   |
+      | jruby 1.5.1 (ruby 1.8.7 patchlevel 249)                   | jruby 1.5 |
+      | ruby 1.8.6 (2010-02-04 patchlevel 398) [i386-mingw32]     | 186 398   |
+      | ruby 1.9.1p378 (2010-01-10 revision 26273) [i386-mingw32] | 191 p3    |
+ 

data/features/tag_command.feature

@@ -5,17 +5,17 @@ Feature: tag command
   So that he can tag versions that pik is aware of
   
   Scenario: tag version
-    When I run "pik Ir 91" and "pik tag iron",
+    When I run "pik Ir 92" and "pik tag iron",
     And I run "pik config list"
     Then I should find "tags: \n  iron:"
-    And I should see "  - 091: IronRuby 0.9.1.0 on .NET 2.0.0.0"
+    And I should see "  - 092: IronRuby 0.9.2.0 on .NET 2.0.0.0"
 
   Scenario: run tagged versions
     When I run "pik 191" and "pik tag mingw",
-    And I run "pik 186 383" and "pik tag mingw",
+    And I run "pik 186" 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]"
+    Then I should see "ruby 1.8.6 (2010-02-04 patchlevel 398) [i386-mingw32]"
+    And I should see "ruby 1.9.1p378 (2010-01-10 revision 26273) [i386-mingw32]"
 
   Scenario: run tags with no options
     When I run "pik tags"

data/features/uninstall_command.feature

@@ -5,9 +5,8 @@ Feature: uninstall command
   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."
-    
+    When I run "pik rm iron 92 -f -q" 
+    And I run "pik install ironruby 0.9.2" 
+    And I run "pik unin iron 92 -f"
+    Then I should see "** Deleting C:\temp\path with spaces\IronRuby-092"
+    And I should see "092: IronRuby 0.9.2.0 on .NET 2.0.0.0 has been uninstalled."