pik 0.1.1 → 0.2.0

data/spec/remove_command_spec.rb

@@ -4,16 +4,16 @@ describe Pik::Remove do
     Pik::Remove.summary.should eql("Removes a ruby location from pik.")
   end
   
-  it "should have a 'quiet' option" do
-    cmd = Pik::Remove.new(['--quiet'])
-    cmd.quiet.should be_true
+  it "should have a 'force' option" do
+    cmd = Pik::Remove.new(['--force'])
+    cmd.force.should be_true
     
-    cmd = Pik::Remove.new(['-q'])
-    cmd.quiet.should be_true
+    cmd = Pik::Remove.new(['-f'])
+    cmd.force.should be_true
   end
   
   it "should remove items from the config" do
-    cmd = Pik::Remove.new(['a', '-q'], { 
+    cmd = Pik::Remove.new(['a', '-f'], { 
                                    'a' => {:path => 'C:/ruby/bin', :gem_home => 'C:/users/rupert/.gems'}, 
                                    'b' => {:path => 'C:/Ruby19/bin'}
                                    }

data/spec/run_command_spec.rb

@@ -1,36 +1,8 @@
 
 describe Pik::Run do
+
   it "should have a summary" do
-    Pik::Run.summary.should eql("Runs command with all version of ruby that pik is aware of.")
+    Pik::Run.summary.should eql("Runs command with all versions of ruby that pik is aware of.")
   end
   
-  it "should use a batch file to switch paths" do
-    cmd = Pik::Command.new([],nil)
-    current_version = cmd.get_version
-    current_path    = cmd.current_ruby_bin_path
-    ENV['PATH']="C:\\Program Files\\Putty;#{Pathname.new(current_path).to_windows}"
-    cmd = Pik::Run.new(['rake -V'], {
-                                     current_version => {:path => current_path},
-                                     'a' => {:path => 'C:/ruby/bin', :gem_home => 'C:/users/rupert/.gems'}, 
-                                     'b' => {:path => 'C:/Ruby19/bin'}
-                                     }
-    )
-    cmd.execute
-    batch = cmd.instance_variable_get('@batch').file_data
-    
-    batch[1].should eql("SET PATH=#{ENV['PATH']}")
-    batch[2].should eql("SET GEM_PATH=")
-    batch[3].should eql("SET GEM_HOME=")
-    batch[5].should eql("CALL rake -V\n")
-    
-    batch[7].should eql("SET PATH=C:\\Program Files\\Putty;C:\\ruby\\bin;C:\\users\\rupert\\.gems\\bin")
-    batch[8].should eql("SET GEM_PATH=C:\\users\\rupert\\.gems")
-    batch[9].should eql("SET GEM_HOME=C:\\users\\rupert\\.gems")
-    batch[11].should eql("CALL rake -V\n")
-    
-    batch[13].should eql("SET PATH=C:\\Program Files\\Putty;C:\\Ruby19\\bin")
-    batch[14].should eql("SET GEM_PATH=")
-    batch[15].should eql("SET GEM_HOME=")
-    batch[17].should eql("CALL rake -V\n")
-  end
 end

data/spec/search_path_spec.rb

@@ -116,6 +116,15 @@ describe SearchPath do
 			@path.join.should == new_path
 		end
 
+		describe "find" do
+			it "should return the first path where block is not false" do
+				path = SearchPath.new(ENV['PATH'])
+				dir = path.find{|i| !!Dir[ File.join(i.gsub('\\','/'), '{ruby.exe, ir.exe}') ].first }
+				dir.should_not be_nil
+				dir.should be_a(String)
+			end
+		end
+
 	end
 
 end

data/spec/switch_command_spec.rb

@@ -1,3 +1,5 @@
+require 'pathname'
+
 describe Pik::Switch do
   
   it "should have a summary" do
@@ -23,7 +25,11 @@ describe Pik::Switch do
   # end
   
   it "should use a batch file to switch paths" do
-    cmd = Pik::Switch.new(['spec'], {'spec' => {:path => 'C:/ruby/bin'}})
+    conf = {
+      'spec ' => {:path => Pathname('C:/ruby/bin')},
+      'real ' => {:path => Pathname.new(::RbConfig::CONFIG['bindir'] )}
+    }
+    cmd = Pik::Switch.new(['spec'], conf)
     cmd.execute
     batch = cmd.instance_variable_get('@batch').file_data
     batch.should include("SET GEM_PATH=")
@@ -33,7 +39,13 @@ describe Pik::Switch do
   end
   
   it "should switch gem_home and gem_path if the config has a :gem_home" do
-    conf = {'spec' => {:path => 'C:/ruby/bin', :gem_home => 'C:/Users/martin_blanke/.gems'}}
+    conf = {
+      'spec ' => {
+          :path => Pathname('C:/ruby/bin'), 
+          :gem_home => Pathname('C:/Users/martin_blanke/.gems')
+        },
+      'real ' => {:path => Pathname.new(::RbConfig::CONFIG['bindir'] )}
+      }
     cmd = Pik::Switch.new(['spec'], conf)
     cmd.execute
     batch = cmd.instance_variable_get('@batch').file_data

data/spec/which_spec.rb

@@ -0,0 +1,7 @@
+  # describe "current_ruby_bin_path" do
+  #   it "should be a Pathname" do
+  #     need to spec Which
+  #     @cmd.current_ruby_bin_path.should be_a(Pathname)
+  #     @cmd.current_ruby_bin_path.basename.to_s.should == "bin"
+  #   end
+  # end

data/tools/pik.bat

@@ -0,0 +1,2 @@
+@ECHO OFF
+"%~dpn0\%~n0.exe" %~dpf0 %*

data/tools/pik/pik

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+
+lib = File.join(File.dirname(__FILE__), '..','..', 'lib')
+require File.join(lib, 'pik')
+
+include Pik
+
+args = ARGV
+
+Command.clean_gem_batch
+
+begin
+  config  = ConfigFile.new
+  
+  args_minus_opts = args.reject{|p| p =~ /^-/}
+  
+  command = if args_minus_opts.empty?
+    Help
+  elsif (c = Commands.find(args.first))
+    args.shift
+    c
+  elsif (choice = Command.choose_from(args_minus_opts, config))
+    args = [choice] + args
+    Switch
+  end
+  
+  if config.empty? && command != Pik::Add
+    add = Pik::Add.new([], config)
+    add.execute
+    add.close
+  end
+  
+  raise "The command '#{args.join(' ')}' is unknown." unless command
+  cmd = command.new(args, config)
+  cmd.execute
+rescue QuitError
+  puts "\nQuitting..."
+rescue => e
+  puts "\nThere was an error"
+  puts " Error: #{e.message}\n\n"
+  puts e.backtrace.map{|m| "  in: #{m}" }
+ensure
+  cmd.close if cmd
+end 
+

data/tools/pik/pik.exy

@@ -0,0 +1,198 @@
+# Generated by mkexy
+# on 2009-10-18 23:27
+
+general:
+  startup: pik
+  core: cui
+  kcode: none
+
+file:
+  pik:
+  stringio.so:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/i386-mingw32/stringio.so
+    type: extension-library
+  yaml/error.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/yaml/error.rb
+  syck.so:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/i386-mingw32/syck.so
+    type: extension-library
+  yaml/ypath.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/yaml/ypath.rb
+  yaml/basenode.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/yaml/basenode.rb
+  yaml/syck.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/yaml/syck.rb
+  yaml/tag.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/yaml/tag.rb
+  yaml/stream.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/yaml/stream.rb
+  yaml/constants.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/yaml/constants.rb
+  rational.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/rational.rb
+  date/format.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/date/format.rb
+  date.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/date.rb
+  yaml/rubytypes.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/yaml/rubytypes.rb
+  yaml/types.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/yaml/types.rb
+  yaml.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/yaml.rb
+  pathname.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/pathname.rb
+  etc.so:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/i386-mingw32/etc.so
+    type: extension-library
+  fileutils.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/fileutils.rb
+  rbconfig.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/i386-mingw32/rbconfig.rb
+  pik/core_ext/pathname.rb:
+    file: ./../../lib/pik/core_ext/pathname.rb
+  pik/commands.rb:
+    file: ./../../lib/pik/commands.rb
+  pik/commands/config_file_editor.rb:
+    file: ./../../lib/pik/commands/config_file_editor.rb
+  pik/commands/batch_file_editor.rb:
+    file: ./../../lib/pik/commands/batch_file_editor.rb
+  optparse.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/optparse.rb
+  pik/commands/command.rb:
+    file: ./../../lib/pik/commands/command.rb
+  English.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/English.rb
+  delegate.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/delegate.rb
+  cgi.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/cgi.rb
+  uri/common.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/uri/common.rb
+  uri/generic.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/uri/generic.rb
+  uri/ftp.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/uri/ftp.rb
+  uri/http.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/uri/http.rb
+  uri/https.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/uri/https.rb
+  uri/ldap.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/uri/ldap.rb
+  uri/mailto.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/uri/mailto.rb
+  uri.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/uri.rb
+  socket.so:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/i386-mingw32/socket.so
+    type: extension-library
+  timeout.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/timeout.rb
+  net/protocol.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/net/protocol.rb
+  net/http.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/net/http.rb
+  openssl.so:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/i386-mingw32/openssl.so
+    type: extension-library
+  openssl/bn.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/openssl/bn.rb
+  openssl/cipher.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/openssl/cipher.rb
+  openssl/digest.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/openssl/digest.rb
+  openssl/buffering.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/openssl/buffering.rb
+  fcntl.so:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/i386-mingw32/fcntl.so
+    type: extension-library
+  openssl/ssl.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/openssl/ssl.rb
+  openssl/x509.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/openssl/x509.rb
+  openssl.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/openssl.rb
+  net/https.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/net/https.rb
+  Win32API.so:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/i386-mingw32/Win32API.so
+    type: extension-library
+  tmpdir.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/tmpdir.rb
+  tempfile.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/tempfile.rb
+  pik/contrib/uri_ext.rb:
+    file: ./../../lib/pik/contrib/uri_ext.rb
+  singleton.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/singleton.rb
+  zlib.so:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/i386-mingw32/zlib.so
+    type: extension-library
+  zip/stdrubyext.rb:
+    file: ./../../lib/pik/contrib/zip/stdrubyext.rb
+  zip/ioextras.rb:
+    file: ./../../lib/pik/contrib/zip/ioextras.rb
+  zip/zip.rb:
+    file: ./../../lib/pik/contrib/zip/zip.rb
+  pik/contrib/unzip.rb:
+    file: ./../../lib/pik/contrib/unzip.rb
+  pik/contrib/progressbar.rb:
+    file: ./../../lib/pik/contrib/progressbar.rb
+  pik/commands/install_command.rb:
+    file: ./../../lib/pik/commands/install_command.rb
+  pik/commands/list_command.rb:
+    file: ./../../lib/pik/commands/list_command.rb
+  pik/commands/add_command.rb:
+    file: ./../../lib/pik/commands/add_command.rb
+  pik/commands/help_command.rb:
+    file: ./../../lib/pik/commands/help_command.rb
+  pik/commands/switch_command.rb:
+    file: ./../../lib/pik/commands/switch_command.rb
+  pik/commands/run_command.rb:
+    file: ./../../lib/pik/commands/run_command.rb
+  pik/commands/remove_command.rb:
+    file: ./../../lib/pik/commands/remove_command.rb
+  pik/commands/checkup_command.rb:
+    file: ./../../lib/pik/commands/checkup_command.rb
+  pik/commands/config_command.rb:
+    file: ./../../lib/pik/commands/config_command.rb
+  pik/commands/gemsync_command.rb:
+    file: ./../../lib/pik/commands/gemsync_command.rb
+  pik/commands/default_command.rb:
+    file: ./../../lib/pik/commands/default_command.rb
+  pik/commands/implode_command.rb:
+    file: ./../../lib/pik/commands/implode_command.rb
+  pik/commands/tag_command.rb:
+    file: ./../../lib/pik/commands/tag_command.rb
+  pik/config_file.rb:
+    file: ./../../lib/pik/config_file.rb
+  win32/registry.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/win32/registry.rb
+  pik/windows_env.rb:
+    file: ./../../lib/pik/windows_env.rb
+  pik/which.rb:
+    file: ./../../lib/pik/which.rb
+  pik/batch_file.rb:
+    file: ./../../lib/pik/batch_file.rb
+  pik/search_path.rb:
+    file: ./../../lib/pik/search_path.rb
+  strscan.so:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/i386-mingw32/strscan.so
+    type: extension-library
+  erb.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/erb.rb
+  abbrev.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/1.8/abbrev.rb
+  highline/compatibility.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/site_ruby/1.8/highline/compatibility.rb
+  highline/system_extensions.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/site_ruby/1.8/highline/system_extensions.rb
+  highline/question.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/site_ruby/1.8/highline/question.rb
+  highline/menu.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/site_ruby/1.8/highline/menu.rb
+  highline/color_scheme.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/site_ruby/1.8/highline/color_scheme.rb
+  highline.rb:
+    file: c:/ruby/186-p368-mingw32/lib/ruby/site_ruby/1.8/highline.rb
+  ./../../lib/pik.rb:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pik
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Gordon Thiesfeld
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-25 00:00:00 -05:00
+date: 2009-10-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,11 +42,15 @@ description: |-
   You have to tell it where your different ruby versions live using 
   'pik add'.  Then you can change to one by using 'pik switch'.
   
-  It also has a "sort of" multiruby functionality in 'pik run'.
+  It also supports running commands/code with all versions configured.
+  
+    pik run  #  Runs commands on the command line
+    pik ruby #  Runs using the ruby interpreter for each version (ruby.exe, jruby.bat, ir.exe)
+    pik gem  #  Runs using the gem command for each version  (gem.bat, igem.bat)
 email: 
 - gthiesfeld@gmail.com
 executables: 
-- pik
+- pik_install
 extensions: []
 
 extra_rdoc_files: 
@@ -57,7 +61,23 @@ files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- bin/pik
+- bin/pik_install
+- features/add_command.feature
+- features/checkup_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/install_command.feature
+- features/list_command.feature
+- features/remove_command.feature
+- features/run_command.feature
+- features/step_definitions/pik_commands.rb
+- features/switch_command.feature
+- features/tag_command.feature
+- features/version.feature
 - lib/pik.rb
 - lib/pik/batch_file.rb
 - lib/pik/checkup.rb
@@ -72,15 +92,27 @@ files:
 - lib/pik/commands/gemsync_command.rb
 - lib/pik/commands/help_command.rb
 - lib/pik/commands/implode_command.rb
+- lib/pik/commands/install_command.rb
 - lib/pik/commands/list_command.rb
 - 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/config_file.rb
+- lib/pik/contrib/progressbar.rb
+- lib/pik/contrib/unzip.rb
+- lib/pik/contrib/uri_ext.rb
+- lib/pik/contrib/zip/ioextras.rb
+- lib/pik/contrib/zip/stdrubyext.rb
+- lib/pik/contrib/zip/tempfile_bugfixed.rb
+- 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/options.rb
 - lib/pik/runner.rb
 - lib/pik/search_path.rb
+- lib/pik/which.rb
 - lib/pik/windows_env.rb
 - spec/add_command_spec.rb
 - spec/batch_file_spec.rb
@@ -90,31 +122,28 @@ files:
 - spec/gemsync_command_spec.rb
 - spec/help_command_spec.rb
 - spec/list_command_spec.rb
+- spec/pathname_spec.rb
 - spec/remove_command_spec.rb
 - spec/run_command_spec.rb
 - spec/search_path_spec.rb
 - 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
 has_rdoc: true
 homepage: http://github.com/vertiginous/pik
 licenses: []
 
-post_install_message: |+
-  
-  ----------------------------------------------------------------------------
-  
-    1.  Use 'pik add' to add all versions of ruby to your pik config, 
-        or use 'pik add -i' for an interactive console to do the same.
-        The current ruby version is added by default.  
-       
-          see 'pik help add' for more info
-    
-    2.  Run 'pik run "gem install pik"' to install pik to all Ruby versions.
-  
-    3.  Run 'pik help' for help.
-  
-  ----------------------------------------------------------------------------  
-  
+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"
 rdoc_options: 
 - --main
 - README.rdoc